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
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)
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
eileenmcnaughton [Tue, 30 Jun 2015 00:06:52 +0000 (00:06 +0000)]
phpcs fixes
eileenmcnaughton [Mon, 29 Jun 2015 23:00:09 +0000 (23:00 +0000)]
switch to FALSE when no passed - seems clearer
Dave Greenberg [Mon, 29 Jun 2015 22:58:13 +0000 (15:58 -0700)]
Merge pull request #6091 from davecivicrm/CRM-16747
CRM-16747 - Include missing ContactReference.tpl in OnBehalf profile …
eileenmcnaughton [Mon, 29 Jun 2015 22:55:47 +0000 (22:55 +0000)]
put back check that has been passed in when filtering
Seamus Lee [Mon, 29 Jun 2015 22:08:58 +0000 (22:08 +0000)]
Fix PHP style issues
Seamus Lee [Mon, 29 Jun 2015 22:05:47 +0000 (22:05 +0000)]
Fix up SQL errors found by dave
eileenmcnaughton [Mon, 29 Jun 2015 21:55:10 +0000 (21:55 +0000)]
stop trying to retrieve value from non-existant parameter
eileenmcnaughton [Mon, 29 Jun 2015 21:42:43 +0000 (21:42 +0000)]
enotice fix
eileenmcnaughton [Mon, 29 Jun 2015 21:39:19 +0000 (21:39 +0000)]
enotice fix
eileenmcnaughton [Mon, 29 Jun 2015 21:20:12 +0000 (21:20 +0000)]
fix visibility on moved funciton
eileenmcnaughton [Mon, 29 Jun 2015 21:16:41 +0000 (21:16 +0000)]
fix for test payment processors not loading
Monish Deb [Mon, 29 Jun 2015 18:09:56 +0000 (23:39 +0530)]
Merge pull request #6105 from rohankatkar/CRM-16755
CRM-16755: Case Summary Report - Invalid number of entries
kurund [Mon, 29 Jun 2015 17:55:19 +0000 (23:25 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-06-29-23-22-39
Conflicts:
CRM/Contribute/Form/Search.php
CRM/Core/Lock.php
Monish Deb [Mon, 29 Jun 2015 13:52:27 +0000 (19:22 +0530)]
Merge pull request #6103 from jitendrapurohit/CRM-16764
CRM-16764 fix for 'Find Respondents To Interview' and 'Find Respondents To Release' thr…
Web Access [Mon, 29 Jun 2015 13:13:51 +0000 (18:43 +0530)]
Fix for CRM-16755
jitendrapurohit [Mon, 29 Jun 2015 09:57:18 +0000 (15:27 +0530)]
'Find Respondents To Interview' and 'Find Respondents To Release' throws DB error
Sudha Bisht [Mon, 29 Jun 2015 07:06:34 +0000 (12:36 +0530)]
Fix for event info message
Eileen McNaughton [Mon, 29 Jun 2015 06:26:45 +0000 (18:26 +1200)]
phpcs follow ups & clarify variable
Eileen McNaughton [Mon, 29 Jun 2015 06:15:56 +0000 (18:15 +1200)]
remove snippet refs now we have moved the payment form & custom data form out of event form
Eileen McNaughton [Mon, 29 Jun 2015 06:08:50 +0000 (18:08 +1200)]
Fix conflict on visibility of ->_paymentProcessors
In order to resolve the conflict on 'protected' I moved functions where it was accessed form ->_paymentProcessors
to an inherited form class. In general the moves make sense - ie. having a function on contribution shared by event is not good,
Nor is having a function on the BAO called by forms.
Eileen McNaughton [Sun, 28 Jun 2015 21:06:52 +0000 (09:06 +1200)]
Merge pull request #6099 from eileenmcnaughton/CRM-16755
CRM-16755 do not load invalid payment processors
Eileen McNaughton [Sun, 28 Jun 2015 21:06:42 +0000 (09:06 +1200)]
Merge pull request #6098 from eileenmcnaughton/master
CRM-16417 post refactoring
Monish Deb [Sun, 28 Jun 2015 19:24:22 +0000 (00:54 +0530)]
Merge pull request #6095 from jitendrapurohit/webtestfixes
webtest fix
Monish Deb [Sun, 28 Jun 2015 19:23:54 +0000 (00:53 +0530)]
Merge pull request #6096 from sudhabisht/4.6QA
Fix for AddCaseTypeTest failure
Monish Deb [Sun, 28 Jun 2015 19:22:31 +0000 (00:52 +0530)]
Merge pull request #6094 from rohankatkar/Webtest--4.6
Webtest Fix-4.6
Yashodha Chaku [Sun, 28 Jun 2015 14:32:50 +0000 (20:02 +0530)]
Merge pull request #6100 from yashodha/webtest
skipping webtests that are working locally and not on Jenkins
Eileen McNaughton [Sun, 28 Jun 2015 13:52:17 +0000 (01:52 +1200)]
phpcs fix
Eileen McNaughton [Sun, 28 Jun 2015 13:29:47 +0000 (01:29 +1200)]
CRM-16755 fix loading of payment processors (exclude invalid & regression on event
colemanw [Sun, 28 Jun 2015 13:25:35 +0000 (09:25 -0400)]
Merge pull request #6011 from eileenmcnaughton/CRM-16676
CRM-16676 replace distributed custom data form
Eileen McNaughton [Sun, 28 Jun 2015 12:54:49 +0000 (00:54 +1200)]
minor signaure fix
Eileen McNaughton [Sun, 28 Jun 2015 12:45:17 +0000 (00:45 +1200)]
CRM-16755 do not load invalid payment processors
yashodha [Sun, 28 Jun 2015 06:59:42 +0000 (12:29 +0530)]
skipping webtests that are working locally and not on Jenkins
Eileen McNaughton [Sun, 28 Jun 2015 06:30:29 +0000 (18:30 +1200)]
CRM-16417 follow up to refactor
Eileen McNaughton [Sun, 28 Jun 2015 06:03:13 +0000 (18:03 +1200)]
missing parentheses
Eileen McNaughton [Sun, 28 Jun 2015 05:51:49 +0000 (17:51 +1200)]
CRM-16417 fully remove renewMembershipFormWrapper
This function was a temporary refactoring function as part of moving the interaction
with the form layer back to the form layer & is not fully gone
Eileen McNaughton [Sat, 27 Jun 2015 20:54:22 +0000 (08:54 +1200)]
CRM-16471 post refactoring - extract pending status from form
Eileen McNaughton [Sat, 27 Jun 2015 20:40:23 +0000 (08:40 +1200)]
CRM-16417 merge one-off function back in
(This is just a refactoring process - at this stage it's clearer in the main function)
Eileen McNaughton [Sat, 27 Jun 2015 20:21:20 +0000 (08:21 +1200)]
Merge pull request #6093 from eileenmcnaughton/master
CRM-16417 post-refactoring, pass renewal Date from the form rather th…
Coleman Watts [Sat, 27 Jun 2015 18:15:00 +0000 (14:15 -0400)]
CRM-16676 - Update customData js code
colemanw [Sat, 27 Jun 2015 17:20:21 +0000 (13:20 -0400)]
Merge pull request #6097 from colemanw/image
Better sizing of image popups
Coleman Watts [Fri, 26 Jun 2015 19:39:40 +0000 (15:39 -0400)]
Better sizing of image popups
Sudha Bisht [Fri, 26 Jun 2015 13:27:31 +0000 (18:57 +0530)]
Fix for AddCaseTypeTest failure
jitendrapurohit [Fri, 26 Jun 2015 13:22:07 +0000 (18:52 +0530)]
webtest fix
Web Access [Fri, 26 Jun 2015 13:11:17 +0000 (18:41 +0530)]
Webtest Fix-4.6
Monish Deb [Fri, 26 Jun 2015 06:50:22 +0000 (12:20 +0530)]
Merge pull request #6089 from monishdeb/master
CRM-16741 fix - Invalid relationship is shown when selecting "relatio…
Eileen McNaughton [Fri, 26 Jun 2015 04:22:54 +0000 (16:22 +1200)]
CRM-16417 move calculation of pending status closer to where it is derived (the form)
Eileen McNaughton [Fri, 26 Jun 2015 04:12:07 +0000 (16:12 +1200)]
CRM-16417 post-refactoring, pass renewal Date from the form rather than try to extract in the BAO
Eileen McNaughton [Fri, 26 Jun 2015 02:17:54 +0000 (14:17 +1200)]
Merge pull request #6090 from eileenmcnaughton/master
CRM-16417 towards incorporating follow on refactors
Dave Greenberg [Fri, 26 Jun 2015 00:05:30 +0000 (17:05 -0700)]
CRM-16747 - Include missing ContactReference.tpl in OnBehalf profile form template.
----------------------------------------
* CRM-16747: Contact Reference fields do not work in profiles present on "On Behalf Of" Contribution pages.
https://issues.civicrm.org/jira/browse/CRM-16747
Eileen McNaughton [Thu, 25 Jun 2015 23:44:28 +0000 (11:44 +1200)]
CRM-16417 towards incorporating follow on refactors
The work on CRM-16417 allows a bunch of follow on refactors. As this one involves extracting it creates a hard to read patch
to it has been pulled out to a separate PR
Dave Greenberg [Thu, 25 Jun 2015 21:20:53 +0000 (14:20 -0700)]
Merge pull request #6076 from mallezie/crm-16707
CRM-16707 Make token usage the responsibality of the form
monishdeb [Thu, 25 Jun 2015 20:23:16 +0000 (01:53 +0530)]
CRM-16741 fix - Invalid relationship is shown when selecting "relationship type"
https://issues.civicrm.org/jira/browse/CRM-16741
Eileen McNaughton [Sun, 14 Jun 2015 02:43:35 +0000 (14:43 +1200)]
whitespace fix
Eileen McNaughton [Wed, 13 May 2015 23:46:08 +0000 (11:46 +1200)]
Replace 'distributed' custom data form with an actual custom data form & use it to get snippets
Eileen McNaughton [Sun, 14 Jun 2015 02:23:11 +0000 (14:23 +1200)]
CRM-16676 post new-form cleanup
colemanw [Thu, 25 Jun 2015 17:57:45 +0000 (13:57 -0400)]
Merge pull request #6061 from colemanw/require_once
Remove unnecessary require_once
Monish Deb [Thu, 25 Jun 2015 12:44:23 +0000 (18:14 +0530)]
Merge pull request #5729 from mlutfy/47-crm14588
CRM-14588: Format date fields in contribution confirm page.
Monish Deb [Thu, 25 Jun 2015 12:43:41 +0000 (18:13 +0530)]
Merge pull request #6010 from eileenmcnaughton/CRM-16675-2
CRM-16675 move functions only used by (deprecated) contribution proce…
Yashodha Chaku [Thu, 25 Jun 2015 11:27:31 +0000 (16:57 +0530)]
Merge pull request #6065 from yashodha/CRM-16665.master
CRM-16665: add followup functionality for email
Monish Deb [Thu, 25 Jun 2015 10:43:42 +0000 (16:13 +0530)]
Merge pull request #5593 from relldoesphp/CRM-15992
CRM-15992 update primary membership
Monish Deb [Thu, 25 Jun 2015 10:33:58 +0000 (16:03 +0530)]
Merge pull request #6064 from sfe-ev/fix-dompdf-reinvoke
Fix CRM_Utils_PDF_Utils::_html2pdf_dompdf() when invoked more than once
Monish Deb [Thu, 25 Jun 2015 10:15:43 +0000 (15:45 +0530)]
Merge pull request #6074 from johanv/CRM-16736_null
CRM-16736 - changed 'null' into NULL.
yashodha [Thu, 25 Jun 2015 08:53:34 +0000 (14:23 +0530)]
CRM-16665: fix variable
----------------------------------------
* CRM-16665: Add followup activity to "Send Email" form
https://issues.civicrm.org/jira/browse/CRM-16665
Yashodha Chaku [Thu, 25 Jun 2015 06:37:15 +0000 (12:07 +0530)]
Merge pull request #6086 from Seb35/master
CRM-16740 - No possibility to select "no premium image"
Tim Otten [Thu, 25 Jun 2015 04:16:44 +0000 (21:16 -0700)]
Merge pull request #5840 from totten/4.6-cron-lock-2
CiviMail locks - Tests, fixes, and cleanups
Eileen McNaughton [Thu, 25 Jun 2015 03:53:20 +0000 (15:53 +1200)]
Merge pull request #6084 from eileenmcnaughton/CRM-16417
CRM-16417 always create contributions, even if failed
projects / civicrm-core.git / log