civicrm-core.git
7 years agoMerge pull request #11261 from JMAConsulting/CRM-21362
colemanw [Fri, 17 Nov 2017 13:03:12 +0000 (08:03 -0500)]
Merge pull request #11261 from JMAConsulting/CRM-21362

CRM-21362: followup PR which fixes duplicate mailing rows for each job

7 years agoMerge pull request #11152 from eileenmcnaughton/api
Mathieu Lu [Fri, 17 Nov 2017 05:09:00 +0000 (00:09 -0500)]
Merge pull request #11152 from eileenmcnaughton/api

CRM-21324 - Support 'null' on date fields in the api

7 years agoMerge pull request #11259 from eileenmcnaughton/report
Mathieu Lu [Fri, 17 Nov 2017 04:43:55 +0000 (23:43 -0500)]
Merge pull request #11259 from eileenmcnaughton/report

CRM-21412 Do not give fatal error on report when no fields selected

7 years agoMerge pull request #11270 from colemanw/CRM-21421
colemanw [Wed, 15 Nov 2017 23:10:40 +0000 (18:10 -0500)]
Merge pull request #11270 from colemanw/CRM-21421

CRM-21421 - Api case update should not re-save case contacts

7 years agoCRM-21412 Do not give fatal error on report when no fields selected
eileen [Wed, 8 Nov 2017 21:44:09 +0000 (10:44 +1300)]
CRM-21412 Do not give fatal error on report when no fields selected

7 years agoMerge pull request #10674 from herbdool/crm20764
Mathieu Lu [Wed, 15 Nov 2017 21:27:59 +0000 (16:27 -0500)]
Merge pull request #10674 from herbdool/crm20764

CRM-20764 Allow clean URLs with CiviCRM on Backdrop

7 years agoMerge pull request #11283 from mattwire/CRM-21432_recur_end_date_display
Mathieu Lu [Wed, 15 Nov 2017 20:57:59 +0000 (15:57 -0500)]
Merge pull request #11283 from mattwire/CRM-21432_recur_end_date_display

CRM-21432 Fix display of end date for recurring contributions

7 years agoMerge pull request #11278 from eileenmcnaughton/towards1
Mathieu Lu [Wed, 15 Nov 2017 19:59:32 +0000 (14:59 -0500)]
Merge pull request #11278 from eileenmcnaughton/towards1

[NFC] Function extraction and renaming of variable for shorter refere…

7 years agoFix display of end date for recurring contributions
Matthew Wire [Wed, 15 Nov 2017 19:42:50 +0000 (19:42 +0000)]
Fix display of end date for recurring contributions

7 years ago[NFC] Function extraction and renaming of variable for shorter reference.
eileen [Tue, 14 Nov 2017 20:09:33 +0000 (09:09 +1300)]
[NFC] Function extraction and renaming of variable for shorter reference.

This is a function extraction towards CRM-19273. I haven't changed the logic but it is apparent that
we are changing the contribution financial type to 'the financial type of the last line
item' - which is a little dubious although it might work in practice. We should expose the field &
let people choose it

7 years agoMerge pull request #9739 from nditech/CRM-19915
Mathieu Lu [Wed, 15 Nov 2017 05:19:45 +0000 (00:19 -0500)]
Merge pull request #9739 from nditech/CRM-19915

Fixes CRM-19915

7 years agoMerge pull request #11034 from ejegg/docStrings
Mathieu Lu [Wed, 15 Nov 2017 05:15:08 +0000 (00:15 -0500)]
Merge pull request #11034 from ejegg/docStrings

[NFC] Fix a bunch of docstrings

7 years agoMerge pull request #11138 from mattwire/CRM-21312_bootstrap_css_fix
Eileen McNaughton [Wed, 15 Nov 2017 04:49:24 +0000 (17:49 +1300)]
Merge pull request #11138 from mattwire/CRM-21312_bootstrap_css_fix

CRM-21312 Fix display of 'Recent Items' when using a bootstrap theme

7 years agoUpdate sendMail return type
Elliott Eggleston [Wed, 15 Nov 2017 04:43:49 +0000 (23:43 -0500)]
Update sendMail return type

7 years agoMerge pull request #11233 from seanmadsen/CRM-14343-import-error-limit
Mathieu Lu [Wed, 15 Nov 2017 03:53:21 +0000 (22:53 -0500)]
Merge pull request #11233 from seanmadsen/CRM-14343-import-error-limit

