civicrm-core.git
9 years agod3.min.js - Move to bower.json
Tim Otten [Sat, 10 Jan 2015 03:03:07 +0000 (19:03 -0800)]
d3.min.js - Move to bower.json

The version 3.4.11 is selected to match the existing code -- I don't know
that it's better or worse than any other version.

9 years agoangularsanitize.js - Remove redundant, unreferenced file
Tim Otten [Sat, 10 Jan 2015 02:47:14 +0000 (18:47 -0800)]
angularsanitize.js - Remove redundant, unreferenced file

9 years agoqunit - Move from packages.git to bower.json
Tim Otten [Sat, 10 Jan 2015 02:45:27 +0000 (18:45 -0800)]
qunit - Move from packages.git to bower.json

9 years agoCA_Config - Move from packages.git to composer.json
Tim Otten [Sat, 10 Jan 2015 00:22:53 +0000 (16:22 -0800)]
CA_Config - Move from packages.git to composer.json

9 years agoMerge pull request #4893 from colemanw/INFRA-132
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

9 years agoINFRA-132 - Remove extra newlines from the bottom of docblocks
Coleman Watts [Fri, 9 Jan 2015 20:19:07 +0000 (15:19 -0500)]
INFRA-132 - Remove extra newlines from the bottom of docblocks

9 years agoINFRA-132 - Fix spacing of @return tag in comments
Coleman Watts [Fri, 9 Jan 2015 19:54:55 +0000 (14:54 -0500)]
INFRA-132 - Fix spacing of @return tag in comments

9 years agoMerge pull request #4892 from colemanw/INFRA-132
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

9 years agoINFRA-132 - Comment grammar cleanup
Coleman Watts [Fri, 9 Jan 2015 19:37:01 +0000 (14:37 -0500)]
INFRA-132 - Comment grammar cleanup

9 years agoINFRA-132 - Comment whitespace cleanup
Coleman Watts [Fri, 9 Jan 2015 18:58:54 +0000 (13:58 -0500)]
INFRA-132 - Comment whitespace cleanup

9 years agoINFRA-132 - Fix missing newlines in comments
Coleman Watts [Fri, 9 Jan 2015 18:50:04 +0000 (13:50 -0500)]
INFRA-132 - Fix missing newlines in comments

9 years agoINFRA-132 - Fix comment spacing
Coleman Watts [Fri, 9 Jan 2015 18:43:03 +0000 (13:43 -0500)]
INFRA-132 - Fix comment spacing

9 years agoMerge pull request #4890 from colemanw/CRM-15803
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

9 years agoMerge pull request #4891 from colemanw/INFRA-132
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

9 years agoINFRA-132 - @param type fixes
Coleman Watts [Fri, 9 Jan 2015 16:00:52 +0000 (11:00 -0500)]
INFRA-132 - @param type fixes

9 years agoCRM-15803 - Validate EntityRef values before rendering
Coleman Watts [Fri, 9 Jan 2015 15:07:24 +0000 (10:07 -0500)]
CRM-15803 - Validate EntityRef values before rendering

9 years agoMerge pull request #4886 from rohankatkar/webtest4.6
Monish Deb [Fri, 9 Jan 2015 15:06:41 +0000 (20:36 +0530)]
Merge pull request #4886 from rohankatkar/webtest4.6

Webtests Fixes

9 years agoMerge pull request #4888 from colemanw/master
colemanw [Fri, 9 Jan 2015 14:30:04 +0000 (09:30 -0500)]
Merge pull request #4888 from colemanw/master

INFRA-132 - Docblock cleanup

9 years agoINFRA-132 - Docblock cleanup
Coleman Watts [Fri, 9 Jan 2015 14:25:24 +0000 (09:25 -0500)]
INFRA-132 - Docblock cleanup

9 years agoMerge pull request #4882 from colemanw/CRM-15789
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

9 years agoWebtests Fixes
Web Access [Fri, 9 Jan 2015 13:09:34 +0000 (18:39 +0530)]
Webtests Fixes

9 years agoMerge pull request #4865 from eileenmcnaughton/my-first-factory
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

9 years agoMerge pull request #4883 from totten/master-cs4
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

9 years agoINFRA-132 - Fix misc oddball syntax
Tim Otten [Fri, 9 Jan 2015 03:53:23 +0000 (19:53 -0800)]
INFRA-132 - Fix misc oddball syntax

9 years agoINFRA-132 - CRM/ - Fix misc oddball syntax
Tim Otten [Fri, 9 Jan 2015 03:53:01 +0000 (19:53 -0800)]
INFRA-132 - CRM/ - Fix misc oddball syntax

