Coleman Watts [Thu, 28 Aug 2014 20:59:24 +0000 (21:59 +0100)]
Prevent double confirm box when deleting attachments
Dave Greenberg [Thu, 28 Aug 2014 18:48:38 +0000 (11:48 -0700)]
Merge pull request #3989 from colemanw/CRM-15198
CRM-15198 - Fix error messages when unable to delete financial type
Coleman Watts [Thu, 28 Aug 2014 16:55:13 +0000 (17:55 +0100)]
Fix strings and messages
Coleman Watts [Thu, 28 Aug 2014 16:30:04 +0000 (17:30 +0100)]
CRM-15198 - Fix error messages when unable to delete financial type
colemanw [Thu, 28 Aug 2014 15:54:19 +0000 (16:54 +0100)]
Merge pull request #3987 from colemanw/menuHeight
More accurate dialog size calculations
Coleman Watts [Thu, 28 Aug 2014 15:52:34 +0000 (16:52 +0100)]
More accurate dialog size calculations
Coleman Watts [Thu, 28 Aug 2014 15:19:08 +0000 (16:19 +0100)]
Event participant form code cleanup
colemanw [Thu, 28 Aug 2014 14:50:13 +0000 (15:50 +0100)]
Merge pull request #3986 from colemanw/String
String fixes
Coleman Watts [Thu, 28 Aug 2014 14:48:55 +0000 (15:48 +0100)]
String fixes
colemanw [Thu, 28 Aug 2014 14:36:35 +0000 (15:36 +0100)]
Merge pull request #3972 from colemanw/CRM-15193
CRM-15193 - Support front/back end modes in CRM.url
Coleman Watts [Thu, 28 Aug 2014 13:38:34 +0000 (14:38 +0100)]
CRM-15193 - Ensure profile create links go to the backend
Coleman Watts [Wed, 27 Aug 2014 22:33:29 +0000 (23:33 +0100)]
Reset cacheCode when flushing dynamic resources
Coleman Watts [Wed, 27 Aug 2014 22:22:50 +0000 (23:22 +0100)]
Add cacheCode to dynamic resource urls
Coleman Watts [Wed, 27 Aug 2014 22:06:34 +0000 (23:06 +0100)]
CRM-15193 - Support front/back end modes in CRM.url
Kurund Jalmi [Thu, 28 Aug 2014 13:31:10 +0000 (19:01 +0530)]
Merge pull request #3985 from jitendrapurohit/Webtest-4.5.0
Webtest Fix 4.5
Jitendra Purohit [Thu, 28 Aug 2014 13:24:00 +0000 (18:54 +0530)]
Webtest Fix 4.5
Coleman Watts [Thu, 28 Aug 2014 11:35:37 +0000 (12:35 +0100)]
Additional check to see if profileCreate links are empty
Tim Otten [Thu, 28 Aug 2014 07:42:10 +0000 (00:42 -0700)]
Merge pull request #3981 from totten/4.5-log-error
CRM_Core_ErrorTest - Fix local failiure (observed in OS X 10.7, MAMP 2.x)
Yashodha Chaku [Thu, 28 Aug 2014 06:47:13 +0000 (12:17 +0530)]
Merge pull request #3982 from yashodha/HR-402
HR-402: fix for notices on case status
Tim Otten [Thu, 28 Aug 2014 06:11:09 +0000 (23:11 -0700)]
Merge pull request #3980 from totten/4.5-component-tests
CRM_Core_BAO_SettingTest - Fix setting leakage which breaks CRM_Core_BAO_SettingTest
CiviCRM [Thu, 28 Aug 2014 05:54:05 +0000 (11:24 +0530)]
HR-402: fix for notices on case status
Tim Otten [Thu, 28 Aug 2014 05:18:52 +0000 (22:18 -0700)]
CRM_Core_ErrorTest - Fix local failiure (observed in OS X 10.7, MAMP 2.x)
Tim Otten [Thu, 28 Aug 2014 04:31:13 +0000 (21:31 -0700)]
Merge pull request #3978 from totten/4.5-revert-450a63
Revert "CRM-14946 add relevant test data set"
Tim Otten [Thu, 28 Aug 2014 04:04:50 +0000 (21:04 -0700)]
CRM_Case_PseudoConstantTest - Fix
The old assertion was dependending on the previous test (e.g. the
list of case-types added/removed). By changing the base class
to CiviCaseTestCase, we get a more consistent (but different)
starting point.
Tim Otten [Thu, 28 Aug 2014 03:40:52 +0000 (20:40 -0700)]
CRM_Core_BAO_SettingTest - Fix setting leakage which breaks CRM_Core_BAO_SettingTest
A previous commit fixed the leak out of CRM_Case_BAO_CaseTest, but there appears to be more.
This fix tries to be more aggressive about setting a general baseline.
Tim Otten [Thu, 28 Aug 2014 03:09:30 +0000 (20:09 -0700)]
Revert "CRM-14946 add relevant test data set"
After interviewing Eileen, Kurund, and Dave, it appears that
450a63c was a
draft that shouldn't have been merged. The underlying question was how to
handle a change in the smart-group data-structure. One approach (implicit
in
450a63c) was to maintain runtime compatibility. Another approach (which
was ultimately chosen) was to define an upgrade that altered the
data-structure.
This fixes the failure in CRM_Contact_BAO_GroupTest::testGroupData.
This reverts commit
450a63cfc27064f2ffc141e76d4662fe612a67a5.
Dave Greenberg [Thu, 28 Aug 2014 01:27:35 +0000 (18:27 -0700)]
Merge pull request #3977 from davecivicrm/CRM-15197
CRM-15197 - Fix for WebTest_Event_AddParticipationTest::testEventAddMult...
Dave Greenberg [Thu, 28 Aug 2014 01:25:53 +0000 (18:25 -0700)]
CRM-15197 - Fix for WebTest_Event_AddParticipationTest::testEventAddMultipleParticipants
----------------------------------------
* CRM-15197:
https://issues.civicrm.org/jira/browse/CRM-15197
Dave Greenberg [Wed, 27 Aug 2014 23:45:15 +0000 (16:45 -0700)]
Merge pull request #3971 from davecivicrm/CRM-15121
CRM-15121 - Fix searching for Permissioned Relationship property in Adva...
Dave Greenberg [Wed, 27 Aug 2014 22:39:13 +0000 (15:39 -0700)]
Merge pull request #3969 from colemanw/CRM-15191
CRM-15191 - Ensure the cache gets cleared after updating custom fields via api
Dave Greenberg [Wed, 27 Aug 2014 22:00:19 +0000 (15:00 -0700)]
CRM-15121 - whitespace fix.
----------------------------------------
* CRM-15121:
https://issues.civicrm.org/jira/browse/CRM-15121
Dave Greenberg [Wed, 27 Aug 2014 21:57:08 +0000 (14:57 -0700)]
CRM-15121 - whitespace fix.
----------------------------------------
* CRM-15121:
https://issues.civicrm.org/jira/browse/CRM-15121
Dave Greenberg [Wed, 27 Aug 2014 21:55:26 +0000 (14:55 -0700)]
CRM-15121 - Fix searching for Permissioned Relationship property in Advanced Search.
----------------------------------------
* CRM-15121:
https://issues.civicrm.org/jira/browse/CRM-15121
Dave Greenberg [Wed, 27 Aug 2014 20:42:01 +0000 (13:42 -0700)]
Merge pull request #3970 from davecivicrm/CRM-14635a
Added link in Case Type config screen to the updated CiviCase config do...
Dave Greenberg [Wed, 27 Aug 2014 20:40:40 +0000 (13:40 -0700)]
Added link in Case Type config screen to the updated CiviCase config doc in the user guide.
Coleman Watts [Wed, 27 Aug 2014 20:28:19 +0000 (21:28 +0100)]
Code cleanup
Coleman Watts [Wed, 27 Aug 2014 20:28:14 +0000 (21:28 +0100)]
CRM-15191 - Prevent blank token for disabled fields
Coleman Watts [Wed, 27 Aug 2014 20:27:32 +0000 (21:27 +0100)]
CRM-15191 - Ensure the cache gets cleared after updating custom fields via api
CiviCRM [Wed, 27 Aug 2014 14:04:41 +0000 (07:04 -0700)]
Update version to 4.5.0
Coleman Watts [Wed, 27 Aug 2014 13:01:40 +0000 (14:01 +0100)]
Sort address tokens into an optgroup
colemanw [Wed, 27 Aug 2014 12:33:26 +0000 (13:33 +0100)]
Fix typo in CRM/Event/Page/EventInfo.tpl
colemanw [Wed, 27 Aug 2014 12:25:47 +0000 (13:25 +0100)]
CRM-15192 - Remove nonsense string from translation
colemanw [Wed, 27 Aug 2014 12:09:45 +0000 (13:09 +0100)]
Merge pull request #3968 from colemanw/Cleanup
Cleanup inconsistent labelling - 'State/Province' vs 'State / Province'
colemanw [Wed, 27 Aug 2014 08:52:37 +0000 (09:52 +0100)]
Merge pull request #3961 from davecivicrm/CRM-14635
CRM-14635 - Fix obsolete links to developer book - link to Developer Res...
Coleman Watts [Wed, 27 Aug 2014 08:50:22 +0000 (09:50 +0100)]
Cleanup inconsistent labelling - 'State/Province' vs 'State / Province'
colemanw [Wed, 27 Aug 2014 08:37:24 +0000 (09:37 +0100)]
Merge pull request #3967 from colemanw/CRM_Contact_Form_Test
CRM_Contact_Form_Test - delete unused/obsolete form
Coleman Watts [Wed, 27 Aug 2014 08:32:06 +0000 (09:32 +0100)]
CRM_Contact_Form_Test - delete unused/obsolete form
Eileen McNaughton [Wed, 27 Aug 2014 05:29:09 +0000 (17:29 +1200)]
Merge pull request #3966 from eileenmcnaughton/CRM-15168-all-functions
Crm 15168 extend getfields title metadata test to all functions
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...
Dave Greenberg [Tue, 26 Aug 2014 22:48:04 +0000 (15:48 -0700)]
CRM-14635 - Fix obsolete links to developer book - link to Developer Resources on wiki instead.
----------------------------------------
* CRM-14635:
https://issues.civicrm.org/jira/browse/CRM-14635
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
projects / civicrm-core.git / log