Eileen McNaughton [Thu, 15 Jun 2017 03:22:32 +0000 (15:22 +1200)]
Merge pull request #10502 from agileware/CRM-20253
CRM-20253: CIVICRM-135: Don' send extra receipt email.
Eileen McNaughton [Thu, 15 Jun 2017 02:33:05 +0000 (14:33 +1200)]
Merge pull request #10509 from seamuslee001/CRM-20253-test2
CRM-20253 Fix some environmental issues in tests
Seamus Lee [Thu, 15 Jun 2017 02:24:17 +0000 (12:24 +1000)]
CRM-20253 Fix some environmental issues in tests
Eileen McNaughton [Thu, 15 Jun 2017 01:54:26 +0000 (13:54 +1200)]
Merge pull request #10508 from seamuslee001/CRM-20253-test2
CRM-20253 Add another test using dummy processor and switch noReceipt…
Seamus Lee [Thu, 15 Jun 2017 00:53:43 +0000 (10:53 +1000)]
CRM-20253 Add another test using dummy processor and switch noReceipt test to dummy processor
Eileen McNaughton [Thu, 15 Jun 2017 00:17:20 +0000 (12:17 +1200)]
Merge pull request #10506 from seamuslee001/CRM-20253-test
CRM-20253 Add test to ensure that email receipts aren't sent when not…
Eileen McNaughton [Wed, 14 Jun 2017 23:56:41 +0000 (11:56 +1200)]
Merge pull request #10479 from tschuettler/CRM-20694
CRM-20694 - CiviMail - Add Resubscribe Message to CiviMail Report
Eileen McNaughton [Wed, 14 Jun 2017 23:54:08 +0000 (11:54 +1200)]
Merge pull request #10476 from chrisfromredfin/CRM-20690
CRM-20690: fix priceset option limits
colemanw [Wed, 14 Jun 2017 22:47:50 +0000 (18:47 -0400)]
Merge pull request #10465 from kryptothesuperdog/CRM-20680
CRM-20680 Spin the Civi logo when navigating between pages
Seamus Lee [Wed, 14 Jun 2017 22:28:55 +0000 (08:28 +1000)]
CRM-20253 Add checking on number of receipts issued when credit card submitted
Seamus Lee [Wed, 14 Jun 2017 22:09:11 +0000 (08:09 +1000)]
CRM-20253 Add test to ensure that email receipts aren't sent when not requested on backend form
colemanw [Wed, 14 Jun 2017 14:16:24 +0000 (10:16 -0400)]
Merge pull request #10333 from francescbassas/patch-10
CRM-18081 Allow search of active relationships during a custom range of dates
Francis Whittle [Wed, 14 Jun 2017 00:15:54 +0000 (10:15 +1000)]
CRM-20253: CIVICRM-135: Don' send extra receipt email.
----------------------------------------
* CRM-20253: backend contribution receipt sent when option not selected
https://issues.civicrm.org/jira/browse/CRM-20253
Eileen McNaughton [Tue, 13 Jun 2017 22:42:20 +0000 (10:42 +1200)]
Merge pull request #10500 from fuzionnz/rephrase_poormans
There's a better way to say it than "poor man's".
colemanw [Tue, 13 Jun 2017 15:12:28 +0000 (11:12 -0400)]
Merge pull request #10481 from seanmadsen/CRM-20698
CRM-20698 - better CSS for disabled table rows
Monish Deb [Tue, 13 Jun 2017 08:14:39 +0000 (13:44 +0530)]
Merge pull request #10484 from JMAConsulting/CRM-20706
CRM-20706: Notice error on using Contribution.Getfield API
Chris Burgess [Tue, 13 Jun 2017 02:38:37 +0000 (14:38 +1200)]
There's a better way to say it than "poor man's".
"Makeshift", "simplistic" or "inferior" are effective ways to describe a solution you think is less than ideal.
The phrase "poor man's" suggests poor people get/deserve inferior things, which IMO is incongruous with CiviCRM's aims.
Avoiding that terminology won't just be inclusive, it will better express what you really meant!
This PR contains comment changes only.
Eileen McNaughton [Mon, 12 Jun 2017 22:05:13 +0000 (10:05 +1200)]
Merge pull request #10433 from JMAConsulting/CRM-20651
CRM-20651: Change partial_amount_pay to partial_amount_to_pay for Partial Payment workflow
Eileen McNaughton [Mon, 12 Jun 2017 20:08:26 +0000 (08:08 +1200)]
Merge pull request #10473 from mickadoo/CRM-20687-remove-issue-number-variables
CRM-20687: Invert logic and rename variable to remove issue reference
colemanw [Mon, 12 Jun 2017 14:40:15 +0000 (10:40 -0400)]
Merge pull request #10494 from seamuslee001/CRM-20243-jquery
CRM-20243 Upgrade jquery to 1.12
Eileen McNaughton [Mon, 12 Jun 2017 08:01:04 +0000 (20:01 +1200)]
Merge pull request #10453 from PalanteJon/CRM-19610-test
Test for CRM-19610
Eileen McNaughton [Mon, 12 Jun 2017 07:53:52 +0000 (19:53 +1200)]
Merge pull request #10491 from seamuslee001/CRM-19610
CRM-19610 : Search preferences changes are not updated
Eileen McNaughton [Mon, 12 Jun 2017 05:05:17 +0000 (17:05 +1200)]
Merge pull request #10490 from seamuslee001/CRM-20678
CRM-20678 Fix issue where repeattransaction was creating transactions…
Eileen McNaughton [Mon, 12 Jun 2017 04:59:52 +0000 (16:59 +1200)]
Merge pull request #10489 from seamuslee001/CRM-20715
CRM-20715 Add Index on is_deceased column
Seamus Lee [Mon, 12 Jun 2017 03:01:42 +0000 (13:01 +1000)]
CRM-20243 Upgrade jquery to 1.12
Seamus Lee [Sun, 11 Jun 2017 22:08:21 +0000 (08:08 +1000)]
Allow for value to be a string '0'
Seamus Lee [Sun, 11 Jun 2017 04:23:49 +0000 (14:23 +1000)]
Only ensure that we check if the value passed is 0 and the db value is 0 or NULL
Jitendra Purohit [Tue, 30 May 2017 11:36:55 +0000 (17:06 +0530)]
CRM-19610 : Search preferences changes are not updated
Tim Otten [Sun, 11 Jun 2017 14:34:58 +0000 (16:34 +0200)]
Merge pull request #9779 from WeMoveEU/CRM-19963
CRM-19963 - Use translated processor name for Paypal in all comparisons
Tim Otten [Sun, 11 Jun 2017 14:15:12 +0000 (16:15 +0200)]
Merge pull request #10227 from WeMoveEU/CRM-20309
CRM-20309 Schedule mailing jobs at increasing times
Seamus Lee [Sun, 11 Jun 2017 04:12:09 +0000 (14:12 +1000)]
CRM-20678 Fix issue where repeattransaction was creating transactions in incorrect currency
Eileen McNaughton [Sun, 11 Jun 2017 02:38:16 +0000 (14:38 +1200)]
Merge pull request #10488 from civicrm/4.7.20-rc
4.7.20 rc
Seamus Lee [Sun, 11 Jun 2017 01:38:00 +0000 (11:38 +1000)]
Add Index on id_deceased column
Tim Otten [Fri, 9 Jun 2017 20:31:31 +0000 (22:31 +0200)]
Merge pull request #10398 from agh1/4.7.20-releasenotes
4.7.20 release notes
deb.monish [Fri, 9 Jun 2017 08:57:43 +0000 (14:27 +0530)]
CRM-20706: Notice error on using Contribution.getfield API
colemanw [Thu, 8 Jun 2017 14:25:59 +0000 (10:25 -0400)]
Merge pull request #10482 from colemanw/CRM-20091
CRM-20091 - api.CustomValue.gettree - Supply defaults and remove unknown array keys
Yashodha Chaku [Thu, 8 Jun 2017 07:05:18 +0000 (12:35 +0530)]
Merge pull request #10360 from yashodha/CRM-20552
CRM- 20552
Coleman Watts [Thu, 8 Jun 2017 02:51:43 +0000 (22:51 -0400)]
CRM-20091 - api.CustomValue.gettree - Supply defaults and remove unknown array keys
Sean Madsen [Wed, 7 Jun 2017 23:36:29 +0000 (17:36 -0600)]
CRM-20698 - better CSS for disabled table rows
Thomas Schüttler [Wed, 7 Jun 2017 09:26:17 +0000 (11:26 +0200)]
CRM-20694 - CiviMail - Add Resubscibe Message to CiviMail Report
----------------------------------------
* CRM-20694: CiviMail Report is missing Resubscribe Message
https://issues.civicrm.org/jira/browse/CRM-20694
Andrew Hunt [Wed, 7 Jun 2017 07:00:45 +0000 (03:00 -0400)]
release notes 4.7.20 all done
Andrew Hunt [Wed, 7 Jun 2017 05:53:13 +0000 (01:53 -0400)]
4.7.20 release notes - complete
Andrew Hunt [Mon, 22 May 2017 23:34:34 +0000 (19:34 -0400)]
4.7.20 release notes: add boilerplate, dates
Andrew Hunt [Wed, 7 Jun 2017 06:25:55 +0000 (02:25 -0400)]
4.7.20 release notes - late changes
Andrew Hunt [Mon, 22 May 2017 23:32:23 +0000 (19:32 -0400)]
4.7.20 release notes: from script 5/22
colemanw [Tue, 6 Jun 2017 18:49:54 +0000 (14:49 -0400)]
Merge pull request #10471 from JMAConsulting/CRM-20684
CRM-20684: Standalone form for contact bulk actions
Christopher J. Wells [Tue, 6 Jun 2017 18:05:45 +0000 (14:05 -0400)]
fix limits
colemanw [Tue, 6 Jun 2017 17:55:35 +0000 (13:55 -0400)]
Merge pull request #10428 from JMAConsulting/CRM-20226
CRM-20226: Parent Group do not inherit child group contacts
mickadoo [Tue, 6 Jun 2017 09:28:57 +0000 (10:28 +0100)]
CRM-20687: Invert logic and rename variable to remove issue reference
deb.monish [Tue, 6 Jun 2017 07:32:02 +0000 (13:02 +0530)]
CRM-20684: Standalone form for contact bulk actions
Tim Otten [Mon, 5 Jun 2017 19:42:05 +0000 (12:42 -0700)]
Merge pull request #10464 from kryptothesuperdog/CRM-20679
CRM-20679 Spin the civi logo while quicksearch is running
Tim Otten [Mon, 5 Jun 2017 06:51:02 +0000 (23:51 -0700)]
Merge pull request #10470 from seamuslee001/master
(NFC) Fix fileperms
Seamus Lee [Mon, 5 Jun 2017 05:48:56 +0000 (15:48 +1000)]
(NFC) Fix fileperms
Eileen McNaughton [Mon, 5 Jun 2017 00:22:07 +0000 (17:22 -0700)]
Merge pull request #10469 from civicrm/4.7.20-rc
4.7.20 rc
Tim Otten [Sun, 4 Jun 2017 23:09:59 +0000 (16:09 -0700)]
Merge pull request #10468 from seamuslee001/CRM-20604
CRM-20604 FIx issue where getRegistrationContactID cannot be a protec…
Tim Otten [Sun, 4 Jun 2017 22:44:17 +0000 (15:44 -0700)]
Merge pull request #10181 from jmcclelland/CRM-20381
CRM-20381 - ensure option to NOT geocode on imports is respected.
Seamus Lee [Sun, 4 Jun 2017 21:26:35 +0000 (07:26 +1000)]
CRM-20604 FIx issue where getRegistrationContactID cannot be a protected class must be public
Jamie McClelland [Sun, 4 Jun 2017 00:08:43 +0000 (20:08 -0400)]
CRM-20381 - syntax - closing brace of class needs empty line.
kryptothesuperdog [Sat, 3 Jun 2017 21:58:50 +0000 (22:58 +0100)]
CRM-20680
kryptothesuperdog [Sat, 3 Jun 2017 21:18:35 +0000 (22:18 +0100)]
CRM-20679 Spin the civi logo while quicksearch is running
colemanw [Sat, 3 Jun 2017 13:06:10 +0000 (08:06 -0500)]
Merge pull request #10460 from colemanw/CRM-20091
CRM-20091 - Add customValue.gettree api
Jamie McClelland [Sat, 3 Jun 2017 01:58:28 +0000 (21:58 -0400)]
CRM-20381 - sytax fixes.
Jamie McClelland [Sat, 3 Jun 2017 01:50:11 +0000 (21:50 -0400)]
CRM-20381 - use '' to indicate no geocode method
'' means empty, NULL means not set, which confuses MagicMerge.
Coleman Watts [Fri, 2 Jun 2017 22:08:34 +0000 (18:08 -0400)]
CRM-20091 - Specify return params from getTree
Eileen McNaughton [Fri, 2 Jun 2017 23:03:10 +0000 (16:03 -0700)]
Merge pull request #10462 from civicrm/4.7.20-rc
4.7.20 rc
Tim Otten [Fri, 2 Jun 2017 21:44:18 +0000 (14:44 -0700)]
Merge pull request #10425 from totten/master-ang-15
CRM-20243 - bower.json - Upgrade to Angular 1.5.x
Tim Otten [Fri, 2 Jun 2017 19:22:02 +0000 (12:22 -0700)]
Merge pull request #10459 from mlutfy/4.7.20-rc-crm20581
CRM-20581 - Allow access to 'get' on StateProvince API with 'Access CiviEvent' - 4.20-rc
Coleman Watts [Fri, 2 Jun 2017 17:43:54 +0000 (13:43 -0400)]
CRM-20091 - Add customValue.gettree api
Jon goldberg [Tue, 16 May 2017 17:59:38 +0000 (13:59 -0400)]
style fix
Jon goldberg [Tue, 16 May 2017 16:59:05 +0000 (12:59 -0400)]
CRM-20581 - Allow access to 'get' on StateProvince API with 'Access CiviCRM', not 'Administer CiviCRM'
colemanw [Fri, 2 Jun 2017 01:21:41 +0000 (20:21 -0500)]
Merge pull request #10451 from totten/master-null-caseid
CRM-20642 - Activity.get - Fix "IS NULL" filtering for case_id, tag_id, file_id
Jon goldberg [Thu, 1 Jun 2017 09:46:58 +0000 (05:46 -0400)]
Test for CRM-19610
Eileen McNaughton [Thu, 1 Jun 2017 02:31:46 +0000 (14:31 +1200)]
Merge pull request #10436 from JMAConsulting/CRM-20655
CRM-20655, fixed notice error
Tim Otten [Wed, 31 May 2017 22:45:27 +0000 (15:45 -0700)]
CRM-20642 - Activity.get - Fix "IS NULL" filtering for case_id, tag_id, file_id
Tim Otten [Wed, 31 May 2017 22:42:47 +0000 (15:42 -0700)]
CRM-20642 - Activity.get - Add test for `case_id IS NULL`
CRM-20642 requires an option for displaying "activities which are *not*
case-related" (i.e. `case_id IS NULL`) . This adds a unit-test for
ensuring that the filter works as expected.
Eileen McNaughton [Wed, 31 May 2017 05:40:18 +0000 (17:40 +1200)]
Merge pull request #10445 from civicrm/4.7.20-rc
4.7.20 rc
Eileen McNaughton [Tue, 30 May 2017 23:11:46 +0000 (11:11 +1200)]
Merge pull request #10444 from seamuslee001/CRM-20662
CRM-20662 Ensure that the system only tries populating the domain_id …
Seamus Lee [Tue, 30 May 2017 22:15:10 +0000 (08:15 +1000)]
CRM-20662 Ensure that the system only tries populating the domain_id field if there is only 1 domain in the system
colemanw [Tue, 30 May 2017 21:56:40 +0000 (16:56 -0500)]
Merge pull request #10438 from colemanw/CRM-20475
CRM-20475 - Add missing phone info to case api
Monish Deb [Tue, 30 May 2017 05:15:59 +0000 (10:45 +0530)]
Merge pull request #10437 from highfalutin/config-help-text
Add help text to civicrm.settings.php re: DSNs containing quotes/backslashes
Coleman Watts [Tue, 30 May 2017 01:08:24 +0000 (21:08 -0400)]
CRM-20475 - Add missing phone info to case api
Noah Miller [Mon, 29 May 2017 22:33:58 +0000 (15:33 -0700)]
Add help text to civicrm.settings.php regarding DSNs containing quotes/backslashes
Tim Otten [Mon, 29 May 2017 21:53:30 +0000 (14:53 -0700)]
Merge pull request #10404 from chrisfromredfin/crm-20604
method cannot be a protected static
Pradeep Nayak [Mon, 29 May 2017 20:43:02 +0000 (02:13 +0530)]
CRM-20655, fixed notice error
----------------------------------------
* CRM-20655: Notice error on batch listing
https://issues.civicrm.org/jira/browse/CRM-20655
deb.monish [Mon, 29 May 2017 15:29:13 +0000 (20:59 +0530)]
CRM-20651: Change partial_amount_pay to partial_amount_to_pay for Partial Payment workflow
deb.monish [Sat, 27 May 2017 20:31:07 +0000 (02:01 +0530)]
CRM-20226: Parent Group do not inherit child group contacts
colemanw [Sat, 27 May 2017 14:52:31 +0000 (09:52 -0500)]
Merge pull request #10366 from JMAConsulting/CRM-20590
CRM-20590, add pre and post hook invocation for delete and create/edi…
Tim Otten [Sat, 27 May 2017 01:53:36 +0000 (18:53 -0700)]
Merge pull request #10421 from davejenx/access-mailing-reports
CRM-20442 - Improve user checking for mailing reports
Tim Otten [Fri, 26 May 2017 01:00:47 +0000 (18:00 -0700)]
CRM-20243 - bower.json - Upgrade to Angular 1.5.x
Two reasons:
* Angular 1.3.x is no longer maintained.
* This is one step toward bringing the CiviCRM and CiviHR codebases into alignment.
Dave Jenkins [Fri, 26 May 2017 17:15:46 +0000 (18:15 +0100)]
Improve user checking for mailing reports
Monish Deb [Fri, 26 May 2017 10:59:44 +0000 (16:29 +0530)]
Merge pull request #10089 from lcdservices/CRM-20370
CRM-20370 click and open reports - add date fields
deb.monish [Thu, 25 May 2017 18:15:04 +0000 (23:45 +0530)]
additional fix
Brian Shaughnessy [Sun, 2 Apr 2017 02:50:58 +0000 (22:50 -0400)]
CRM-20370 click and open reports - add date fields
Tim Otten [Thu, 25 May 2017 18:14:14 +0000 (11:14 -0700)]
Merge pull request #10416 from totten/master-kernel-docblock
(NFC) Civi\API\Kernel - Add more docblocks
Tim Otten [Thu, 25 May 2017 16:47:47 +0000 (09:47 -0700)]
(NFC) Civi\API\Kernel - Add more docblocks
Francesc Bassas i Bullich [Thu, 25 May 2017 08:11:12 +0000 (10:11 +0200)]
Add inline help on advanced search form
Eileen McNaughton [Wed, 24 May 2017 21:29:22 +0000 (09:29 +1200)]
Merge pull request #10344 from GinkgoFJG/CRM-12059
CRM-12059: Added support for hook_civicrm_permissions() on Joomla.
Christopher J. Wells [Wed, 24 May 2017 16:24:21 +0000 (12:24 -0400)]
update getRegistrationContactID to include public visibility so it's usable as a static
Frank J. Gómez [Wed, 24 May 2017 14:11:38 +0000 (10:11 -0400)]
CRM-12059: Replaced bad conditional (always true) with an accurate, more readable, and more efficient one.
Added some code documentation and replaced comments about specific Joomla methods with references to external resources.
Tim Otten [Tue, 23 May 2017 21:50:04 +0000 (14:50 -0700)]
Merge pull request #10385 from seamuslee001/CRM-20561-auth
CRM-20561 Use Composer to install Auth_SASL
projects / civicrm-core.git / log