civicrm-core.git
9 years agoMerge pull request #6503 from totten/4.6-random
Tim Otten [Sat, 15 Aug 2015 12:56:47 +0000 (05:56 -0700)]
Merge pull request #6503 from totten/4.6-random

Utils - SQL, Array, Resolver, DAO - Random improvements

9 years agoCivi\Core\Resolver - Add "global://" support
Tim Otten [Sat, 25 Jul 2015 03:40:14 +0000 (20:40 -0700)]
Civi\Core\Resolver - Add "global://" support

9 years agoCRM_Utils_SQL_*
Tim Otten [Thu, 30 Jul 2015 04:21:55 +0000 (21:21 -0700)]
CRM_Utils_SQL_*

9 years agoCRM_Utils_AutoClean
Tim Otten [Sat, 25 Jul 2015 03:43:08 +0000 (20:43 -0700)]
CRM_Utils_AutoClean

9 years agoCRM_Utils_Array - Add pathGet() and pathSet()
Tim Otten [Sat, 25 Jul 2015 03:38:06 +0000 (20:38 -0700)]
CRM_Utils_Array - Add pathGet() and pathSet()

9 years agoCRM_Utils_Array::extend()
Tim Otten [Thu, 23 Jul 2015 10:22:35 +0000 (03:22 -0700)]
CRM_Utils_Array::extend()

9 years agoCRM_Core_DAO::fetchAll
Tim Otten [Thu, 30 Jul 2015 04:21:23 +0000 (21:21 -0700)]
CRM_Core_DAO::fetchAll

9 years agoMerge pull request #6498 from monishdeb/4.6
Monish Deb [Fri, 14 Aug 2015 13:08:48 +0000 (18:38 +0530)]
Merge pull request #6498 from monishdeb/4.6

CRM-17022 fix - Bug introduced in 4.6.6 breaks Grant Search

9 years agoMerge pull request #6497 from jitendrapurohit/CRM-17016
Monish Deb [Fri, 14 Aug 2015 11:49:51 +0000 (17:19 +0530)]
Merge pull request #6497 from jitendrapurohit/CRM-17016

CRM-17016 -- State list for Fiji incomplete

9 years agoCRM-17022 fix - Bug introduced in 4.6.6 breaks Grant Search
monishdeb [Fri, 14 Aug 2015 07:17:39 +0000 (12:47 +0530)]
CRM-17022 fix - Bug introduced in 4.6.6 breaks Grant Search

https://issues.civicrm.org/jira/browse/CRM-17022

9 years agoCRM-17016 -- State list for Fiji incomplete
jitendrapurohit [Fri, 14 Aug 2015 06:00:33 +0000 (11:30 +0530)]
CRM-17016 -- State list for Fiji incomplete

9 years agoMerge pull request #6490 from sudhabisht/CRM-9066
Monish Deb [Fri, 14 Aug 2015 05:31:43 +0000 (11:01 +0530)]
Merge pull request #6490 from sudhabisht/CRM-9066

Fix for duplicate entry in bookkeeping transaction report

9 years agoMerge pull request #6484 from monishdeb/4.6
Monish Deb [Fri, 14 Aug 2015 05:16:13 +0000 (10:46 +0530)]
Merge pull request #6484 from monishdeb/4.6

CRM-17011 fix

9 years agoMerge pull request #6335 from totten/4.6-header-cleanup
Tim Otten [Thu, 13 Aug 2015 21:41:50 +0000 (14:41 -0700)]
Merge pull request #6335 from totten/4.6-header-cleanup

ScheduledReminder, Extensions, Cxn - Fix copy-pasted header

9 years agoMerge pull request #6489 from totten/4.6-comp-ext
Tim Otten [Thu, 13 Aug 2015 21:40:33 +0000 (14:40 -0700)]
Merge pull request #6489 from totten/4.6-comp-ext

CRM_Core_BAO_ConfigSetting - Support components from extensions