9 years agoINFRA-132 - Fix misc oddball syntax
Tim Otten [Fri, 9 Jan 2015 02:54:52 +0000 (18:54 -0800)]
INFRA-132 - Fix misc oddball syntax

9 years agoINFRA-132 - tests/- Fix misc oddball syntax
Tim Otten [Fri, 9 Jan 2015 02:31:57 +0000 (18:31 -0800)]
INFRA-132 - tests/- Fix misc oddball syntax

9 years agoINFRA-132 - api/v3 - 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

9 years agoINFRA-132 - CRM/ - Fix misc oddball syntax
Tim Otten [Fri, 9 Jan 2015 02:31:55 +0000 (18:31 -0800)]
INFRA-132 - CRM/ - Fix misc oddball syntax

9 years agoCRM-15789 - Additional button/icon cleanup
Coleman Watts [Fri, 9 Jan 2015 02:58:20 +0000 (21:58 -0500)]
CRM-15789 - Additional button/icon cleanup

9 years agoINFRA-132 - CRM/Core/BAO/RecurringEntity.php - Fix EOL
Tim Otten [Fri, 9 Jan 2015 02:22:45 +0000 (18:22 -0800)]
INFRA-132 - CRM/Core/BAO/RecurringEntity.php - Fix EOL

9 years agoINFRA-132 - s/false/FALSE/
Tim Otten [Fri, 9 Jan 2015 02:09:06 +0000 (18:09 -0800)]
INFRA-132 - s/false/FALSE/

9 years agoINFRA-132 - s/true/TRUE/
Tim Otten [Fri, 9 Jan 2015 02:06:41 +0000 (18:06 -0800)]
INFRA-132 - s/true/TRUE/

9 years agoINFRA-132 - s/null/NULL/
Tim Otten [Fri, 9 Jan 2015 02:03:18 +0000 (18:03 -0800)]
INFRA-132 - s/null/NULL/

9 years agoMerge pull request #4880 from totten/master-cs3
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

9 years agoINFRA-132 - CRM_Utils_GlobalStackTest
Tim Otten [Fri, 9 Jan 2015 00:28:29 +0000 (16:28 -0800)]
INFRA-132 - CRM_Utils_GlobalStackTest

9 years agoINFRA-132 - CRM/Admin/Form/Setting/Component.php - Remove unused global
Tim Otten [Fri, 9 Jan 2015 00:26:09 +0000 (16:26 -0800)]
INFRA-132 - CRM/Admin/Form/Setting/Component.php - Remove unused global

9 years agoINFRA-132 - Trailing commas for multiline arrays
Tim Otten [Fri, 9 Jan 2015 00:06:46 +0000 (16:06 -0800)]
INFRA-132 - Trailing commas for multiline arrays

9 years agoINFRA-132 - api/ - Misc
Tim Otten [Fri, 9 Jan 2015 00:02:10 +0000 (16:02 -0800)]
INFRA-132 - api/ - Misc

9 years agoINFRA-132 - tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php
Tim Otten [Thu, 8 Jan 2015 23:39:24 +0000 (15:39 -0800)]
INFRA-132 - tests/phpunit/WebTest/Contact/SearchbyDateFilterTest.php

9 years agoINFRA-132 - CRM/Utils/Hook.php
Tim Otten [Thu, 8 Jan 2015 23:39:24 +0000 (15:39 -0800)]
INFRA-132 - CRM/Utils/Hook.php

9 years agoINFRA-132 - CRM/Contact/BAO/Relationship.php
Tim Otten [Thu, 8 Jan 2015 23:39:24 +0000 (15:39 -0800)]
INFRA-132 - CRM/Contact/BAO/Relationship.php

9 years agoMerge pull request #4871 from eileenmcnaughton/CRM-15795
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