CRM-14343 - Remove limit of downloading only 250 errors during CSV import

7 years agoMerge pull request #11255 from tschuettler/CRM-21407
Mathieu Lu [Wed, 15 Nov 2017 03:10:34 +0000 (22:10 -0500)]
Merge pull request #11255 from tschuettler/CRM-21407

CRM-21407 - Fix ISO compliance for German counties

7 years agoMerge pull request #11266 from eileenmcnaughton/additional-test
Mathieu Lu [Wed, 15 Nov 2017 03:02:26 +0000 (22:02 -0500)]
Merge pull request #11266 from eileenmcnaughton/additional-test

[NFC] Additional test

7 years agoMerge pull request #11277 from mihaelmladenov/NDI-14-cancel-event-participants
colemanw [Wed, 15 Nov 2017 02:48:53 +0000 (21:48 -0500)]
Merge pull request #11277 from mihaelmladenov/NDI-14-cancel-event-participants

CRM-21426: Removed duplicate submit buttons on Cancel/Delete Event Participants

7 years agoNDI-14: Removed top submit buttons on Delete Event Participants task
Mihael Mladenov [Tue, 14 Nov 2017 21:17:42 +0000 (23:17 +0200)]
NDI-14: Removed top submit buttons on Delete Event Participants task

7 years agoNDI-14: Changed label of cancel event participants submit button
Mihael Mladenov [Tue, 14 Nov 2017 19:18:49 +0000 (21:18 +0200)]
NDI-14: Changed label of cancel event participants submit button

7 years agoMerge pull request #11273 from aydun/CRM-21422_london_timezone
Eileen McNaughton [Tue, 14 Nov 2017 19:18:47 +0000 (08:18 +1300)]
Merge pull request #11273 from aydun/CRM-21422_london_timezone

CRM-21422 - Fix handling of 0 timezone offset

7 years agoCode improvement as per Eileen's comment
Aidan Saunders [Tue, 14 Nov 2017 15:18:11 +0000 (15:18 +0000)]
Code improvement as per Eileen's comment

7 years agoNDI-14: Removed duplicate submit buttons on Cancel Event Participants page
Mihael Mladenov [Tue, 14 Nov 2017 12:23:08 +0000 (14:23 +0200)]
NDI-14: Removed duplicate submit buttons on Cancel Event Participants page

7 years agoMerge pull request #11272 from eileenmcnaughton/towards1
Monish Deb [Tue, 14 Nov 2017 10:03:48 +0000 (15:33 +0530)]
Merge pull request #11272 from eileenmcnaughton/towards1

NFC code tidy up preparatory to CRM-19273

7 years agoMerge pull request #11275 from civicrm/4.7.28-rc
Eileen McNaughton [Tue, 14 Nov 2017 08:42:50 +0000 (21:42 +1300)]
Merge pull request #11275 from civicrm/4.7.28-rc

4.7.28 rc

