colemanw [Fri, 18 Dec 2015 02:40:20 +0000 (21:40 -0500)]
Merge pull request #7443 from eileenmcnaughton/CRM-17700
CRM-17700 allow contribution get to bypass permissions
Eileen McNaughton [Fri, 18 Dec 2015 01:35:38 +0000 (14:35 +1300)]
Merge pull request #7466 from eileenmcnaughton/test-fix
Test fix : adjust expected message from when a.net is unresponsive
eileenmcnaugton [Fri, 18 Dec 2015 00:02:32 +0000 (13:02 +1300)]
Test fix : adjust expected message from when a.net is unresponsive
Dave Greenberg [Thu, 17 Dec 2015 22:59:44 +0000 (14:59 -0800)]
Merge pull request #7449 from johanv/CRM-14920-sort_order_labels_custom_search_2nd_try
Crm 14920 sort order labels custom search 2nd try
Kurund Jalmi [Thu, 17 Dec 2015 18:08:41 +0000 (23:38 +0530)]
Merge pull request #7462 from rohankatkar/testfix4.7
tests fixes
Web Access [Thu, 17 Dec 2015 14:48:05 +0000 (20:18 +0530)]
tests fixes
Johan Vervloet [Thu, 17 Dec 2015 14:41:57 +0000 (15:41 +0100)]
Revert "CRM-14920 - labels from custom search: honor sort order."
This reverts commit
211c4cb1de75da6ea3cf9407505d0234827e969e.
Johan Vervloet [Thu, 17 Dec 2015 14:40:10 +0000 (15:40 +0100)]
CRM-14920 One more fix for ZipCodeRange custom search.
----------------------------------------
* CRM-14920: Custom Searches do not honor user sort order
https://issues.civicrm.org/jira/browse/CRM-14920
Yashodha Chaku [Thu, 17 Dec 2015 11:19:43 +0000 (16:49 +0530)]
Merge pull request #7460 from yashodha/CRM-17703
CRM-17703: Enotices on export when relationship type using 'any conta…
colemanw [Thu, 17 Dec 2015 11:19:06 +0000 (06:19 -0500)]
Merge pull request #7459 from totten/master-backdrop
CRM-17711 - Basic support for Backdrop CMS
yashodha [Thu, 17 Dec 2015 09:37:25 +0000 (15:07 +0530)]
CRM-17703: Enotices on export when relationship type using 'any contact type' exists
----------------------------------------
* CRM-17703: Enotices on export when relationship type using 'any contact type' exists
https://issues.civicrm.org/jira/browse/CRM-17703
Tim Otten [Thu, 17 Dec 2015 04:48:34 +0000 (20:48 -0800)]
CRM-17711 - distmaker - Backdrop fixes
Tim Otten [Thu, 17 Dec 2015 04:39:44 +0000 (20:39 -0800)]
CRM-17711 - distmaker/backdrop - Load proper civicrm.config.php
Tim Otten [Wed, 16 Dec 2015 06:54:42 +0000 (22:54 -0800)]
CRM-17711 - Work with Backdrop `civicrm.module` in `./backdrop/` or `./drupal/`
Tim Otten [Wed, 16 Dec 2015 05:13:44 +0000 (21:13 -0800)]
GenCode - Display PHP errors
Nate Haug [Wed, 16 Dec 2015 03:17:23 +0000 (19:17 -0800)]
CRM-17711 - Updates to use Backdrop config system, fewer drupal_* functions.
----------------------------------------
* CRM-17711: Add Support for Backdrop
https://issues.civicrm.org/jira/browse/CRM-17711
Tim Otten [Wed, 16 Dec 2015 02:01:59 +0000 (18:01 -0800)]
CRM-17711 - distmaker for Backdrop
Also: Allow calling `distmaker` with less confusing arguments (`d56` vs
`Drupal6`; `j5` vs `Joomla).
Jen Lampton [Wed, 16 Dec 2015 01:39:08 +0000 (17:39 -0800)]
Add lots of Backdrop CMS suggestions to the docs in the civi settings file.
Jen Lampton [Wed, 16 Dec 2015 01:19:08 +0000 (17:19 -0800)]
Add a Backdrop CMS suggestion in the civi settings file.
Jen Lampton [Wed, 16 Dec 2015 01:03:57 +0000 (17:03 -0800)]
Add Backdrop support in CodeGen.
Tim Otten [Tue, 15 Dec 2015 23:35:53 +0000 (15:35 -0800)]
CRM-17711 - CRM_*_Backdrop - Fix enough to run setup.sh
Tim Otten [Tue, 15 Dec 2015 23:35:53 +0000 (15:35 -0800)]
CRM_*_Backdrop - Fix enough to run setup.sh
Tim Otten [Tue, 15 Dec 2015 23:18:19 +0000 (15:18 -0800)]
Copy CRM/*/Drupal.php to CRM/*/Backdrop.php
Dave Greenberg [Thu, 17 Dec 2015 01:43:44 +0000 (17:43 -0800)]
Merge pull request #7450 from davejenx/CRM-17702
CRM-17702 - Fix validation for multiple membership types when using price sets on back-end membership creation…
eileen [Thu, 17 Dec 2015 00:22:51 +0000 (13:22 +1300)]
CRM-17700 fix api to respect skipping permissions at the custom field level
Dave Greenberg [Thu, 17 Dec 2015 00:15:39 +0000 (16:15 -0800)]
Merge pull request #7454 from eileenmcnaughton/R8995
CRM_17474 standardise address field addition to other reports
eileen [Wed, 16 Dec 2015 22:41:25 +0000 (11:41 +1300)]
CRM-17700 test for custom fields with permissions
eileen [Mon, 14 Dec 2015 01:49:09 +0000 (14:49 +1300)]
CRM-17700 allow contribution get to bypass permissions
Note this just extends the existing 'check_permissions' to apply to custom data as well. Using
check permission defaults to 0 for php api & 1 for json (can not be overriden in json)
colemanw [Wed, 16 Dec 2015 19:57:33 +0000 (14:57 -0500)]
Merge pull request #7456 from davejenx/CRM-17717
CRM-17717 - send correct MIME type for .jpg files
Dave Jenkins [Wed, 16 Dec 2015 16:54:16 +0000 (16:54 +0000)]
CRM-17717 - apply strtolower to file extension.
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
Dave Jenkins [Wed, 16 Dec 2015 14:49:19 +0000 (14:49 +0000)]
CRM-17717 - send correct MIME type for .jpg files
CiviCRM [Wed, 16 Dec 2015 10:11:13 +0000 (02:11 -0800)]
Update version to 4.7.beta4
Monish Deb [Wed, 16 Dec 2015 05:57:16 +0000 (11:27 +0530)]
Merge pull request #7455 from yashodha/minor-fix
get rid of auto-incremented column id
yashodha [Wed, 16 Dec 2015 05:53:38 +0000 (11:23 +0530)]
get rid of auto-incremented column id
eileenmcnaugton [Sat, 26 Sep 2015 02:22:28 +0000 (14:22 +1200)]
CRM_17474 standardise address field addition to other reports
This also adds add extra address fields to participant listing such as
address_name & county
Conflicts:
CRM/Report/Form/Event/ParticipantListing.php
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
Dave Greenberg [Tue, 15 Dec 2015 19:03:40 +0000 (11:03 -0800)]
Merge pull request #7429 from seamuslee001/CRM-17693
CRM-17693 Increase default string table size to be 255. 255 Character…
Dave Greenberg [Tue, 15 Dec 2015 18:56:56 +0000 (10:56 -0800)]
Merge pull request #7432 from monishdeb/CRM-17492
CRM-17492 fix - Query speed issue searching on transaction ID
Dave Jenkins [Tue, 15 Dec 2015 14:27:48 +0000 (14:27 +0000)]
CRM-17702 - Fix validation for multiple membership types when using price sets on back-end membership creation: (1) get the check for multiple membership types working - it got broken between 4.6.10 & 4.7; (2) fix bug where value of quantity field is treated as price_field_value.id .
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
Yashodha Chaku [Tue, 15 Dec 2015 13:55:13 +0000 (19:25 +0530)]
Merge pull request #7447 from yashodha/CRM-17704
CRM-17704: Export: Regression on Select Fields to Export - Current Em…
Monish Deb [Tue, 15 Dec 2015 13:30:37 +0000 (19:00 +0530)]
Merge pull request #7448 from rohankatkar/test-fix-4.7
Webtests fixes
Web Access [Tue, 15 Dec 2015 13:27:07 +0000 (18:57 +0530)]
Webtests fixes
yashodha [Tue, 15 Dec 2015 12:11:48 +0000 (17:41 +0530)]
format fix
yashodha [Tue, 15 Dec 2015 09:06:44 +0000 (14:36 +0530)]
CRM-17704: fix for select all primary fields
----------------------------------------
* CRM-17704: Export: Regression on Select Fields to Export - Current Employer
https://issues.civicrm.org/jira/browse/CRM-17704
yashodha [Tue, 15 Dec 2015 06:31:15 +0000 (12:01 +0530)]
CRM-17704: Export: Regression on Select Fields to Export - Current Employer
----------------------------------------
* CRM-17704: Export: Regression on Select Fields to Export - Current Employer
https://issues.civicrm.org/jira/browse/CRM-17704
monishdeb [Tue, 15 Dec 2015 05:45:28 +0000 (11:15 +0530)]
minor fix
Seamus Lee [Tue, 15 Dec 2015 01:16:35 +0000 (01:16 +0000)]
Increase Default sizes to 255
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
monishdeb [Fri, 11 Dec 2015 13:16:15 +0000 (18:46 +0530)]
format fixes
monishdeb [Fri, 11 Dec 2015 12:45:29 +0000 (18:15 +0530)]
CRM-17492 fix - Query speed issue searching on transaction ID
https://issues.civicrm.org/jira/browse/CRM-17492
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
Seamus Lee [Fri, 11 Dec 2015 07:58:08 +0000 (07:58 +0000)]
CRM-17693 Increase default string table size to be 255. 255 Characters seems fairly common on the db and matches max length of contribution page title
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
projects / civicrm-core.git / log