Johan Vervloet [Wed, 16 Dec 2015 15:37:01 +0000 (16:37 +0100)]
CRM-16587 - revert of some changes of 379902.
I reverted some changes that are not needed, so that it is easier
to see what exactly changed in the pull request.
----------------------------------------
* CRM-16587: Action menu is not available on selected records on a Custom search
https://issues.civicrm.org/jira/browse/CRM-16587
Johan Vervloet [Wed, 16 Dec 2015 15:27:00 +0000 (16:27 +0100)]
CRM-14920 - Fixed issues when results are sorted on contact ID.
----------------------------------------
* CRM-14920: Custom Searches do not honor user sort order
https://issues.civicrm.org/jira/browse/CRM-14920
Johan Vervloet [Tue, 15 Dec 2015 21:16:24 +0000 (22:16 +0100)]
CRM-16587 Selecting results now work when results are sorted on contact id.
This is also rather hacky, since you have to adapt your custom searches again.
I fixed it for PostMailing and ZipCodeRange.
----------------------------------------
* CRM-16587: Action menu is not available on selected records on a Custom search
https://issues.civicrm.org/jira/browse/CRM-16587
Conflicts:
CRM/Contact/Form/Search/Custom/ZipCodeRange.php
Johan Vervloet [Tue, 15 Dec 2015 12:48:25 +0000 (13:48 +0100)]
CRM-14920 - This will work with my workaround of CRM-16587.
----------------------------------------
* CRM-14920: Custom Searches do not honor user sort order
https://issues.civicrm.org/jira/browse/CRM-14920
* CRM-16587: Action menu is not available on selected records on a Custom search
https://issues.civicrm.org/jira/browse/CRM-16587
Johan Vervloet [Mon, 14 Dec 2015 15:48:49 +0000 (16:48 +0100)]
CRM-14920 - labels from custom search: honor sort order.
This fixes the issue when you manually select a number of rows
from the custom search results. It does not work when you
want to create labels for all results.
----------------------------------------
* CRM-14920: Custom Searches do not honor user sort order
https://issues.civicrm.org/jira/browse/CRM-14920
Johan Vervloet [Tue, 15 Dec 2015 14:05:36 +0000 (15:05 +0100)]
CRM-16587 - workaround selected records custom search.
This is a workaround, and it will probably not work 100% in these cases:
* if you need to select columns with identical names from different tables
* if you need expressions in your SELECT statement, instead of just selecting
a column.
You also have to adapt your custom searches for this to work. I changed
the PostalMailing custom search so that you now can apply actions on a
selection of the retuned records.
----------------------------------------
* CRM-16587: Action menu is not available on selected records on a Custom search
https://issues.civicrm.org/jira/browse/CRM-16587
Dave Greenberg [Mon, 14 Dec 2015 20:31:35 +0000 (12:31 -0800)]
Merge pull request #7423 from eileenmcnaughton/CRM-17691
CRM-17691 do not use default return properties from search screen …
eileen [Thu, 10 Dec 2015 04:20:24 +0000 (17:20 +1300)]
CRM-17691 when doing a query to retrieve ids for export ... only retrieve the ids
This has a substantial impact on peformance
Change-Id: Iad952ec7d0a0725b24c982efcca8c35482d6ae63
eileen [Thu, 10 Dec 2015 04:19:18 +0000 (17:19 +1300)]
Free the DAO, if it comes back it's yours
Change-Id: Ida6c2a316f3fb5f505f7b24667e88fead174ce08
eileen [Mon, 14 Dec 2015 19:28:25 +0000 (08:28 +1300)]
CRM-17691 add the campaign id to selector even though it ? is not used?
Without this we get enotices on a basic search - but there is no evidenc the field is actually rendered:-(
Change-Id: I0b57e1dcaf444ad54f3d1144542e13a55f162659
eileen [Thu, 10 Dec 2015 03:28:18 +0000 (16:28 +1300)]
CRM-17691 do not use default return properties from search screen
Change-Id: Ic6b3d7a2ac2b0ca691ed9fdb84a1ff86f6c73e52
Change-Id: Ib275a710fceceba2e10d0293dc3366c1f37d3397
Dave Greenberg [Mon, 14 Dec 2015 18:33:17 +0000 (10:33 -0800)]
Merge pull request #7442 from seamuslee001/CRM-17654-further
CRM-17654 Fix issue where it wasn't storing all selected relationship…
Monish Deb [Mon, 14 Dec 2015 13:52:43 +0000 (19:22 +0530)]
Merge pull request #7445 from rohankatkar/4.7-webtests-fix
Webtests fixes
Yashodha Chaku [Mon, 14 Dec 2015 13:48:10 +0000 (19:18 +0530)]
Merge pull request #7444 from yashodha/CRM-17687
CRM-17687: Import tag length
Web Access [Mon, 14 Dec 2015 13:17:21 +0000 (18:47 +0530)]
Webtests fixes
Monish Deb [Mon, 14 Dec 2015 09:49:09 +0000 (15:19 +0530)]
Merge pull request #7430 from sudhabisht/CRM-16997
Fix for contribution repeat statistic bug
yashodha [Mon, 14 Dec 2015 08:14:37 +0000 (13:44 +0530)]
CRM-17687: Import tag length
----------------------------------------
* CRM-17687: Import tag length
https://issues.civicrm.org/jira/browse/CRM-17687
Seamus Lee [Mon, 14 Dec 2015 02:15:29 +0000 (02:15 +0000)]
CRM-17654 Fix issue where it wasn't storing all selected relationship types in db
colemanw [Sat, 12 Dec 2015 23:33:27 +0000 (18:33 -0500)]
Merge pull request #7441 from colemanw/CRM-17698
CRM-17698 - Fix editing multi-valued custom fields
Coleman Watts [Sat, 12 Dec 2015 22:17:42 +0000 (17:17 -0500)]
CRM-17698 - Fix editing multi-valued custom fields
colemanw [Sat, 12 Dec 2015 21:37:50 +0000 (16:37 -0500)]
Merge pull request #7439 from colemanw/rmExt
Remove old unused stuff from tools directory
Coleman Watts [Sat, 12 Dec 2015 02:58:13 +0000 (21:58 -0500)]
Remove old unused stuff from tools directory
colemanw [Sat, 12 Dec 2015 02:27:54 +0000 (21:27 -0500)]
Merge pull request #7438 from colemanw/insertToken
insertToken fix for message templates
Coleman Watts [Sat, 12 Dec 2015 01:16:09 +0000 (20:16 -0500)]
insertToken fix for message templates
Dave Greenberg [Sat, 12 Dec 2015 00:25:59 +0000 (16:25 -0800)]
Merge pull request #7431 from jitendrapurohit/CRM-17690
CRM-17690 - Grant fields being retrieved by default when completely i…
Dave Greenberg [Sat, 12 Dec 2015 00:12:12 +0000 (16:12 -0800)]
Merge pull request #7436 from mlutfy/47-crm17695
CRM-17695: ts() fixes.
Dave Greenberg [Sat, 12 Dec 2015 00:08:41 +0000 (16:08 -0800)]
Merge pull request #7434 from rohankatkar/WebTest-master
Webtests Fixes
colemanw [Fri, 11 Dec 2015 20:36:17 +0000 (15:36 -0500)]
Merge pull request #7437 from colemanw/CRM-17670
CRM-17670 - Fix bug caused by datatables refactor
Coleman Watts [Fri, 11 Dec 2015 18:23:55 +0000 (13:23 -0500)]
CRM-17670 - Fix bug caused by datatables refactor
Mathieu Lutfy [Fri, 11 Dec 2015 16:27:30 +0000 (11:27 -0500)]
CRM-17695: ts() fixes.
colemanw [Fri, 11 Dec 2015 14:24:12 +0000 (09:24 -0500)]
Merge pull request #7433 from colemanw/CRM_Utils_Check
CRM_Utils_Check Fixes
colemanw [Fri, 11 Dec 2015 13:26:11 +0000 (08:26 -0500)]
Merge pull request #7428 from colemanw/config
Add some @property annotations to CRM_Core_Config
Coleman Watts [Fri, 11 Dec 2015 13:15:35 +0000 (08:15 -0500)]
Make assertValid do what it says it does
Web Access [Fri, 11 Dec 2015 13:14:43 +0000 (18:44 +0530)]
Webtests Fixes
Coleman Watts [Fri, 11 Dec 2015 13:02:01 +0000 (08:02 -0500)]
Update test with renamed class
jitendrapurohit [Fri, 11 Dec 2015 08:44:42 +0000 (14:14 +0530)]
CRM-17690 - Grant fields being retrieved by default when completely irrelevant
Sudha Bisht [Fri, 11 Dec 2015 08:27:46 +0000 (13:57 +0530)]
Fix for contribution repeat statistic bug
Coleman Watts [Fri, 11 Dec 2015 02:56:15 +0000 (21:56 -0500)]
Add some @property annotations to CRM_Core_Config
Coleman Watts [Fri, 11 Dec 2015 02:32:59 +0000 (21:32 -0500)]
Cleanup CRM_Utils_Check classes
Eileen McNaughton [Fri, 11 Dec 2015 02:14:12 +0000 (15:14 +1300)]
Merge pull request #7000 from eileenmcnaughton/CRM-17275-import
Crm 17275 import
eileenmcnaughton [Fri, 11 Dec 2015 01:10:55 +0000 (01:10 +0000)]
preliminary tidy up
colemanw [Thu, 10 Dec 2015 21:43:16 +0000 (16:43 -0500)]
Merge pull request #7422 from colemanw/CRM-17637
CRM-17637 - Add poor man's cron fallback for VersionCheck
Coleman Watts [Thu, 10 Dec 2015 17:31:30 +0000 (12:31 -0500)]
CRM-17637 - Ensure files directory is writeable
Coleman Watts [Thu, 10 Dec 2015 16:22:40 +0000 (11:22 -0500)]
CRM-17637 - Add unit test for cron fallback
Monish Deb [Thu, 10 Dec 2015 16:35:29 +0000 (22:05 +0530)]
Merge pull request #7426 from jitendrapurohit/webtest47
webtest fixes
Monish Deb [Thu, 10 Dec 2015 13:20:31 +0000 (18:50 +0530)]
Merge pull request #6189 from sudhabisht/crm-16769
Add field mapping api
jitendrapurohit [Thu, 10 Dec 2015 13:16:11 +0000 (18:46 +0530)]
webtest fixes
Yashodha Chaku [Thu, 10 Dec 2015 12:33:05 +0000 (18:03 +0530)]
Merge pull request #7425 from yashodha/CRM-17682
CRM-17682: Membership status rule edit form won't save removal of 'ad…
Monish Deb [Thu, 10 Dec 2015 08:25:05 +0000 (13:55 +0530)]
Merge pull request #7420 from davecivicrm/CRM-16526
CRM-16525 - Remove $finType var assign since it throws an eNotice if …
Monish Deb [Thu, 10 Dec 2015 08:19:10 +0000 (13:49 +0530)]
Merge pull request #7424 from jitendrapurohit/CRM-17692
CRM-17692 - Improper advance search result for multiple tag set
Sudha Bisht [Thu, 10 Dec 2015 08:09:46 +0000 (13:39 +0530)]
Test Fix
Sudha Bisht [Fri, 7 Aug 2015 14:00:00 +0000 (19:30 +0530)]
Removed api skipped part
Sudha Bisht [Thu, 6 Aug 2015 08:12:37 +0000 (13:42 +0530)]
Test Fix
Sudha Bisht [Wed, 15 Jul 2015 10:49:17 +0000 (16:19 +0530)]
Operator related fix
Sudha Bisht [Mon, 13 Jul 2015 09:33:49 +0000 (15:03 +0530)]
Fix for test failure
Sudha Bisht [Fri, 10 Jul 2015 13:02:23 +0000 (18:32 +0530)]
Fix for test failure
Tim Mallezie [Mon, 29 Jun 2015 13:01:33 +0000 (15:01 +0200)]
remove contact_type field constraint
Tim Mallezie [Mon, 29 Jun 2015 10:36:32 +0000 (12:36 +0200)]
Add Mapping and mappingfield API
jitendrapurohit [Thu, 10 Dec 2015 07:26:50 +0000 (12:56 +0530)]
CRM-17692 - Improper advance search result for multiple tag set
yashodha [Thu, 10 Dec 2015 07:08:03 +0000 (12:38 +0530)]
CRM-17682: Membership status rule edit form won't save removal of 'admin only' attribute
----------------------------------------
* CRM-17682: Membership status rule edit form won't save removal of 'admin only' attribute
https://issues.civicrm.org/jira/browse/CRM-17682
Yashodha Chaku [Thu, 10 Dec 2015 06:24:13 +0000 (11:54 +0530)]
Merge pull request #7416 from saurabhbatra96/CRM-17660
CRM-17660 - Missin "Littoral" and "Nord-Ouest" provinces in Cameroon
Coleman Watts [Thu, 10 Dec 2015 02:13:29 +0000 (21:13 -0500)]
CRM-17637 - Add poor man's cron fallback for VersionCheck
Coleman Watts [Thu, 10 Dec 2015 01:12:05 +0000 (20:12 -0500)]
CRM-17637 - VersionCheck - refactor & centralize lookup of scheduled job
Dave Greenberg [Thu, 10 Dec 2015 00:04:55 +0000 (16:04 -0800)]
CRM-16525 - Remove $finType var assign since it throws an eNotice if Financial Type ACLs are not enabled AND it does not appear to be used in any tpl file.
----------------------------------------
* CRM-16525: Add the possibility to enable/disable membership status for certain membership types
https://issues.civicrm.org/jira/browse/CRM-16525
colemanw [Wed, 9 Dec 2015 23:23:00 +0000 (18:23 -0500)]
Merge pull request #7419 from colemanw/help
SystemCheck help improvements
Coleman Watts [Wed, 9 Dec 2015 21:34:48 +0000 (16:34 -0500)]
SystemCheck help improvements
Dave Greenberg [Wed, 9 Dec 2015 21:06:15 +0000 (13:06 -0800)]
Merge pull request #7408 from seamuslee001/CRM-17307
CRM-17650 ensure that replyto_email is updated when re-using a previo…
Eileen McNaughton [Wed, 9 Dec 2015 20:00:15 +0000 (09:00 +1300)]
Merge pull request #7371 from eileenmcnaughton/CRM-17655
CRM-17655 Adding a payment to a recurring contribution sequence shoul…
Kurund Jalmi [Wed, 9 Dec 2015 15:18:08 +0000 (20:48 +0530)]
Merge pull request #7417 from rohankatkar/Webtests-master-fix
Webtests Fix
Saurabh Batra [Wed, 9 Dec 2015 14:07:58 +0000 (19:37 +0530)]
CRM-17660 - Missin "Littoral" and "Nord-Ouest" provinces in Cameroon
https://issues.civicrm.org/jira/browse/CRM-17660
Web Access [Wed, 9 Dec 2015 13:18:31 +0000 (18:48 +0530)]
Webtests Fix
CiviCRM [Wed, 9 Dec 2015 08:42:57 +0000 (00:42 -0800)]
Update version to 4.7.beta3
eileenmcnaugton [Wed, 9 Dec 2015 03:47:28 +0000 (16:47 +1300)]
add code to help track down intermittant test fail
eileenmcnaughton [Thu, 3 Dec 2015 09:32:03 +0000 (09:32 +0000)]
CRM-17655 Adding a payment to a recurring contribution sequence should update the contribution_recur table
Dave Greenberg [Tue, 8 Dec 2015 23:50:51 +0000 (15:50 -0800)]
Merge pull request #7414 from davecivicrm/CRM-17656
CRM-17656 - forward port web test for activity custom data.
Dave Greenberg [Tue, 8 Dec 2015 23:48:56 +0000 (15:48 -0800)]
CRM-17656 - forward port web test for activity custom data.
----------------------------------------
* CRM-17656: Cannot edit activities with custom fields in popup from a search results screen
https://issues.civicrm.org/jira/browse/CRM-17656
Dave Greenberg [Tue, 8 Dec 2015 17:25:50 +0000 (09:25 -0800)]
Merge pull request #7411 from jitendrapurohit/webtest
47 webtest fixes
colemanw [Tue, 8 Dec 2015 17:22:06 +0000 (12:22 -0500)]
Merge pull request #7412 from colemanw/UpgradeCleanup
Upgrade cleanup
Coleman Watts [Mon, 7 Dec 2015 02:38:43 +0000 (21:38 -0500)]
Remove redundant fn
Coleman Watts [Sun, 6 Dec 2015 02:40:13 +0000 (21:40 -0500)]
Array cleanup
Coleman Watts [Sat, 5 Dec 2015 18:08:38 +0000 (13:08 -0500)]
Remove unnecessarily translated strings
jitendrapurohit [Tue, 8 Dec 2015 13:25:19 +0000 (18:55 +0530)]
webtest fixes
Yashodha Chaku [Tue, 8 Dec 2015 12:40:12 +0000 (18:10 +0530)]
Merge pull request #7410 from jitendrapurohit/CRM-17679
generated sql changes for CRM-17679
jitendrapurohit [Tue, 8 Dec 2015 12:18:52 +0000 (17:48 +0530)]
generated sql changes for CRM-17679
Yashodha Chaku [Tue, 8 Dec 2015 11:23:09 +0000 (16:53 +0530)]
Merge pull request #7409 from yashodha/CRM-17679.fix
CRM-17679: Mismatch between financial transactions & contributions
yashodha [Tue, 8 Dec 2015 09:13:53 +0000 (14:43 +0530)]
CRM-17679: Mismatch between financial transactions & contributions
----------------------------------------
* CRM-17679: Mismatch between financial transactions & contributions
https://issues.civicrm.org/jira/browse/CRM-17679
Seamus Lee [Tue, 8 Dec 2015 06:14:39 +0000 (06:14 +0000)]
CRM-17307 ensure that replyto_email is updated when re-using a previous mailing and changing the from address
Dave Greenberg [Tue, 8 Dec 2015 00:55:40 +0000 (16:55 -0800)]
Merge pull request #7403 from monishdeb/CRM-17308
CRM-17308 fix - Location type 'select' (for all entities) AND Phone t…
Dave Greenberg [Tue, 8 Dec 2015 00:33:52 +0000 (16:33 -0800)]
Merge pull request #7402 from rohankatkar/webtestmaster_4.7
Webtests fix
Eileen McNaughton [Tue, 8 Dec 2015 00:23:27 +0000 (13:23 +1300)]
Merge pull request #7406 from eileenmcnaughton/CRM-16259
CRM-16259 exclude payment from syntax conformance tests
eileenmcnaugton [Mon, 7 Dec 2015 22:11:32 +0000 (11:11 +1300)]
CRM-16259 exclude payment from syntax conformance tests
colemanw [Mon, 7 Dec 2015 21:39:14 +0000 (16:39 -0500)]
Merge pull request #7387 from colemanw/versionCheck
CRM-17637 - Refactor versionCheck into a scheduled job
Dave Greenberg [Mon, 7 Dec 2015 20:58:21 +0000 (12:58 -0800)]
Merge pull request #7405 from laryn/patch-4
Change Dutch word to English
Laryn [Mon, 7 Dec 2015 20:53:20 +0000 (14:53 -0600)]
Change Dutch word to English
Coleman Watts [Mon, 7 Dec 2015 20:12:59 +0000 (15:12 -0500)]
CRM-17637 - Don't show up-to-date status if scheduled job is disabled
Dave Greenberg [Mon, 7 Dec 2015 18:56:40 +0000 (10:56 -0800)]
Merge pull request #7401 from sudhabisht/WebtesFix
Fixed test failure
colemanw [Mon, 7 Dec 2015 18:46:00 +0000 (13:46 -0500)]
Merge pull request #7398 from eileenmcnaughton/CRM-17628
CRM-17628 add qfKey to contribution search links
colemanw [Mon, 7 Dec 2015 17:56:18 +0000 (12:56 -0500)]
Merge pull request #7397 from colemanw/CRM-17507
CRM-17507 - Cleanup settings setItem calls
monishdeb [Mon, 7 Dec 2015 14:22:26 +0000 (19:52 +0530)]
CRM-17308 fix - Location type 'select' (for all entities) AND Phone type should be required
https://issues.civicrm.org/jira/browse/CRM-17308
Web Access [Mon, 7 Dec 2015 14:08:22 +0000 (19:38 +0530)]
Webtests fix
projects / civicrm-core.git / log