colemanw [Fri, 13 Nov 2015 22:02:12 +0000 (17:02 -0500)]
Merge pull request #7206 from colemanw/wysiwyg
wysiwyg fixes
Coleman Watts [Fri, 13 Nov 2015 18:07:14 +0000 (13:07 -0500)]
Fix wysiwyg help
Dave Greenberg [Fri, 13 Nov 2015 17:44:42 +0000 (09:44 -0800)]
Merge pull request #7179 from davecivicrm/CRM-14732
CRM-14732
Coleman Watts [Fri, 13 Nov 2015 16:54:58 +0000 (11:54 -0500)]
Fix token selector display with TinyMCE
Coleman Watts [Fri, 13 Nov 2015 16:53:22 +0000 (11:53 -0500)]
CiviMail css tweaks
Eileen McNaughton [Fri, 13 Nov 2015 04:25:34 +0000 (20:25 -0800)]
Merge pull request #7197 from eileenmcnaughton/CRM-17557
CRM-17557 membership not processed to current
eileen [Fri, 13 Nov 2015 02:39:41 +0000 (18:39 -0800)]
CRM-17557 ensure /bin/bash payments are completed
colemanw [Fri, 13 Nov 2015 00:25:04 +0000 (19:25 -0500)]
Merge pull request #7199 from colemanw/CRM-16415
CRM-16415 - crmButton fixes
eileen [Thu, 12 Nov 2015 23:45:56 +0000 (15:45 -0800)]
Switch back to retrieving memberships based on membership payment rather than accurate line items
Per comments the unit tests are not building membership payments with accurate linkage between the membership & contribution. THis is not a new
regression so not addressing at the moment. It may related to CRM-14918. NB it seems that the intent is there should be a /bin/bash contribution for a /bin/bash membership
so I guess the line item SHOULD link the 2
eileen [Thu, 12 Nov 2015 23:12:55 +0000 (15:12 -0800)]
CRM-17539 membership payments not completing AND sending emails
eileen [Thu, 12 Nov 2015 20:08:51 +0000 (12:08 -0800)]
CRM-17566 fix eNotice on contributionID not being passed to processor
eileen [Thu, 12 Nov 2015 19:49:21 +0000 (11:49 -0800)]
CRM-17557 set member_since in completetransaction flow
eileen [Thu, 12 Nov 2015 19:14:07 +0000 (11:14 -0800)]
CRM-17557 remove deprecated concepts (focus on component, membership_payment vs line_item)
eileen [Thu, 12 Nov 2015 19:06:39 +0000 (11:06 -0800)]
CRM-17557 membership not processed to current
Eileen McNaughton [Thu, 12 Nov 2015 23:16:26 +0000 (15:16 -0800)]
Merge pull request #7196 from eileenmcnaughton/CRM-17542
CRM-17542 fix test processor being loaded when not applicable.
Coleman Watts [Thu, 12 Nov 2015 21:55:47 +0000 (16:55 -0500)]
CRM-16415 - Use crmButton for menu buttons
Coleman Watts [Thu, 12 Nov 2015 21:36:13 +0000 (16:36 -0500)]
CRM-16415 - Use crmButton on contact summary screen
Coleman Watts [Thu, 12 Nov 2015 21:34:37 +0000 (16:34 -0500)]
CRM-16415 - Update crmButton markup
Coleman Watts [Thu, 12 Nov 2015 21:22:40 +0000 (16:22 -0500)]
CRM-16415 - Fix form button clickability
Coleman Watts [Thu, 12 Nov 2015 21:22:05 +0000 (16:22 -0500)]
CRM-16415 - Add space after icon in crmButton
colemanw [Thu, 12 Nov 2015 17:30:49 +0000 (12:30 -0500)]
Merge pull request #7193 from systopia/CRM-17555
proposed fix for CRM-17555
eileen [Thu, 12 Nov 2015 16:36:58 +0000 (08:36 -0800)]
CRM-
17542424242 fix test processor being loaded when not applicable.
The filter for test processors was including processors that were not included in the array
Monish Deb [Thu, 12 Nov 2015 15:17:21 +0000 (20:47 +0530)]
Merge pull request #7194 from monishdeb/testFailures
Webtests 4.7 beta1 fixes
monishdeb [Thu, 12 Nov 2015 14:46:29 +0000 (20:16 +0530)]
format fix
monishdeb [Thu, 12 Nov 2015 14:42:08 +0000 (20:12 +0530)]
Webtests 4.7 beta1 fixes
Eileen McNaughton [Thu, 12 Nov 2015 14:36:32 +0000 (06:36 -0800)]
Merge pull request #7073 from eileenmcnaughton/CRM-17464-master
CRM-17464 remove deadlock inducing query
colemanw [Thu, 12 Nov 2015 14:18:24 +0000 (09:18 -0500)]
Merge pull request #7187 from davecivicrm/CRM-17176
CRM-17176 - Improve confirm message for clean-up reports menu task. F…
Niko Bochan [Thu, 5 Nov 2015 13:19:26 +0000 (14:19 +0100)]
proposed fix for CRM-17555
Monish Deb [Thu, 12 Nov 2015 10:39:22 +0000 (16:09 +0530)]
Merge pull request #7191 from eileenmcnaughton/master
CRM-17539 & progress on CRM-16929
Yashodha Chaku [Thu, 12 Nov 2015 06:38:15 +0000 (12:08 +0530)]
Merge pull request #7118 from lcdservices/CRM-17491
CRM-17491 update price set field if quantity changes
Kurund Jalmi [Thu, 12 Nov 2015 05:30:26 +0000 (11:00 +0530)]
Merge pull request #7177 from rohankatkar/master4.7webtest
Webtests fixes
eileen [Thu, 12 Nov 2015 04:58:33 +0000 (20:58 -0800)]
CRM-17539 set /bin/bash payments to completed rather than pending
Monish Deb [Thu, 12 Nov 2015 04:54:38 +0000 (10:24 +0530)]
Merge pull request #7188 from davecivicrm/CRM-17550
CRM-17550 - Missing payment description in PayPalImpl.
eileen [Thu, 12 Nov 2015 04:43:33 +0000 (20:43 -0800)]
CRM-CRM-17539, CRM-16929 make payment_method optional for /bin/bash value
eileen [Thu, 12 Nov 2015 04:28:26 +0000 (20:28 -0800)]
CRM-17539 Do not require payment-method for /bin/bash contributions
eileen [Thu, 12 Nov 2015 03:50:53 +0000 (19:50 -0800)]
CRM-16929 rework calculate tpl to be more robust and generic
This makes is so that the data value 'line_raw_total' is (hopefully accurately) calculated on every price field value
including 'quickConfig' and 'no thanks' options and the data value 'raw_total' for the priceset is the sum of these
Dave Greenberg [Thu, 12 Nov 2015 00:27:19 +0000 (16:27 -0800)]
CRM-17550 - Missing payment description in PayPalImpl.
----------------------------------------
* CRM-17550: PayPal Website Standard : payment description is not being passed to PayPal
https://issues.civicrm.org/jira/browse/CRM-17550
Dave Greenberg [Thu, 12 Nov 2015 00:23:29 +0000 (16:23 -0800)]
CRM-17176 - Improve confirm message for clean-up reports menu task. Fix bug in navigation api.
----------------------------------------
* CRM-17176: Add api action to reset reports menu
https://issues.civicrm.org/jira/browse/CRM-17176
Tim Otten [Wed, 11 Nov 2015 22:20:27 +0000 (14:20 -0800)]
Merge pull request #7156 from xurizaemon/CRM-17177
CRM-17177. die() instead of trigger_error() when accessed via web.
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 21:44:58 +0000 (13:44 -0800)]
Merge pull request #7184 from eileenmcnaughton/CRM-17542
CRM-17542 fix fatal on pay-later with separate membership
eileen [Wed, 11 Nov 2015 19:46:19 +0000 (11:46 -0800)]
CRM-17542 fix fatal on pay-later with separate membership
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
Dave Greenberg [Tue, 10 Nov 2015 21:07:29 +0000 (13:07 -0800)]
CRM-14732 - Activities where all target contacts are in trash should not be returned by activity search.
----------------------------------------
* CRM-14732: Search returns activities from Contacts in Trash
https://issues.civicrm.org/jira/browse/CRM-14732
Dave Greenberg [Tue, 10 Nov 2015 21:05:33 +0000 (13:05 -0800)]
CRM-14732 - Activities where all target contacts are in trash should not be returned by activity search.
----------------------------------------
* CRM-14732: Search returns activities from Contacts in Trash
https://issues.civicrm.org/jira/browse/CRM-14732
Web Access [Tue, 10 Nov 2015 13:08:18 +0000 (18:38 +0530)]
Webtests fixes
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
Chris Burgess [Sun, 8 Nov 2015 09:49:54 +0000 (22:49 +1300)]
CRM-17177. die() instead of trigger_error() when accessed via web.
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
projects / civicrm-core.git / log