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
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 "{"
Tim Otten [Wed, 7 Jan 2015 03:51:55 +0000 (19:51 -0800)]
INFRA-132 - Add space before "{"
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)
Tim Otten [Wed, 7 Jan 2015 03:21:31 +0000 (19:21 -0800)]
INFRA-132 - Put "else" and "catch" on new line
Tim Otten [Wed, 7 Jan 2015 02:56:33 +0000 (18:56 -0800)]
CRM_Core_ClassLoader - Fix compatibility with class_exists()
The previous code would bomb if one called class_exists() on a non-existent
CRM class.
Tim Otten [Mon, 5 Jan 2015 20:06:28 +0000 (12:06 -0800)]
CRM_Extension_System - Fix for shared DB with multiple sites
* Use separate caches for each site.
* Strictly inject all config values so that we can accurately construct a stable, unique identifier for the site configuration (serialize($this->parameters)).
Tim Otten [Mon, 5 Jan 2015 20:10:32 +0000 (12:10 -0800)]
CRM_Extension_System - Cleanup style
Tim Otten [Tue, 6 Jan 2015 19:25:41 +0000 (11:25 -0800)]
CRM_Core_DAO::assignTestFK() - Fix FK checks on BAOs
Tim Otten [Tue, 6 Jan 2015 02:16:13 +0000 (18:16 -0800)]
CRM_Core_DAO::createTestObject() - Prefer BAO's
Tim Otten [Wed, 7 Jan 2015 00:56:31 +0000 (16:56 -0800)]
Merge pull request #4863 from totten/master-phpcbf4
INFRA-132 - Mass PHP cleanup
Tim Otten [Tue, 6 Jan 2015 21:49:54 +0000 (13:49 -0800)]
INFRA-132 - tests/ - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:58 +0000 (14:56 -0800)]
INFRA-132 - CRM/Utils - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:58 +0000 (14:56 -0800)]
INFRA-132 - CRM/Upgrade - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:57 +0000 (14:56 -0800)]
INFRA-132 - CRM/Report - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:57 +0000 (14:56 -0800)]
INFRA-132 - CRM/Profile - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:57 +0000 (14:56 -0800)]
INFRA-132 - CRM/Price - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:57 +0000 (14:56 -0800)]
INFRA-132 - CRM/Pledge - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:56 +0000 (14:56 -0800)]
INFRA-132 - CRM/Member - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:56 +0000 (14:56 -0800)]
INFRA-132 - CRM/Mailing - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:56 +0000 (14:56 -0800)]
INFRA-132 - CRM/Import - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:55 +0000 (14:56 -0800)]
INFRA-132 - CRM/Grant - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:55 +0000 (14:56 -0800)]
INFRA-132 - CRM/Extension - Misc
Tim Otten [Tue, 6 Jan 2015 22:15:07 +0000 (14:15 -0800)]
INFRA-132 - CRM/Export - Misc
Tim Otten [Tue, 6 Jan 2015 22:15:07 +0000 (14:15 -0800)]
INFRA-132 - CRM/Event - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:54 +0000 (14:56 -0800)]
INFRA-132 - CRM/Dedupe - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:54 +0000 (14:56 -0800)]
INFRA-132 - CRM/Custom - Misc
Tim Otten [Tue, 6 Jan 2015 22:15:06 +0000 (14:15 -0800)]
INFRA-132 - CRM/Core - Misc
Tim Otten [Tue, 6 Jan 2015 22:15:06 +0000 (14:15 -0800)]
INFRA-132 - CRM/Contribute - Misc
Tim Otten [Tue, 6 Jan 2015 22:15:06 +0000 (14:15 -0800)]
INFRA-132 - CRM/Contact - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:53 +0000 (14:56 -0800)]
INFRA-132 - CRM/Case - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:53 +0000 (14:56 -0800)]
INFRA-132 - CRM/Campaign - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:53 +0000 (14:56 -0800)]
INFRA-132 - CRM/Admin - Misc
Tim Otten [Tue, 6 Jan 2015 22:15:06 +0000 (14:15 -0800)]
INFRA-132 - CRM/Activity - Misc
Tim Otten [Tue, 6 Jan 2015 22:56:52 +0000 (14:56 -0800)]
INFRA-132 - CRM/ACL - Misc
Tim Otten [Tue, 6 Jan 2015 21:35:24 +0000 (13:35 -0800)]
INFRA-132 - bin/ - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:35:24 +0000 (13:35 -0800)]
INFRA-132 - install/ - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:35:24 +0000 (13:35 -0800)]
INFRA-132 - extern/ - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:42:38 +0000 (13:42 -0800)]
INFRA-132 - tests/ - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:35:24 +0000 (13:35 -0800)]
INFRA-132 - settings/ - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:35:24 +0000 (13:35 -0800)]
INFRA-132 - distmaker/ - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:37:01 +0000 (13:37 -0800)]
INFRA-132 - xml/ - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:35:56 +0000 (13:35 -0800)]
INFRA-132 - api/ - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:24 +0000 (13:21 -0800)]
INFRA-132 - CRM/Utils - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:24 +0000 (13:21 -0800)]
INFRA-132 - CRM/Upgrade - phpcbf (plus fixup)
Tim Otten [Tue, 6 Jan 2015 21:21:23 +0000 (13:21 -0800)]
INFRA-132 - CRM/UF - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:23 +0000 (13:21 -0800)]
INFRA-132 - CRM/SMS - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:23 +0000 (13:21 -0800)]
INFRA-132 - CRM/Report - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:23 +0000 (13:21 -0800)]
INFRA-132 - CRM/Profile - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:23 +0000 (13:21 -0800)]
INFRA-132 - CRM/Price - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:22 +0000 (13:21 -0800)]
INFRA-132 - CRM/Pledge - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:22 +0000 (13:21 -0800)]
INFRA-132 - CRM/PCP - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:22 +0000 (13:21 -0800)]
INFRA-132 - CRM/Note - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:22 +0000 (13:21 -0800)]
INFRA-132 - CRM/Member - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:22 +0000 (13:21 -0800)]
INFRA-132 - CRM/Mailing - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:22 +0000 (13:21 -0800)]
INFRA-132 - CRM/Import - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:21 +0000 (13:21 -0800)]
INFRA-132 - CRM/Group - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:21:21 +0000 (13:21 -0800)]
INFRA-132 - CRM/Grant - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:21 +0000 (13:09 -0800)]
INFRA-132 - CRM/Friend - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:21 +0000 (13:09 -0800)]
INFRA-132 - CRM/Financial - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:10:53 +0000 (13:10 -0800)]
INFRA-132 - CRM/Extension - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:10:53 +0000 (13:10 -0800)]
INFRA-132 - CRM/Export - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:10:53 +0000 (13:10 -0800)]
INFRA-132 - CRM/Event - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:20 +0000 (13:09 -0800)]
INFRA-132 - CRM/Dedupe - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:20 +0000 (13:09 -0800)]
INFRA-132 - CRM/Custom - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:20 +0000 (13:09 -0800)]
INFRA-132 - CRM/Core - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:20 +0000 (13:09 -0800)]
INFRA-132 - CRM/Contribute - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:20 +0000 (13:09 -0800)]
INFRA-132 - CRM/Contact - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:19 +0000 (13:09 -0800)]
INFRA-132 - CRM/Case - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:19 +0000 (13:09 -0800)]
INFRA-132 - CRM/Campaign - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:19 +0000 (13:09 -0800)]
INFRA-132 - CRM/Bridge - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:19 +0000 (13:09 -0800)]
INFRA-132 - CRM/Batch - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:19 +0000 (13:09 -0800)]
INFRA-132 - CRM/Badge - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:19 +0000 (13:09 -0800)]
INFRA-132 - CRM/Admin - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:19 +0000 (13:09 -0800)]
INFRA-132 - CRM/Activity - phpcbf
Tim Otten [Tue, 6 Jan 2015 21:09:18 +0000 (13:09 -0800)]
INFRA-132 - CRM/ACL - phpcbf
Tim Otten [Tue, 6 Jan 2015 19:58:05 +0000 (11:58 -0800)]
INFRA-132 - CRM/Report/Form.php - Cleanup via PHPStorm
Tim Otten [Tue, 6 Jan 2015 19:58:05 +0000 (11:58 -0800)]
INFRA-132 - CRM/Member/BAO/Membership.php - Cleanup via PHPStorm
Tim Otten [Tue, 6 Jan 2015 19:58:05 +0000 (11:58 -0800)]
INFRA-132 - CRM/Core/BAO/UFGroup.php - Cleanup via PHPStorm
Tim Otten [Tue, 6 Jan 2015 19:58:05 +0000 (11:58 -0800)]
INFRA-132 - CRM/Contribute/BAO/Contribution.php - Cleanup via PHPStorm
Tim Otten [Tue, 6 Jan 2015 19:58:05 +0000 (11:58 -0800)]
INFRA-132 - CRM/Contact/BAO/Query.php - Cleanup via PHPStorm
Tim Otten [Tue, 6 Jan 2015 19:58:04 +0000 (11:58 -0800)]
INFRA-132 - CRM/Contact/BAO/Contact.php - Cleanup via PHPStorm
projects / civicrm-core.git / log