9 years agoINFRA-132 - s/(else|try){/(else|try) {/
Tim Otten [Thu, 8 Jan 2015 23:01:43 +0000 (15:01 -0800)]
INFRA-132 - s/(else|try){/(else|try) {/

9 years agoINFRA-132 - Remove extra spaces around '.'
Tim Otten [Thu, 8 Jan 2015 22:57:35 +0000 (14:57 -0800)]
INFRA-132 - Remove extra spaces around '.'

9 years agoINFRA-132 - s/array (/array(/
Tim Otten [Thu, 8 Jan 2015 22:50:52 +0000 (14:50 -0800)]
INFRA-132 - s/array (/array(/

9 years agoCRM-15773 - Revert incorrect column header label change
Coleman Watts [Thu, 8 Jan 2015 19:54:54 +0000 (14:54 -0500)]
CRM-15773 - Revert incorrect column header label change

9 years agoFix scope error
Coleman Watts [Thu, 8 Jan 2015 19:47:49 +0000 (14:47 -0500)]
Fix scope error

9 years agoMerge pull request #4861 from colemanw/CRM-15789
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

9 years agoCRM-15789 - Remove ascii art from button text
Coleman Watts [Thu, 8 Jan 2015 18:40:51 +0000 (13:40 -0500)]
CRM-15789 - Remove ascii art from button text

9 years agoCRM-15789 - Fix button display in popups
Coleman Watts [Thu, 8 Jan 2015 18:37:58 +0000 (13:37 -0500)]
CRM-15789 - Fix button display in popups

9 years agoRemove unused tpl
Coleman Watts [Thu, 8 Jan 2015 16:55:44 +0000 (11:55 -0500)]
Remove unused tpl

9 years agoCRM-15789 - More consistent button classes and icons
Coleman Watts [Thu, 8 Jan 2015 15:35:49 +0000 (10:35 -0500)]
CRM-15789 - More consistent button classes and icons

9 years agoCRM-15789 - Cleanup submit button styles
Coleman Watts [Wed, 7 Jan 2015 18:19:08 +0000 (13:19 -0500)]
CRM-15789 - Cleanup submit button styles

9 years agoCRM-15789 - Cleanup editable icons/styles
Coleman Watts [Wed, 7 Jan 2015 16:42:10 +0000 (11:42 -0500)]
CRM-15789 - Cleanup editable icons/styles

9 years agoCRM-15789 - Remove civicrm.css styles redundant with jQuery UI
Coleman Watts [Tue, 6 Jan 2015 19:37:22 +0000 (14:37 -0500)]
CRM-15789 - Remove civicrm.css styles redundant with jQuery UI

9 years agoCRM-15789 - Add icons to submit buttons
Coleman Watts [Tue, 6 Jan 2015 18:31:44 +0000 (13:31 -0500)]
CRM-15789 - Add icons to submit buttons

9 years agoMerge pull request #4878 from pratikshad/broken-webtest
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...

9 years agoMerge pull request #4877 from rohankatkar/webtest4.6
Monish Deb [Thu, 8 Jan 2015 18:20:34 +0000 (23:50 +0530)]
Merge pull request #4877 from rohankatkar/webtest4.6

Webtests fixes

9 years agoFixed webtest of export and testAdvanceSearch of Contact_AdavanceSearchTest
pratikshad [Thu, 8 Jan 2015 13:52:33 +0000 (19:22 +0530)]
Fixed webtest of export and testAdvanceSearch of Contact_AdavanceSearchTest

9 years agoWebtests fixes
Web Access [Thu, 8 Jan 2015 13:18:58 +0000 (18:48 +0530)]
Webtests fixes

9 years agoMerge pull request #4872 from totten/master-civimail-defaults
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

9 years agoCRM-15578 - crmMailingAB/report - Grammatical consistency. More intuitive order.
Tim Otten [Thu, 8 Jan 2015 02:18:52 +0000 (18:18 -0800)]
CRM-15578 - crmMailingAB/report - Grammatical consistency. More intuitive order.

9 years agoCRM-15578 - Fix display of dates on past newsletters
Tim Otten [Thu, 8 Jan 2015 02:18:15 +0000 (18:18 -0800)]
CRM-15578 - Fix display of dates on past newsletters

9 years agoCRM-15578 - edit-unified.html - Change layout
Tim Otten [Thu, 8 Jan 2015 01:02:42 +0000 (17:02 -0800)]
CRM-15578 - edit-unified.html - Change layout

9 years agocrmMailing - Cleanup per jshint
Tim Otten [Thu, 8 Jan 2015 00:37:56 +0000 (16:37 -0800)]
crmMailing - Cleanup per jshint

9 years agoCRM-15578 - crmMailing - Start out with an empty mailing
Tim Otten [Thu, 8 Jan 2015 00:36:44 +0000 (16:36 -0800)]
CRM-15578 - crmMailing - Start out with an empty mailing

9 years agobower.json - Fix angular-jquery-dialog-service
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.

9 years agoMerge pull request #4860 from totten/master-ext-cache
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

9 years agoMerge pull request #4851 from totten/master-createtest-bao
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

9 years agoMerge pull request #4866 from totten/master-phpcs
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

9 years agoUpdate version to 4.6.alpha2
CiviCRM [Wed, 7 Jan 2015 22:35:40 +0000 (14:35 -0800)]
Update version to 4.6.alpha2

9 years agoCRM-15795 prevent silent failure with rollback on participants
Eileen McNaughton [Wed, 7 Jan 2015 22:19:27 +0000 (11:19 +1300)]
CRM-15795 prevent silent failure with rollback on participants

9 years agoMerge pull request #4870 from totten/master-sql-inst
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

9 years agoxml/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.

9 years agoMerge pull request #4869 from totten/master-dmjs
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.

9 years agodistmaker - Make DM_PHP, DM_RSYNC, and DM_ZIP optional
Tim Otten [Wed, 7 Jan 2015 19:57:28 +0000 (11:57 -0800)]
distmaker - Make DM_PHP, DM_RSYNC, and DM_ZIP optional

9 years agoCRM-15797 - distmaker - Fixes for JS dependencies:
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

9 years agoMerge pull request #4868 from agh1/smtp-help
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

9 years agoCRM-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

9 years agoMerge pull request #4867 from atif-shaikh/UpgradeFix
Kurund Jalmi [Wed, 7 Jan 2015 11:43:21 +0000 (17:13 +0530)]
Merge pull request #4867 from atif-shaikh/UpgradeFix

UpgradeFix

9 years agoUpgradeFix
atif-shaikh [Wed, 7 Jan 2015 10:35:20 +0000 (16:05 +0530)]
UpgradeFix

9 years agoINFRA-132 - Spaces around "."
Tim Otten [Wed, 7 Jan 2015 05:52:59 +0000 (21:52 -0800)]
INFRA-132 - Spaces around "."

9 years agoINFRA-132 - Remove white space after an opening "(" or before a closing ")"
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 ")"

9 years agoINFRA-132 - Change "else if" to "elseif"
Tim Otten [Wed, 7 Jan 2015 04:17:30 +0000 (20:17 -0800)]
INFRA-132 - Change "else if" to "elseif"

9 years agoINFRA-132 - Newline after "{"
Tim Otten [Wed, 7 Jan 2015 04:01:33 +0000 (20:01 -0800)]
INFRA-132 - Newline after "{"

9 years agocomment fix
Eileen McNaughton [Wed, 7 Jan 2015 03:52:56 +0000 (16:52 +1300)]
comment fix

9 years agoINFRA-132 - Add space before "{"
Tim Otten [Wed, 7 Jan 2015 03:51:55 +0000 (19:51 -0800)]
INFRA-132 - Add space before "{"

9 years agoenotice fixes
Eileen McNaughton [Wed, 7 Jan 2015 03:46:57 +0000 (16:46 +1300)]
enotice fixes

9 years agoINFRA-132 - Put space after flow-control (if/switch/for/foreach/while)
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)

9 years agoadd code comments
Eileen McNaughton [Wed, 7 Jan 2015 03:42:01 +0000 (16:42 +1300)]
add code comments

9 years agoINFRA-132 - Put "else" and "catch" on new line
Tim Otten [Wed, 7 Jan 2015 03:21:31 +0000 (19:21 -0800)]
INFRA-132 - Put "else" and "catch" on new line

9 years agodefer to Tim's wisdom
Eileen McNaughton [Wed, 7 Jan 2015 03:21:41 +0000 (16:21 +1300)]
defer to Tim's wisdom

9 years agofix namespace calls
Eileen McNaughton [Wed, 7 Jan 2015 03:10:36 +0000 (16:10 +1300)]
fix namespace calls

9 years agoCRM-15771 towards factory class
Eileen McNaughton [Wed, 7 Jan 2015 03:04:36 +0000 (16:04 +1300)]
CRM-15771 towards factory class

9 years agoCRM_Core_ClassLoader - Fix compatibility with class_exists()
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.

9 years agoCRM-15771 remove payment singleton ref
Eileen McNaughton [Wed, 7 Jan 2015 02:41:27 +0000 (15:41 +1300)]
CRM-15771 remove payment singleton ref

9 years agoCRM-15771 remove obsolete singleton functions
Eileen McNaughton [Wed, 7 Jan 2015 02:24:45 +0000 (15:24 +1300)]
CRM-15771 remove obsolete singleton functions

9 years agocache in main singleton class
Eileen McNaughton [Wed, 7 Jan 2015 01:44:06 +0000 (14:44 +1300)]
cache in main singleton class

9 years agoCRM_Extension_System - Fix for shared DB with multiple sites
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)).