7 years agoCRM-21304 quash form reload message when refreshing (#11122)
Eileen McNaughton [Tue, 14 Nov 2017 07:45:07 +0000 (20:45 +1300)]
CRM-21304 quash form reload message when refreshing (#11122)

* CRM-21304 quash form reload message when refreshing

* CRM-21304 - Disable unsaved changes warning on dedupe form

----------------------------------------
* CRM-21304: Dedupe usablity, quash refresh message in more cases
  https://issues.civicrm.org/jira/browse/CRM-21304

7 years agoMerge pull request #11072 from cividesk/CRM-21265-4.7
Eileen McNaughton [Tue, 14 Nov 2017 07:33:59 +0000 (20:33 +1300)]
Merge pull request #11072 from cividesk/CRM-21265-4.7

CRM-21265: update payment status to Failed if membership transaction…

7 years agoMerge pull request #11205 from agileware/CRM-20166
Eileen McNaughton [Tue, 14 Nov 2017 06:06:26 +0000 (19:06 +1300)]
Merge pull request #11205 from agileware/CRM-20166

CRM-20166: Making CVV always required for front-end pages.

7 years agoMerge pull request #11264 from seanmadsen/CRM-21419-activity-separation
colemanw [Tue, 14 Nov 2017 01:53:15 +0000 (20:53 -0500)]
Merge pull request #11264 from seanmadsen/CRM-21419-activity-separation

CRM-21419 Prevent users from accidentally creating a single activity when they want multiple

7 years agoMerge pull request #11269 from varshith/CRM-21041_respect_default_communication_style...
colemanw [Mon, 13 Nov 2017 23:14:13 +0000 (18:14 -0500)]
Merge pull request #11269 from varshith/CRM-21041_respect_default_communication_style_on_api_contact_create

CRM-21041: Respect default 'Communication Style' when creating a …

7 years agoclear weird character causing warnings
Vinu Varshith S [Mon, 13 Nov 2017 17:19:30 +0000 (22:49 +0530)]
clear weird character causing warnings

7 years agoMerge pull request #11254 from colemanw/CRM-21406
colemanw [Mon, 13 Nov 2017 13:47:08 +0000 (08:47 -0500)]
Merge pull request #11254 from colemanw/CRM-21406

CRM-21406 - Standalone export form

7 years agoFix handling of 0 offset
Aidan Saunders [Mon, 13 Nov 2017 13:11:12 +0000 (13:11 +0000)]
Fix handling of 0 offset

7 years agoCRM-20166: Making CVV always required for front-end contribution pages.
Alok Patel [Wed, 8 Nov 2017 07:29:29 +0000 (12:59 +0530)]
CRM-20166: Making CVV always required for front-end contribution pages.

7 years agoAdding test cases for CRM-21041
Vinu Varshith S [Mon, 13 Nov 2017 11:20:14 +0000 (16:50 +0530)]
Adding test cases for CRM-21041

7 years agoNFC code tidy up, convert result to array more cleanly
eileen [Mon, 13 Nov 2017 07:57:49 +0000 (20:57 +1300)]
NFC code tidy up, convert result to array more cleanly

7 years agoNFC code tidy up preparatory to CRM-19273
eileen [Mon, 13 Nov 2017 07:18:14 +0000 (20:18 +1300)]
NFC code tidy up preparatory to CRM-19273

As part of reducing https://github.com/civicrm/civicrm-core/pull/10962/files easier to parse this makes some small
code tidy ups
1) renames functions to not use the deprecated convention of leading underscore
2) renames function to getLineItemsToAlter rather than 'to add & update'
 (later changes will cause this array to include 'to_cancel' & 'to_resurrect')
3) changes the array return format for that function to be an array of requiredChanges
4) rename function _getFinancialItemsToRecord to getReverseFinancialItemsToRecord to
reflect the fact it is generating an array of reversals to perform

7 years agoAvoid 'array_pop calling a function' situation
Vinu Varshith S [Sun, 12 Nov 2017 05:05:08 +0000 (10:35 +0530)]
Avoid 'array_pop calling a function' situation

7 years agoMerge pull request #11195 from jitendrapurohit/CRM-21349
colemanw [Sat, 11 Nov 2017 16:37:20 +0000 (11:37 -0500)]
Merge pull request #11195 from jitendrapurohit/CRM-21349

CRM-21349: Increase timeout of status message after batch merge

7 years agoCRM-21421 - Api case update should not re-save case contacts
Coleman Watts [Sat, 11 Nov 2017 16:32:04 +0000 (11:32 -0500)]
CRM-21421 - Api case update should not re-save case contacts

7 years agoCRM-21041: Respect default 'Communication Style' when creating a Contact via API
Vinu Varshith S [Sat, 11 Nov 2017 11:10:35 +0000 (16:40 +0530)]
CRM-21041: Respect default 'Communication Style' when creating a Contact via API

7 years agominor fix
Jitendra Purohit [Sat, 11 Nov 2017 11:06:27 +0000 (16:36 +0530)]
minor fix

7 years agoMerge pull request #11204 from MiyaNoctem/CRM-21360-make-open-case-manageable
colemanw [Fri, 10 Nov 2017 21:40:30 +0000 (16:40 -0500)]
Merge pull request #11204 from MiyaNoctem/CRM-21360-make-open-case-manageable

CRM-21360: Make 'Open Case' Activity Optional

7 years agoMerge pull request #11224 from colemanw/CRM-21384
colemanw [Fri, 10 Nov 2017 14:22:17 +0000 (09:22 -0500)]
Merge pull request #11224 from colemanw/CRM-21384

