Eileen McNaughton [Sun, 6 Nov 2016 21:09:34 +0000 (10:09 +1300)]
Merge pull request #9355 from KarinG/patch-4
Update DataSource.php
Karin Gerritsen [Sun, 6 Nov 2016 16:26:33 +0000 (09:26 -0700)]
Update DataSource.php
https://issues.civicrm.org/jira/browse/CRM-19607
Eileen McNaughton [Sun, 6 Nov 2016 07:03:45 +0000 (20:03 +1300)]
Merge pull request #9350 from monishdeb/CRM-19590
CRM-19590: Failed CC Contributions Listed with Status of Pending (Incomplete Transaction) Instead of Failed
Tim Otten [Fri, 4 Nov 2016 17:03:52 +0000 (10:03 -0700)]
Merge pull request #9351 from vedantrathore/comment-fixes
Comment Fixes for CRM/Profile directory
Vedant Rathore [Fri, 4 Nov 2016 00:49:54 +0000 (06:19 +0530)]
Comment Fixes for Profile
deb.monish [Thu, 3 Nov 2016 12:02:49 +0000 (17:32 +0530)]
style fix
deb.monish [Thu, 3 Nov 2016 11:57:32 +0000 (17:27 +0530)]
CRM-19590: Failed CC Contributions Listed with Status of Pending (Incomplete Transaction) Instead of Failed
Yashodha Chaku [Thu, 3 Nov 2016 09:16:19 +0000 (14:46 +0530)]
Merge pull request #9315 from jitendrapurohit/CRM-19642
CRM-19462 - membership autorenew error when included via price set
Yashodha Chaku [Thu, 3 Nov 2016 09:14:22 +0000 (14:44 +0530)]
Merge pull request #9299 from alifrumin/surveydetailsstreetaddress
CRM-19595 : Adding street address to the survey details report
Yashodha Chaku [Thu, 3 Nov 2016 08:57:11 +0000 (14:27 +0530)]
Merge pull request #9342 from JMAConsulting/CRM-19587
CRM-19587, donot delete financial account if its present in civicrm_f…
Yashodha Chaku [Thu, 3 Nov 2016 08:45:16 +0000 (14:15 +0530)]
Merge pull request #9346 from JMAConsulting/CRM-19587-1
CRM-19587, changed variable name and error message
Yashodha Chaku [Wed, 2 Nov 2016 14:57:20 +0000 (20:27 +0530)]
Merge pull request #9337 from eileenmcnaughton/line_item
CRM-19583 show financial type of line items whenbackoffice users view…
Pradeep Nayak [Tue, 1 Nov 2016 12:20:24 +0000 (17:50 +0530)]
CRM-19587, changed variable name and error message
----------------------------------------
* CRM-19587: DB Error when trying to delete FInancial Account
https://issues.civicrm.org/jira/browse/CRM-19587
Pradeep Nayak [Tue, 1 Nov 2016 12:21:41 +0000 (17:51 +0530)]
CRM-19587, Added test
----------------------------------------
* CRM-19587: DB Error when trying to delete FInancial Account
https://issues.civicrm.org/jira/browse/CRM-19587
Pradeep Nayak [Tue, 1 Nov 2016 12:20:54 +0000 (17:50 +0530)]
CRM-19587, code cleanup and fixes
----------------------------------------
* CRM-19587: DB Error when trying to delete FInancial Account
https://issues.civicrm.org/jira/browse/CRM-19587
Pradeep Nayak [Mon, 31 Oct 2016 13:18:19 +0000 (18:48 +0530)]
CRM-19587, donot delete financial account if its present in civicrm_financial_item table
----------------------------------------
* CRM-19587: DB Error when trying to delete FInancial Account
https://issues.civicrm.org/jira/browse/CRM-19587
colemanw [Tue, 1 Nov 2016 23:45:58 +0000 (19:45 -0400)]
Merge pull request #9301 from eileenmcnaughton/quicksearch
CRM-19547 rationalise expensive use of exactMatch search on quicksearch
colemanw [Tue, 1 Nov 2016 23:39:59 +0000 (19:39 -0400)]
Merge pull request #9345 from civicrm/4.7.13-rc
Merge 4.7.13-rc into master
Alice Frumin [Tue, 1 Nov 2016 21:40:47 +0000 (17:40 -0400)]
using addAddressFields
colemanw [Tue, 1 Nov 2016 13:34:25 +0000 (09:34 -0400)]
Merge pull request #9344 from colemanw/cc
Pass-thru empty values from api contribution_sendconfirmation
Coleman Watts [Tue, 1 Nov 2016 04:55:45 +0000 (00:55 -0400)]
Pass-thru empty values from api contribution_sendconfirmation
Coleman Watts [Tue, 1 Nov 2016 04:52:09 +0000 (00:52 -0400)]
Change function signature back
colemanw [Mon, 31 Oct 2016 19:09:10 +0000 (15:09 -0400)]
Merge pull request #9310 from litespeedmarc/CRM-19397
CRM-19397: Don't perform i18n re-write when saving data to cache
Eileen McNaughton [Mon, 31 Oct 2016 09:46:02 +0000 (22:46 +1300)]
Merge pull request #9339 from civicrm/eileenmcnaughton-patch-1
Follow up fix on recently merged ACL cache code fix - this got missed
Eileen McNaughton [Mon, 31 Oct 2016 09:09:23 +0000 (22:09 +1300)]
Follow up fix on recently merged ACL cache code fix - this got missed
Eileen McNaughton [Mon, 31 Oct 2016 07:53:49 +0000 (20:53 +1300)]
Merge pull request #9264 from wmortada/CRM-19503
CRM-19503 Fix errors in Activity Summary Report
Eileen McNaughton [Mon, 31 Oct 2016 02:31:08 +0000 (15:31 +1300)]
Merge pull request #9338 from eileenmcnaughton/pradeep
CRM-16189, more code clean-up.
Pradeep Nayak [Tue, 25 Oct 2016 14:43:03 +0000 (20:13 +0530)]
CRM-16189, code cleanup, removed cruft code, called existing function
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
Pradeep Nayak [Tue, 25 Oct 2016 14:07:03 +0000 (19:37 +0530)]
CRM-16189, code cleanup
----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
https://issues.civicrm.org/jira/browse/CRM-16189
eileenmcnaugton [Mon, 31 Oct 2016 01:11:42 +0000 (14:11 +1300)]
CRM-16189, more code clean-up.
This is a partial of Pradeep's commit. Having made his go stale I have picked off some parts
to reduce the amount still left to merge
Eileen McNaughton [Mon, 31 Oct 2016 00:41:55 +0000 (13:41 +1300)]
Merge pull request #9327 from eileenmcnaughton/pradeep
Fix line item fetch on membership template with priceset.
eileenmcnaugton [Sun, 30 Oct 2016 23:03:06 +0000 (12:03 +1300)]
CRM-19583 show financial type of line items whenbackoffice users view them
Eileen McNaughton [Sun, 30 Oct 2016 20:50:42 +0000 (09:50 +1300)]
Merge pull request #9336 from eileenmcnaughton/line_item
Reformat lineitem.tpl. whitspace only
eileenmcnaugton [Sun, 30 Oct 2016 20:44:41 +0000 (09:44 +1300)]
Reformat lineitem.tpl. whitspace only
colemanw [Sat, 29 Oct 2016 02:19:37 +0000 (22:19 -0400)]
Merge pull request #9304 from colemanw/CRM-17869
CRM-17869 - Revert custom field date search refactoring to support relative dates
colemanw [Sat, 29 Oct 2016 02:19:20 +0000 (22:19 -0400)]
Merge pull request #9334 from monishdeb/CRM-19394
CRM-19394: Fix for custom date range fields
colemanw [Sat, 29 Oct 2016 02:17:35 +0000 (22:17 -0400)]
Merge pull request #9293 from civicrm/4.7.13-rc
4.7.13 rc
deb.monish [Fri, 28 Oct 2016 20:36:38 +0000 (02:06 +0530)]
CRM-19394: Fix for custom date range fields
Eileen McNaughton [Fri, 28 Oct 2016 19:58:48 +0000 (08:58 +1300)]
Merge pull request #9333 from monishdeb/CRM-17807
CRM-17807: unit test to check if invoice is created for paypal std.
colemanw [Fri, 28 Oct 2016 18:56:49 +0000 (14:56 -0400)]
Merge pull request #9332 from jitendrapurohit/CRM-19394-4.7.13-rc
CRM-19394: Fix relative date saved search
colemanw [Fri, 28 Oct 2016 18:50:34 +0000 (14:50 -0400)]
Merge pull request #9324 from jmcclelland/crm-19569
CRM-19569 - use relative links from info page to registration page.
deb.monish [Fri, 28 Oct 2016 16:11:09 +0000 (21:41 +0530)]
CRM-17807: unit test to check if invoice is created for paypal std.
jitendrapurohit [Fri, 28 Oct 2016 09:34:18 +0000 (15:04 +0530)]
Fix relative date saved search
colemanw [Thu, 27 Oct 2016 20:21:43 +0000 (16:21 -0400)]
Merge pull request #9330 from colemanw/CRM-19551
CRM-19551 - Display multiple case activity attachments
Coleman Watts [Thu, 27 Oct 2016 18:59:53 +0000 (14:59 -0400)]
CRM-19551 - Display multiple case activity attachments
colemanw [Thu, 27 Oct 2016 14:59:20 +0000 (10:59 -0400)]
Merge pull request #9325 from colemanw/multicurrency
multicurrency - delete old D6 module
Monish Deb [Thu, 27 Oct 2016 11:47:39 +0000 (17:17 +0530)]
Merge pull request #9328 from jitendrapurohit/warningfix
CRM-19313: Fix custom group page warnings
eileen [Thu, 27 Oct 2016 10:24:04 +0000 (23:24 +1300)]
Fix line item fetch on membership template with priceset.
In conjunction with checking Pradeep's code tidy up I found that the code here is not currently presenting membership
details correctly. I used Pradeep's solution, but I also clarified the process to process quickConfig as close to
the place where it is used as possible - in this case it directly affects the display of the lines.
Ideally we would assign something clearer to the template such as displayLineItemRows rahter than these mystical
parameters"
error: pathspec 'Fix line item fetch on membership template with priceset.
In conjunction with checking Pradeep's code tidy up I found that the code here is not currently presenting membership
details correctly. I used Pradeep's solution, but I also clarified the process to process quickConfig as close to
the place where it is used as possible - in this case it directly affects the display of the lines.
Ideally we would assign something clearer to the template such as displayLineItemRows rahter than these mystical
parameters
eileen [Thu, 27 Oct 2016 11:00:06 +0000 (00:00 +1300)]
Fix lineitem fetch on ContributionView page.
Make the way in which is_quick_config it used explicit (do we want to display line items) rather than hidden
in a parameter in the getLineItem call
Monish Deb [Thu, 27 Oct 2016 11:14:52 +0000 (16:44 +0530)]
Merge pull request #9326 from eileenmcnaughton/cont_page_null
CRM-19478 Handle contribution_page_id = 'null' oddity.
jitendrapurohit [Thu, 27 Oct 2016 10:42:08 +0000 (16:12 +0530)]
Fix custom group page warnings
eileen [Thu, 27 Oct 2016 08:15:10 +0000 (21:15 +1300)]
CRM-19478 Handle contribution_page_id = 'null' oddity.
I can't quite figure out the full flow here but this fix has been tested by Stoob & confirmed
Monish Deb [Thu, 27 Oct 2016 07:28:12 +0000 (12:58 +0530)]
Merge pull request #9314 from liedekef/searchmember
CRM-19556 : Allow to search on just being an active member
Coleman Watts [Thu, 27 Oct 2016 01:24:34 +0000 (21:24 -0400)]
Custom field form cleanup
Franky Van Liedekerke [Wed, 26 Oct 2016 21:44:31 +0000 (23:44 +0200)]
Stylefix
eileen [Thu, 20 Oct 2016 05:35:51 +0000 (18:35 +1300)]
CRM-19547 rationalise expensive use of exactMatch search on quicksearch
- do not do exact match when the string is just a wildcard (it will never be an exact match)
- do not do exact match when the search is an email & there is no @ (it will never be an exact match)
- do not do exact match when the search is for sort_name and prepending wildcards is disabled for the site (it
is functionally equivalent
Change-Id: I17506264eb24f88b6818b014ce248580df1d962c
Coleman Watts [Wed, 26 Oct 2016 19:15:17 +0000 (15:15 -0400)]
multicurrency - delete old D6 module
Jamie McClelland [Wed, 26 Oct 2016 16:54:09 +0000 (12:54 -0400)]
CRM-19569 - use relative links from info page to registration page.
Monish Deb [Wed, 26 Oct 2016 13:12:26 +0000 (18:42 +0530)]
Merge pull request #8889 from fuzionnz/CRM-9484
CRM-9484: Handle message formats more robustly
Monish Deb [Wed, 26 Oct 2016 12:57:33 +0000 (18:27 +0530)]
Merge pull request #8956 from TobiasLounsbury/CRM-19278
CRM-19278: Added logic to support all return status codes for the Goo…
Monish Deb [Wed, 26 Oct 2016 11:42:54 +0000 (17:12 +0530)]
Merge pull request #9321 from monishdeb/CRM-19561
CRM-19561: When using Pay Later with a Price Set, Contribution Details in Email Receipt are Blank
Monish Deb [Wed, 26 Oct 2016 10:55:04 +0000 (16:25 +0530)]
Merge pull request #9316 from tschuettler/CRM-19563
CRM-19563: Add mapping_type_id, name and description to mappings from…
tschuettler [Wed, 26 Oct 2016 09:48:07 +0000 (11:48 +0200)]
added missing group assignment
deb.monish [Wed, 26 Oct 2016 07:37:06 +0000 (13:07 +0530)]
CRM-19561: When using Pay Later with a Price Set, Contribution Details in Email Receipt are Blank
colemanw [Wed, 26 Oct 2016 01:52:26 +0000 (21:52 -0400)]
Merge pull request #9320 from colemanw/CRM-19543
CRM-19543 - Fix integer 0 matching for api pseudoconstants
colemanw [Wed, 26 Oct 2016 01:04:34 +0000 (21:04 -0400)]
Merge pull request #9319 from colemanw/CRM-19506-rc
CRM-19506 - Remove conflicting uniqueName from CaseContact DAO
Coleman Watts [Tue, 25 Oct 2016 21:14:07 +0000 (17:14 -0400)]
CRM-19543 - Don't match pseudoconstants when using comparison operators
Coleman Watts [Tue, 25 Oct 2016 19:20:49 +0000 (15:20 -0400)]
CRM-19543 - Fix integer 0 matching for api pseudoconstants
Franky Van Liedekerke [Tue, 25 Oct 2016 20:21:51 +0000 (22:21 +0200)]
Show better text when executing the search
Coleman Watts [Tue, 25 Oct 2016 17:26:14 +0000 (13:26 -0400)]
CRM-19506 - Remove conflicting uniqueName from CaseContact DAO
This uniqueName did not seem to serve any purpose, and was ambiguous,
easily confused with the "id" column.
Coleman Watts [Sat, 15 Oct 2016 03:06:22 +0000 (23:06 -0400)]
CRM-19506 - Add caseContact test
Thomas Schüttler [Tue, 25 Oct 2016 14:35:14 +0000 (16:35 +0200)]
CRM-19563: Add mapping_type_id, name and description to mappings from search builder
jitendrapurohit [Tue, 25 Oct 2016 06:33:59 +0000 (12:03 +0530)]
CRM-19642 - membership autorenew error when included via price set
Eileen McNaughton [Mon, 24 Oct 2016 23:29:46 +0000 (12:29 +1300)]
Merge pull request #9246 from eileenmcnaughton/bjorn
CRM-19494 Refactoring of permission code
Franky Van Liedekerke [Mon, 24 Oct 2016 21:56:18 +0000 (23:56 +0200)]
Allow to search on just being an active member
Monish Deb [Mon, 24 Oct 2016 18:14:17 +0000 (23:44 +0530)]
Merge pull request #9313 from tschuettler/CRM-19559
CRM-19559: CRM_Contact_BAO_Contact_Utils - Fix handling of postal_co…
Thomas Schüttler [Mon, 24 Oct 2016 12:36:52 +0000 (14:36 +0200)]
CRM-19559 - CRM_Contact_BAO_Contact_Utils - Fix handling of postal_code in contactDetails()
Monish Deb [Mon, 24 Oct 2016 11:26:53 +0000 (16:56 +0530)]
Merge pull request #8424 from seamuslee001/CRM-18594
CRM-18594 Attempt to add test to check aphabetical event type
eileenmcnaugton [Mon, 24 Oct 2016 08:50:26 +0000 (21:50 +1300)]
CRM-19557 Fix ACL caching function to not use inefficient query for view my contact
Conflicts:
CRM/Contact/BAO/Contact/Permission.php
eileen [Fri, 14 Oct 2016 17:08:20 +0000 (18:08 +0100)]
Return explicit FALSE for test expectation
Change-Id: Ic975b736eae4edf145636b01cb6e618bbfc0ab70
eileen [Fri, 14 Oct 2016 15:13:23 +0000 (16:13 +0100)]
CRM-12645 remove unused function
eileen [Fri, 14 Oct 2016 15:06:29 +0000 (16:06 +0100)]
CRM-12645 remove replaced function
eileen [Fri, 14 Oct 2016 14:24:13 +0000 (15:24 +0100)]
CRM-12645 fix regression in previous refactor
eileenmcnaugton [Mon, 29 Feb 2016 05:48:46 +0000 (18:48 +1300)]
CRM-18120 make acl query less debilitating
eileen [Thu, 13 Oct 2016 16:17:55 +0000 (17:17 +0100)]
CRM-12645 fix the code that calls the links function to not whomp it.
Also, index rows by id so array_keys is useful
eileen [Thu, 13 Oct 2016 16:04:56 +0000 (17:04 +0100)]
Minor in-passing tidy-ups
eileen [Thu, 13 Oct 2016 14:10:51 +0000 (15:10 +0100)]
Fix enotice
systopia [Thu, 13 Oct 2016 10:48:20 +0000 (11:48 +0100)]
implementing @eileen's suggestions:
- style
- extra test
- documentation
- FIXME remarks
systopia [Wed, 12 Oct 2016 21:51:26 +0000 (22:51 +0100)]
obeying master jenkins
obeying master jenkins
systopia [Wed, 12 Oct 2016 20:47:32 +0000 (21:47 +0100)]
using new Permission::allowList to fix CRM-12645
systopia [Wed, 12 Oct 2016 20:21:08 +0000 (21:21 +0100)]
finished unit tests
systopia [Wed, 12 Oct 2016 20:19:50 +0000 (21:19 +0100)]
fixed bug in the original function
systopia [Wed, 12 Oct 2016 20:19:12 +0000 (21:19 +0100)]
fixed: EDIT implies VIEW
systopia [Wed, 12 Oct 2016 13:02:06 +0000 (14:02 +0100)]
unit tests for new list permission functions (wip)
systopia [Wed, 12 Oct 2016 11:28:01 +0000 (12:28 +0100)]
unit tests for new list permission functions (wip)
systopia [Wed, 12 Oct 2016 11:27:42 +0000 (12:27 +0100)]
adding new list permission functions (wip)
systopia [Tue, 11 Oct 2016 23:55:16 +0000 (00:55 +0100)]
started unit tests for new list permission functions
systopia [Tue, 11 Oct 2016 23:54:54 +0000 (00:54 +0100)]
cleanup and documentation
systopia [Tue, 11 Oct 2016 23:53:17 +0000 (00:53 +0100)]
added check for 'view/edit my contact'
systopia [Tue, 11 Oct 2016 23:51:28 +0000 (00:51 +0100)]
added new list permission functions
projects / civicrm-core.git / log