9 years agoMerge pull request #6476 from monishdeb/CRM-16950
Monish Deb [Thu, 13 Aug 2015 20:01:31 +0000 (01:31 +0530)]
Merge pull request #6476 from monishdeb/CRM-16950

Crm 16950 ix

9 years agoMerge pull request #6491 from monishdeb/46-upgrade-fix
Monish Deb [Thu, 13 Aug 2015 16:59:16 +0000 (22:29 +0530)]
Merge pull request #6491 from monishdeb/46-upgrade-fix

Upgrade script failure on Jenkin fix

9 years agoUpgrade script failure on Jenkin fix
monishdeb [Thu, 13 Aug 2015 15:03:06 +0000 (20:33 +0530)]
Upgrade script failure on Jenkin fix

9 years agoFix for duplicate entry in bookkeeping transaction
Sudha Bisht [Thu, 13 Aug 2015 10:11:40 +0000 (15:41 +0530)]
Fix for duplicate entry in bookkeeping transaction

9 years agoMerge pull request #6487 from jitendrapurohit/CRM-17009
Monish Deb [Thu, 13 Aug 2015 07:29:14 +0000 (12:59 +0530)]
Merge pull request #6487 from jitendrapurohit/CRM-17009

CRM-17009 -- event registration doesn't respect reg end date

9 years agoMerge pull request #6486 from jitendrapurohit/CRM-15935
Monish Deb [Thu, 13 Aug 2015 05:00:41 +0000 (10:30 +0530)]
Merge pull request #6486 from jitendrapurohit/CRM-15935

CRM-15935 -- Lybunt report includes people who made no contributions

9 years agoCRM_Core_BAO_ConfigSetting - Support components from extensions
Tim Otten [Wed, 12 Aug 2015 07:48:04 +0000 (00:48 -0700)]
CRM_Core_BAO_ConfigSetting - Support components from extensions

9 years agoCRM-17009 -- event registration doesn't respect reg end date
jitendrapurohit [Wed, 12 Aug 2015 13:11:15 +0000 (18:41 +0530)]
CRM-17009 -- event registration doesn't respect reg end date

9 years agoCRM-15935 -- Lybunt report includes people who made no contributions
jitendrapurohit [Wed, 12 Aug 2015 11:51:01 +0000 (17:21 +0530)]
CRM-15935 -- Lybunt report includes people who made no contributions

9 years agoCRM-17011 fix - Broken smart group regression - membership type, membership status
monishdeb [Wed, 12 Aug 2015 11:15:44 +0000 (16:45 +0530)]
CRM-17011 fix - Broken smart group regression - membership type, membership status

https://issues.civicrm.org/jira/browse/CRM-17011

9 years agoCRM-17011 fix for smart group regression
eileenmcnaugton [Wed, 12 Aug 2015 00:12:56 +0000 (12:12 +1200)]
CRM-17011 fix for smart group regression

9 years agoMerge pull request #6350 from PalanteJon/CRM-16939-4.6
Yashodha Chaku [Wed, 12 Aug 2015 08:25:33 +0000 (13:55 +0530)]
Merge pull request #6350 from PalanteJon/CRM-16939-4.6

CRM-16939 - Allow exporting current employers > 64 characters

9 years agoMerge pull request #6470 from monishdeb/CRM-17006
Monish Deb [Wed, 12 Aug 2015 07:32:58 +0000 (13:02 +0530)]
Merge pull request #6470 from monishdeb/CRM-17006

CRM-17006 fix - Advanced search on radio custom fields broken

9 years agoMerge pull request #6427 from eileenmcnaughton/CRM-16975
Monish Deb [Wed, 12 Aug 2015 06:49:30 +0000 (12:19 +0530)]
Merge pull request #6427 from eileenmcnaughton/CRM-16975

CRM-16975 fix for membership price set config - backport 4.7 code tha…