CRM-21384 - Don't show deleted contacts in case relations

7 years agoMerge pull request #11260 from JMAConsulting/CRM-21416
colemanw [Fri, 10 Nov 2017 12:54:02 +0000 (07:54 -0500)]
Merge pull request #11260 from JMAConsulting/CRM-21416

CRM-21416: Add reset link beside 'Search' button below Advance Search form

7 years agoCRM-21416: Add reset link beside 'Search' button below Advance Search form
deb.monish [Thu, 9 Nov 2017 08:11:20 +0000 (13:41 +0530)]
CRM-21416: Add reset link beside 'Search' button below Advance Search form

7 years agoAdd unit test on financial items for pending payments.
eileen [Fri, 10 Nov 2017 00:15:48 +0000 (13:15 +1300)]
Add unit test on financial items for pending payments.

This test was supposed to demonstrate a failure but actually it demonstrates something working.

Still, good to have an additional test

7 years agoMerge pull request #11265 from eileenmcnaughton/test
Tim Otten [Fri, 10 Nov 2017 01:59:08 +0000 (17:59 -0800)]
Merge pull request #11265 from eileenmcnaughton/test

[NFC] Minor refactor of test to allow re-use

7 years ago[NFC] Minor refactor of test to allow re-use
eileen [Sun, 22 Oct 2017 03:29:51 +0000 (14:29 +1100)]
[NFC] Minor refactor of test to allow re-use

Change-Id: Ie0ec7ff504420aa41641abc6de4edb8cfb5a4b64

7 years agoMerge pull request #11253 from christianwach/CRM-20358
Tim Otten [Thu, 9 Nov 2017 20:58:20 +0000 (12:58 -0800)]
Merge pull request #11253 from christianwach/CRM-20358

CRM-20358: Fix WordPress Access Control table

7 years agoCRM-21419 Radio options create separate activities
Sean Madsen [Thu, 9 Nov 2017 16:02:32 +0000 (11:02 -0500)]
CRM-21419 Radio options create separate activities

Instead of a checkbox for the user to choose to create separate
activities for each contact, use a set of radio options in order to
prompt the user to make a decision. This helps prevent users from
accidentally choosing to create combined activities.

7 years agoCRM-21349 - Improve batch merge status message
Coleman Watts [Thu, 9 Nov 2017 13:33:12 +0000 (08:33 -0500)]
CRM-21349 - Improve batch merge status message

7 years agoinclude title
Jitendra Purohit [Thu, 9 Nov 2017 10:50:46 +0000 (16:20 +0530)]
include title

7 years agoCRM-20358: fix WordPress Access Control table
Christian Wach [Wed, 8 Nov 2017 12:13:20 +0000 (12:13 +0000)]
CRM-20358: fix WordPress Access Control table

7 years agoCRM-21362: followup PR which fixes duplicate mailing rows for each job
deb.monish [Thu, 9 Nov 2017 08:21:37 +0000 (13:51 +0530)]
CRM-21362: followup PR which fixes duplicate mailing rows for each job

7 years agoMerge pull request #11256 from colemanw/CRM-21408
Tim Otten [Wed, 8 Nov 2017 19:05:15 +0000 (11:05 -0800)]
Merge pull request #11256 from colemanw/CRM-21408

CRM-21408 - Api explorer - better defaults for sequential checkbox

7 years agoCRM-21408 - Api explorer - better defaults for sequential checkbox
Coleman Watts [Wed, 8 Nov 2017 14:40:27 +0000 (09:40 -0500)]
CRM-21408 - Api explorer - better defaults for sequential checkbox

----------------------------------------
* CRM-21408: Api explorer - better defaults for sequential checkbox
  https://issues.civicrm.org/jira/browse/CRM-21408

7 years agoCRM-21406 - Make standalone export work in popup context
Coleman Watts [Wed, 8 Nov 2017 13:31:37 +0000 (08:31 -0500)]
CRM-21406 - Make standalone export work in popup context

7 years agoFix ISO compliance for German counties
Thomas Schüttler [Wed, 8 Nov 2017 13:21:14 +0000 (14:21 +0100)]
Fix ISO compliance for German counties

7 years agoCRM-21406 - Standalone export form
Coleman Watts [Wed, 8 Nov 2017 12:44:57 +0000 (07:44 -0500)]
CRM-21406 - Standalone export form

