Tim Otten [Sat, 10 Jan 2015 03:44:02 +0000 (19:44 -0800)]
INFRA-132 - tests/ - PHPStorm cleanup
Tim Otten [Fri, 9 Jan 2015 23:09:24 +0000 (15:09 -0800)]
INFRA-132 - FunctionDeclarationArgumentSpacing.SpaceBeforeEquals
Tim Otten [Fri, 9 Jan 2015 23:00:50 +0000 (15:00 -0800)]
INFRA-132 - SpacingAfterBeak
Tim Otten [Fri, 9 Jan 2015 22:48:38 +0000 (14:48 -0800)]
INFRA-132 - BraceOnNewLine. ContentAfterBrace. FirstIndexNoNewline.
colemanw [Sat, 10 Jan 2015 03:05:52 +0000 (22:05 -0500)]
Merge pull request #4895 from colemanw/INFRA-132
INFRA-132 - Whitespace fixes in docbloks
Coleman Watts [Sat, 10 Jan 2015 03:03:14 +0000 (22:03 -0500)]
INFRA-132 - Whitespace fixes in docbloks
Coleman Watts [Sat, 10 Jan 2015 02:47:51 +0000 (21:47 -0500)]
Merge branch 4.5 into master
Conflicts:
CRM/Report/Form.php
CRM/Report/Form/Activity.php
CRM/Utils/File.php
colemanw [Sat, 10 Jan 2015 01:55:56 +0000 (20:55 -0500)]
Merge pull request #4894 from colemanw/CRM-15805
CRM-15805 - Add missing permission declaration for option group/value apis
Coleman Watts [Sat, 10 Jan 2015 00:55:55 +0000 (19:55 -0500)]
CRM-15805 - Add missing permission declaration for option group/value apis
colemanw [Fri, 9 Jan 2015 20:22:35 +0000 (15:22 -0500)]
Merge pull request #4893 from colemanw/INFRA-132
INFRA-132 - Fix spacing of @return tag in comments
Coleman Watts [Fri, 9 Jan 2015 20:19:07 +0000 (15:19 -0500)]
INFRA-132 - Remove extra newlines from the bottom of docblocks
Coleman Watts [Fri, 9 Jan 2015 19:54:55 +0000 (14:54 -0500)]
INFRA-132 - Fix spacing of @return tag in comments
colemanw [Fri, 9 Jan 2015 19:45:32 +0000 (14:45 -0500)]
Merge pull request #4892 from colemanw/INFRA-132
INFRA-132 - Code comment cleanup
Coleman Watts [Fri, 9 Jan 2015 19:37:01 +0000 (14:37 -0500)]
INFRA-132 - Comment grammar cleanup
Coleman Watts [Fri, 9 Jan 2015 18:58:54 +0000 (13:58 -0500)]
INFRA-132 - Comment whitespace cleanup
Coleman Watts [Fri, 9 Jan 2015 18:50:04 +0000 (13:50 -0500)]
INFRA-132 - Fix missing newlines in comments
Coleman Watts [Fri, 9 Jan 2015 18:43:03 +0000 (13:43 -0500)]
INFRA-132 - Fix comment spacing
colemanw [Fri, 9 Jan 2015 16:42:37 +0000 (11:42 -0500)]
Merge pull request #4890 from colemanw/CRM-15803
CRM-15803 - Validate EntityRef values before rendering
colemanw [Fri, 9 Jan 2015 16:34:36 +0000 (11:34 -0500)]
Merge pull request #4891 from colemanw/INFRA-132
INFRA-132 - Fix misplaced @param types in docblocks
Coleman Watts [Fri, 9 Jan 2015 16:00:52 +0000 (11:00 -0500)]
INFRA-132 - @param type fixes
Coleman Watts [Fri, 9 Jan 2015 15:07:24 +0000 (10:07 -0500)]
CRM-15803 - Validate EntityRef values before rendering
Monish Deb [Fri, 9 Jan 2015 15:06:41 +0000 (20:36 +0530)]
Merge pull request #4886 from rohankatkar/webtest4.6
Webtests Fixes
colemanw [Fri, 9 Jan 2015 14:30:04 +0000 (09:30 -0500)]
Merge pull request #4888 from colemanw/master
INFRA-132 - Docblock cleanup
Coleman Watts [Fri, 9 Jan 2015 14:25:24 +0000 (09:25 -0500)]
INFRA-132 - Docblock cleanup
colemanw [Fri, 9 Jan 2015 13:56:06 +0000 (08:56 -0500)]
Merge pull request #4882 from colemanw/CRM-15789
CRM-15789 - Additional button/icon cleanup
Web Access [Fri, 9 Jan 2015 13:09:34 +0000 (18:39 +0530)]
Webtests Fixes
Eileen McNaughton [Fri, 9 Jan 2015 06:50:23 +0000 (19:50 +1300)]
Merge pull request #4865 from eileenmcnaughton/my-first-factory
CRM-15771 - CRM_Core_Payment - Replace singletons with manager class
Tim Otten [Fri, 9 Jan 2015 06:08:07 +0000 (22:08 -0800)]
Merge pull request #4883 from totten/master-cs4
INFRA-132 - Misc cleanup
Tim Otten [Fri, 9 Jan 2015 03:53:23 +0000 (19:53 -0800)]
INFRA-132 - Fix misc oddball syntax
Tim Otten [Fri, 9 Jan 2015 03:53:01 +0000 (19:53 -0800)]
INFRA-132 - CRM/ - Fix misc oddball syntax
Tim Otten [Fri, 9 Jan 2015 02:54:52 +0000 (18:54 -0800)]
INFRA-132 - Fix misc oddball syntax
Tim Otten [Fri, 9 Jan 2015 02:31:57 +0000 (18:31 -0800)]
INFRA-132 - tests/- Fix misc oddball syntax
Tim Otten [Fri, 9 Jan 2015 02:31:56 +0000 (18:31 -0800)]
INFRA-132 - api/v3 - Fix misc oddball syntax
Tim Otten [Fri, 9 Jan 2015 02:31:55 +0000 (18:31 -0800)]
INFRA-132 - CRM/ - Fix misc oddball syntax
Coleman Watts [Fri, 9 Jan 2015 02:58:20 +0000 (21:58 -0500)]
CRM-15789 - Additional button/icon cleanup
Tim Otten [Fri, 9 Jan 2015 02:22:45 +0000 (18:22 -0800)]
INFRA-132 - CRM/Core/BAO/RecurringEntity.php - Fix EOL
Tim Otten [Fri, 9 Jan 2015 02:09:06 +0000 (18:09 -0800)]
INFRA-132 - s/false/FALSE/
Tim Otten [Fri, 9 Jan 2015 02:06:41 +0000 (18:06 -0800)]
INFRA-132 - s/true/TRUE/
Tim Otten [Fri, 9 Jan 2015 02:03:18 +0000 (18:03 -0800)]
INFRA-132 - s/null/NULL/
Tim Otten [Fri, 9 Jan 2015 01:31:32 +0000 (17:31 -0800)]
Merge pull request #4880 from totten/master-cs3
INFRA-132 - Misc cleanup
Tim Otten [Fri, 9 Jan 2015 00:51:16 +0000 (16:51 -0800)]
Merge pull request #4879 from OnkelTem/opendir_fixes
CRM-15799 - CRM_Utils_File - Improve error handling
Tim Otten [Fri, 9 Jan 2015 00:28:29 +0000 (16:28 -0800)]
INFRA-132 - CRM_Utils_GlobalStackTest
Tim Otten [Fri, 9 Jan 2015 00:26:09 +0000 (16:26 -0800)]
INFRA-132 - CRM/Admin/Form/Setting/Component.php - Remove unused global
Tim Otten [Fri, 9 Jan 2015 00:06:46 +0000 (16:06 -0800)]
INFRA-132 - Trailing commas for multiline arrays
Tim Otten [Fri, 9 Jan 2015 00:02:10 +0000 (16:02 -0800)]
INFRA-132 - api/ - Misc
Tim Otten [Thu, 8 Jan 2015 23:39:24 +0000 (15:39 -0800)]
INFRA-132 - tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
Tim Otten [Thu, 8 Jan 2015 23:39:24 +0000 (15:39 -0800)]
INFRA-132 - CRM/Utils/Hook.php
Tim Otten [Thu, 8 Jan 2015 23:39:24 +0000 (15:39 -0800)]
INFRA-132 - CRM/Contact/BAO/Relationship.php
Eileen McNaughton [Thu, 8 Jan 2015 23:37:13 +0000 (12:37 +1300)]
Merge pull request #4871 from eileenmcnaughton/CRM-15795
CRM-15795 prevent silent failure with rollback on participants
Tim Otten [Thu, 8 Jan 2015 23:01:43 +0000 (15:01 -0800)]
INFRA-132 - s/(else|try){/(else|try) {/
Tim Otten [Thu, 8 Jan 2015 22:57:35 +0000 (14:57 -0800)]
INFRA-132 - Remove extra spaces around '.'
Tim Otten [Thu, 8 Jan 2015 22:50:52 +0000 (14:50 -0800)]
INFRA-132 - s/array (/array(/
aneganov [Thu, 8 Jan 2015 22:31:03 +0000 (01:31 +0300)]
CRM-15799 - System crash on attempt to upgrade from 4.5.4 to 4.5.5
----------------------------------------
* CRM-15799: System crash on attempt to upgrade from 4.5.4 to 4.5.5
https://issues.civicrm.org/jira/browse/CRM-15799
Coleman Watts [Thu, 8 Jan 2015 19:54:54 +0000 (14:54 -0500)]
CRM-15773 - Revert incorrect column header label change
Coleman Watts [Thu, 8 Jan 2015 19:47:49 +0000 (14:47 -0500)]
Fix scope error
colemanw [Thu, 8 Jan 2015 19:40:57 +0000 (14:40 -0500)]
Merge pull request #4861 from colemanw/CRM-15789
CRM-15789 - Add icons to submit buttons
Coleman Watts [Thu, 8 Jan 2015 18:40:51 +0000 (13:40 -0500)]
CRM-15789 - Remove ascii art from button text
Coleman Watts [Thu, 8 Jan 2015 18:37:58 +0000 (13:37 -0500)]
CRM-15789 - Fix button display in popups
Coleman Watts [Thu, 8 Jan 2015 16:55:44 +0000 (11:55 -0500)]
Remove unused tpl
Coleman Watts [Thu, 8 Jan 2015 15:35:49 +0000 (10:35 -0500)]
CRM-15789 - More consistent button classes and icons
Coleman Watts [Wed, 7 Jan 2015 18:19:08 +0000 (13:19 -0500)]
CRM-15789 - Cleanup submit button styles
Coleman Watts [Wed, 7 Jan 2015 16:42:10 +0000 (11:42 -0500)]
CRM-15789 - Cleanup editable icons/styles
Coleman Watts [Tue, 6 Jan 2015 19:37:22 +0000 (14:37 -0500)]
CRM-15789 - Remove civicrm.css styles redundant with jQuery UI
Coleman Watts [Tue, 6 Jan 2015 18:31:44 +0000 (13:31 -0500)]
CRM-15789 - Add icons to submit buttons
Monish Deb [Thu, 8 Jan 2015 18:20:51 +0000 (23:50 +0530)]
Merge pull request #4878 from pratikshad/broken-webtest
Fixed webtest of export and testAdvanceSearch of Contact_AdavanceSearchT...
Monish Deb [Thu, 8 Jan 2015 18:20:34 +0000 (23:50 +0530)]
Merge pull request #4877 from rohankatkar/webtest4.6
Webtests fixes
pratikshad [Thu, 8 Jan 2015 13:52:33 +0000 (19:22 +0530)]
Fixed webtest of export and testAdvanceSearch of Contact_AdavanceSearchTest
Web Access [Thu, 8 Jan 2015 13:18:58 +0000 (18:48 +0530)]
Webtests fixes
Tim Otten [Thu, 8 Jan 2015 06:21:01 +0000 (22:21 -0800)]
Merge pull request #4872 from totten/master-civimail-defaults
CRM-15578 - CiviMail UI - Multiple fixes
Tim Otten [Thu, 8 Jan 2015 02:18:52 +0000 (18:18 -0800)]
CRM-15578 - crmMailingAB/report - Grammatical consistency. More intuitive order.
Tim Otten [Thu, 8 Jan 2015 02:18:15 +0000 (18:18 -0800)]
CRM-15578 - Fix display of dates on past newsletters
Tim Otten [Thu, 8 Jan 2015 01:02:42 +0000 (17:02 -0800)]
CRM-15578 - edit-unified.html - Change layout
Tim Otten [Thu, 8 Jan 2015 00:37:56 +0000 (16:37 -0800)]
crmMailing - Cleanup per jshint
Tim Otten [Thu, 8 Jan 2015 00:36:44 +0000 (16:36 -0800)]
CRM-15578 - crmMailing - Start out with an empty mailing
Tim Otten [Thu, 8 Jan 2015 00:33:34 +0000 (16:33 -0800)]
bower.json - Fix angular-jquery-dialog-service
When we moved bower.json from civicrm-packages.git to civicrm-core.git, we
transferred old (stale) information about angular-jquery-dialog-service.
Restore it.
Tim Otten [Thu, 8 Jan 2015 00:19:04 +0000 (16:19 -0800)]
Merge pull request #4860 from totten/master-ext-cache
CRM-15788 - CRM_Extension_System - Fix for shared DB with multiple sites
Tim Otten [Thu, 8 Jan 2015 00:16:48 +0000 (16:16 -0800)]
Merge pull request #4851 from totten/master-createtest-bao
CRM_Core_DAO::createTestObject() - Prefer BAO's
Tim Otten [Wed, 7 Jan 2015 23:32:20 +0000 (15:32 -0800)]
Merge pull request #4866 from totten/master-phpcs
INFRA-132 - Cleanup misc patterns not handled by phpcbf
CiviCRM [Wed, 7 Jan 2015 22:35:40 +0000 (14:35 -0800)]
Update version to 4.6.alpha2
Eileen McNaughton [Wed, 7 Jan 2015 22:19:27 +0000 (11:19 +1300)]
CRM-15795 prevent silent failure with rollback on participants
Tim Otten [Wed, 7 Jan 2015 21:25:35 +0000 (13:25 -0800)]
Merge pull request #4870 from totten/master-sql-inst
xml/templates/civicrm_state_province.tpl - Fix crash in web-based installation
Tim Otten [Wed, 7 Jan 2015 21:22:59 +0000 (13:22 -0800)]
xml/templates/civicrm_state_province.tpl - Fix crash in web-based installation
The web-based installer bombs when it encounters inlined comments.
Tim Otten [Wed, 7 Jan 2015 20:17:22 +0000 (12:17 -0800)]
Merge pull request #4869 from totten/master-dmjs
CRM-15797 - distmaker - Fixes for JS dependencies. Make various DM_* optional.
Tim Otten [Wed, 7 Jan 2015 19:57:28 +0000 (11:57 -0800)]
distmaker - Make DM_PHP, DM_RSYNC, and DM_ZIP optional
Tim Otten [Wed, 7 Jan 2015 19:45:48 +0000 (11:45 -0800)]
CRM-15797 - distmaker - Fixes for JS dependencies:
* Exclude node_modules
* Include bower_components
* Include .json, composer.lock, bower.json, package.json
* DM_NPM should be optional
colemanw [Wed, 7 Jan 2015 17:49:42 +0000 (12:49 -0500)]
Merge pull request #4868 from agh1/smtp-help
CRM-15796 Admin settings: explain ssl prefix on outbound mail form
Andrew Hunt [Wed, 7 Jan 2015 16:44:36 +0000 (11:44 -0500)]
CRM-15796 Admin settings: explain ssl prefix on outbound mail form
and improve port help
Kurund Jalmi [Wed, 7 Jan 2015 11:43:21 +0000 (17:13 +0530)]
Merge pull request #4867 from atif-shaikh/UpgradeFix
UpgradeFix
atif-shaikh [Wed, 7 Jan 2015 10:35:20 +0000 (16:05 +0530)]
UpgradeFix
Tim Otten [Wed, 7 Jan 2015 05:52:59 +0000 (21:52 -0800)]
INFRA-132 - Spaces around "."
Tim Otten [Wed, 7 Jan 2015 05:17:23 +0000 (21:17 -0800)]
INFRA-132 - Remove white space after an opening "(" or before a closing ")"
Tim Otten [Wed, 7 Jan 2015 04:17:30 +0000 (20:17 -0800)]
INFRA-132 - Change "else if" to "elseif"
Tim Otten [Wed, 7 Jan 2015 04:01:33 +0000 (20:01 -0800)]
INFRA-132 - Newline after "{"
Eileen McNaughton [Wed, 7 Jan 2015 03:52:56 +0000 (16:52 +1300)]
comment fix
Tim Otten [Wed, 7 Jan 2015 03:51:55 +0000 (19:51 -0800)]
INFRA-132 - Add space before "{"
Eileen McNaughton [Wed, 7 Jan 2015 03:46:57 +0000 (16:46 +1300)]
enotice fixes
Tim Otten [Wed, 7 Jan 2015 03:44:33 +0000 (19:44 -0800)]
INFRA-132 - Put space after flow-control (if/switch/for/foreach/while)
Eileen McNaughton [Wed, 7 Jan 2015 03:42:01 +0000 (16:42 +1300)]
add code comments
Tim Otten [Wed, 7 Jan 2015 03:21:31 +0000 (19:21 -0800)]
INFRA-132 - Put "else" and "catch" on new line
Eileen McNaughton [Wed, 7 Jan 2015 03:21:41 +0000 (16:21 +1300)]
defer to Tim's wisdom
projects / civicrm-core.git / log