Yashodha Chaku [Mon, 28 Nov 2016 11:54:09 +0000 (17:24 +0530)]
Merge pull request #9455 from yashodha/CRM-19686
CRM-19686
yashodha [Mon, 28 Nov 2016 10:59:39 +0000 (16:29 +0530)]
change quotes to backticks
Steve Kessler [Fri, 25 Nov 2016 19:21:31 +0000 (12:21 -0700)]
Update DedupeException.tpl
Add links to contact for exceptions.
Monish Deb [Mon, 28 Nov 2016 09:45:25 +0000 (15:15 +0530)]
Merge pull request #9436 from jitendrapurohit/CRM-19679
CRM-19679 fix custom file upload in multi-record set
Monish Deb [Mon, 28 Nov 2016 08:06:57 +0000 (13:36 +0530)]
Merge pull request #9453 from jitendrapurohit/CRM-19680
CRM-19680: Participant.get API generates invalid query when searching…
jitendrapurohit [Mon, 28 Nov 2016 05:57:12 +0000 (11:27 +0530)]
CRM-19680: Participant.get API generates invalid query when searching for role_id IS NULL
Monish Deb [Fri, 25 Nov 2016 11:14:35 +0000 (16:44 +0530)]
Merge pull request #9446 from johanv/CRM-19683-word_replacement_fix
CRM-19683: Can now change word replacements if you have more than one language
Monish Deb [Fri, 25 Nov 2016 03:55:05 +0000 (09:25 +0530)]
Merge pull request #9450 from civicrm/4.7.14-rc
4.7.14 rc
Eileen McNaughton [Thu, 24 Nov 2016 23:16:47 +0000 (12:16 +1300)]
Merge pull request #9449 from eileenmcnaughton/member
CRM-19594 fix line item memberships for price sets with multiple memb…
eileen [Thu, 24 Nov 2016 14:48:13 +0000 (03:48 +1300)]
CRM-19594 fix line item memberships for price sets with multiple memberships
Eileen McNaughton [Thu, 24 Nov 2016 22:09:34 +0000 (11:09 +1300)]
Merge pull request #9448 from civicrm/4.7.14-rc
4.7.14 rc
Monish Deb [Thu, 24 Nov 2016 12:36:16 +0000 (18:06 +0530)]
Merge pull request #9437 from JMAConsulting/CRM-19681
CRM-19681, fixed code to respect date filters passed from url for report
Johan Vervloet [Thu, 24 Nov 2016 10:30:39 +0000 (11:30 +0100)]
Please the PHP 5.old gods.
Johan Vervloet [Thu, 24 Nov 2016 09:41:05 +0000 (10:41 +0100)]
CRM-19683 Can now change word replacements if you have more than one language.
Eileen McNaughton [Thu, 24 Nov 2016 07:35:06 +0000 (20:35 +1300)]
Merge pull request #9444 from eileenmcnaughton/member
CRM-19594 further fix on creating correct line items for memberships
eileen [Thu, 24 Nov 2016 04:39:12 +0000 (17:39 +1300)]
CRM-19594 another fix on line items for membership.
This one was test driven, but extends us to checking correct line item amounts
eileen [Thu, 24 Nov 2016 02:03:39 +0000 (15:03 +1300)]
CRM-19594 further fix on creating correct line items for memberships
Coleman Watts [Thu, 24 Nov 2016 01:20:26 +0000 (20:20 -0500)]
Merge branch '4.7.14-rc' into master
Conflicts:
CRM/Utils/System/DrupalBase.php
Coleman Watts [Wed, 23 Nov 2016 22:52:53 +0000 (17:52 -0500)]
Eileen McNaughton [Wed, 23 Nov 2016 21:35:03 +0000 (10:35 +1300)]
Merge pull request #9441 from seamuslee001/4.7.14-rc
4.7.14-rc merge
Seamus Lee [Wed, 23 Nov 2016 02:46:33 +0000 (13:46 +1100)]
CRM-19641 Further Fix
Eileen McNaughton [Wed, 23 Nov 2016 20:35:06 +0000 (09:35 +1300)]
Merge pull request #9433 from seamuslee001/CRM-19641-b
CRM-19641 Further Fix
Pradeep Nayak [Wed, 23 Nov 2016 14:21:18 +0000 (19:51 +0530)]
CRM-19681, fixed static function notice error
----------------------------------------
* CRM-19681: date fields not respected when passed through url for report
https://issues.civicrm.org/jira/browse/CRM-19681
Pradeep Nayak [Wed, 23 Nov 2016 14:19:53 +0000 (19:49 +0530)]
CRM-19681, fixed code to respect date filters passed from url for report
----------------------------------------
* CRM-19681: date fields not respected when passed through url for report
https://issues.civicrm.org/jira/browse/CRM-19681
jitendrapurohit [Wed, 23 Nov 2016 10:58:33 +0000 (16:28 +0530)]
CRM-19679 fix custom file upload in multi-record set
Eileen McNaughton [Wed, 23 Nov 2016 04:22:47 +0000 (17:22 +1300)]
Merge pull request #9434 from seamuslee001/4.7.14-rc
4.7.14 rc
deb.monish [Wed, 23 Nov 2016 00:05:08 +0000 (05:35 +0530)]
unit test fix
Brian Shaughnessy [Tue, 22 Nov 2016 19:37:59 +0000 (14:37 -0500)]
CRM-19676: fix how params are merged
deb.monish [Tue, 22 Nov 2016 23:43:25 +0000 (05:13 +0530)]
CRM-19677: Mailings fail in Multilingual post 4.7.13
Coleman Watts [Tue, 22 Nov 2016 04:46:01 +0000 (23:46 -0500)]
CRM-19649 - Improve ckeditor config defaults
Seamus Lee [Wed, 23 Nov 2016 02:46:33 +0000 (13:46 +1100)]
CRM-19641 Further Fix
Eileen McNaughton [Wed, 23 Nov 2016 01:10:28 +0000 (14:10 +1300)]
Merge pull request #9431 from monishdeb/CRM-19676
CRM-19676: fix how params are merged
Eileen McNaughton [Wed, 23 Nov 2016 00:37:51 +0000 (13:37 +1300)]
Merge pull request #9430 from monishdeb/CRM-19677
CRM-19677: Mailings fail in Multilingual post 4.7.13
deb.monish [Wed, 23 Nov 2016 00:05:08 +0000 (05:35 +0530)]
unit test fix
Brian Shaughnessy [Tue, 22 Nov 2016 19:37:59 +0000 (14:37 -0500)]
CRM-19676: fix how params are merged
deb.monish [Tue, 22 Nov 2016 23:43:25 +0000 (05:13 +0530)]
CRM-19677: Mailings fail in Multilingual post 4.7.13
Eileen McNaughton [Tue, 22 Nov 2016 22:20:56 +0000 (11:20 +1300)]
Merge pull request #9357 from monishdeb/CRM-19600
CRM-19600: Membership Renewal activity not created through online contribution page
Eileen McNaughton [Tue, 22 Nov 2016 22:18:05 +0000 (11:18 +1300)]
Merge pull request #9405 from jitendrapurohit/CRM-19660
CRM-19660: Financial Transaction stores wrong transaction date if the…
colemanw [Tue, 22 Nov 2016 14:02:55 +0000 (09:02 -0500)]
Merge pull request #9427 from colemanw/CRM-19649
CRM-19649 - Improve ckeditor config defaults
deb.monish [Tue, 22 Nov 2016 12:00:34 +0000 (17:30 +0530)]
Extend Unit test to assert membership renewal activity
jitendrapurohit [Tue, 22 Nov 2016 11:58:55 +0000 (17:28 +0530)]
add unit test
deb.monish [Mon, 7 Nov 2016 14:51:57 +0000 (20:21 +0530)]
CRM-19600: Membership Renewal activity not created through online contribution page
Coleman Watts [Tue, 22 Nov 2016 04:46:01 +0000 (23:46 -0500)]
CRM-19649 - Improve ckeditor config defaults
Coleman Watts [Mon, 21 Nov 2016 23:52:39 +0000 (18:52 -0500)]
CRM-19649 - Fix wysiwyg defaults
Seamus Lee [Mon, 21 Nov 2016 21:05:20 +0000 (08:05 +1100)]
Ensure that the folder matches the http_host
colemanw [Tue, 22 Nov 2016 00:47:48 +0000 (19:47 -0500)]
Merge pull request #9425 from colemanw/CRM-19649
CRM-19649 - Fix wysiwyg defaults
colemanw [Mon, 21 Nov 2016 23:58:27 +0000 (18:58 -0500)]
Merge pull request #9424 from seamuslee001/CRM-19303-b
CRM-19303 Ensure that the folder matches the http_host
Coleman Watts [Mon, 21 Nov 2016 23:52:39 +0000 (18:52 -0500)]
CRM-19649 - Fix wysiwyg defaults
Tim Otten [Mon, 21 Nov 2016 23:20:52 +0000 (15:20 -0800)]
Set version to 4.7.15
Seamus Lee [Mon, 21 Nov 2016 21:05:20 +0000 (08:05 +1100)]
Ensure that the folder matches the http_host
Monish Deb [Mon, 21 Nov 2016 20:23:35 +0000 (01:53 +0530)]
Merge pull request #9392 from monishdeb/CRM-19394
CRM-19394: Relative date is not processed correctly
Eileen McNaughton [Mon, 21 Nov 2016 19:58:58 +0000 (08:58 +1300)]
Merge pull request #9390 from eileenmcnaughton/members
CRM-19594 Wrong membership updated
colemanw [Mon, 21 Nov 2016 17:04:33 +0000 (12:04 -0500)]
Merge pull request #9419 from colemanw/CRM-19649
CRM-19649 - Multiple wysiwyg config presets
Coleman Watts [Mon, 21 Nov 2016 03:23:34 +0000 (22:23 -0500)]
CRM-19649 - Make sure directories exist
Coleman Watts [Mon, 21 Nov 2016 02:03:43 +0000 (21:03 -0500)]
CRM-19649 - Multiple wysiwyg presets
Coleman Watts [Sun, 20 Nov 2016 04:16:41 +0000 (23:16 -0500)]
CRM-19649 - Add more options to the configurator
colemanw [Mon, 21 Nov 2016 01:00:44 +0000 (20:00 -0500)]
Merge pull request #9409 from seamuslee001/CRM-19303
CRM-19303
colemanw [Sun, 20 Nov 2016 23:20:13 +0000 (18:20 -0500)]
Merge pull request #9418 from colemanw/upgradets
Remove unnecessary ts() from upgrade tasks
colemanw [Sun, 20 Nov 2016 22:04:58 +0000 (17:04 -0500)]
Merge pull request #9417 from ineffyble/CRM-19581
CRM-19581 Change default third gender to "Other"
Coleman Watts [Sun, 20 Nov 2016 19:34:53 +0000 (14:34 -0500)]
Remove unnecessary ts() from upgrade tasks
colemanw [Sun, 20 Nov 2016 19:10:51 +0000 (14:10 -0500)]
Merge pull request #9415 from lcdservices/CRM-19668
CRM-19668 display subtype icon in relationship listing when valid
Coleman Watts [Sun, 20 Nov 2016 18:11:15 +0000 (13:11 -0500)]
CRM-19668 - Use explodePadded for safety if we already have an array
Effy Elden [Sun, 20 Nov 2016 10:07:45 +0000 (21:07 +1100)]
CRM-19581 Change default third gender to 'Other'
Brian Shaughnessy [Sat, 19 Nov 2016 23:51:33 +0000 (18:51 -0500)]
CRM-19668 display subtype icon in relationship listing when valid
Eileen McNaughton [Sat, 19 Nov 2016 07:09:50 +0000 (20:09 +1300)]
Merge pull request #9403 from KarinG/patch-10
CRM-19658 test for is_email_receipt override
Eileen McNaughton [Sat, 19 Nov 2016 04:05:03 +0000 (17:05 +1300)]
Merge pull request #9353 from adixon/CRM-19601
CRM-19601 is_email_receipt is ignored
Eileen McNaughton [Sat, 19 Nov 2016 03:51:02 +0000 (16:51 +1300)]
Merge pull request #9398 from seamuslee001/CRM-19562
CRM-19562
Eileen McNaughton [Sat, 19 Nov 2016 03:41:25 +0000 (16:41 +1300)]
Merge pull request #9413 from colemanw/CRM-17795
CRM-17795 - Include OpenID
eileen [Sat, 19 Nov 2016 02:51:37 +0000 (15:51 +1300)]
Remove inconsistent assertion
eileen [Sat, 19 Nov 2016 01:30:54 +0000 (14:30 +1300)]
Whitespace
eileen [Sat, 19 Nov 2016 01:26:02 +0000 (14:26 +1300)]
CRM-19594 extend test to ensure 2 line items created on separate membership
Coleman Watts [Sat, 19 Nov 2016 00:57:29 +0000 (19:57 -0500)]
CRM-17795 - Include OpenID
Monish Deb [Fri, 18 Nov 2016 13:25:04 +0000 (18:55 +0530)]
Merge pull request #9406 from JMAConsulting/CRM-19661
CRM-19661, fixed query to add group by
Pradeep Nayak [Fri, 18 Nov 2016 12:10:57 +0000 (17:40 +0530)]
CRM-19661, fixed sql for Group by clause for mysql version 5.7+
----------------------------------------
* CRM-19661: Notice error on Event Income Report (Detail)
https://issues.civicrm.org/jira/browse/CRM-19661
Pradeep Nayak [Thu, 17 Nov 2016 09:21:43 +0000 (14:51 +0530)]
CRM-19661, fixed query to add group by
----------------------------------------
* CRM-19661: Notice error on Event Income Report (Detail)
https://issues.civicrm.org/jira/browse/CRM-19661
eileen [Wed, 16 Nov 2016 09:28:02 +0000 (22:28 +1300)]
CRM-19213 fix payment_instrument_id on event & add first test (shell really)
Seamus Lee [Sat, 15 Oct 2016 00:54:43 +0000 (11:54 +1100)]
Fix Jenkins Failure
Milton Zurita [Tue, 27 Sep 2016 03:39:06 +0000 (22:39 -0500)]
CRM-19303: Small changes to remove inline control structures.
Milton Zurita [Tue, 27 Sep 2016 03:36:29 +0000 (22:36 -0500)]
CRM-19303:
Final Style Changes. Other warnings not in my modifications. Line# 40-51
Milton Zurita [Tue, 27 Sep 2016 03:29:39 +0000 (22:29 -0500)]
CRM-19303 - Style Fixes
Milton Zurita [Fri, 16 Sep 2016 08:38:50 +0000 (03:38 -0500)]
Fixed: CRM-19303
Instead of assuming the default folder exists, it checks, if not it will search nearby directories for the files.
Monish Deb [Thu, 17 Nov 2016 12:48:47 +0000 (18:18 +0530)]
Merge pull request #9407 from monishdeb/CRM-19302
CRM-19302: Fix Copying of File Custom Fields on Event Copy
deb.monish [Thu, 17 Nov 2016 11:55:09 +0000 (17:25 +0530)]
minor change
MiyaNoctem [Wed, 5 Oct 2016 19:35:46 +0000 (14:35 -0500)]
Update Event.php
MiyaNoctem [Wed, 5 Oct 2016 19:22:33 +0000 (14:22 -0500)]
Update Event.php
Camilo Rodriguez [Tue, 6 Sep 2016 05:56:32 +0000 (00:56 -0500)]
CRM-19302
Fixed bug! Created new static method that copies all custom fields from old event to new event. Files are handled by copying them and having separate records in civicrm_file table, not just custom fields table.
Monish Deb [Thu, 17 Nov 2016 10:38:33 +0000 (16:08 +0530)]
Merge pull request #9375 from JMAConsulting/CRM-19636
CRM-19636, fixed db error for Top Donor report when filtered using Co…
jitendrapurohit [Thu, 17 Nov 2016 09:24:40 +0000 (14:54 +0530)]
CRM-19660: Financial Transaction stores wrong transaction date if the contribution is cancelled
Yashodha Chaku [Thu, 17 Nov 2016 08:31:24 +0000 (14:01 +0530)]
Merge pull request #9404 from agileware/CRM-19659
CRM-19659 - Fix undefined array index in CiviCRM mailings caused by NULL language.
Pradeep Nayak [Thu, 17 Nov 2016 06:34:09 +0000 (12:04 +0530)]
CRM-19636, used getBasicContactFilters() to get contact filters
----------------------------------------
* CRM-19636: DB error on Top Donor Report
https://issues.civicrm.org/jira/browse/CRM-19636
Pradeep Nayak [Fri, 11 Nov 2016 13:04:34 +0000 (18:34 +0530)]
CRM-19636, fixed db error for Top Donor report when filtered using Contact Name, Contact sub type, Contact type etc
----------------------------------------
* CRM-19636: DB error on Top Donor Report
https://issues.civicrm.org/jira/browse/CRM-19636
Yashodha Chaku [Thu, 17 Nov 2016 06:03:46 +0000 (11:33 +0530)]
Merge pull request #9400 from francescbassas/patch-7
CRM-19654 Missing cancel date and row style for canceled contributions
Agileware Support [Thu, 17 Nov 2016 01:51:08 +0000 (12:51 +1100)]
Fix undefined array index in CiviCRM mailings caused by NULL language.
Karin Gerritsen [Wed, 16 Nov 2016 20:45:59 +0000 (13:45 -0700)]
Syntax fix - line ending
Karin Gerritsen [Wed, 16 Nov 2016 20:38:08 +0000 (13:38 -0700)]
Test for https://github.com/civicrm/civicrm-core/pull/9353
colemanw [Wed, 16 Nov 2016 16:35:37 +0000 (11:35 -0500)]
Merge pull request #9397 from eileenmcnaughton/api
CRM-19650 - API Remove now-unused api functions
francescbassas [Wed, 16 Nov 2016 15:58:42 +0000 (16:58 +0100)]
CRM-19654 Missing cancel date and row style for canceled contributions
Monish Deb [Wed, 16 Nov 2016 13:22:11 +0000 (18:52 +0530)]
Merge pull request #9399 from jitendrapurohit/CRM-19621
CRM-19621: Contribution confirm page does not display state/country
jitendrapurohit [Wed, 16 Nov 2016 09:21:49 +0000 (14:51 +0530)]
CRM-19621: Contribution confirm page does not display state/country
eileen [Wed, 16 Nov 2016 07:32:03 +0000 (20:32 +1300)]
CRM-19213 another instance of mis-set payment_instrument_id
projects / civicrm-core.git / log