eileenmcnaughton [Wed, 8 Jul 2015 07:48:51 +0000 (07:48 +0000)]
Fix e-notice & add tests around where e-notice was
Eileen McNaughton [Wed, 8 Jul 2015 03:05:33 +0000 (15:05 +1200)]
Merge pull request #6165 from eileenmcnaughton/test
fix misnaming on new test class
Eileen McNaughton [Wed, 8 Jul 2015 03:04:57 +0000 (15:04 +1200)]
fix misnaming on new test class
colemanw [Tue, 7 Jul 2015 18:56:52 +0000 (14:56 -0400)]
Merge pull request #6164 from colemanw/CRM-16354
CRM-16354 Upgrade CKEditor to v4.5
Coleman Watts [Tue, 7 Jul 2015 18:54:30 +0000 (14:54 -0400)]
CRM-16354 Upgrade CKEditor to v4.5
Eileen McNaughton [Tue, 7 Jul 2015 12:23:05 +0000 (00:23 +1200)]
Merge pull request #6149 from eileenmcnaughton/master
CRM-16800 add unit test for membership renewal backoffice form
Monish Deb [Mon, 6 Jul 2015 19:33:11 +0000 (01:03 +0530)]
Merge pull request #6154 from sudhabisht/mQA
CRM test fix
Monish Deb [Mon, 6 Jul 2015 19:32:23 +0000 (01:02 +0530)]
Merge pull request #6155 from rohankatkar/webtest_master
Webtests fix for master
Web Access [Mon, 6 Jul 2015 14:22:58 +0000 (19:52 +0530)]
Webtests fix for master
Sudha Bisht [Mon, 6 Jul 2015 14:04:36 +0000 (19:34 +0530)]
CRM test fix
kurund [Mon, 6 Jul 2015 09:12:10 +0000 (14:42 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-06-14-41-49
Eileen McNaughton [Mon, 6 Jul 2015 03:23:01 +0000 (15:23 +1200)]
phpcs fix
Eileen McNaughton [Mon, 6 Jul 2015 03:21:07 +0000 (15:21 +1200)]
CRM-16800 towards fixing recurring error,
I am trying to figure out what part of this function membership form needs to share as the form has 2 paths
depending on recurring or otherwise. Ideally the create membership function would be used in both cases & recurring
which is a small part of the shared function, could be handled separately
Eileen McNaughton [Mon, 6 Jul 2015 01:43:58 +0000 (13:43 +1200)]
remove unused variables
Eileen McNaughton [Mon, 6 Jul 2015 01:35:17 +0000 (13:35 +1200)]
Merge pull request #6146 from KarinG/patch-8
Edit <title> to avoid clash with other field
Eileen McNaughton [Mon, 6 Jul 2015 01:33:27 +0000 (13:33 +1200)]
phpcs fixes
Eileen McNaughton [Mon, 6 Jul 2015 01:27:01 +0000 (13:27 +1200)]
CRM-16800 add unit test for membership renewal backoffice form
Eileen McNaughton [Mon, 6 Jul 2015 01:24:46 +0000 (13:24 +1200)]
Merge pull request #6148 from eileenmcnaughton/master
CRM-16800 4.7 regression fix + unit test on correct line items for back office member…
Eileen McNaughton [Mon, 6 Jul 2015 00:50:37 +0000 (12:50 +1200)]
CRM-16800 4.7 regression on correct line items for back office membership by credit card
Karin Gerritsen [Sun, 5 Jul 2015 22:01:13 +0000 (16:01 -0600)]
Edit <title> to avoid clash with other field
Both processor_id and payment_processor_id have <title>Payment Processor</title>. This causes issues with imports into the recurring series table (using Eileen's CSV importer) - as the field mapping is stored by title and will always select the first match - even if you previously selected 'the second Payment Processor' <title>. Renaming the <title> for processor_id to Processor ID. Leaving the payment_processor_id <title> as is: Payment Processor
Eileen McNaughton [Sun, 5 Jul 2015 21:17:56 +0000 (09:17 +1200)]
Merge pull request #6144 from eileenmcnaughton/master
Rationalise if statement
colemanw [Sun, 5 Jul 2015 15:58:09 +0000 (11:58 -0400)]
Merge pull request #6140 from colemanw/CRM-16643
CRM-16643 - Deprecate 'setvalue' api action & switch editable default to 'create'
Eileen McNaughton [Sun, 5 Jul 2015 14:07:55 +0000 (02:07 +1200)]
Rationalise if statement
Eileen McNaughton [Sun, 5 Jul 2015 13:08:49 +0000 (01:08 +1200)]
Merge pull request #6143 from eileenmcnaughton/CRM-16788
CRM-16788 add test to check recurring created
Eileen McNaughton [Sun, 5 Jul 2015 12:36:30 +0000 (00:36 +1200)]
phpcs
Eileen McNaughton [Sun, 5 Jul 2015 12:20:21 +0000 (00:20 +1200)]
CRM-16788 phpcs
Eileen McNaughton [Sun, 5 Jul 2015 11:21:10 +0000 (23:21 +1200)]
CRM-16788 formatting fixes
Eileen McNaughton [Sun, 5 Jul 2015 11:09:45 +0000 (23:09 +1200)]
CRM-16788 add test to check recurring created
(This does appear to be working - but on renewal form not so much, this form is adding the test to prepare to fix the other form)
Eileen McNaughton [Sun, 5 Jul 2015 10:49:33 +0000 (22:49 +1200)]
Merge pull request #6142 from eileenmcnaughton/CRM-16799
CRM-16799 Contribution.get api - support 'is_test'
eileenmcnaughton [Sun, 5 Jul 2015 08:16:48 +0000 (08:16 +0000)]
CRM-16799 Contribution.get api - support 'is_test'
It would probably be more correct to accept is_test & make contribution_test an alias of that for backwards compatibility, but this
is the quick version which at least supports the 'right' param
Coleman Watts [Sat, 4 Jul 2015 02:22:49 +0000 (22:22 -0400)]
CRM-16643 - Deprecate 'setvalue' api action & switch editable default to 'create'
Coleman Watts [Sat, 4 Jul 2015 02:00:22 +0000 (22:00 -0400)]
Merge branch '4.6' into master
colemanw [Sat, 4 Jul 2015 01:56:43 +0000 (21:56 -0400)]
Merge pull request #6138 from colemanw/CRM-16643
CRM-16643 - Add 'setvalue' deprecation warning to api explorer
Coleman Watts [Fri, 3 Jul 2015 20:40:59 +0000 (16:40 -0400)]
CRM-16643 - Add 'setvalue' deprecation warning to api explorer
colemanw [Fri, 3 Jul 2015 20:20:44 +0000 (16:20 -0400)]
Merge pull request #6134 from colemanw/CRM-16584
CRM-16584 - Improve bounce management with Mandrilla SMTP
Coleman Watts [Fri, 3 Jul 2015 15:31:13 +0000 (11:31 -0400)]
Whitespace fix
Olivier [Fri, 3 Jul 2015 14:05:41 +0000 (10:05 -0400)]
CRM-16584 - Improve bounce management with Mandrilla SMTP
colemanw [Fri, 3 Jul 2015 13:37:24 +0000 (09:37 -0400)]
Merge pull request #6129 from colemanw/CRM-16793
CRM-16793 - Fix editing group names
colemanw [Fri, 3 Jul 2015 13:31:33 +0000 (09:31 -0400)]
Merge pull request #6132 from colemanw/CRM-16795
CRM-16795 - Fix z-index conflict btw WP admin bar and popups
Coleman Watts [Fri, 3 Jul 2015 13:28:41 +0000 (09:28 -0400)]
CRM-16795 - Fix z-index conflict btw WP admin bar and popups
Monish Deb [Fri, 3 Jul 2015 09:43:08 +0000 (15:13 +0530)]
Merge pull request #6124 from sudhabisht/46qa
Webtest Failure
Yashodha Chaku [Fri, 3 Jul 2015 08:43:23 +0000 (14:13 +0530)]
Merge pull request #6130 from civicrm/revert-6117-CRM-16735.4.6
Revert "CRM-16735: PCP notification email should not be sent when con…
Yashodha Chaku [Fri, 3 Jul 2015 12:21:33 +0000 (17:51 +0530)]
Revert "CRM-16735: PCP notification email should not be sent when contributio…"
Sudha Bisht [Fri, 3 Jul 2015 07:06:37 +0000 (12:36 +0530)]
Format Fixs
Sudha Bisht [Thu, 2 Jul 2015 15:06:20 +0000 (20:36 +0530)]
Format fix
Sudha Bisht [Thu, 2 Jul 2015 14:47:32 +0000 (20:17 +0530)]
Removed unwanted code
Sudha Bisht [Thu, 2 Jul 2015 14:39:45 +0000 (20:09 +0530)]
Webtest Fix
Yashodha Chaku [Fri, 3 Jul 2015 06:48:42 +0000 (12:18 +0530)]
Merge pull request #6117 from yashodha/CRM-16735.4.6
CRM-16735: PCP notification email should not be sent when contributio…
Coleman Watts [Fri, 3 Jul 2015 00:34:44 +0000 (20:34 -0400)]
CRM-16793 - Fix editing group names
colemanw [Fri, 3 Jul 2015 00:19:09 +0000 (20:19 -0400)]
Merge pull request #6111 from colemanw/CRM-11856
CRM-11856 - Add help text when creating a smart group
Tim Otten [Thu, 2 Jul 2015 22:22:45 +0000 (15:22 -0700)]
Merge branch 'onlyjob-master'
Conflicts:
composer.json
Eileen McNaughton [Thu, 2 Jul 2015 20:52:49 +0000 (08:52 +1200)]
Merge pull request #6123 from eileenmcnaughton/CRM-16788
CRM-16788 regression on membership backoffice not showing auto-renew
colemanw [Thu, 2 Jul 2015 16:53:19 +0000 (12:53 -0400)]
Merge pull request #6128 from colemanw/CRM-16676
CRM-16676 - Fix custom data target containers
Dave Greenberg [Thu, 2 Jul 2015 16:50:19 +0000 (09:50 -0700)]
Merge pull request #6122 from marcov4lente/CRM-16789
CRM-16789 Invoice attachements when tax rate is 0.
Coleman Watts [Thu, 2 Jul 2015 16:46:51 +0000 (12:46 -0400)]
CRM-16676 - Fix custom data target containers
colemanw [Thu, 2 Jul 2015 14:55:35 +0000 (10:55 -0400)]
Merge pull request #6125 from colemanw/CRM-16426-2
CRM-16426 - Rename jquery.ui.datepicker.validation
Coleman Watts [Thu, 2 Jul 2015 14:53:50 +0000 (10:53 -0400)]
CRM-16426 - Rename jquery.ui.datepicker.validation
Eileen McNaughton [Thu, 2 Jul 2015 13:04:17 +0000 (01:04 +1200)]
fix formatting
Eileen McNaughton [Thu, 2 Jul 2015 12:50:14 +0000 (00:50 +1200)]
CRM-16788 regression on membership backoffice not showing auto-renew
Marco Valente [Thu, 2 Jul 2015 11:33:55 +0000 (12:33 +0100)]
CRM-16789 Invoice attachements when tax rate is 0
Correcting the issue: Event or contribution payment invoices is not being sent when
the tax amount is 0 or evaluates to false.
kurund [Thu, 2 Jul 2015 05:36:12 +0000 (11:06 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-02-11-04-42
Conflicts:
tests/phpunit/api/v3/SyntaxConformanceTest.php
Monish Deb [Wed, 1 Jul 2015 21:53:35 +0000 (03:23 +0530)]
Merge pull request #6119 from monishdeb/CRM-16782
CRM-16782 fix - Fatal error on using IN/NOT IN operator on contribution and membership fields
monishdeb [Wed, 1 Jul 2015 21:51:15 +0000 (03:21 +0530)]
Webtest fix
Monish Deb [Wed, 1 Jul 2015 18:52:34 +0000 (00:22 +0530)]
Merge pull request #6118 from sudhabisht/46webtest
Webtest Fix
monishdeb [Wed, 1 Jul 2015 14:32:14 +0000 (20:02 +0530)]
CRM-16782 fix - Fatal error on using IN/NOT IN operator on contribution and membership fields
https://issues.civicrm.org/jira/browse/CRM-16782
Monish Deb [Wed, 1 Jul 2015 14:01:57 +0000 (19:31 +0530)]
Merge pull request #6116 from rohankatkar/webtest4.6
Webtest fix - 4.6
Monish Deb [Wed, 1 Jul 2015 14:01:45 +0000 (19:31 +0530)]
Merge pull request #6115 from monishdeb/master
CRM-16780 fix - Fatal Error on Relationship Edit page
Sudha Bisht [Wed, 1 Jul 2015 13:59:24 +0000 (19:29 +0530)]
Webtest Fix
yashodha [Wed, 1 Jul 2015 13:48:13 +0000 (19:18 +0530)]
line spacing fix
yashodha [Wed, 1 Jul 2015 11:40:36 +0000 (17:10 +0530)]
CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added
----------------------------------------
* CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added
https://issues.civicrm.org/jira/browse/CRM-16735
yashodha [Wed, 1 Jul 2015 10:54:43 +0000 (16:24 +0530)]
CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added
----------------------------------------
* CRM-16735: PCP notification email should not be sent when contribution record is updated UNLESS a new PCP soft credit is added
https://issues.civicrm.org/jira/browse/CRM-16735
Kurund Jalmi [Wed, 1 Jul 2015 09:25:08 +0000 (14:55 +0530)]
Merge pull request #6113 from laryn/patch-2
Add warning about backing up database before import - CRM-16778
Eileen McNaughton [Wed, 1 Jul 2015 08:52:05 +0000 (20:52 +1200)]
Merge pull request #6088 from eileenmcnaughton/CRM-16473
CRM-16473 api:user Add user.get api
monishdeb [Wed, 1 Jul 2015 07:44:56 +0000 (13:14 +0530)]
format fixes
Web Access [Wed, 1 Jul 2015 07:14:47 +0000 (12:44 +0530)]
Webtest fix - 4.6
monishdeb [Wed, 1 Jul 2015 07:07:21 +0000 (12:37 +0530)]
CRM-16780 fix - Fatal Error on Relationship Edit page
https://issues.civicrm.org/jira/browse/CRM-16780
Monish Deb [Wed, 1 Jul 2015 04:48:38 +0000 (10:18 +0530)]
Merge pull request #6106 from monishdeb/master
CRM-14588 fix - Non Local Date format used in membership thank you an…
Monish Deb [Wed, 1 Jul 2015 04:38:38 +0000 (10:08 +0530)]
Merge pull request #6109 from rohankatkar/CRM--16745
CRM-16745: Payment Instrument/Payment Method should offer a multi-select option when searching for Contrbutions
Eileen McNaughton [Wed, 1 Jul 2015 02:03:20 +0000 (14:03 +1200)]
cleanup uf match in custom data test
Eileen McNaughton [Wed, 1 Jul 2015 02:00:41 +0000 (14:00 +1200)]
CRM-16473 - createLoggedInUser in setup & in test - reduce to setup only
Eileen McNaughton [Tue, 30 Jun 2015 21:51:14 +0000 (09:51 +1200)]
CRM-16473 test fixes to support addition of User api & uf_match entry to createLoggedInUser
Laryn [Tue, 30 Jun 2015 21:50:45 +0000 (16:50 -0500)]
Add warning about backing up database
This was just a suggestion as per this discussion:
http://civicrm.stackexchange.com/questions/3644/error-uploading-civicrm-contacts-can-i-revert
Eileen McNaughton [Tue, 30 Jun 2015 21:49:15 +0000 (09:49 +1200)]
CRM-16473 add user api test
Eileen McNaughton [Tue, 30 Jun 2015 21:47:59 +0000 (09:47 +1200)]
CRM-16473 API: user.get - add user get api (drupal only)
Coleman Watts [Tue, 30 Jun 2015 21:25:15 +0000 (17:25 -0400)]
CRM-11856 - Copy/paste the fix to copy/pasted code
Coleman Watts [Tue, 30 Jun 2015 20:58:14 +0000 (16:58 -0400)]
CRM-11856 - Add help text when creating a smart group
Coleman Watts [Tue, 30 Jun 2015 19:10:08 +0000 (15:10 -0400)]
Fix task button icon
Yashodha Chaku [Tue, 30 Jun 2015 16:33:45 +0000 (22:03 +0530)]
Merge pull request #6108 from sudhabisht/CRM-16772
Fix for displaying primary email id on print case report
Yashodha Chaku [Tue, 30 Jun 2015 16:32:09 +0000 (22:02 +0530)]
Merge pull request #6110 from jitendrapurohit/webtestfixes
webtest fix for Address Import
Dave Greenberg [Tue, 30 Jun 2015 15:01:19 +0000 (08:01 -0700)]
Merge pull request #5839 from seamuslee001/CRM-9764-4-6
CRM-9764 Ensure all custom searches have ACL - Backport to 4.6
jitendrapurohit [Tue, 30 Jun 2015 13:23:48 +0000 (18:53 +0530)]
webtest fix for Address Import
Web Access [Tue, 30 Jun 2015 12:12:37 +0000 (17:42 +0530)]
Fix for CRM-16745
Sudha Bisht [Tue, 30 Jun 2015 11:02:50 +0000 (16:32 +0530)]
Fix for displaying primary id on print case report
Monish Deb [Tue, 30 Jun 2015 10:53:07 +0000 (16:23 +0530)]
Merge pull request #6101 from eileenmcnaughton/monish
Fix conflict on visibility of ->_paymentProcessors
Yashodha Chaku [Tue, 30 Jun 2015 10:19:00 +0000 (15:49 +0530)]
Merge pull request #6107 from yashodha/CRM-16768
CRM-16768: Invoice template function uses domain id instead of contac…
monishdeb [Tue, 30 Jun 2015 07:22:20 +0000 (12:52 +0530)]
minor fix
monishdeb [Mon, 29 Jun 2015 13:51:45 +0000 (19:21 +0530)]
CRM-14588 fix - Non Local Date format used in membership thank you and confirm contribution pages
https://issues.civicrm.org/jira/browse/CRM-14588
yashodha [Tue, 30 Jun 2015 07:13:47 +0000 (12:43 +0530)]
CRM-16768: Invoice template function uses domain id instead of contact id to get address parts
----------------------------------------
* CRM-16768: Invoice template function uses domain id instead of contact id to get address parts
https://issues.civicrm.org/jira/browse/CRM-16768
Monish Deb [Tue, 30 Jun 2015 05:56:41 +0000 (11:26 +0530)]
Merge pull request #6102 from sudhabisht/CRM-16685
Fix for status message while displaying disabled event info.
Seamus Lee [Tue, 30 Jun 2015 05:12:26 +0000 (05:12 +0000)]
Fix minor typo
projects / civicrm-core.git / log