----------------------------------------
* CRM-21406: Create Standalone Export Form
  https://issues.civicrm.org/jira/browse/CRM-21406

7 years agoMerge pull request #11223 from colemanw/CRM-21382
colemanw [Wed, 8 Nov 2017 10:40:28 +0000 (05:40 -0500)]
Merge pull request #11223 from colemanw/CRM-21382

CRM-21382 - Fix print/merge document on case and support multiple cases

7 years agoMerge pull request #11245 from colemanw/CRM-21398
colemanw [Wed, 8 Nov 2017 10:38:47 +0000 (05:38 -0500)]
Merge pull request #11245 from colemanw/CRM-21398

CRM-21398 - Fix fatal error when exporting cases

7 years agoMerge pull request #11251 from totten/master-mailtest
Tim Otten [Wed, 8 Nov 2017 08:21:36 +0000 (00:21 -0800)]
Merge pull request #11251 from totten/master-mailtest

CRM-17860, CRM-18231 - JobProcessMailingTest - Re-remove require_once

7 years agoCRM-17860, CRM-18231 - JobProcessMailingTest - Re-remove require_once
Tim Otten [Wed, 8 Nov 2017 06:47:19 +0000 (22:47 -0800)]
CRM-17860, CRM-18231 - JobProcessMailingTest - Re-remove require_once

Overview
--------
Remove an unnecessary line from test suite.