9 years agoMerge pull request #6481 from yashodha/CRM-16985
Monish Deb [Wed, 12 Aug 2015 06:27:32 +0000 (11:57 +0530)]
Merge pull request #6481 from yashodha/CRM-16985

CRM-16985: Inline edit LABEL on Option Value selector updates NAME in…

9 years agoMerge pull request #6441 from monishdeb/4.6
Kurund Jalmi [Wed, 12 Aug 2015 04:40:24 +0000 (10:10 +0530)]
Merge pull request #6441 from monishdeb/4.6

CRM-14536 fix - Free Membership still submits to payment processor

9 years agoMerge pull request #6475 from colemanw/CRM-16806
colemanw [Wed, 12 Aug 2015 01:38:23 +0000 (21:38 -0400)]
Merge pull request #6475 from colemanw/CRM-16806

CRM-16806 - Additional cleanup

9 years agoMerge pull request #6436 from seamuslee001/msgtemplate_dynamic_load
colemanw [Wed, 12 Aug 2015 01:37:53 +0000 (21:37 -0400)]
Merge pull request #6436 from seamuslee001/msgtemplate_dynamic_load

CRM-16983 Dynamically load the content of Message templates in CiviMail when se…

9 years agoMerge pull request #6468 from eileenmcnaughton/CRM-17010
Eileen McNaughton [Tue, 11 Aug 2015 21:42:04 +0000 (09:42 +1200)]
Merge pull request #6468 from eileenmcnaughton/CRM-17010

CRM-17010 add data info to price-set-class

9 years agoMove to getsingle api and associated changes
Seamus Lee [Tue, 11 Aug 2015 21:11:56 +0000 (21:11 +0000)]
Move to getsingle api and associated changes

9 years agoreverted extra code
monishdeb [Tue, 11 Aug 2015 19:56:21 +0000 (01:26 +0530)]
reverted extra code

9 years agoformat fix
monishdeb [Tue, 11 Aug 2015 19:31:37 +0000 (01:01 +0530)]
format fix

9 years agoQA changes
monishdeb [Tue, 11 Aug 2015 19:22:33 +0000 (00:52 +0530)]
QA changes

9 years agoCRM-16806 - Additional cleanup
Coleman Watts [Tue, 11 Aug 2015 19:12:30 +0000 (15:12 -0400)]
CRM-16806 - Additional cleanup

9 years agoMerge pull request #6177 from xurizaemon/CRM-16806
colemanw [Tue, 11 Aug 2015 19:03:16 +0000 (15:03 -0400)]
Merge pull request #6177 from xurizaemon/CRM-16806

CRM-16806: Validate supplied entity type.

9 years agoMerge pull request #6462 from eileenmcnaughton/4.6
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 …

9 years agoCRM-16950 display tax rate on renewal form
Brian Shaughnessy [Wed, 5 Aug 2015 00:59:43 +0000 (20:59 -0400)]
CRM-16950 display tax rate on renewal form

9 years agoCRM-16950 apply tax during membership renewal
Brian Shaughnessy [Sat, 1 Aug 2015 17:53:44 +0000 (13:53 -0400)]
CRM-16950 apply tax during membership renewal

9 years agoCRM-16985: Inline edit LABEL on Option Value selector updates NAME instead
yashodha [Tue, 11 Aug 2015 13:09:35 +0000 (18:39 +0530)]
CRM-16985: Inline edit LABEL on Option Value selector updates NAME instead

----------------------------------------
* CRM-16985: Inline edit LABEL on Option Value selector updates NAME instead
  https://issues.civicrm.org/jira/browse/CRM-16985

9 years agoFormat fix
monishdeb [Tue, 11 Aug 2015 12:54:50 +0000 (18:24 +0530)]
Format fix

9 years agoCRM-17006 fix - Advanced search on radio custom fields broken
monishdeb [Tue, 11 Aug 2015 11:27:22 +0000 (16:57 +0530)]
CRM-17006 fix - Advanced search on radio custom fields broken

