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
yashodha [Thu, 27 Aug 2015 04:33:48 +0000 (10:03 +0530)]
CRM-17069: minor fix
----------------------------------------
* CRM-17069: Search for Contribution with campaign causes fatal error
https://issues.civicrm.org/jira/browse/CRM-17069
Eileen McNaughton [Thu, 27 Aug 2015 04:24:07 +0000 (16:24 +1200)]
Merge pull request #6598 from eileenmcnaughton/paypal
Paypal
yashodha [Thu, 27 Aug 2015 04:20:55 +0000 (09:50 +0530)]
CRM-17069: Search for Contribution with campaign causes fatal error
----------------------------------------
* CRM-17069: Search for Contribution with campaign causes fatal error
https://issues.civicrm.org/jira/browse/CRM-17069
Dave Greenberg [Thu, 27 Aug 2015 01:18:31 +0000 (18:18 -0700)]
Merge pull request #6432 from deepak-srivastava/dedupe-workflow-47
CRM-16865: Mass Dedupe Workflow Improvements
eileenmcnaugton [Wed, 26 Aug 2015 12:22:22 +0000 (00:22 +1200)]
CRM-16808 paypal express follow up fixes
eileenmcnaugton [Wed, 26 Aug 2015 23:53:41 +0000 (11:53 +1200)]
CRM-17092 fix for recurring contribution id not set on membership
eileenmcnaugton [Wed, 26 Aug 2015 23:52:18 +0000 (11:52 +1200)]
Consolidate some form parameter handling
eileenmcnaugton [Wed, 26 Aug 2015 22:54:12 +0000 (10:54 +1200)]
CRM-17092 add test to ensure contribution_recur_id is being set'
Eileen McNaughton [Wed, 26 Aug 2015 22:55:24 +0000 (10:55 +1200)]
Merge pull request #6596 from eileenmcnaughton/CRM-17089
CRM-17089 Consolidate billing block address field processing on membe…
eileenmcnaugton [Wed, 26 Aug 2015 14:02:31 +0000 (02:02 +1200)]
CRM-17089 fix remaining billing field enotices by consolidation with Contribute form
Eileen McNaughton [Wed, 26 Aug 2015 20:50:51 +0000 (08:50 +1200)]
Merge pull request #6593 from eileenmcnaughton/CRM-11338
CRM-11338 fix fee_amount to work on membership form & add test
colemanw [Wed, 26 Aug 2015 20:46:56 +0000 (16:46 -0400)]
Merge pull request #6602 from colemanw/CRM-16990
CRM-16990 - Fix saving custom values
Coleman Watts [Wed, 26 Aug 2015 20:45:00 +0000 (16:45 -0400)]
CRM-16990 - Fix saving custom values
Niels Heinemann [Wed, 26 Aug 2015 19:30:30 +0000 (15:30 -0400)]
CRM-17038 - Fix custom tokens in greetings
Coleman Watts [Wed, 26 Aug 2015 18:25:51 +0000 (14:25 -0400)]
CRM-16512 - fix 'view my contact' permission in api acl
Monish Deb [Wed, 26 Aug 2015 13:50:06 +0000 (19:20 +0530)]
Merge pull request #6579 from jitendrapurohit/CRM-13408
CRM-13408 - Add Campaign API permissions
Monish Deb [Wed, 26 Aug 2015 13:48:26 +0000 (19:18 +0530)]
Merge pull request #6500 from LevityNL/master
Allow using arrays via the REST API
eileenmcnaugton [Wed, 26 Aug 2015 10:29:32 +0000 (22:29 +1200)]
CRM-11338 add fix & test for amount & fee_amount on membership renewal
joannechester [Wed, 26 Aug 2015 12:26:43 +0000 (22:26 +1000)]
adding-60days-filters
joannechester [Wed, 19 Aug 2015 11:55:24 +0000 (21:55 +1000)]
text-change
joannechester [Tue, 18 Aug 2015 12:13:07 +0000 (22:13 +1000)]
fixing-style-errors
joannechester [Mon, 17 Aug 2015 14:49:37 +0000 (00:49 +1000)]
week-relative-to-site-setting
joannechester [Mon, 3 Aug 2015 13:15:16 +0000 (23:15 +1000)]
crm-16954-indent-fixes
joannechester [Mon, 3 Aug 2015 13:04:20 +0000 (23:04 +1000)]
crm-16954-change-to-next-30-90-last-90-days
eileenmcnaugton [Wed, 26 Aug 2015 08:13:21 +0000 (20:13 +1200)]
CRM-11338 ensure fee_amount set from membership form & add test
eileenmcnaugton [Tue, 25 Aug 2015 22:58:15 +0000 (10:58 +1200)]
CRM-17089 Consolidate billing block address field processing on membership forms
Currenlty the membership form is not saving correctly & giving enotices.
Am modifiying to be using the same code for both forms as part of this
fix.
Conflicts:
CRM/Member/Form/Membership.php
CRM-17089 consolidated billing name assignment between the forms
CRM-17089 fix & consolidate saving of billing fields
Eileen McNaughton [Wed, 26 Aug 2015 08:21:42 +0000 (20:21 +1200)]
Merge pull request #6595 from eileenmcnaughton/CRM-16996
CRM-16996 missing parenteses on if when validating financial_type_id
Eileen McNaughton [Wed, 26 Aug 2015 08:17:16 +0000 (20:17 +1200)]
Merge pull request #6591 from eileenmcnaughton/CRM-16802
CRM-16082 move responsibility for ensuring a domain group exists out …
Eileen McNaughton [Wed, 26 Aug 2015 08:16:11 +0000 (20:16 +1200)]
Merge pull request #6576 from eileenmcnaughton/CRM-17072
CRM-17072 fix timezone handling for UTC dates
Eileen McNaughton [Wed, 26 Aug 2015 08:15:41 +0000 (20:15 +1200)]
Merge pull request #6590 from eileenmcnaughton/CRM-16555
CRM-16555 follow up fix - the credit card js got removed from members…
eileenmcnaugton [Tue, 25 Aug 2015 22:32:20 +0000 (10:32 +1200)]
CRM-16996 missing parenteses on if when validating financial_type_id
Yashodha Chaku [Wed, 26 Aug 2015 06:05:05 +0000 (11:35 +0530)]
Merge pull request #6584 from eileenmcnaughton/CRM-17078
CRM-17078 contribution summary report fatals when custom data included
CiviCRM [Wed, 26 Aug 2015 01:29:37 +0000 (18:29 -0700)]
Update version to 4.6.9
Dave Greenberg [Wed, 26 Aug 2015 01:25:02 +0000 (18:25 -0700)]
Merge pull request #6444 from PalanteJon/CRM-16981
Crm-16981- CiviMail - fix visible mailings for ACLed and multisite users
Eileen McNaughton [Wed, 26 Aug 2015 01:14:11 +0000 (13:14 +1200)]
Merge pull request #6589 from eileenmcnaughton/CRM-11338
CRM-11338 add tests for fee_amount to various forms
Eileen McNaughton [Wed, 26 Aug 2015 00:45:54 +0000 (12:45 +1200)]
Merge pull request #6539 from joannechester/CRM-16185-rename-date-filters
CRM-16185-rename-date-filters
eileenmcnaugton [Tue, 25 Aug 2015 22:15:02 +0000 (10:15 +1200)]
CRM-16555 follow up fix - the credit card js got removed from membership etc forms
eileenmcnaugton [Tue, 25 Aug 2015 19:04:04 +0000 (07:04 +1200)]
CRM-11338 add testing for fee_amount handling to online contribution page
eileenmcnaugton [Tue, 25 Aug 2015 18:40:29 +0000 (06:40 +1200)]
CRM-16914 fix reference to payment_instrument_id
eileenmcnaugton [Tue, 25 Aug 2015 18:39:23 +0000 (06:39 +1200)]
CRM-11338, CRM-16454 remove last instance of passing pending to processFormContribution
The parameter has been 'on the way out' through the 4.7 refactor & as part of writing tests for CRM-11338
remove the last instance. This needs to happen as I've seen that otherwise use of it is at risk of being merged back in from 4.6 patches
eileenmcnaugton [Tue, 25 Aug 2015 18:19:47 +0000 (06:19 +1200)]
CRM-11338 add tests for fee_amount to online contribution page
eileenmcnaugton [Tue, 25 Aug 2015 18:12:50 +0000 (06:12 +1200)]
CRM-11338 ensure payment processor fee is set in back-office contribution
Eileen McNaughton [Tue, 25 Aug 2015 17:44:22 +0000 (05:44 +1200)]
Merge pull request #6587 from eileenmcnaughton/CRM-11338
CRM-11338 retrieve fee_amount from paypal
projects / civicrm-core.git / log