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
Coleman Watts [Fri, 7 Aug 2015 20:23:57 +0000 (16:23 -0400)]
CRM-12527 - Set http headers in CMS-compatible way
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
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: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
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.
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
Samuel Vanhove [Wed, 29 Apr 2015 15:59:53 +0000 (11:59 -0400)]
CRM-16176 - add SchemaStructure for upgrade
Samuel Vanhove [Mon, 27 Apr 2015 14:31:43 +0000 (10:31 -0400)]
CRM-16176 - Upgrader
Samuel Vanhove [Mon, 27 Apr 2015 04:49:18 +0000 (00:49 -0400)]
CRM-16176 - schema + templates update - upgrade script missing
JKingsnorth [Wed, 5 Aug 2015 09:31:05 +0000 (10:31 +0100)]
Checkstyle fix - one pesky whitespace
Eileen McNaughton [Wed, 5 Aug 2015 08:33:22 +0000 (20:33 +1200)]
Merge pull request #6406 from eileenmcnaughton/CRM-16523
CRM-16523 remove remaining hook-bypasses
Monish Deb [Wed, 5 Aug 2015 07:34:15 +0000 (13:04 +0530)]
Merge pull request #6366 from jitendrapurohit/CRM-13644master
CRM-13644 - Add permission check for Group API
Eileen McNaughton [Wed, 5 Aug 2015 03:55:06 +0000 (15:55 +1200)]
Merge pull request #6414 from eileenmcnaughton/CRM-16967
CRM-16967 form regressions
Eileen McNaughton [Wed, 5 Aug 2015 03:25:45 +0000 (15:25 +1200)]
Merge pull request #6416 from torrance/drupal8
Avoid CiviCRM running full drupal cache flush, as this results in CivCRM clobbering Drupal's Symfony with its own.
Torrance [Wed, 5 Aug 2015 03:24:00 +0000 (15:24 +1200)]
Avoid CiviCRM running full drupal cache flush, as this results in CiviCRM clobbering Drupal's Symfony with its own.
eileenmcnaugton [Wed, 5 Aug 2015 02:54:15 +0000 (14:54 +1200)]
CRM-16523 baseIPN test fixes
Eileen McNaughton [Wed, 5 Aug 2015 02:48:13 +0000 (14:48 +1200)]
Merge pull request #6413 from eileenmcnaughton/CRM-16965
CRM-16965 deal with membership processor not loading properly
Coleman Watts [Wed, 5 Aug 2015 01:42:25 +0000 (21:42 -0400)]
CRM-16705 - Fix syntaxConformanceTest to work with oddball pseudoconstant keyColumn
eileenmcnaugton [Wed, 5 Aug 2015 00:35:46 +0000 (12:35 +1200)]
CRM-16967 form regressions
eileenmcnaugton [Tue, 4 Aug 2015 23:08:21 +0000 (11:08 +1200)]
CRM-16965 deal with membership processor not loading properly
eileenmcnaugton [Tue, 4 Aug 2015 22:15:57 +0000 (10:15 +1200)]
CRM-16523 test fix
eileenmcnaugton [Tue, 4 Aug 2015 21:58:52 +0000 (09:58 +1200)]
CRM-16523 test fix on participant mail
Dave Greenberg [Tue, 4 Aug 2015 21:27:10 +0000 (14:27 -0700)]
Merge pull request #6397 from colemanw/CRM-14078
CRM-14078 - Make field labels more consistent
eileenmcnaugton [Tue, 4 Aug 2015 20:58:37 +0000 (08:58 +1200)]
CRM-16523 towards fixing test on this
colemanw [Tue, 4 Aug 2015 20:20:54 +0000 (16:20 -0400)]
Merge pull request #6408 from johanv/CRM-16963-permissions_country_api
CRM-16963 - Access CiviCRM sufficient to retrieve country information
colemanw [Tue, 4 Aug 2015 20:16:19 +0000 (16:16 -0400)]
Merge pull request #6411 from colemanw/CRM-16444
CRM-16444 ckeditor-configurator.js cleanup
Coleman Watts [Tue, 4 Aug 2015 20:15:39 +0000 (16:15 -0400)]
CRM-16444 ckeditor-configurator.js cleanup
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"
eileenmcnaugton [Tue, 4 Aug 2015 10:50:17 +0000 (22:50 +1200)]
CRM-16523 remove last hook by-pass
Eileen McNaughton [Tue, 4 Aug 2015 18:06:52 +0000 (06:06 +1200)]
Merge pull request #6404 from eileenmcnaughton/master
remove some unused variables
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 …
Johan Vervloet [Tue, 4 Aug 2015 13:48:12 +0000 (15:48 +0200)]
CRM-16963 - Access CiviCRM is sufficient to retrieve country information.
----------------------------------------
* CRM-16963: 'Administer CiviCRM' permissions needed to retrieve countries using the API
https://issues.civicrm.org/jira/browse/CRM-16963
colemanw [Tue, 4 Aug 2015 13:37:15 +0000 (09:37 -0400)]
Merge pull request #6401 from colemanw/CRM-10836
CRM-10836 - Change 'Is Deceased' to 'Deceased'
colemanw [Tue, 4 Aug 2015 12:42:27 +0000 (08:42 -0400)]
Revert "CRM-16836 - Enforce permissions in group api getoptions"
eileenmcnaugton [Tue, 4 Aug 2015 10:17:02 +0000 (22:17 +1200)]
CRM-16523 deprecate use of completetransacion in 'odd' way
eileenmcnaugton [Tue, 4 Aug 2015 08:54:02 +0000 (20:54 +1200)]
CRM-16523 towards removing overload of recur_contribution
eileenmcnaugton [Tue, 4 Aug 2015 08:28:42 +0000 (20:28 +1200)]
CRM-16532 towards calling hooks when completing transactions
Eileen McNaughton [Tue, 4 Aug 2015 10:29:17 +0000 (22:29 +1200)]
Merge pull request #6393 from eileenmcnaughton/CRM-16523
Crm 16523
JKingsnorth [Tue, 4 Aug 2015 09:35:41 +0000 (10:35 +0100)]
CRM-16959 - Support multiple contact/group IDs in a more standard format
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
eileenmcnaugton [Tue, 4 Aug 2015 06:27:55 +0000 (18:27 +1200)]
CRM-16523 ensure contact_id is loaded when creating a contribution
eileenmcnaugton [Tue, 4 Aug 2015 06:04:53 +0000 (18:04 +1200)]
CRM-16523 assume 'new' where membership is being updated from pending
eileenmcnaugton [Tue, 4 Aug 2015 05:35:52 +0000 (17:35 +1200)]
towards test fix, catch error higher up & declare fn protected
eileenmcnaugton [Tue, 4 Aug 2015 05:28:46 +0000 (17:28 +1200)]
CRM-16523 code comments & bypass IPN to call completeOrder
eileenmcnaugton [Tue, 4 Aug 2015 05:27:02 +0000 (17:27 +1200)]
CRM-16523 towards fixing test issues on this
eileenmcnaugton [Tue, 4 Aug 2015 04:38:05 +0000 (16:38 +1200)]
add titles to membeship_log for api conformance
eileenmcnaugton [Tue, 4 Aug 2015 01:24:31 +0000 (13:24 +1200)]
towards more standardised fn comments:
eileenmcnaugton [Mon, 3 Aug 2015 13:38:46 +0000 (01:38 +1200)]
CRM-16523 refactor completetransation to call hooks
eileenmcnaugton [Mon, 3 Aug 2015 13:06:03 +0000 (01:06 +1200)]
CRM-16523 towards calling hooks throughout completetransaction
Coleman Watts [Mon, 3 Aug 2015 21:58:01 +0000 (17:58 -0400)]
CRM-14078 - 'Paid By' -> 'Payment Method'
Coleman Watts [Mon, 3 Aug 2015 21:42:27 +0000 (17:42 -0400)]
CRM-14078 - 'Payment Instrument' -> 'Payment Method'
Coleman Watts [Sat, 1 Aug 2015 15:34:39 +0000 (11:34 -0400)]
CRM-14078 - Consolodate contribution 'Date Received' field label
Coleman Watts [Fri, 31 Jul 2015 14:43:29 +0000 (10:43 -0400)]
Fix incorrect marker class
Coleman Watts [Thu, 30 Jul 2015 19:28:50 +0000 (15:28 -0400)]
CRM-14078 - More consistent contact field labels
Coleman Watts [Tue, 4 Aug 2015 01:36:42 +0000 (21:36 -0400)]
CRM-10836 - Change 'Is Deceased' to 'Deceased'
Coleman Watts [Tue, 4 Aug 2015 00:40:27 +0000 (20:40 -0400)]
CRM-16705 - Compensate for oddball pdf_format_id option value
Tim Otten [Mon, 3 Aug 2015 23:00:44 +0000 (16:00 -0700)]
Merge remote-tracking branch 'origin/4.6' into 4.6-master-2015-08-03-16-00-35
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
Eileen McNaughton [Mon, 3 Aug 2015 21:00:39 +0000 (09:00 +1200)]
Merge pull request #6391 from eileenmcnaughton/CRM-16926
CRM-16926 fix up patch for 4.7
colemanw [Mon, 3 Aug 2015 20:40:49 +0000 (16:40 -0400)]
Merge pull request #6386 from eileenmcnaughton/CRM-16955
CRM-16955 make payment form load billing defaults on processor change
Dave Greenberg [Mon, 3 Aug 2015 20:00:56 +0000 (13:00 -0700)]
Merge pull request #6389 from JKingsnorth/CRM-16957
CRM-16957: Allow changing selections even if none selected originally
eileenmcnaugton [Mon, 3 Aug 2015 02:25:05 +0000 (14:25 +1200)]
CRM-16955 make payment form load billing defaults on processor change
Eileen McNaughton [Mon, 3 Aug 2015 14:00:51 +0000 (02:00 +1200)]
Merge pull request #6385 from eileenmcnaughton/cleanup
Cody tidy up
Eileen McNaughton [Mon, 3 Aug 2015 13:33:05 +0000 (01:33 +1200)]
Merge pull request #6387 from eileenmcnaughton/CRM-16542
CRM-16542 re-fix paypal express form in a way that reflects our code …
projects / civicrm-core.git / log