https://issues.civicrm.org/jira/browse/CRM-17006

9 years agoCRM-17010 add data info to price-set-class
eileenmcnaugton [Tue, 11 Aug 2015 05:46:37 +0000 (17:46 +1200)]
CRM-17010 add data info to price-set-class

9 years agoMerge pull request #6466 from seamuslee001/permisssion_fixup_4.6
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…

9 years agoMerge pull request #6339 from cividesk/Fortify_Fixes
Tim Otten [Tue, 11 Aug 2015 01:24:01 +0000 (18:24 -0700)]
Merge pull request #6339 from cividesk/Fortify_Fixes

Fortify fixes

9 years agoCRM-17003 Output Administer Multiple Organisation permission as an array not as string
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

9 years agoCRM-16993 avoid fatal when line items are created & then altered to completed
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

9 years agoWebtests and improvisations
monishdeb [Mon, 10 Aug 2015 10:31:22 +0000 (16:01 +0530)]
Webtests and improvisations

9 years agoCRM-14536 fix - Free Membership still submits to payment processor
monishdeb [Fri, 7 Aug 2015 17:43:07 +0000 (23:13 +0530)]
CRM-14536 fix - Free Membership still submits to payment processor

https://issues.civicrm.org/jira/browse/CRM-14536

9 years agoMerge pull request #6458 from totten/4.6-toxic-list
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

9 years agoINFRA-142 - distmaker - (Precaution) Exclude .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.

9 years agoMerge pull request #6037 from colemanw/CRM-16512
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'

9 years agoMerge pull request #6439 from sudhabisht/CRM-16978
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

9 years agoMerge pull request #6451 from colemanw/i18n
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

9 years agoMerge pull request #6435 from seamuslee001/mailing_ui_tidy_up
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

9 years agoFix issue of now not already filterinng down to object within values array
Seamus Lee [Sun, 9 Aug 2015 05:13:49 +0000 (05:13 +0000)]
Fix issue of now not already filterinng down to object within values array

9 years agoCRM-13301 - Add multilingual popup to participant status label
Coleman Watts [Sun, 9 Aug 2015 02:14:22 +0000 (22:14 -0400)]
CRM-13301 - Add multilingual popup to participant status label

9 years agoINFRA-142 - Add .toxic.json
Tim Otten [Sat, 8 Aug 2015 04:04:53 +0000 (21:04 -0700)]
INFRA-142 - Add .toxic.json

9 years agoMerge pull request #6442 from colemanw/CRM-12021
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

9 years agoCRM-12021 - Don't allow no default location type
Coleman Watts [Fri, 7 Aug 2015 18:43:50 +0000 (14:43 -0400)]
CRM-12021 - Don't allow no default location type

9 years agoFix for multiple role assignment between cases
Sudha Bisht [Fri, 7 Aug 2015 11:08:00 +0000 (16:38 +0530)]
Fix for multiple role assignment between cases

9 years agoShift to Angular promise version as per advice from totten
Seamus Lee [Fri, 7 Aug 2015 10:32:32 +0000 (10:32 +0000)]
Shift to Angular promise version as per advice from totten

9 years agoMerge pull request #6409 from monishdeb/4.6
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…

9 years agoFix JS style issue
Seamus Lee [Fri, 7 Aug 2015 00:53:55 +0000 (00:53 +0000)]
Fix JS style issue

9 years agoDynamically load the content of Message templates in CiviMail when selected rather...
Seamus Lee [Fri, 7 Aug 2015 00:27:40 +0000 (00:27 +0000)]
Dynamically load the content of Message templates in CiviMail when selected  rather than load on inital load

9 years agoOrder Header and Footer lists by name field not by table id
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

9 years agoMerge pull request #6428 from seamuslee001/membership_fix_up
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

