eileen [Fri, 6 Nov 2015 07:52:02 +0000 (23:52 -0800)]
CRM-16929 price set calcs
Consolidate calculation to a single function, always store calculated total on the form (even if not visible)
for consistent calcs.
This means the 'raw-data' attribute is calculated regardless of whether we are working with a
'price set' or a 'quick config' priceset and can always be used for calculating whether to show it
eileen [Wed, 11 Nov 2015 22:14:06 +0000 (14:14 -0800)]
Refactor part of calculate.tpl towards CRM-16929
eileen [Wed, 11 Nov 2015 22:08:14 +0000 (14:08 -0800)]
fix indentation
Eileen McNaughton [Wed, 11 Nov 2015 17:50:24 +0000 (09:50 -0800)]
Merge pull request #7181 from eileenmcnaughton/CRM-17335-2
CRM-17335 toward eliminating use of leaky static
eileen [Tue, 10 Nov 2015 21:22:41 +0000 (13:22 -0800)]
CRM-17335 toward eliminating use of leaky static
Change-Id: I9181add19192993a2bfb994cd1b03397e77ba4d3
Monish Deb [Tue, 10 Nov 2015 06:10:54 +0000 (11:40 +0530)]
Merge pull request #7172 from eileenmcnaughton/ws
remove trailing spaces
eileen [Tue, 10 Nov 2015 03:13:17 +0000 (19:13 -0800)]
remove trailing spaces
Dave Greenberg [Tue, 10 Nov 2015 00:45:40 +0000 (16:45 -0800)]
Merge pull request #7171 from davecivicrm/CRM-17503
CRM-17503 - PayPal Express supports recurring - process_type row change.
Dave Greenberg [Tue, 10 Nov 2015 00:40:06 +0000 (16:40 -0800)]
CRM-17503 - PayPal Express supports recurring - process_type row change.
----------------------------------------
* CRM-17503: Paypal express should formally support recurring
https://issues.civicrm.org/jira/browse/CRM-17503
Eileen McNaughton [Mon, 9 Nov 2015 19:27:30 +0000 (11:27 -0800)]
Merge pull request #7158 from kemal-bay/master
CRM-17147 People with empty deceased-flag ('is null') get removed fro…
Monish Deb [Mon, 9 Nov 2015 19:09:16 +0000 (00:39 +0530)]
Merge pull request #7165 from monishdeb/testFailures
Core Bugs(CRM-17535,CRM-17530) and Webtest fixes in 4.7beta1
monishdeb [Mon, 9 Nov 2015 14:57:42 +0000 (20:27 +0530)]
Core Bugs and Webtest fixes in 4.7beta1
Monish Deb [Mon, 9 Nov 2015 14:51:11 +0000 (20:21 +0530)]
Merge pull request #7164 from rohankatkar/master-4.7-webtests
Webtests Fixes - Master
Web Access [Mon, 9 Nov 2015 13:20:29 +0000 (18:50 +0530)]
Webtests Fixes - Master
Kurund Jalmi [Mon, 9 Nov 2015 08:38:47 +0000 (14:08 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-11-09-14-08-33
Eileen McNaughton [Sun, 8 Nov 2015 18:25:02 +0000 (10:25 -0800)]
Merge pull request #7160 from saurabhbatra96/CRM-17516
CRM-17516 Declare previously undefined variable as NULL.
Saurabh Batra [Sun, 8 Nov 2015 16:35:48 +0000 (22:05 +0530)]
CRM-17516 Declare previously undefined variable as NULL.
----------------------------------------
* CRM-17516:
https://issues.civicrm.org/jira/browse/CRM-17516
Kemal Bay [Sun, 8 Nov 2015 13:34:20 +0000 (15:34 +0200)]
CRM-17147 People with empty deceased-flag ('is null') get removed from recipient list of a mailing
Monish Deb [Sat, 7 Nov 2015 20:58:55 +0000 (02:28 +0530)]
Merge pull request #7149 from monishdeb/testFailures
4.7beta1 webtest and corebug fixes
monishdeb [Sat, 7 Nov 2015 16:40:17 +0000 (22:10 +0530)]
webtest fixes
Monish Deb [Sat, 7 Nov 2015 15:02:59 +0000 (20:32 +0530)]
Merge pull request #7146 from rohankatkar/4.7-master-webtests
Webtests fixes
colemanw [Sat, 7 Nov 2015 12:23:54 +0000 (07:23 -0500)]
Merge pull request #7153 from lcdservices/CRM-17524
CRM-17524 user id link less restrictive
Brian Shaughnessy [Sat, 7 Nov 2015 04:24:28 +0000 (23:24 -0500)]
CRM-17524 user id link less restrictive
colemanw [Sat, 7 Nov 2015 00:38:46 +0000 (19:38 -0500)]
Merge pull request #6515 from johanv/CRM-13725-duplicate_realtionships_check_custom_fields
CRM-13725 check custom fields to test for duplicate relationship.
colemanw [Sat, 7 Nov 2015 00:35:04 +0000 (19:35 -0500)]
Merge pull request #7151 from colemanw/CRM-17323
CRM-17323 - Fix site registration links
colemanw [Sat, 7 Nov 2015 00:34:06 +0000 (19:34 -0500)]
Merge pull request #7150 from colemanw/CRM-13823
CRM-13823 - Add menu link
Dave Greenberg [Fri, 6 Nov 2015 21:37:48 +0000 (13:37 -0800)]
Merge pull request #7141 from agh1/report-print-header
Issues with printing reports
Dave Greenberg [Fri, 6 Nov 2015 21:27:52 +0000 (13:27 -0800)]
Merge pull request #7134 from eileenmcnaughton/CRM-17500
CRM-17500 fix display name etc not being updated from billing
Dave Greenberg [Fri, 6 Nov 2015 19:47:25 +0000 (11:47 -0800)]
Merge pull request #7139 from JKingsnorth/CRM-17512
CRM-17512 Improve event sellout messages
Coleman Watts [Fri, 6 Nov 2015 19:17:04 +0000 (14:17 -0500)]
CRM-17323 - Fix site registration links
Coleman Watts [Fri, 6 Nov 2015 19:01:19 +0000 (14:01 -0500)]
CRM-13823 - Add menu link
colemanw [Fri, 6 Nov 2015 16:35:54 +0000 (11:35 -0500)]
Merge pull request #7144 from monishdeb/CRM-17518
CRM-17518 fix - "IN" operator doesn't work on the contact_sub_type fi…
colemanw [Fri, 6 Nov 2015 16:33:49 +0000 (11:33 -0500)]
Merge pull request #7148 from JKingsnorth/CRM-16676
CRM-16676 Further cleanup, unused method
monishdeb [Fri, 6 Nov 2015 15:49:38 +0000 (21:19 +0530)]
4.7beta1 webtest and corebug fixes
JKingsnorth [Fri, 6 Nov 2015 14:10:19 +0000 (14:10 +0000)]
CRM-16676 Further refactoring, unused method
Web Access [Fri, 6 Nov 2015 13:18:57 +0000 (18:48 +0530)]
Webtests fixes
JKingsnorth [Fri, 6 Nov 2015 10:11:57 +0000 (10:11 +0000)]
CRM-17512 Webtest fix
JKingsnorth [Fri, 6 Nov 2015 10:10:10 +0000 (10:10 +0000)]
CRM-17512 Fix webtests
monishdeb [Fri, 6 Nov 2015 06:24:50 +0000 (11:54 +0530)]
CRM-17518 fix - "IN" operator doesn't work on the contact_sub_type field for api.Contact.get
https://issues.civicrm.org/jira/browse/CRM-17518
eileen [Thu, 5 Nov 2015 05:55:03 +0000 (21:55 -0800)]
CRM-17500 fix display name etc not being updated from billing
This is tested here in contribution flow
colemanw [Thu, 5 Nov 2015 21:58:24 +0000 (16:58 -0500)]
Merge pull request #6892 from eileenmcnaughton/CRM-17225-report-save
CRM-17225 add button for reports to be saved in view mode or criteria mode
colemanw [Thu, 5 Nov 2015 21:33:17 +0000 (16:33 -0500)]
Merge pull request #7059 from totten/danaskallman-patch-3
CRM-12227 - Set default extension directory
colemanw [Thu, 5 Nov 2015 21:28:21 +0000 (16:28 -0500)]
Merge pull request #7088 from mollux/CRM-17459
CRM-17459 - fix filtering with api on custom fields.
colemanw [Thu, 5 Nov 2015 21:25:23 +0000 (16:25 -0500)]
Merge pull request #7089 from JKingsnorth/CRM-17474
CRM-17474: Improvements to contact, participant and mailing reports
Andrew Hunt [Thu, 5 Nov 2015 21:14:16 +0000 (16:14 -0500)]
CRM-13682 Reports - make div the page break rather than table
Table page break confuses dompdf
Andrew Hunt [Thu, 5 Nov 2015 21:05:48 +0000 (16:05 -0500)]
CRM-13682 Reports - break up table on page break section
Andrew Hunt [Thu, 5 Nov 2015 19:54:37 +0000 (14:54 -0500)]
CRM-17511 Reports - default header getting emptied
Coleman Watts [Thu, 5 Nov 2015 19:37:05 +0000 (14:37 -0500)]
Merge branch 4.6 into master
Conflicts:
CRM/Member/BAO/Query.php
sql/civicrm_generated.mysql
xml/version.xml
colemanw [Thu, 5 Nov 2015 19:31:37 +0000 (14:31 -0500)]
Merge pull request #7136 from monishdeb/CRM-17339
CRM-17339 master fix - Error when importing contributions matched on email
Monish Deb [Thu, 5 Nov 2015 19:11:12 +0000 (00:41 +0530)]
Merge pull request #7137 from rohankatkar/master-4.7-webtests
Fix for webtests
Dave Greenberg [Thu, 5 Nov 2015 18:12:17 +0000 (10:12 -0800)]
Merge pull request #7114 from mollux/CRM-16029
CRM-16029 - Follow-up fixes for multilingual financial types and accounts
Dave Greenberg [Thu, 5 Nov 2015 17:43:56 +0000 (09:43 -0800)]
Merge pull request #7138 from mollux/minor_fixes
Fixed possibly wrong modifier id id when creating an activity.
Dave Greenberg [Thu, 5 Nov 2015 17:13:50 +0000 (09:13 -0800)]
Merge pull request #7140 from JKingsnorth/patch-2
Update README.txt
John Kingsnorth [Thu, 5 Nov 2015 16:32:58 +0000 (16:32 +0000)]
Update README.txt
Candidate for trivial patch of the year.
JKingsnorth [Thu, 5 Nov 2015 16:17:20 +0000 (16:17 +0000)]
CRM-17512 Improve event sellout messages
Mattias Michaux [Thu, 5 Nov 2015 15:59:06 +0000 (16:59 +0100)]
Fixed possibly wrong modifier id id when creating activity.
Eileen McNaughton [Thu, 5 Nov 2015 14:55:49 +0000 (06:55 -0800)]
Merge pull request #7133 from eileenmcnaughton/CRM-17509
CRM-17509 fix fatal on getting amount for waitlisted registrants
Web Access [Thu, 5 Nov 2015 13:11:45 +0000 (18:41 +0530)]
Fix for webtests
monishdeb [Thu, 5 Nov 2015 09:58:56 +0000 (15:28 +0530)]
CRM-17339 fix - Error when importing contributions matched on email
https://issues.civicrm.org/jira/browse/CRM-17339
eileen [Thu, 5 Nov 2015 02:13:00 +0000 (18:13 -0800)]
CRM-17509 fix fatal on getting amount for waitlisted registrants
Dave Greenberg [Thu, 5 Nov 2015 00:40:24 +0000 (16:40 -0800)]
Merge pull request #7116 from JKingsnorth/CRM-17488
CRM-17488 Fix bounce status on mailing detail report
Dave Greenberg [Wed, 4 Nov 2015 22:22:34 +0000 (14:22 -0800)]
Merge pull request #7131 from davecivicrm/CRM-17505
CRM-17505 - Choose date range layout fix.
Dave Greenberg [Wed, 4 Nov 2015 22:20:15 +0000 (14:20 -0800)]
CRM-17505 - Choose date range layout fix.
----------------------------------------
* CRM-17505: Fix search form layout for date range fields
https://issues.civicrm.org/jira/browse/CRM-17505
colemanw [Wed, 4 Nov 2015 22:16:03 +0000 (17:16 -0500)]
Merge pull request #7130 from colemanw/CRM-17493
CRM-17493 - Fix datatable when popup forms disabled
Coleman Watts [Wed, 4 Nov 2015 22:15:01 +0000 (17:15 -0500)]
CRM-17493 - Fix datatable when popup forms disabled
Coleman Watts [Wed, 4 Nov 2015 21:45:43 +0000 (16:45 -0500)]
Minor cleanup
Tim Otten [Wed, 4 Nov 2015 21:20:10 +0000 (13:20 -0800)]
Merge pull request #7092 from totten/master-exturl-default
CRM-16373 - Settings - Fix default for ext_repo_url
Dave Greenberg [Wed, 4 Nov 2015 20:00:48 +0000 (12:00 -0800)]
Merge pull request #7126 from monishdeb/4.6
CRM-17497 fix - Adding relationship with multi-valued custom field fails
Kurund Jalmi [Wed, 4 Nov 2015 15:17:49 +0000 (20:47 +0530)]
Merge pull request #7127 from rohankatkar/Master_4.7
Webtests Fixes - Master
JKingsnorth [Wed, 4 Nov 2015 14:38:48 +0000 (14:38 +0000)]
Style fixes
JKingsnorth [Wed, 4 Nov 2015 14:28:26 +0000 (14:28 +0000)]
CRM-17474 Add custom field support to mailing detail report
JKingsnorth [Wed, 4 Nov 2015 14:27:25 +0000 (14:27 +0000)]
CRM-17474 Tidy up comments and deprecated properties in mailing reports
JKingsnorth [Wed, 4 Nov 2015 14:06:40 +0000 (14:06 +0000)]
CRM-17474 Provide additional information on bounce report
Web Access [Wed, 4 Nov 2015 13:21:09 +0000 (18:51 +0530)]
Webtests Fixes - Master
CiviCRM [Wed, 4 Nov 2015 10:05:31 +0000 (02:05 -0800)]
Update version to 4.6.11
JKingsnorth [Wed, 4 Nov 2015 09:34:24 +0000 (09:34 +0000)]
CRM-17488 Correct capitalization of values
monishdeb [Wed, 4 Nov 2015 08:07:59 +0000 (13:37 +0530)]
CRM-17497 fix - Adding relationship with multi-valued custom field fails
https://issues.civicrm.org/jira/browse/CRM-17497
Monish Deb [Wed, 4 Nov 2015 06:01:39 +0000 (11:31 +0530)]
Merge pull request #7122 from rohankatkar/Master_Webtest
Webtest fixes- Master
Dave Greenberg [Wed, 4 Nov 2015 02:08:32 +0000 (18:08 -0800)]
Merge pull request #7074 from jitendrapurohit/CRM-17433
CRM-17433 - Invalid error message on deleting Participant record if N…
Dave Greenberg [Wed, 4 Nov 2015 02:01:33 +0000 (18:01 -0800)]
Merge pull request #7120 from monishdeb/testFailures
CRM-17481 fix - Simply saving Individual Edit Form, create new inheri…
Eileen McNaughton [Tue, 3 Nov 2015 22:56:19 +0000 (14:56 -0800)]
Merge pull request #7117 from eileenmcnaughton/CRM-17490
CRM-17490 fix interface error on activity import
Eileen McNaughton [Tue, 3 Nov 2015 22:49:24 +0000 (14:49 -0800)]
Merge pull request #7115 from mollux/CRM-17486
CRM-17486 - Added skipRecentView support when creating a relationship.
Dave Greenberg [Tue, 3 Nov 2015 20:17:09 +0000 (12:17 -0800)]
Merge pull request #7119 from seamuslee001/CRM-17471-4.6
Crm 17471 Fix situation where search options not updating for change in membership status
Web Access [Tue, 3 Nov 2015 13:18:10 +0000 (18:48 +0530)]
Webtest fixes- Master
Monish Deb [Tue, 3 Nov 2015 12:49:55 +0000 (18:19 +0530)]
Merge pull request #7112 from rohankatkar/4.7-WebtestMaster
Webtest Fix-Master
monishdeb [Tue, 3 Nov 2015 11:16:16 +0000 (16:46 +0530)]
CRM-17481 fix - Simply saving Individual Edit Form, create new inherited membership everytime
https://issues.civicrm.org/jira/browse/CRM-17481
Monish Deb [Tue, 3 Nov 2015 05:00:27 +0000 (10:30 +0530)]
Merge pull request #6901 from monishdeb/4.6
CRM-17339 fix - Error when importing contributions matched on name an…
Monish Deb [Tue, 3 Nov 2015 05:00:16 +0000 (10:30 +0530)]
Merge pull request #7041 from monishdeb/CRM-17343
CRM-17343 fix - Invoice email does not send out when completing payme…
Web Access [Tue, 3 Nov 2015 04:50:30 +0000 (10:20 +0530)]
Warning fix
Seamus Lee [Sat, 31 Oct 2015 23:09:12 +0000 (23:09 +0000)]
CRM - 17471 Fix Issue where updated status labels aren't displayed in search
CRM-17471 Fix issue where updated statuses aren't represented in PseudoConstant, by flushing the cache
Change membershipStatus psuedoConstant to use label column not name
Alter buildSearchForm rather than PseudoConstant to be more safe
Coleman Watts [Mon, 2 Nov 2015 21:58:29 +0000 (16:58 -0500)]
Merge branch '4.6' into master
Conflicts:
templates/CRM/common/footer.tpl
Monish Deb [Mon, 2 Nov 2015 19:15:26 +0000 (00:45 +0530)]
Merge pull request #7105 from eileenmcnaughton/master
enotice fix
Monish Deb [Mon, 2 Nov 2015 19:14:16 +0000 (00:44 +0530)]
Merge pull request #7113 from sudhabisht/TestFix
Fix for webtest failure
eileenmcnaugton [Mon, 2 Nov 2015 18:25:33 +0000 (07:25 +1300)]
CRM-17490 fix interface error on activity import
Dave Greenberg [Mon, 2 Nov 2015 18:19:15 +0000 (10:19 -0800)]
Merge pull request #7111 from kurund/CRM-17393
CRM-17393, changed the incorrect logic
Dave Greenberg [Mon, 2 Nov 2015 18:17:04 +0000 (10:17 -0800)]
Merge pull request #7101 from colemanw/footer
Footer tpl cleanup
JKingsnorth [Mon, 2 Nov 2015 15:43:17 +0000 (15:43 +0000)]
CRM-17488 Fix bounce status on mailing detail report
JKingsnorth [Mon, 2 Nov 2015 15:10:04 +0000 (15:10 +0000)]
Remove old merge conflict comments
Mattias Michaux [Mon, 2 Nov 2015 14:59:20 +0000 (15:59 +0100)]
Added possibility to skip the recent view list when creating a relationship.
JKingsnorth [Mon, 2 Nov 2015 14:55:34 +0000 (14:55 +0000)]
Code style fixes
projects / civicrm-core.git / log