Eileen McNaughton [Thu, 6 Aug 2015 08:56:32 +0000 (20:56 +1200)]
Merge pull request #6424 from seamuslee001/4.6-CRM-13644
4.6 Backport - CRM-13644 Apply Permission Check for Group API
Eileen McNaughton [Thu, 6 Aug 2015 08:24:25 +0000 (20:24 +1200)]
Merge pull request #6426 from eileenmcnaughton/CRM-16832
CRM-16832. Do not redirect offsite when fed invalid keys.
Monish Deb [Thu, 6 Aug 2015 05:16:15 +0000 (10:46 +0530)]
Merge pull request #6420 from jitendrapurohit/CRM-16949
CRM-16949 - Multi-record custom fields repeated when displayed for an individual
Monish Deb [Thu, 6 Aug 2015 05:15:59 +0000 (10:45 +0530)]
Merge pull request #6410 from jmcclelland/CRM-10100
ensure correct open, click, etc. statistics
Chris Burgess [Mon, 13 Jul 2015 00:45:51 +0000 (12:45 +1200)]
CRM-16832. Do not redirect offsite when fed invalid keys.
URLs to test:
* http://civicrm.dev/civicrm/contribute/transact?qfKey=xxx&entryURL=http://evil.example.com/ should go to CIVICRM_UF_BASEURL
* http://civicrm.dev/civicrm/contribute/transact?qfKey=xxx&entryURL=/civicrm/contribute/transact%3Fid%3D1 should go to /civicrm/contribute/transact?id=1
* http://civicrm.dev/civicrm/contribute/transact?qfKey=xxx&entryURL=http://civicrm.dev/civicrm/contribute/transact%3Fid%3D1 should go to /civicrm/contribute/transact?id=1
Seamus Lee [Thu, 6 Aug 2015 00:06:12 +0000 (00:06 +0000)]
PHPcs Fixes
Seamus Lee [Wed, 5 Aug 2015 23:56:20 +0000 (23:56 +0000)]
CRM-13644 Apply Permission Check for Group API 4.6
Eileen McNaughton [Wed, 5 Aug 2015 20:45:02 +0000 (08:45 +1200)]
Merge pull request #6418 from eileenmcnaughton/CRM-15815-46
CRM-15815 fix chaining with sequential
jitendrapurohit [Wed, 5 Aug 2015 13:27:54 +0000 (18:57 +0530)]
minor fixes
jitendrapurohit [Wed, 5 Aug 2015 13:18:18 +0000 (18:48 +0530)]
CRM-16949 - Multi-record custom fields repeated when displayed for an individual
CiviCRM [Wed, 5 Aug 2015 12:06:18 +0000 (05:06 -0700)]
Update version to 4.6.7
eileenmcnaugton [Wed, 5 Aug 2015 11:18:07 +0000 (23:18 +1200)]
CRM-16168 api chaining fix (plus some test tidy up)
Johan Vervloet [Tue, 24 Mar 2015 09:23:00 +0000 (10:23 +0100)]
CRM-16168 - Added 2 unit tests.
In the two tests, I try to get an event and its loc block
in one chained call.
In the first test, a loc block exists, so it should be
returned.
In the second test, no loc block exists. This should not
crash the API.
----------------------------------------
* CRM-16168: Chained call event-loc block returns an error if no loc block exists.
https://issues.civicrm.org/jira/browse/CRM-16168
Johan Vervloet [Mon, 2 Feb 2015 12:59:01 +0000 (13:59 +0100)]
Refs #15891 - Small fix.
I accidently left a line that writes debug output to a file.
Just removed it.
Johan Vervloet [Mon, 2 Feb 2015 12:23:15 +0000 (13:23 +0100)]
CRM-15891 - Unit test to illustrate the problem.
If I use the api to create a contact and two websites, I expect the
result values to contain the array key 'api.website.create' to be
there.
----------------------------------------
* CRM-15891: Inconsistency in returned json for chained get and chained create
https://issues.civicrm.org/jira/browse/CRM-15891
Conflicts:
tests/phpunit/api/v3/ContactTest.php
eileenmcnaughton [Wed, 5 Aug 2015 10:39:25 +0000 (10:39 +0000)]
CRM-15904 fix sequential with reload
Johan Vervloet [Mon, 2 Feb 2015 13:21:43 +0000 (14:21 +0100)]
CRM-15904 - Unit test to illustrate the issue.
This unit test illustrates the problem.
I use chaining to create a contact and an e-mail address. If I do
this with sequential=1 and the reload option, I get an error.
Obviously this pull request will cause errors during automatic
testing.
----------------------------------------
* CRM-15904: API: Reload option does not work with chaining and sequential
https://issues.civicrm.org/jira/browse/CRM-15904
Johan Vervloet [Sat, 24 Jan 2015 21:20:27 +0000 (22:20 +0100)]
Unit test for CRM-15815.
----------------------------------------
* CRM-15815: Two chained create calls, with the first one creating an array
https://issues.civicrm.org/jira/browse/CRM-15815
eileenmcnaughton [Wed, 5 Aug 2015 09:20:30 +0000 (09:20 +0000)]
CRM-15815 fix chaining with sequential
colemanw [Tue, 4 Aug 2015 19:33:54 +0000 (15:33 -0400)]
Merge pull request #6407 from civicrm/revert-6236-CRM-16836
Revert "CRM-16836 - Enforce permissions in group api getoptions"
Jamie McClelland [Mon, 26 Aug 2013 17:30:07 +0000 (13:30 -0400)]
ensure correct open, click, etc. statistics
See http://issues.civicrm.org/jira/browse/CRM-10100 We're counting opens
for the same message more than once. By counting the event_queue_id we
ensure only one count per message.
Monish Deb [Tue, 4 Aug 2015 14:33:09 +0000 (20:03 +0530)]
Merge pull request #6388 from monishdeb/4.6
CRM-16945 fix - Groups tab shows duplicate groups when a contact has …
colemanw [Tue, 4 Aug 2015 12:42:27 +0000 (08:42 -0400)]
Revert "CRM-16836 - Enforce permissions in group api getoptions"
Monish Deb [Tue, 4 Aug 2015 07:12:36 +0000 (12:42 +0530)]
Merge pull request #6403 from sudhabisht/WarningFix
Warning Fix
Sudha Bisht [Tue, 4 Aug 2015 07:11:01 +0000 (12:41 +0530)]
Warning Fix
Kurund Jalmi [Tue, 4 Aug 2015 06:45:49 +0000 (12:15 +0530)]
Merge pull request #6395 from colemanw/CRM-16846
CRM-16846 - run old sql without resetting locale to that version
Coleman Watts [Mon, 3 Aug 2015 21:23:50 +0000 (17:23 -0400)]
CRM-16846 - run old sql without resetting locale to that version
colemanw [Mon, 3 Aug 2015 21:16:42 +0000 (17:16 -0400)]
Merge pull request #6396 from eileenmcnaughton/4.6
CRM-16927 rename changed-name-function in the test suite
eileenmcnaugton [Mon, 3 Aug 2015 21:12:43 +0000 (09:12 +1200)]
CRM-16927 rename changed-name-function in the test suite
Eileen McNaughton [Mon, 3 Aug 2015 21:01:51 +0000 (09:01 +1200)]
Merge pull request #6390 from eileenmcnaughton/CRM-16958
CRM-16958 ensure sort_name is set when display_name set
eileenmcnaughton [Mon, 3 Aug 2015 12:16:31 +0000 (12:16 +0000)]
CRM-16958 ensure sort_name is set when display_name set
monishdeb [Mon, 3 Aug 2015 09:13:07 +0000 (14:43 +0530)]
improvement
monishdeb [Mon, 3 Aug 2015 08:17:48 +0000 (13:47 +0530)]
minor fix
monishdeb [Mon, 3 Aug 2015 05:40:31 +0000 (11:10 +0530)]
CRM-16945 fix - Groups tab shows duplicate groups when a contact has been hard-added to a smart gorup or paarent group
https://issues.civicrm.org/jira/browse/CRM-16945
Eileen McNaughton [Mon, 3 Aug 2015 02:06:37 +0000 (14:06 +1200)]
Merge pull request #6364 from eileenmcnaughton/CRM-16945
CRM-16945 add test to demonstrate bug & lock in fix
eileenmcnaugton [Fri, 31 Jul 2015 04:54:15 +0000 (16:54 +1200)]
CRM-16945 add test to demonstrate bug & lock in fix
colemanw [Sat, 1 Aug 2015 11:58:55 +0000 (07:58 -0400)]
Merge pull request #6371 from colemanw/CRM-16891
CRM-16891 - Add $region param to hook_civicrm_coreResourceList
Monish Deb [Sat, 1 Aug 2015 08:09:34 +0000 (13:39 +0530)]
Merge pull request #6342 from monishdeb/4.6
CRM-16927 fix - Notice Search membership with custom fields
colemanw [Sat, 1 Aug 2015 02:35:40 +0000 (22:35 -0400)]
Merge pull request #6368 from colemanw/gender
Add api alias for 'gender_id' as 'gender'
Coleman Watts [Sat, 1 Aug 2015 02:18:42 +0000 (22:18 -0400)]
CRM-16891 - Add $region param to hook_civicrm_coreResourceList
colemanw [Sat, 1 Aug 2015 01:32:23 +0000 (21:32 -0400)]
Merge pull request #6369 from colemanw/explorer
API Explorer fixes
Coleman Watts [Fri, 31 Jul 2015 21:34:56 +0000 (17:34 -0400)]
API Explorer - Fix jumpy select boxes
Coleman Watts [Fri, 31 Jul 2015 20:41:57 +0000 (16:41 -0400)]
API Explorer - Default contact-ref to select current user
Coleman Watts [Fri, 31 Jul 2015 20:14:59 +0000 (16:14 -0400)]
Add destroy methods for crmEntityRef and crmSelect2
Coleman Watts [Fri, 31 Jul 2015 19:27:09 +0000 (15:27 -0400)]
Improve api explorer smarty code generation
Dave Greenberg [Fri, 31 Jul 2015 19:17:47 +0000 (12:17 -0700)]
Merge pull request #6365 from yashodha/CRM-16936
CRM-16936: Donor with only email address shows no display name
monishdeb [Fri, 31 Jul 2015 18:04:03 +0000 (23:34 +0530)]
minor change
monishdeb [Fri, 31 Jul 2015 17:59:17 +0000 (23:29 +0530)]
CustomValue fix for Grant
monishdeb [Wed, 29 Jul 2015 17:28:23 +0000 (22:58 +0530)]
format fix
monishdeb [Wed, 29 Jul 2015 17:21:28 +0000 (22:51 +0530)]
CRM-16927 fix - Notice Search membership with custom fields
https://issues.civicrm.org/jira/browse/CRM-16927
Coleman Watts [Fri, 31 Jul 2015 17:20:00 +0000 (13:20 -0400)]
Add api alias for 'gender_id' as 'gender'
Monish Deb [Fri, 31 Jul 2015 14:29:30 +0000 (19:59 +0530)]
Merge pull request #6367 from monishdeb/generated-mysql
Generated Data for CRM-16907 changes
monishdeb [Fri, 31 Jul 2015 14:26:33 +0000 (19:56 +0530)]
Generated Data for CRM-16907 changes
----------------------------------------
* CRM-16907: Improvements to in-app Help menu content
https://issues.civicrm.org/jira/browse/CRM-16907
Monish Deb [Fri, 31 Jul 2015 10:35:09 +0000 (16:05 +0530)]
Merge pull request #6354 from yashodha/CRM-16907
CRM-16907: Improvements to in-app Help menu content
yashodha [Fri, 31 Jul 2015 08:01:08 +0000 (13:31 +0530)]
CRM-16936: Donor with only email address shows no display name
----------------------------------------
* CRM-16936: Donor with only email address shows no display name
https://issues.civicrm.org/jira/browse/CRM-16936
Monish Deb [Fri, 31 Jul 2015 06:17:58 +0000 (11:47 +0530)]
Merge pull request #6356 from monishdeb/CRM-16931
CRM-16931 fix - Update Smart Group Counts throws a syntax error (AND …
eileenmcnaugton [Fri, 31 Jul 2015 04:53:41 +0000 (16:53 +1200)]
tidy up on test class
Kurund Jalmi [Fri, 31 Jul 2015 02:56:35 +0000 (08:26 +0530)]
Merge pull request #6363 from civicrm/CRM-16944
CRM-16944 e-notice
Eileen McNaughton [Fri, 31 Jul 2015 00:39:42 +0000 (12:39 +1200)]
CRM-16944 e-notice
Tim Otten [Thu, 30 Jul 2015 22:27:38 +0000 (15:27 -0700)]
Merge pull request #6286 from colemanw/CRM-16891
CRM-16891 - Add hook_civicrm_coreResourceList
Kurund Jalmi [Thu, 30 Jul 2015 13:48:37 +0000 (19:18 +0530)]
Merge pull request #6355 from jitendrapurohit/CRM-16915addfixes
Additional fixes for CRM-16915
monishdeb [Thu, 30 Jul 2015 09:58:27 +0000 (15:28 +0530)]
CRM-16931 fix - Update Smart Group Counts throws a syntax error (AND instead of WHERE)
https://issues.civicrm.org/jira/browse/CRM-16931
jitendrapurohit [Thu, 30 Jul 2015 08:55:37 +0000 (14:25 +0530)]
additional fixes for CRM-16915
yashodha [Thu, 30 Jul 2015 08:15:02 +0000 (13:45 +0530)]
CRM-16907: Improvements to in-app Help menu content
----------------------------------------
* CRM-16907: Improvements to in-app Help menu content
https://issues.civicrm.org/jira/browse/CRM-16907
Tim Otten [Thu, 30 Jul 2015 00:00:44 +0000 (17:00 -0700)]
Merge pull request #6334 from totten/4.6-bower-afu
bower.json - Harden angular-file-upload version.
Dave Greenberg [Wed, 29 Jul 2015 23:59:02 +0000 (16:59 -0700)]
Merge pull request #6278 from eileenmcnaughton/CRM-16882
CRM-16882 renew my membership automatically should not show for non-auto-renew memberships
colemanw [Wed, 29 Jul 2015 21:44:39 +0000 (17:44 -0400)]
Merge pull request #6344 from colemanw/CRM-16930
CRM-16930 - custom case fields on print report
colemanw [Wed, 29 Jul 2015 21:20:04 +0000 (17:20 -0400)]
Merge pull request #6351 from colemanw/CRM-16645
CRM-16645 - Fix param name collision with wp
Coleman Watts [Wed, 29 Jul 2015 21:15:09 +0000 (17:15 -0400)]
CRM-16645 - Fix param name collision with wp
----------------------------------------
* CRM-16645: PCP Credit Dropdown Hard-coded to 10 results, no 'load more'
https://issues.civicrm.org/jira/browse/CRM-16645
Eileen McNaughton [Wed, 29 Jul 2015 20:36:53 +0000 (08:36 +1200)]
Merge pull request #6326 from eileenmcnaughton/CRM-16926
CRM-16926 complete recurring transactions when payment_status_id = 1,…
colemanw [Wed, 29 Jul 2015 19:08:29 +0000 (15:08 -0400)]
Merge pull request #6346 from colemanw/icon
Add missing button icon
Coleman Watts [Wed, 29 Jul 2015 19:06:23 +0000 (15:06 -0400)]
Add missing button icon
Coleman Watts [Wed, 29 Jul 2015 17:54:23 +0000 (13:54 -0400)]
CRM-16930 - Use custom group label instead of generic 'Case Custom Data'
Dave Greenberg [Wed, 29 Jul 2015 16:37:27 +0000 (09:37 -0700)]
Merge pull request #6336 from jitendrapurohit/CRM-16915refinements
Minor Fix for CRM-16915
Jamie McClelland [Wed, 29 Jul 2015 16:22:53 +0000 (12:22 -0400)]
CRM-16930 - enable custom case fields on case report.
Monish Deb [Wed, 29 Jul 2015 06:05:25 +0000 (11:35 +0530)]
Merge pull request #6320 from monishdeb/4.6
CRM-16922 fix
jitendrapurohit [Wed, 29 Jul 2015 05:01:22 +0000 (10:31 +0530)]
Minor Fix for CRM-16915
Eileen McNaughton [Wed, 29 Jul 2015 02:48:58 +0000 (14:48 +1200)]
CRM-16926 backoffice version of respecting payment_status_id
Eileen McNaughton [Wed, 29 Jul 2015 02:45:23 +0000 (14:45 +1200)]
enotice fix
Tim Otten [Wed, 29 Jul 2015 00:27:40 +0000 (17:27 -0700)]
Merge pull request #6319 from totten/4.6-composer-cxn
CRM-16917 - composer.json - Update civicrm-cxn-rpc
Tim Otten [Wed, 29 Jul 2015 00:22:37 +0000 (17:22 -0700)]
bower.json - Harden angular-file-upload version.
v1.1.7 introduced a breaking change to the file names, so we need to be
more cautious with this package.
Eileen McNaughton [Tue, 28 Jul 2015 21:24:34 +0000 (09:24 +1200)]
enotice fix
Eileen McNaughton [Tue, 28 Jul 2015 21:21:50 +0000 (09:21 +1200)]
CRM-16926 complete recurring transactions when payment_status_id = 1,
carefully to grandfather in
Dave Greenberg [Tue, 28 Jul 2015 20:15:20 +0000 (13:15 -0700)]
Merge pull request #6330 from jitendrapurohit/CRM-16915
CRM-16915 - Filter Profile selector in Configure Event - Registration…
jitendrapurohit [Tue, 28 Jul 2015 13:34:43 +0000 (19:04 +0530)]
CRM-16915 - Filter Profile selector in Configure Event - Registration tab for non-admin users
colemanw [Tue, 28 Jul 2015 13:33:01 +0000 (09:33 -0400)]
Merge pull request #6329 from colemanw/CRM-16903
CRM-16903 - add icons for translation on profile edition
samuelsov [Thu, 23 Jul 2015 19:13:02 +0000 (15:13 -0400)]
CRM-16903 - add icons for translation on profile edition
Eileen McNaughton [Tue, 28 Jul 2015 04:23:16 +0000 (16:23 +1200)]
CRM-16922 broken smart groups from participant_status_id
monishdeb [Tue, 28 Jul 2015 07:14:23 +0000 (12:44 +0530)]
CRM-16922 fix - Broken smart groups due to CRM-16858
https://issues.civicrm.org/jira/browse/CRM-16922
Monish Deb [Tue, 28 Jul 2015 06:18:18 +0000 (11:48 +0530)]
Merge pull request #6299 from monishdeb/4.6
CRM-16909 fix - "Find Pledges" search filters on "status" are not wor…
Tim Otten [Tue, 28 Jul 2015 02:22:35 +0000 (19:22 -0700)]
CRM-16917 - composer.json - Update civicrm-cxn-rpc
Dave Greenberg [Mon, 27 Jul 2015 19:10:20 +0000 (12:10 -0700)]
Merge pull request #6302 from colemanw/CRM-16908
CRM-16908 - Improve disabled buttons in mailing UI
monishdeb [Mon, 27 Jul 2015 15:58:04 +0000 (21:28 +0530)]
minor fix for custom Select Field
monishdeb [Fri, 24 Jul 2015 14:42:26 +0000 (20:12 +0530)]
CRM-16909 fix - "Find Pledges" search filters on "status" are not working
https://issues.civicrm.org/jira/browse/CRM-16909
colemanw [Mon, 27 Jul 2015 15:28:31 +0000 (11:28 -0400)]
Merge pull request #6301 from colemanw/CRM-16905
CRM-16905 - Sort by count cannot be done with sql
Yashodha Chaku [Mon, 27 Jul 2015 11:37:02 +0000 (17:07 +0530)]
Merge pull request #6269 from yashodha/CRM-15564
CRM-15564: Event info page shows past event Closed with Active Regist…
Kurund Jalmi [Mon, 27 Jul 2015 04:26:34 +0000 (09:56 +0530)]
Merge pull request #6311 from eileenmcnaughton/4.6
CRM-16919 filter payment processor by domain
Eileen McNaughton [Mon, 27 Jul 2015 02:07:00 +0000 (14:07 +1200)]
CRM-16919 filter payment processor by domain
colemanw [Sun, 26 Jul 2015 20:13:13 +0000 (16:13 -0400)]
Merge pull request #6305 from joannechester/patch-3
CRM-16492-Change help text for creating smart group
joannechester [Sun, 26 Jul 2015 13:07:36 +0000 (23:07 +1000)]
crm-16492-change-help-text-on-creating-smart-group
projects / civicrm-core.git / log