Tim Otten [Wed, 27 Aug 2014 05:16:58 +0000 (22:16 -0700)]
Merge pull request #3965 from totten/4.5-casetest-settingtest
CRM_Case_BAO_CaseTest - Fix setting leakage which breaks CRM_Core_BAO_SettingTest
Tim Otten [Wed, 27 Aug 2014 03:57:29 +0000 (20:57 -0700)]
CRM_Case_BAO_CaseTest - Fix setting leakage which breaks CRM_Core_BAO_SettingTest
Tim Otten [Wed, 27 Aug 2014 03:56:59 +0000 (20:56 -0700)]
CRM_Core_BAO_ConfigSetting -- Add disableComponent($componentName)
Tim Otten [Wed, 27 Aug 2014 03:55:46 +0000 (20:55 -0700)]
Merge pull request #3964 from totten/4.5-memlogtest
CRM_Member_BAO_MembershipLogTest - Fix failure
Tim Otten [Wed, 27 Aug 2014 02:52:20 +0000 (19:52 -0700)]
CRM_Member_BAO_MembershipLogTest - Fix failure
Tim Otten [Wed, 27 Aug 2014 02:39:25 +0000 (19:39 -0700)]
Merge pull request #3960 from totten/4.5-flush
CRM-15156 - Clear cms resource cache during upgrade (resubmit)
Tim Otten [Wed, 27 Aug 2014 01:38:38 +0000 (18:38 -0700)]
Merge pull request #3963 from totten/4.5-createtestobj
CRM-14476 - SyntaxConformanceTest - Fix CaseType failures
Tim Otten [Wed, 27 Aug 2014 00:52:08 +0000 (17:52 -0700)]
Merge pull request #3962 from totten/master-test-autoload
INFRA-125, CRM-15011 - Fix autoloading for api_v3_*Test and WebTest_*Test
Tim Otten [Wed, 27 Aug 2014 00:40:52 +0000 (17:40 -0700)]
CRM-14476 - SyntaxConformanceTest - Fix CaseType failures
Tim Otten [Wed, 27 Aug 2014 00:39:50 +0000 (17:39 -0700)]
SyntaxConformanceTest - Use BAO's instead of DAO's to allow better-tuned test data
Tim Otten [Tue, 26 Aug 2014 23:56:51 +0000 (16:56 -0700)]
CRM_Core_BAO_File::delete() - Delete evil override
This function's signature and semantics are incompatible with the parent
class. I used grep to look for where the function is called -- and cannot
find anything:
* svngrep -i 'delete(.*,.*)' CRM/ api/ bin/
* svngrep -i 'file.*->delete
* svngrep File::delete .
Tim Otten [Fri, 22 Aug 2014 08:05:49 +0000 (01:05 -0700)]
CRM_Core_DAO - Cleanup in createTestObject
Tim Otten [Fri, 22 Aug 2014 07:49:55 +0000 (00:49 -0700)]
CRM_Core_DAO - Simplify signature of assignTestFK() and assignTestValue()
Tim Otten [Fri, 22 Aug 2014 07:43:18 +0000 (00:43 -0700)]
CRM_Core_DAO -- Extract assignTestFK() and assignTestValue() from createTestObject()
Tim Otten [Fri, 22 Aug 2014 07:32:33 +0000 (00:32 -0700)]
CRM_Case_XMLRepository - Better reporting of XML parsing errors
Dave Greenberg [Tue, 26 Aug 2014 22:59:00 +0000 (15:59 -0700)]
Merge pull request #3959 from davecivicrm/CRM-15145a
CRM-15145 - additional styling for upgrade message, change register link...
Tim Otten [Tue, 26 Aug 2014 22:09:08 +0000 (15:09 -0700)]
CRM_Utils_System_UnitTests - Work-around for _drupal_flush_css_js() crash
Coleman Watts [Tue, 26 Aug 2014 13:30:37 +0000 (14:30 +0100)]
CRM-15156 - Clear cms resource cache during upgrade
Dave Greenberg [Tue, 26 Aug 2014 22:05:54 +0000 (15:05 -0700)]
CRM-15145 - additional styling for upgrade message, change register link in install success message, update CONTRIBUTORS.txt.
----------------------------------------
* CRM-15145:
https://issues.civicrm.org/jira/browse/CRM-15145
Tim Otten [Tue, 26 Aug 2014 21:49:27 +0000 (14:49 -0700)]
Merge pull request #3956 from totten/4.5-phpunit-compare
phpunit-compare - Generate CSV comparison of Jenkins datasets
Tim Otten [Tue, 26 Aug 2014 21:45:30 +0000 (14:45 -0700)]
Merge pull request #3958 from civicrm/revert-3949-CRM-15156
Revert "CRM-15156 - Clear cms resource cache during upgrade"
Tim Otten [Tue, 26 Aug 2014 21:44:07 +0000 (14:44 -0700)]
Revert "CRM-15156 - Clear cms resource cache during upgrade"
colemanw [Tue, 26 Aug 2014 21:13:26 +0000 (22:13 +0100)]
Merge pull request #3957 from colemanw/CRM-15149
CRM-15149 - Ensure search results are force-refreshed when a contact is updated
Coleman Watts [Tue, 26 Aug 2014 21:06:38 +0000 (22:06 +0100)]
CRM-15149 - Ensure search results are force-refreshed when a contact is updated
Tim Otten [Tue, 26 Aug 2014 20:58:09 +0000 (13:58 -0700)]
phpunit-compare - Add support for CSV output
colemanw [Tue, 26 Aug 2014 20:34:15 +0000 (21:34 +0100)]
Merge pull request #3955 from colemanw/search
Fix refresh bug with embedded search forms in contact summary tabs
Coleman Watts [Tue, 26 Aug 2014 20:32:38 +0000 (21:32 +0100)]
Fix refresh bug with embedded search forms in contact summary tabs
Tim Otten [Tue, 26 Aug 2014 20:32:12 +0000 (13:32 -0700)]
phpunit-compare - Add support for reading results from Jenkins' XML files
colemanw [Tue, 26 Aug 2014 20:27:31 +0000 (21:27 +0100)]
Merge pull request #3949 from colemanw/CRM-15156
CRM-15156 - Clear cms resource cache during upgrade
Coleman Watts [Tue, 26 Aug 2014 19:04:48 +0000 (20:04 +0100)]
Fix style for disabled
colemanw [Tue, 26 Aug 2014 18:09:38 +0000 (19:09 +0100)]
Merge pull request #3954 from colemanw/forms
Form cleanup
Coleman Watts [Tue, 26 Aug 2014 18:08:03 +0000 (19:08 +0100)]
Profile code cleanup
Coleman Watts [Tue, 26 Aug 2014 18:07:22 +0000 (19:07 +0100)]
Select2 style fixes for public pages
Coleman Watts [Tue, 26 Aug 2014 18:05:12 +0000 (19:05 +0100)]
Centralize select placeholder handling
Dave Greenberg [Tue, 26 Aug 2014 16:28:12 +0000 (09:28 -0700)]
Merge pull request #3946 from jitendrapurohit/CRM-15176
CRM-15176
Dave Greenberg [Tue, 26 Aug 2014 16:16:49 +0000 (09:16 -0700)]
Merge pull request #3948 from joannechester/4.5
CRM-14635: Update links in user interface that point to book membership chapters
colemanw [Tue, 26 Aug 2014 15:26:13 +0000 (16:26 +0100)]
Merge pull request #3953 from colemanw/CRM-15149
CRM-15149 - Close popup after deleting an object (don't try to view it)
Coleman Watts [Tue, 26 Aug 2014 15:15:24 +0000 (16:15 +0100)]
CRM-15149 - Close popup after deleting an object (don't try to view it)
colemanw [Tue, 26 Aug 2014 14:59:52 +0000 (15:59 +0100)]
Merge pull request #3951 from colemanw/select2
select2 style fix
Coleman Watts [Tue, 26 Aug 2014 14:59:24 +0000 (15:59 +0100)]
Remove unused styles from joomla.css
Coleman Watts [Tue, 26 Aug 2014 14:57:44 +0000 (15:57 +0100)]
select2 style fix
colemanw [Tue, 26 Aug 2014 14:40:21 +0000 (15:40 +0100)]
Merge pull request #3950 from colemanw/Joomla
Joomla css fixes
Coleman Watts [Tue, 26 Aug 2014 14:39:08 +0000 (15:39 +0100)]
Joomla css fixes
Coleman Watts [Tue, 26 Aug 2014 13:30:37 +0000 (14:30 +0100)]
CRM-15156 - Clear cms resource cache during upgrade
Coleman Watts [Tue, 26 Aug 2014 12:27:59 +0000 (13:27 +0100)]
API explorer - escape special character from php syntax - global
Coleman Watts [Tue, 26 Aug 2014 12:21:11 +0000 (13:21 +0100)]
API explorer - escape special character from php syntax
joannechester [Tue, 26 Aug 2014 12:14:45 +0000 (22:14 +1000)]
Update Component.hlp
joannechester [Tue, 26 Aug 2014 12:09:36 +0000 (22:09 +1000)]
Update MembershipType.tpl
joannechester [Tue, 26 Aug 2014 12:09:01 +0000 (22:09 +1000)]
Update MembershipStatus.tpl
joannechester [Tue, 26 Aug 2014 12:07:55 +0000 (22:07 +1000)]
Update MembershipType.tpl
joannechester [Tue, 26 Aug 2014 12:04:02 +0000 (22:04 +1000)]
Update Component.hlp
joannechester [Tue, 26 Aug 2014 12:01:21 +0000 (22:01 +1000)]
Update Miscellaneous.tpl
Jitendra Purohit [Tue, 26 Aug 2014 11:00:38 +0000 (16:30 +0530)]
CRM-15176
Kurund Jalmi [Tue, 26 Aug 2014 10:54:10 +0000 (16:24 +0530)]
Merge pull request #3944 from monishdeb/CRM-15139
CRM-15139 QA fix
Kurund Jalmi [Tue, 26 Aug 2014 10:53:55 +0000 (16:23 +0530)]
Merge pull request #3945 from jitendrapurohit/CRM-15169
CRM-15169
Jitendra Purohit [Tue, 26 Aug 2014 10:49:43 +0000 (16:19 +0530)]
CRM-15169
monishdeb [Tue, 26 Aug 2014 10:19:02 +0000 (15:49 +0530)]
CRM-15139 QA fix
----------------------------------------
* CRM-15139: Batch update does not show values when using custom fields limited by event type
https://issues.civicrm.org/jira/browse/CRM-15139
Coleman Watts [Tue, 26 Aug 2014 10:01:16 +0000 (11:01 +0100)]
API explorer - tweak drush syntax
Coleman Watts [Tue, 26 Aug 2014 09:26:46 +0000 (10:26 +0100)]
API explorer - add rudimentary drush support
Coleman Watts [Tue, 26 Aug 2014 08:58:51 +0000 (09:58 +0100)]
API explorer - better action handling
colemanw [Tue, 26 Aug 2014 07:45:17 +0000 (08:45 +0100)]
Merge pull request #3943 from civicrm/master
Merge master into 4.5
Coleman Watts [Tue, 26 Aug 2014 07:43:47 +0000 (08:43 +0100)]
Match crm-public styles with select2
Coleman Watts [Tue, 26 Aug 2014 06:23:34 +0000 (07:23 +0100)]
Fix overzealous search/replace
Coleman Watts [Mon, 25 Aug 2014 21:44:21 +0000 (22:44 +0100)]
Ensure headers are set correctly for json output
colemanw [Mon, 25 Aug 2014 20:15:13 +0000 (21:15 +0100)]
Merge pull request #3942 from colemanw/chainSelect
CRM-15172 - Add chainSelect method to CRM_Core_Form
Coleman Watts [Mon, 25 Aug 2014 20:08:39 +0000 (21:08 +0100)]
CRM-15172 - Fix profile state/county required options
Coleman Watts [Mon, 25 Aug 2014 19:58:32 +0000 (20:58 +0100)]
CRM-15172 - Add centralized state/county validation
Kurund Jalmi [Mon, 25 Aug 2014 18:25:10 +0000 (23:55 +0530)]
Merge pull request #3941 from monishdeb/CRM-15139
CRM-15139 fix - Batch update does not show values when using custom fields limited by event type
Kurund Jalmi [Mon, 25 Aug 2014 18:21:05 +0000 (23:51 +0530)]
Merge pull request #3939 from atif-shaikh/addtlNoticeFix
Notice Fixes on Contribution Reports
Kurund Jalmi [Mon, 25 Aug 2014 18:19:45 +0000 (23:49 +0530)]
Merge pull request #3938 from atif-shaikh/CRM-15169
CRM-15169 - Notices on Event Participant Listing Report
Monish [Mon, 25 Aug 2014 16:42:47 +0000 (22:12 +0530)]
CRM-15139 fix - Batch update does not show values when using custom fields limited by event type
https://issues.civicrm.org/jira/browse/CRM-15139
Dave Greenberg [Mon, 25 Aug 2014 16:26:26 +0000 (09:26 -0700)]
Merge pull request #3918 from williamtheaker/master
Changed HTML input type
colemanw [Mon, 25 Aug 2014 13:13:23 +0000 (14:13 +0100)]
Merge pull request #3940 from colemanw/Mailing
Mailing form and submitOnce fixes
Coleman Watts [Mon, 25 Aug 2014 13:13:03 +0000 (14:13 +0100)]
Mailing form and submitOnce fixes
atif-shaikh [Mon, 25 Aug 2014 10:38:27 +0000 (16:08 +0530)]
Notice Fixes on Contribution Reports
atif-shaikh [Mon, 25 Aug 2014 10:28:28 +0000 (15:58 +0530)]
CRM-15169 - Notices on Event Participant Listing Report
https://issues.civicrm.org/jira/browse/CRM-15169
Kurund Jalmi [Mon, 25 Aug 2014 10:14:29 +0000 (15:44 +0530)]
Merge pull request #3936 from jitendrapurohit/CRM-15160Fixes
CRM-15160 Fix for communication_style and other options
Kurund Jalmi [Mon, 25 Aug 2014 10:14:09 +0000 (15:44 +0530)]
Merge pull request #3937 from jitendrapurohit/CRM-15159
CRM-15159
Jitendra Purohit [Mon, 25 Aug 2014 10:02:13 +0000 (15:32 +0530)]
CRM-15160 Fix for communication_style and other options
Jitendra Purohit [Mon, 25 Aug 2014 09:34:51 +0000 (15:04 +0530)]
Static declaration of functions
colemanw [Mon, 25 Aug 2014 09:08:53 +0000 (10:08 +0100)]
Merge pull request #3934 from civicrm/master
Merge master into 4.5
colemanw [Mon, 25 Aug 2014 09:02:02 +0000 (10:02 +0100)]
Merge pull request #3933 from colemanw/Fix
Fix payment processor form unsaved changes warning
Coleman Watts [Mon, 25 Aug 2014 09:01:32 +0000 (10:01 +0100)]
Fix payment processor form unsaved changes warning
Monish Deb [Mon, 25 Aug 2014 08:20:32 +0000 (13:50 +0530)]
Merge pull request #3902 from atif-shaikh/CRM-15120
CRM-15120 - Mailing labels Prefix missing for Merge labels for contacts ...
atif-shaikh [Mon, 25 Aug 2014 08:18:43 +0000 (13:48 +0530)]
indentation fix
Coleman Watts [Mon, 25 Aug 2014 07:00:44 +0000 (08:00 +0100)]
Ensure widgets are initialized after inline-edit form error
Coleman Watts [Sun, 24 Aug 2014 21:05:14 +0000 (22:05 +0100)]
CRM-15172 - Refactor forms to use addChainSelect method
Kurund Jalmi [Mon, 25 Aug 2014 05:43:23 +0000 (11:13 +0530)]
Merge pull request #3931 from yashodha/version-fix
version fixes
Kurund Jalmi [Mon, 25 Aug 2014 05:41:07 +0000 (11:11 +0530)]
Merge pull request #3910 from deepak-srivastava/pull-clickatell-out-of-core
Pull clickatell extension out of core (to veda repo)
Kurund Jalmi [Mon, 25 Aug 2014 05:37:58 +0000 (11:07 +0530)]
Merge pull request #3930 from eileenmcnaughton/whitespace
Whitespace
kurund [Mon, 25 Aug 2014 05:30:50 +0000 (11:00 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-08-25-10-57-01
Conflicts:
tests/phpunit/CiviTest/CiviUnitTestCase.php
CiviCRM [Mon, 25 Aug 2014 05:18:30 +0000 (10:48 +0530)]
version fixes
Eileen McNaughton [Mon, 25 Aug 2014 04:33:21 +0000 (16:33 +1200)]
CRM-15168 remove inadvertantly added line break
Eileen McNaughton [Mon, 25 Aug 2014 04:29:09 +0000 (16:29 +1200)]
CRM-15168 remove inadvertantly added line break
Eileen McNaughton [Mon, 25 Aug 2014 04:19:56 +0000 (16:19 +1200)]
CRM-15168 remove inadvertantly added line break
Eileen McNaughton [Mon, 25 Aug 2014 04:17:43 +0000 (16:17 +1200)]
CRM-15168 remove inadvertantly added line break
Eileen McNaughton [Mon, 25 Aug 2014 04:13:32 +0000 (16:13 +1200)]
CRM-15168 remove inadvertantly added line break
Eileen McNaughton [Mon, 25 Aug 2014 01:36:38 +0000 (13:36 +1200)]
Merge pull request #3928 from eileenmcnaughton/CRM-15168
CRM-15168 increase test coverage
Eileen McNaughton [Mon, 25 Aug 2014 01:36:08 +0000 (13:36 +1200)]
CRM-15168 Update test to reflect almost all api are compliant
Eileen McNaughton [Mon, 25 Aug 2014 01:35:20 +0000 (13:35 +1200)]
CRM-15168 fix setting api metadata titles
projects / civicrm-core.git / log