Eileen McNaughton [Tue, 11 Aug 2015 20:36:45 +0000 (08:36 +1200)]
Merge pull request #6473 from colemanw/CRM-16809
CRM-16809 - Don't generate qfKey for payment snippet
Coleman Watts [Tue, 11 Aug 2015 17:16:51 +0000 (13:16 -0400)]
Merge branch '4.6' into master
Conflicts:
CRM/Member/Form/Membership.php
colemanw [Tue, 11 Aug 2015 17:16:13 +0000 (13:16 -0400)]
Merge pull request #6462 from eileenmcnaughton/4.6
CRM-16993 actual fix on not crashing when recurring is paid …
Coleman Watts [Tue, 11 Aug 2015 17:15:26 +0000 (13:15 -0400)]
Merge branch '4.6' into master
Coleman Watts [Tue, 11 Aug 2015 15:02:06 +0000 (11:02 -0400)]
CRM-16809 - Don't generate qfKey for payment snippet
colemanw [Tue, 11 Aug 2015 14:40:40 +0000 (10:40 -0400)]
Merge pull request #6472 from colemanw/CRM-16809
CRM-16809 - Hide contribution submit buttons for paypal express
Coleman Watts [Tue, 11 Aug 2015 14:29:06 +0000 (10:29 -0400)]
CRM-16809 - Hide contribution submit buttons for paypal express
colemanw [Tue, 11 Aug 2015 01:52:16 +0000 (21:52 -0400)]
Merge pull request #6466 from seamuslee001/permisssion_fixup_4.6
CRM-17003 Output Administer Multiple Organisation permission as an ar…
Tim Otten [Tue, 11 Aug 2015 01:24:01 +0000 (18:24 -0700)]
Merge pull request #6339 from cividesk/Fortify_Fixes
Fortify fixes
Seamus Lee [Mon, 10 Aug 2015 21:38:47 +0000 (21:38 +0000)]
CRM-17003 Output Administer Multiple Organisation permission as an array not as string
Coleman Watts [Mon, 10 Aug 2015 18:10:29 +0000 (14:10 -0400)]
CRM-13823 - Remove unused file
Coleman Watts [Mon, 10 Aug 2015 17:07:43 +0000 (13:07 -0400)]
Merge https://github.com/civicrm/civicrm-core/pull/6276
Conflicts:
CRM/Upgrade/Incremental/sql/4.7.alpha1.mysql.tpl
colemanw [Mon, 10 Aug 2015 16:43:48 +0000 (12:43 -0400)]
Merge pull request #6465 from colemanw/CRM-16689
CRM-16689 - Add case number to unclosed case autocomplete results
Coleman Watts [Mon, 10 Aug 2015 16:37:43 +0000 (12:37 -0400)]
CRM-16689 - Add case number to unclosed case autocomplete results
Yashodha Chaku [Mon, 10 Aug 2015 12:43:12 +0000 (18:13 +0530)]
Merge pull request #6459 from yashodha/CRM-12081
CRM-12081: Label on field is wrong for recurring contributions
Yashodha Chaku [Mon, 10 Aug 2015 11:52:11 +0000 (17:22 +0530)]
Merge pull request #6460 from yashodha/CRM-16943
notice fix
eileenmcnaugton [Mon, 10 Aug 2015 04:17:01 +0000 (16:17 +1200)]
CRM-16993 avoid fatal when line items are created & then altered to completed
Kurund Jalmi [Mon, 10 Aug 2015 10:14:07 +0000 (15:44 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-10-15-41-33
Eileen McNaughton [Mon, 10 Aug 2015 10:05:24 +0000 (22:05 +1200)]
Merge pull request #6456 from eileenmcnaughton/CRM-16993
CRM-16993 Back-office membership form: fix fatal on recur with instant processor
Eileen McNaughton [Mon, 10 Aug 2015 07:45:53 +0000 (19:45 +1200)]
Merge pull request #6455 from eileenmcnaughton/master
CRM-16692 follow-up fix, move assumptions back to calling-form
Tim Otten [Mon, 10 Aug 2015 07:08:17 +0000 (00:08 -0700)]
Merge pull request #6458 from totten/4.6-toxic-list
INFRA-142 - Add .toxic.json
Tim Otten [Mon, 10 Aug 2015 06:27:38 +0000 (23:27 -0700)]
INFRA-142 - distmaker - (Precaution) Exclude .toxic.json
This file shouldn't show up in the root (since dm_install_core uses a
whitelist), but if we add it to other repos, it could show there.
yashodha [Mon, 10 Aug 2015 06:15:27 +0000 (11:45 +0530)]
notice fix
yashodha [Mon, 10 Aug 2015 06:03:09 +0000 (11:33 +0530)]
CRM-12081: Label on field is wrong for recurring contributions
----------------------------------------
* CRM-12081: Label on field is wrong for recurring contributions
https://issues.civicrm.org/jira/browse/CRM-12081
Monish Deb [Mon, 10 Aug 2015 05:36:18 +0000 (11:06 +0530)]
Merge pull request #6037 from colemanw/CRM-16512
CRM-16512 - Hide dashboard related contact table for users without 'view my contact'
Yashodha Chaku [Mon, 10 Aug 2015 05:11:09 +0000 (10:41 +0530)]
Merge pull request #6438 from yashodha/CRM-16943
CRM-16943: CRM_Core_Form_Search assumes a checkbox. CiviGrant dashboa…
Monish Deb [Mon, 10 Aug 2015 04:39:13 +0000 (10:09 +0530)]
Merge pull request #6439 from sudhabisht/CRM-16978
Fix for multiple role assignment between same contact cases
eileenmcnaugton [Mon, 10 Aug 2015 03:52:16 +0000 (15:52 +1200)]
CRM-16993 actual fix on not crashing when recurring is paid
eileenmcnaugton [Mon, 10 Aug 2015 02:38:48 +0000 (14:38 +1200)]
CRM-16993 test to replicate failure
eileenmcnaugton [Mon, 10 Aug 2015 02:31:03 +0000 (14:31 +1200)]
CRM-16692 follow-up fix, move assumptions back to calling-form
eileenmcnaugton [Mon, 10 Aug 2015 01:42:25 +0000 (13:42 +1200)]
CRM-16692 follow up removal of unused variables
Eileen McNaughton [Mon, 10 Aug 2015 03:44:31 +0000 (15:44 +1200)]
Merge pull request #6454 from eileenmcnaughton/master
CRM-16992 preliminary tidy-up - push extraction of parameters back to form
eileenmcnaugton [Mon, 10 Aug 2015 01:33:46 +0000 (13:33 +1200)]
CRM-16692 fix for incorrect line items
eileenmcnaugton [Mon, 10 Aug 2015 01:20:25 +0000 (13:20 +1200)]
CRM-16692 test
eileenmcnaugton [Mon, 10 Aug 2015 00:56:55 +0000 (12:56 +1200)]
CRM-16992 preliminary tidy-up - push extraction of parameters back to the form layer
eileenmcnaugton [Tue, 4 Aug 2015 11:59:29 +0000 (23:59 +1200)]
remove unused fn (did this
'come back' from a 4.6 merge - I thought it was gone
Eileen McNaughton [Mon, 10 Aug 2015 01:07:22 +0000 (13:07 +1200)]
Merge pull request #6450 from civicrm/4.6
Merge 4.6 to master
colemanw [Sun, 9 Aug 2015 21:59:15 +0000 (17:59 -0400)]
Merge pull request #6453 from colemanw/i18n
CRM-15375 - Fix incorrect default language in i18n form
Coleman Watts [Sun, 9 Aug 2015 02:16:39 +0000 (22:16 -0400)]
CRM-15375 - Fix incorrect default language in i18n form
colemanw [Sun, 9 Aug 2015 21:05:22 +0000 (17:05 -0400)]
Merge pull request #6451 from colemanw/i18n
CRM-13301 - Add multilingual popup to participant status label
colemanw [Sun, 9 Aug 2015 19:35:27 +0000 (15:35 -0400)]
Merge pull request #6435 from seamuslee001/mailing_ui_tidy_up
CRM-16991 Order Header and Footer lists by name field not by table id
Monish Deb [Sun, 9 Aug 2015 10:49:01 +0000 (16:19 +0530)]
Merge pull request #6440 from jitendrapurohit/CRM-14706
CRM-14706 -- Relationship contact reports with group and relation typ…
Monish Deb [Sun, 9 Aug 2015 10:38:16 +0000 (16:08 +0530)]
Merge pull request #6449 from monishdeb/master
Resolved merge conflict on CustomQuery file
monishdeb [Sun, 9 Aug 2015 10:35:44 +0000 (16:05 +0530)]
Resolved merge conflict on CustomQuery file
Coleman Watts [Sun, 9 Aug 2015 02:14:22 +0000 (22:14 -0400)]
CRM-13301 - Add multilingual popup to participant status label
colemanw [Sat, 8 Aug 2015 14:27:40 +0000 (10:27 -0400)]
Merge pull request #6429 from mallezie/crm-16976
CRM-16976 allow to filter campaigns based on active state
colemanw [Sat, 8 Aug 2015 14:20:32 +0000 (10:20 -0400)]
Merge pull request #6381 from colemanw/CRM-14055
CRM-14055 - Allow creating an event template via api
colemanw [Sat, 8 Aug 2015 14:18:36 +0000 (10:18 -0400)]
Merge pull request #6394 from colemanw/CRM-14599
CRM-14599 - Exclude deleted contacts from test mailing
Tim Otten [Sat, 8 Aug 2015 04:04:53 +0000 (21:04 -0700)]
INFRA-142 - Add .toxic.json
colemanw [Sat, 8 Aug 2015 01:33:49 +0000 (21:33 -0400)]
Merge pull request #6443 from colemanw/CRM-12527
CRM-12527 - Don't let devel footer break json responses
Coleman Watts [Sat, 8 Aug 2015 00:04:46 +0000 (20:04 -0400)]
CRM-12527 - Show devel footer in api explorer output
colemanw [Fri, 7 Aug 2015 20:57:51 +0000 (16:57 -0400)]
Merge pull request #6442 from colemanw/CRM-12021
CRM-12021 - Don't allow no default location type
Coleman Watts [Fri, 7 Aug 2015 20:23:57 +0000 (16:23 -0400)]
CRM-12527 - Set http headers in CMS-compatible way
Coleman Watts [Fri, 7 Aug 2015 18:43:50 +0000 (14:43 -0400)]
CRM-12021 - Don't allow no default location type
jitendrapurohit [Fri, 7 Aug 2015 13:28:36 +0000 (18:58 +0530)]
CRM-14706 -- Relationship contact reports with group and relation type filters fails
Sudha Bisht [Fri, 7 Aug 2015 11:08:00 +0000 (16:38 +0530)]
Fix for multiple role assignment between cases
yashodha [Fri, 7 Aug 2015 10:58:20 +0000 (16:28 +0530)]
CRM-16943: CRM_Core_Form_Search assumes a checkbox. CiviGrant dashboard has none
----------------------------------------
* CRM-16943: CRM_Core_Form_Search assumes a checkbox. CiviGrant dashboard has none
https://issues.civicrm.org/jira/browse/CRM-16943
Monish Deb [Fri, 7 Aug 2015 05:19:28 +0000 (10:49 +0530)]
Merge pull request #6409 from monishdeb/4.6
CRM-16961 fix - 4.6.5 search regression on custom fields where option…
Dave Greenberg [Thu, 6 Aug 2015 23:25:06 +0000 (16:25 -0700)]
Merge pull request #6434 from JoeMurray/patch-4
prevent error on $mainBlockId not set
Dave Greenberg [Thu, 6 Aug 2015 23:25:00 +0000 (16:25 -0700)]
Merge pull request #6433 from JoeMurray/patch-3
handle !isset($short['ref']) as '', not null
Seamus Lee [Thu, 6 Aug 2015 21:34:42 +0000 (21:34 +0000)]
Order Header and Footer lists by name field not by table id
Dave Greenberg [Thu, 6 Aug 2015 16:36:04 +0000 (09:36 -0700)]
Merge pull request #6425 from davecivicrm/CRM-15187
CRM-15187 - Only show Change Membership Type warnings when action is …
Joe Murray [Thu, 6 Aug 2015 15:45:35 +0000 (11:45 -0400)]
prevent error on $mainBlockId not set
This was in an override file on a site I am taking over and seems like it should be a core bug fix
Joe Murray [Thu, 6 Aug 2015 15:40:06 +0000 (11:40 -0400)]
handle !isset($short['ref']) as '', not null
Kurund Jalmi [Thu, 6 Aug 2015 15:14:54 +0000 (20:44 +0530)]
Merge pull request #6428 from seamuslee001/membership_fix_up
Fix Spelling of membership in Membership Search form
Kurund Jalmi [Thu, 6 Aug 2015 15:10:24 +0000 (20:40 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-06-19-31-58
Conflicts:
CRM/Upgrade/Incremental/php/FourSix.php
sql/civicrm_generated.mysql
xml/version.xml
Tim Mallezie [Thu, 6 Aug 2015 10:19:07 +0000 (12:19 +0200)]
CRM-16976 allow to filter campaigns based on active state
Seamus Lee [Thu, 6 Aug 2015 08:57:28 +0000 (08:57 +0000)]
Fix Spelling of membership in Membership Search form
Eileen McNaughton [Thu, 6 Aug 2015 08:57:16 +0000 (20:57 +1200)]
Merge pull request #6422 from davecivicrm/CRM-16973
CRM-16973 - filter FROM Email Address select by domain_id
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.
eileenmcnaugton [Wed, 5 Aug 2015 23:51:31 +0000 (11:51 +1200)]
CRM-16961 fix for search for cust data with parentheses
Conflicts:
CRM/Core/BAO/CustomQuery.php
----------------------------------------
* CRM-16961: 4.6.5 search regression on custom fields where option values have brackets
https://issues.civicrm.org/jira/browse/CRM-16961
monishdeb [Wed, 5 Aug 2015 11:45:41 +0000 (17:15 +0530)]
traditional way to fix by using special character in RLIKE
monishdeb [Tue, 4 Aug 2015 18:22:13 +0000 (23:52 +0530)]
formatting fix
monishdeb [Tue, 4 Aug 2015 15:34:07 +0000 (21:04 +0530)]
format fix
monishdeb [Tue, 4 Aug 2015 14:48:31 +0000 (20:18 +0530)]
CRM-16961 fix - 4.6.5 search regression on custom fields where option values have brackets
https://issues.civicrm.org/jira/browse/CRM-16961
Monish Deb [Thu, 6 Aug 2015 05:20:37 +0000 (10:50 +0530)]
Merge pull request #6419 from sudhabisht/CRM-16176
Fixs related to multilingual upgrade failure.
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
Dave Greenberg [Thu, 6 Aug 2015 00:24:41 +0000 (17:24 -0700)]
CRM-15187 - Only show Change Membership Type warnings when action is UPDATE.
----------------------------------------
* CRM-15187: Accounting implications of Membership Type changes
https://issues.civicrm.org/jira/browse/CRM-15187
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
Dave Greenberg [Wed, 5 Aug 2015 22:56:36 +0000 (15:56 -0700)]
CRM-16973 - filter FROM Email Address select by domain_id
----------------------------------------
* CRM-16973: CiviMail not respecting multisite ACL
https://issues.civicrm.org/jira/browse/CRM-16973
colemanw [Wed, 5 Aug 2015 21:20:27 +0000 (17:20 -0400)]
Merge pull request #6405 from JKingsnorth/CRM-16959
CRM-16959 - Support multiple contact/group IDs in a more standard format
colemanw [Wed, 5 Aug 2015 21:13:27 +0000 (17:13 -0400)]
Merge pull request #6399 from colemanw/CRM-16705
CRM-16705 - Compensate for oddball pdf_format_id option value
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
Sudha Bisht [Wed, 5 Aug 2015 10:47:24 +0000 (16:17 +0530)]
Upgrade failure fix
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
Samuel Vanhove [Wed, 29 Apr 2015 16:03:29 +0000 (12:03 -0400)]
CRM-16176 - forgot to rename class
projects / civicrm-core.git / log