Before
------
The test worked when executed as part of the `api_v3` suite, but it failed
when run individually (because the `require_once` doesn't work).  Moreover,
the tests for `org.civicrm.flexmailer` failed

After
-----
The tests work on their own.

Comment
-------

This change deals entirely with the packaging/framing of a test-case.  It
neither (a) involves the runtime behavior of the application nor (b) the
semantics/behavior of the test.  Consequently, it should be safe to merge as
long as the test-runner remains happy.

7 years agoMerge pull request #11249 from seamuslee001/CRM-21363-maria
Eileen McNaughton [Wed, 8 Nov 2017 05:24:03 +0000 (18:24 +1300)]
Merge pull request #11249 from seamuslee001/CRM-21363-maria

CRM-21363 Only implement ONLY_FULL_GROUP_BY if it is in the default g…

7 years agoMerge pull request #11059 from JMAConsulting/CRM-21200
Eileen McNaughton [Wed, 8 Nov 2017 00:52:00 +0000 (13:52 +1300)]
Merge pull request #11059 from JMAConsulting/CRM-21200

CRM-21200: Pay Now payment overwrites the contribution

7 years agoMerge pull request #10901 from JMAConsulting/CRM-21106
Eileen McNaughton [Tue, 7 Nov 2017 21:53:51 +0000 (10:53 +1300)]
Merge pull request #10901 from JMAConsulting/CRM-21106

CRM-21106, removed code related to Financial type acl from report

7 years agoCRM-21363 Only implement ONLY_FULL_GROUP_BY if it is in the default global sql_modes
Seamus Lee [Tue, 7 Nov 2017 21:09:50 +0000 (08:09 +1100)]
CRM-21363 Only implement ONLY_FULL_GROUP_BY if it is in the default global sql_modes

7 years agoCRM-21384 - Don't show deleted contacts in case roles
Coleman Watts [Tue, 7 Nov 2017 16:25:59 +0000 (11:25 -0500)]
CRM-21384 - Don't show deleted contacts in case roles

----------------------------------------
* CRM-21384: Ensure deleted contacts are filtered out of CiviCase
  https://issues.civicrm.org/jira/browse/CRM-21384

7 years agoCRM-21384 - Don't show deleted contacts in case relations
Coleman Watts [Wed, 1 Nov 2017 21:21:38 +0000 (17:21 -0400)]
CRM-21384 - Don't show deleted contacts in case relations

7 years agoMerge pull request #11171 from mydropwizard/drupal-8-hooks
Mark Hanna [Tue, 7 Nov 2017 13:38:34 +0000 (07:38 -0600)]
Merge pull request #11171 from mydropwizard/drupal-8-hooks

CRM-21341 Drupal 8 Hook Support

7 years agoMerge pull request #11173 from totten/master-reinstall-dep
Eileen McNaughton [Tue, 7 Nov 2017 04:42:50 +0000 (17:42 +1300)]
Merge pull request #11173 from totten/master-reinstall-dep

CRM-16243 - Redundant extension installation should not throw error

7 years agoMerge pull request #11229 from seamuslee001/dedupe_test_fix
Eileen McNaughton [Tue, 7 Nov 2017 04:32:40 +0000 (17:32 +1300)]
Merge pull request #11229 from seamuslee001/dedupe_test_fix

CRM-21364 Fix Dedupe fillTable Query when running in full groupBy Mode

7 years agoWhitespace cleanup
Coleman Watts [Tue, 7 Nov 2017 02:16:23 +0000 (21:16 -0500)]
Whitespace cleanup

7 years agoMerge pull request #11247 from seamuslee001/CRM-21400
Eileen McNaughton [Tue, 7 Nov 2017 02:15:43 +0000 (15:15 +1300)]
Merge pull request #11247 from seamuslee001/CRM-21400

CRM-21400 Add a static var to hold the trxn_id so it can be accessed …

7 years agoMerge pull request #11246 from seamuslee001/CRM-21395
Tim Otten [Tue, 7 Nov 2017 01:51:30 +0000 (17:51 -0800)]
Merge pull request #11246 from seamuslee001/CRM-21395

CRM-21395 make patch safe for multiple composer runs

7 years agoCRM-21400 Add a static var to hold the trxn_id so it can be accessed through hook_civ...
Seamus Lee [Tue, 7 Nov 2017 00:21:14 +0000 (11:21 +1100)]
CRM-21400 Add a static var to hold the trxn_id so it can be accessed through hook_civicrm_buildForm

7 years agoCheck that Drupal 8 has been bootstrapped
David Snopek [Mon, 6 Nov 2017 22:46:00 +0000 (16:46 -0600)]
Check that Drupal 8 has been bootstrapped

7 years agoMerge pull request #11237 from civicrm/4.7.28-rc
Eileen McNaughton [Mon, 6 Nov 2017 22:14:55 +0000 (11:14 +1300)]
Merge pull request #11237 from civicrm/4.7.28-rc

4.7.28 rc

7 years agoCRM-21395 make patch safe for multiple composer runs
Seamus Lee [Mon, 6 Nov 2017 21:25:23 +0000 (08:25 +1100)]
CRM-21395 make patch safe for multiple composer runs

7 years agoCRM-21398 - Fix fatal error when exporting cases
Coleman Watts [Mon, 6 Nov 2017 15:38:56 +0000 (10:38 -0500)]
CRM-21398 - Fix fatal error when exporting cases

----------------------------------------
* CRM-21398: Error when exporting cases
  https://issues.civicrm.org/jira/browse/CRM-21398

7 years agoMerge pull request #11234 from seamuslee001/CRM-21388
Eileen McNaughton [Sun, 5 Nov 2017 22:16:28 +0000 (11:16 +1300)]
Merge pull request #11234 from seamuslee001/CRM-21388

CRM-21388 Only throw execption if Extexsion Key is set in the url

7 years agoMerge pull request #11243 from seamuslee001/CRM-21395
Eileen McNaughton [Sun, 5 Nov 2017 22:09:30 +0000 (11:09 +1300)]
Merge pull request #11243 from seamuslee001/CRM-21395

CRM-21395 port https://github.com/dompdf/dompdf/pull/1570/files using…

7 years agoCRM-21395 port https://github.com/dompdf/dompdf/pull/1570/files using patch files...
Seamus Lee [Sun, 5 Nov 2017 21:16:54 +0000 (08:16 +1100)]
CRM-21395 port https://github.com/dompdf/dompdf/pull/1570/files using patch files to civicrm dompdf to fix no-block-level error found

7 years agoMerge pull request #11242 from mlutfy/crm21393
colemanw [Sun, 5 Nov 2017 14:08:00 +0000 (09:08 -0500)]
Merge pull request #11242 from mlutfy/crm21393

CRM-21393: Event checkPermission should only check the specific event…

7 years agoMerge pull request #11236 from mattwire/CRM-20164_Joomla_IPN
colemanw [Sat, 4 Nov 2017 23:56:24 +0000 (19:56 -0400)]
Merge pull request #11236 from mattwire/CRM-20164_Joomla_IPN

CRM-20164 Fix IPN notify URL with Joomla when derived from menu item

7 years agoCRM-21393: Event checkPermission should only check the specific event, if eventId...
Mathieu Lutfy [Sat, 4 Nov 2017 03:25:00 +0000 (23:25 -0400)]
CRM-21393: Event checkPermission should only check the specific event, if eventId was passed (for performance).

7 years agoMerge pull request #11230 from colemanw/CRM-21385
colemanw [Sat, 4 Nov 2017 00:47:17 +0000 (20:47 -0400)]
Merge pull request #11230 from colemanw/CRM-21385

CRM-21385 - Hide wp admin bar when maximizing ckeditor

7 years agoMerge pull request #10501 from jitendrapurohit/CRM-20728
Eileen McNaughton [Fri, 3 Nov 2017 21:39:45 +0000 (10:39 +1300)]
Merge pull request #10501 from jitendrapurohit/CRM-20728

CRM-20728: Store session in drupal before exiting

7 years agoFix IPN notify URL with Joomla when derived from menu item
Matthew Wire [Fri, 3 Nov 2017 19:49:12 +0000 (19:49 +0000)]
Fix IPN notify URL with Joomla when derived from menu item

7 years agoMerge pull request #11202 from JMAConsulting/CRM-21357
Mathieu Lu [Fri, 3 Nov 2017 12:51:57 +0000 (08:51 -0400)]
Merge pull request #11202 from JMAConsulting/CRM-21357

CRM-21357: Added default start date on membership batch entry form

7 years agoMerge pull request #10687 from JMAConsulting/CRM-20898
Mathieu Lu [Fri, 3 Nov 2017 12:31:57 +0000 (08:31 -0400)]
Merge pull request #10687 from JMAConsulting/CRM-20898

CRM-20899, formatted number upto 2 decimal place

7 years agoMerge pull request #11231 from seamuslee001/recur_test_fix
Monish Deb [Fri, 3 Nov 2017 09:35:14 +0000 (15:05 +0530)]
Merge pull request #11231 from seamuslee001/recur_test_fix

Fix Recurring contribution sql so that it doesen't use group by as th…

7 years agoFix Recurring contribution sql so that it doesen't use group by as there doesn't...
Seamus Lee [Thu, 2 Nov 2017 23:40:16 +0000 (10:40 +1100)]
Fix Recurring contribution sql so that it doesen't use group by as there doesn't appear to be a reason to do so given that we have a where id = x clause and we were grouping on the same field

7 years agoCRM-21388 Only throw execption if Extexsion Key is set in the url
Seamus Lee [Fri, 3 Nov 2017 05:40:14 +0000 (16:40 +1100)]
CRM-21388 Only throw execption if Extexsion Key is set in the url

7 years agoMerge pull request #11225 from seamuslee001/generate_data_only_full_group_by
Tim Otten [Fri, 3 Nov 2017 03:58:18 +0000 (20:58 -0700)]
Merge pull request #11225 from seamuslee001/generate_data_only_full_group_by

Fix GenerateData for only_full_group_by sqlMode

7 years agoCRM-14343 - Remove 250 limit for import errors
Sean Madsen [Fri, 3 Nov 2017 00:54:22 +0000 (20:54 -0400)]
CRM-14343 - Remove 250 limit for import errors

7 years agoCRM-21385 - Hide wp admin bar when maximizing ckeditor
Coleman Watts [Fri, 3 Nov 2017 00:00:35 +0000 (20:00 -0400)]
CRM-21385 - Hide wp admin bar when maximizing ckeditor

----------------------------------------
* CRM-21385: WordPress top nav bar blocks top row of WYSIWYG editor when maximized
  https://issues.civicrm.org/jira/browse/CRM-21385

7 years agoMerge pull request #11213 from totten/master-test-doc
Tim Otten [Thu, 2 Nov 2017 23:41:47 +0000 (16:41 -0700)]
Merge pull request #11213 from totten/master-test-doc

(NFC) Move test docs to civicrm-dev-docs

7 years agoCRM-21364 Fix Dedupe fillTable Query when running in full groupBy Mode
Seamus Lee [Thu, 2 Nov 2017 23:34:05 +0000 (10:34 +1100)]
CRM-21364 Fix Dedupe fillTable Query when running in full groupBy Mode