eileenmcnaugton [Thu, 3 Sep 2015 08:33:47 +0000 (20:33 +1200)]
comment fixes
Monish Deb [Thu, 3 Sep 2015 08:02:51 +0000 (13:32 +0530)]
Merge pull request #6337 from jitendrapurohit/CRM-16792master
CRM-16792 - Report: Contrib Summary when soft credit stats and filter…
Eileen McNaughton [Thu, 3 Sep 2015 07:58:51 +0000 (19:58 +1200)]
Merge pull request #6601 from colemanw/CRM-16974
CRM-16974 - Disable amounts section of contribution page when enabling member price set
Eileen McNaughton [Wed, 2 Sep 2015 19:57:34 +0000 (07:57 +1200)]
Merge pull request #6664 from eileenmcnaughton/comments-3
Comments 3
eileenmcnaugton [Wed, 2 Sep 2015 12:47:36 +0000 (00:47 +1200)]
comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 12:45:16 +0000 (00:45 +1200)]
comment fixes
Eileen McNaughton [Wed, 2 Sep 2015 12:42:50 +0000 (00:42 +1200)]
Merge pull request #6663 from eileenmcnaughton/comments-3
comment fixes
eileenmcnaugton [Wed, 2 Sep 2015 12:32:37 +0000 (00:32 +1200)]
comment fixes
jenkins seems to spit the dummy at these but the issue appears to be php5.5 style code
which is fine here, rather than the change
Eileen McNaughton [Wed, 2 Sep 2015 08:19:18 +0000 (20:19 +1200)]
Merge pull request #6655 from eileenmcnaughton/comments-3
Comments fixes
Eileen McNaughton [Wed, 2 Sep 2015 05:06:52 +0000 (17:06 +1200)]
Merge pull request #6657 from colemanw/CRM-17120
CRM-17120 - Use CRM_Core_Pseudoconstant to lookup option labels
Coleman Watts [Tue, 1 Sep 2015 23:58:04 +0000 (16:58 -0700)]
CRM-17120 - Use CRM_Core_Pseudoconstant to lookup option labels
eileenmcnaugton [Wed, 2 Sep 2015 02:33:38 +0000 (14:33 +1200)]
comment fixes
Kurund Jalmi [Tue, 1 Sep 2015 23:53:25 +0000 (16:53 -0700)]
fixed merge conflicts
Dave Greenberg [Tue, 1 Sep 2015 23:10:19 +0000 (16:10 -0700)]
Merge pull request #6343 from pradpnayak/CRM-16506
CRM-16506, Fixed and improve mailing stats
Dave Greenberg [Tue, 1 Sep 2015 23:01:57 +0000 (16:01 -0700)]
Merge pull request #6643 from davecivicrm/CRM-17031
CRM-17031 - improve offline event receipts for new installs
Eileen McNaughton [Tue, 1 Sep 2015 20:42:39 +0000 (08:42 +1200)]
Merge pull request #6646 from eileenmcnaughton/comments-3
Comments fixes
Eileen McNaughton [Tue, 1 Sep 2015 20:40:54 +0000 (08:40 +1200)]
Merge pull request #6647 from eileenmcnaughton/test-fix
test-fix, pass through whether the form is in test mode
Monish Deb [Tue, 1 Sep 2015 12:42:13 +0000 (18:12 +0530)]
Merge pull request #6651 from monishdeb/testFailures
Qill fix participant.is_test
monishdeb [Tue, 1 Sep 2015 12:39:40 +0000 (18:09 +0530)]
CRM-17121 fix - Advanced Search on Event Type OR Address returns only Event results
https://issues.civicrm.org/jira/browse/CRM-17121
Kurund Jalmi [Tue, 1 Sep 2015 05:57:21 +0000 (22:57 -0700)]
Merge pull request #6639 from kurund/comment-cleanup
style fixes
eileenmcnaugton [Tue, 1 Sep 2015 05:13:13 +0000 (17:13 +1200)]
comment fixes
eileenmcnaugton [Tue, 1 Sep 2015 05:01:28 +0000 (17:01 +1200)]
test-fix, pass through whether the form is in test mode
Dave Greenberg [Tue, 1 Sep 2015 03:42:02 +0000 (20:42 -0700)]
Merge pull request #6645 from lcdservices/CRM-17122
CRM-17122: fix button label text in merge interface
eileenmcnaugton [Mon, 31 Aug 2015 12:31:59 +0000 (00:31 +1200)]
comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 12:04:52 +0000 (00:04 +1200)]
more comment fixes
Eileen McNaughton [Tue, 1 Sep 2015 02:32:30 +0000 (14:32 +1200)]
Merge pull request #6640 from eileenmcnaughton/comments-3
Unrelated fails I think
Brian Shaughnessy [Tue, 1 Sep 2015 02:14:06 +0000 (22:14 -0400)]
CRM-17122: fix button label text in merge interface
Kurund Jalmi [Tue, 1 Sep 2015 01:08:57 +0000 (18:08 -0700)]
Merge pull request #6531 from samuelsov/CRM-16561-bis
CRM-16561 - translatable tax invoice template (with upgrade)
Dave Greenberg [Tue, 1 Sep 2015 01:01:23 +0000 (18:01 -0700)]
CRM-17031 - improve offline event receipts for new installs.
----------------------------------------
* CRM-17031: Improvement to offline Event Confirmation template
https://issues.civicrm.org/jira/browse/CRM-17031
Dave Greenberg [Tue, 1 Sep 2015 00:58:23 +0000 (17:58 -0700)]
CRM-17031 - improve offline event receipts for new installs
----------------------------------------
* CRM-17031: Improvement to offline Event Confirmation template
https://issues.civicrm.org/jira/browse/CRM-17031
eileenmcnaugton [Mon, 31 Aug 2015 21:53:43 +0000 (09:53 +1200)]
comment & formatting fixes
Pradeep Nayak [Sun, 23 Aug 2015 20:28:26 +0000 (01:58 +0530)]
--CRM-16506, added opt out column in summary report
Pradeep Nayak [Fri, 21 Aug 2015 19:44:04 +0000 (01:14 +0530)]
--CRM-16506, added link to mailing name
Pradeep Nayak [Fri, 21 Aug 2015 19:30:47 +0000 (01:00 +0530)]
--CRM-16506, code cleanup, removed cruft code
Pradeep Nayak [Fri, 21 Aug 2015 17:49:24 +0000 (23:19 +0530)]
-- CRM-16506, updated form values for default install of reports
----------------------------------------
* CRM-16506:
https://issues.civicrm.org/jira/browse/CRM-16506
Pradeep Nayak [Fri, 21 Aug 2015 06:33:55 +0000 (12:03 +0530)]
--CRM-16506, fixed strict notice error
Pradeep Nayak [Wed, 29 Jul 2015 17:57:34 +0000 (23:27 +0530)]
--CRM-16506, fixed formatting
Pradeep Nayak [Mon, 27 Jul 2015 17:40:26 +0000 (23:10 +0530)]
CRM-16506, Fixed and improve mailing stats
----------------------------------------
* CRM-16506: Fix and improve mailing stats
https://issues.civicrm.org/jira/browse/CRM-16506
eileenmcnaugton [Mon, 31 Aug 2015 12:32:39 +0000 (00:32 +1200)]
comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 12:31:16 +0000 (00:31 +1200)]
comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 12:30:22 +0000 (00:30 +1200)]
comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 12:29:35 +0000 (00:29 +1200)]
comment fixes
Kurund Jalmi [Mon, 31 Aug 2015 19:42:32 +0000 (12:42 -0700)]
style fixes
Kurund Jalmi [Mon, 31 Aug 2015 19:33:37 +0000 (12:33 -0700)]
Merge pull request #6635 from eileenmcnaughton/comments
fixes to comments
Kurund Jalmi [Mon, 31 Aug 2015 19:32:23 +0000 (12:32 -0700)]
Merge pull request #6637 from eileenmcnaughton/comments-3
Comments fixes
Kurund Jalmi [Mon, 31 Aug 2015 19:23:15 +0000 (12:23 -0700)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-31-12-20-39
Conflicts:
CRM/Activity/BAO/Query.php
CRM/Campaign/BAO/Query.php
CRM/Contribute/BAO/Query.php
CRM/Event/BAO/Query.php
CRM/Member/BAO/Query.php
CRM/Pledge/BAO/Query.php
CRM/Report/Form/Contribute/Summary.php
sql/civicrm_generated.mysql
xml/version.xml
Dave Greenberg [Mon, 31 Aug 2015 18:24:02 +0000 (11:24 -0700)]
Merge pull request #6578 from jitendrapurohit/CRM-16716
CRM-16716 -- Filter with recur contribution status and modified date …
eileenmcnaugton [Mon, 31 Aug 2015 11:44:26 +0000 (23:44 +1200)]
comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 13:20:46 +0000 (01:20 +1200)]
comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 11:35:34 +0000 (23:35 +1200)]
more comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 11:21:38 +0000 (23:21 +1200)]
more comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 11:16:35 +0000 (23:16 +1200)]
more comment fixes
Yashodha Chaku [Mon, 31 Aug 2015 11:02:40 +0000 (16:32 +0530)]
Merge pull request #6606 from yashodha/CRM-17028
CRM-17028: Yearly and Monthly Repeat Reminders send on every cron for…
yashodha [Tue, 27 Oct 2015 09:46:30 +0000 (15:16 +0530)]
CRM-17028: Yearly and Monthly Repeat Reminders send on every cron for 24 hours
----------------------------------------
* CRM-17028: Yearly and Monthly Repeat Reminders send on every cron for 24 hours
https://issues.civicrm.org/jira/browse/CRM-17028
eileenmcnaugton [Mon, 31 Aug 2015 11:00:19 +0000 (23:00 +1200)]
further comment fixes
eileenmcnaugton [Mon, 31 Aug 2015 10:41:52 +0000 (22:41 +1200)]
fixes to comment blocks
Eileen McNaughton [Mon, 31 Aug 2015 07:41:40 +0000 (19:41 +1200)]
Merge pull request #6630 from eileenmcnaughton/CRM-17114
CRM-17114 move setting of billing address data onto payment form
Monish Deb [Mon, 31 Aug 2015 05:30:45 +0000 (11:00 +0530)]
Merge pull request #6627 from monishdeb/CRM-16966
CRM-16966 fix - backoffice buildRecur script loads processor incorrec…
eileenmcnaugton [Mon, 31 Aug 2015 00:34:02 +0000 (12:34 +1200)]
CRM-17114 move setting of billing address data onto payment form
monishdeb [Sat, 29 Aug 2015 20:48:24 +0000 (02:18 +0530)]
CRM-16966 fix - backoffice buildRecur script loads processor incorrectly (sometimes)
https://issues.civicrm.org/jira/browse/CRM-16966
Tim Otten [Sat, 29 Aug 2015 15:23:15 +0000 (08:23 -0700)]
Merge pull request #6615 from seamuslee001/export_function_refactor
Split up some of CRM_Export_BAO_Export::ExportComponents into smaller…
Tim Otten [Sat, 29 Aug 2015 14:36:52 +0000 (07:36 -0700)]
Merge pull request #6588 from totten/master-rm-old-civimail
CRM-15578 - CiviMail - Remove legacy composition UI
Kurund Jalmi [Sat, 29 Aug 2015 09:12:28 +0000 (14:42 +0530)]
Merge pull request #6626 from ddhuri/master
CRM-17111 - Typo error on system error message.
Dhanesh Dhuri [Sat, 29 Aug 2015 06:58:47 +0000 (12:28 +0530)]
CRM-17111 - Typo error on system error message.
Seamus Lee [Sat, 29 Aug 2015 03:35:48 +0000 (03:35 +0000)]
Minor error in refactor
Seamus Lee [Sat, 29 Aug 2015 03:30:15 +0000 (03:30 +0000)]
Move TrashedCaluse testing to its own line simplifying empty where test
colemanw [Sat, 29 Aug 2015 01:40:54 +0000 (21:40 -0400)]
Merge pull request #6624 from colemanw/APIExplorer
APIExplorer - allow entering an id in entityRef
Coleman Watts [Fri, 28 Aug 2015 20:47:42 +0000 (16:47 -0400)]
APIExplorer - allow entering an id in entityRef
colemanw [Fri, 28 Aug 2015 21:00:46 +0000 (17:00 -0400)]
Merge pull request #6565 from colemanw/CRM-17013
CRM-17013 - Only use submitOnce on fullscreen forms
colemanw [Fri, 28 Aug 2015 18:51:01 +0000 (14:51 -0400)]
Merge pull request #6621 from colemanw/CRM-17100
CRM-17100 - Fix campaign widget bar color
Coleman Watts [Fri, 28 Aug 2015 16:21:23 +0000 (12:21 -0400)]
CRM-17100 - Fix campaign widget bar color
colemanw [Fri, 28 Aug 2015 14:18:49 +0000 (10:18 -0400)]
Merge pull request #6618 from mallezie/crm-17106
crm-17106 add custom fields to message template
colemanw [Fri, 28 Aug 2015 14:10:22 +0000 (10:10 -0400)]
Merge pull request #6611 from johanv/CRM-17101-api_custom_field_sql_operator
CRM-17101 - unit test & fix. searching on custom fields with <=.
colemanw [Fri, 28 Aug 2015 14:04:24 +0000 (10:04 -0400)]
Merge pull request #6519 from joannechester/CRM-17033
CRM-17033-week-relative-to-site-setting
colemanw [Fri, 28 Aug 2015 13:54:34 +0000 (09:54 -0400)]
Merge pull request #6619 from colemanw/jsortable
Fix jSortable table styling
Coleman Watts [Fri, 28 Aug 2015 13:31:52 +0000 (09:31 -0400)]
Fix jSortable table styling
Tim Mallezie [Fri, 28 Aug 2015 13:24:05 +0000 (15:24 +0200)]
crm-17106 add custom fields to message template
Seamus Lee [Fri, 28 Aug 2015 12:31:00 +0000 (12:31 +0000)]
Fix further issues found by Tim
Monish Deb [Fri, 28 Aug 2015 11:45:24 +0000 (17:15 +0530)]
Merge pull request #6609 from jitendrapurohit/CRM-17094
CRM-17094 -- update amount_level after changing fee selections
Monish Deb [Fri, 28 Aug 2015 11:30:18 +0000 (17:00 +0530)]
Merge pull request #6610 from monishdeb/testFailures
CRM-17069 fix for master
Monish Deb [Fri, 28 Aug 2015 05:58:27 +0000 (11:28 +0530)]
Merge pull request #6605 from yashodha/4.6.CRM-17069
CRM-17069: Search for Contribution with campaign causes fatal error
Seamus Lee [Fri, 28 Aug 2015 00:39:51 +0000 (00:39 +0000)]
Fix indention of function
Dave Greenberg [Fri, 28 Aug 2015 00:35:02 +0000 (17:35 -0700)]
Merge pull request #6614 from davecivicrm/CRM-16708
CRM-16708 - Fix Sched Reminder configure link from event dashboard.
Seamus Lee [Fri, 28 Aug 2015 00:34:02 +0000 (00:34 +0000)]
Fix spelling on Default
Seamus Lee [Fri, 28 Aug 2015 00:32:40 +0000 (00:32 +0000)]
Fix issues found my Tim Otton
Dave Greenberg [Fri, 28 Aug 2015 00:04:24 +0000 (17:04 -0700)]
Merge pull request #6392 from joannechester/CRM-16954-change-filters
crm-16954-change-to-next-30-90-last-90-days
Seamus Lee [Fri, 28 Aug 2015 00:01:27 +0000 (00:01 +0000)]
Split up some of CRM_Export_BAO_Export::ExportComponents into smaller tighter functions
Dave Greenberg [Thu, 27 Aug 2015 22:17:34 +0000 (15:17 -0700)]
CRM-16708 - Fix Sched Reminder configure link from event dashboard.
----------------------------------------
* CRM-16708: Link from Event Info page "Configure" menu to Schedule Reminders is incorrect
https://issues.civicrm.org/jira/browse/CRM-16708
Eileen McNaughton [Thu, 27 Aug 2015 20:55:55 +0000 (08:55 +1200)]
Merge pull request #6603 from eileenmcnaughton/CRM-17092
CRM-17092 fix for recurring contribution id not set on membership
Johan Vervloet [Thu, 27 Aug 2015 19:52:56 +0000 (21:52 +0200)]
CRM-17101 - A bug fix.
----------------------------------------
* CRM-17101: civicrm_api3_basic_get does not work for SQL operators on custom fields.
https://issues.civicrm.org/jira/browse/CRM-17101
Johan Vervloet [Thu, 27 Aug 2015 19:31:44 +0000 (21:31 +0200)]
CRM-17101 - unit test searching on custom fields with <=.
----------------------------------------
* CRM-17101: civicrm_api3_basic_get does not work for SQL operators on custom fields.
https://issues.civicrm.org/jira/browse/CRM-17101
colemanw [Thu, 27 Aug 2015 17:11:34 +0000 (13:11 -0400)]
Merge pull request #6599 from colemanw/CRM-16512
CRM-16512 - fix 'view my contact' permission in api acl
colemanw [Thu, 27 Aug 2015 15:08:02 +0000 (11:08 -0400)]
Merge pull request #6600 from colemanw/CRM-17038
CRM-17038 - Fix custom tokens in greetings
joannechester [Thu, 27 Aug 2015 14:26:54 +0000 (00:26 +1000)]
more fixes
joannechester [Thu, 27 Aug 2015 14:22:02 +0000 (00:22 +1000)]
Removing changes for CRM-17033
These are in their own PR
Monish Deb [Thu, 27 Aug 2015 13:15:00 +0000 (18:45 +0530)]
Merge pull request #6586 from yashodha/CRM-17069
CRM-17069: Search for Contribution with campaign causes fatal error
monishdeb [Thu, 27 Aug 2015 12:51:29 +0000 (18:21 +0530)]
CRM-17069 fix for master
----------------------------------------
* CRM-17069: Search for Contribution with campaign causes fatal error
https://issues.civicrm.org/jira/browse/CRM-17069
Monish Deb [Thu, 27 Aug 2015 12:50:55 +0000 (18:20 +0530)]
Merge pull request #6608 from monishdeb/testFailures
Test build failure fix for master
jitendrapurohit [Thu, 27 Aug 2015 12:34:55 +0000 (18:04 +0530)]
CRM-17094 -- update amount_level after changing fee selections
monishdeb [Thu, 27 Aug 2015 10:39:05 +0000 (16:09 +0530)]
testFailure fix for master
projects / civicrm-core.git / log