9 years agoFix Spelling of membership in Membership Search form
Seamus Lee [Thu, 6 Aug 2015 08:57:28 +0000 (08:57 +0000)]
Fix Spelling of membership in Membership Search form

9 years agoMerge pull request #6422 from davecivicrm/CRM-16973
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

9 years agoMerge pull request #6424 from seamuslee001/4.6-CRM-13644
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

9 years agoCRM-16975 fix for membership price set config - backport 4.7 code that allows more...
eileenmcnaugton [Thu, 6 Aug 2015 06:05:21 +0000 (18:05 +1200)]
CRM-16975 fix for membership price set config - backport 4.7 code that allows more sensible determination of whether
multiple payments are supported

9 years agoMerge pull request #6426 from eileenmcnaughton/CRM-16832
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.

9 years agoCRM-16961 fix for search for cust data with parentheses
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

9 years agotraditional way to fix by using special character in RLIKE
monishdeb [Wed, 5 Aug 2015 11:45:41 +0000 (17:15 +0530)]
traditional way to fix by using special character in RLIKE

9 years agoformatting fix
monishdeb [Tue, 4 Aug 2015 18:22:13 +0000 (23:52 +0530)]
formatting fix

9 years agoformat fix
monishdeb [Tue, 4 Aug 2015 15:34:07 +0000 (21:04 +0530)]
format fix

9 years agoCRM-16961 fix - 4.6.5 search regression on custom fields where option values have...
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

9 years agoMerge pull request #6420 from jitendrapurohit/CRM-16949
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

9 years agoMerge pull request #6410 from jmcclelland/CRM-10100
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

9 years agoCRM-16832. Do not redirect offsite when fed invalid keys.
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

9 years agoPHPcs Fixes
Seamus Lee [Thu, 6 Aug 2015 00:06:12 +0000 (00:06 +0000)]
PHPcs Fixes

9 years agoCRM-13644 Apply Permission Check for Group API 4.6
Seamus Lee [Wed, 5 Aug 2015 23:56:20 +0000 (23:56 +0000)]
CRM-13644 Apply Permission Check for Group API 4.6

9 years agoCRM-16973 - filter FROM Email Address select by domain_id
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

9 years agoMerge pull request #6418 from eileenmcnaughton/CRM-15815-46
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

9 years agominor fixes
jitendrapurohit [Wed, 5 Aug 2015 13:27:54 +0000 (18:57 +0530)]
minor fixes

9 years agoCRM-16949 - Multi-record custom fields repeated when displayed for an individual
jitendrapurohit [Wed, 5 Aug 2015 13:18:18 +0000 (18:48 +0530)]
CRM-16949 - Multi-record custom fields repeated when displayed for an individual

9 years agoUpdate version to 4.6.7
CiviCRM [Wed, 5 Aug 2015 12:06:18 +0000 (05:06 -0700)]
Update version to 4.6.7

9 years agoCRM-16168 api chaining fix (plus some test tidy up)
eileenmcnaugton [Wed, 5 Aug 2015 11:18:07 +0000 (23:18 +1200)]
CRM-16168 api chaining fix (plus some test tidy up)

9 years agoCRM-16168 - Added 2 unit tests.
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

9 years agoRefs #15891 - Small fix.
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.

9 years agoCRM-15891 - Unit test to illustrate the problem.
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

9 years agoCRM-15904 fix sequential with reload
eileenmcnaughton [Wed, 5 Aug 2015 10:39:25 +0000 (10:39 +0000)]
CRM-15904 fix sequential with reload

9 years agoCRM-15904 - Unit test to illustrate the issue.
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

9 years agoUnit test for CRM-15815.
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

9 years agoCRM-15815 fix chaining with sequential
eileenmcnaughton [Wed, 5 Aug 2015 09:20:30 +0000 (09:20 +0000)]
CRM-15815 fix chaining with sequential

9 years agoMerge pull request #6407 from civicrm/revert-6236-CRM-16836
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"