Seamus Lee [Fri, 28 Aug 2015 00:32:40 +0000 (00:32 +0000)]
Fix issues found my Tim Otton
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
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
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
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
monishdeb [Thu, 27 Aug 2015 10:39:05 +0000 (16:09 +0530)]
testFailure fix for master
Eileen McNaughton [Thu, 27 Aug 2015 04:24:07 +0000 (16:24 +1200)]
Merge pull request #6598 from eileenmcnaughton/paypal
Paypal
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
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
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: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
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
colemanw [Tue, 25 Aug 2015 17:07:25 +0000 (13:07 -0400)]
Merge pull request #6563 from colemanw/bin
Remove deprecated files from /bin
Tim Otten [Tue, 25 Aug 2015 16:20:35 +0000 (09:20 -0700)]
Merge pull request #6571 from totten/master-bad-camel
ImTest, SyntaxConformanceTest, CRM_Utils_String - Fix for case-insensitive filesystems
deepak-srivastava [Tue, 25 Aug 2015 14:32:31 +0000 (15:32 +0100)]
disable unsaved-cahnges warnings
deepak-srivastava [Tue, 25 Aug 2015 14:01:27 +0000 (15:01 +0100)]
Make flip action also flip contact type icons
jitendrapurohit [Tue, 25 Aug 2015 13:27:51 +0000 (18:57 +0530)]
add administer CiviCampaign to the permission check
eileenmcnaugton [Sun, 23 Aug 2015 20:49:22 +0000 (08:49 +1200)]
CRM-11338 retrieve fee_amount from paypal
Kurund Jalmi [Mon, 24 Aug 2015 18:37:52 +0000 (00:07 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-24-22-26-45
Conflicts:
CRM/Contact/BAO/Relationship.php
CRM/Member/Form/Membership.php
sql/civicrm_generated.mysql
tests/phpunit/api/v3/CustomValueTest.php
xml/version.xml
colemanw [Mon, 24 Aug 2015 12:58:14 +0000 (08:58 -0400)]
Merge pull request #6577 from eileenmcnaughton/CRM-17071
CRM-17071 add required marker to payment form
jitendrapurohit [Mon, 24 Aug 2015 12:44:59 +0000 (18:14 +0530)]
CRM-13408 - Add Campaign API permissions
Monish Deb [Mon, 24 Aug 2015 09:15:48 +0000 (14:45 +0530)]
Merge pull request #6562 from monishdeb/4.6
CRM-17057 fix - Advanced Search does not respect the selected Case St…
Monish Deb [Mon, 24 Aug 2015 06:23:17 +0000 (11:53 +0530)]
Merge pull request #6553 from sudhabisht/C12658
Fix for Enabling logging on multilingual installations
Eileen McNaughton [Mon, 24 Aug 2015 03:22:47 +0000 (15:22 +1200)]
Merge pull request #6574 from eileenmcnaughton/CRM-17070
CRM-17070 add support for fee_amount to completetransaciton
eileenmcnaugton [Mon, 24 Aug 2015 02:07:05 +0000 (14:07 +1200)]
CRM-17071 add required marker to payment form
This commit adds the red asterisk to required payment fields, although they
are not set on the form layer as required as we don't want to alter existing validation
eileenmcnaugton [Sun, 23 Aug 2015 21:20:40 +0000 (09:20 +1200)]
CRM-17070 add support for fee_amount to completetransaciton
colemanw [Sat, 22 Aug 2015 15:24:26 +0000 (11:24 -0400)]
Merge pull request #6566 from colemanw/CRM-17066
CRM-17066 - Specify api permissions for messageTemplates
colemanw [Sat, 22 Aug 2015 15:23:38 +0000 (11:23 -0400)]
Merge pull request #6569 from seamuslee001/CRM-17066
CRM-17066 Limit the Save template icon display to only those who have…
Kurund Jalmi [Sat, 22 Aug 2015 10:09:05 +0000 (15:39 +0530)]
Merge pull request #6561 from sudhabisht/CRM-10808
Webtest for Campaign filter in Adv Search
Eileen McNaughton [Sat, 22 Aug 2015 08:47:47 +0000 (20:47 +1200)]
Merge pull request #6568 from eileenmcnaughton/CRM-17068
CRM-17068 fix static warning
Tim Otten [Sat, 22 Aug 2015 08:28:56 +0000 (01:28 -0700)]
ImTest, SyntaxConformanceTest, CRM_Utils_String - Fix for case-insensitive filesystems
Seamus Lee [Sat, 22 Aug 2015 05:30:22 +0000 (05:30 +0000)]
CRM-17066 Limit the Save template icon display to only those who have permission to edit mailing templates
Eileen McNaughton [Sat, 22 Aug 2015 05:20:04 +0000 (17:20 +1200)]
Merge pull request #6567 from eileenmcnaughton/CRM-17064
CRM-17064 follow up - use presense of payment processor rather than c…
eileenmcnaughton [Sat, 22 Aug 2015 04:15:42 +0000 (04:15 +0000)]
CRM-17068 fix static warning
Coleman Watts [Fri, 21 Aug 2015 20:34:02 +0000 (16:34 -0400)]
CRM-17066 - Specify api permissions for messageTemplates
Eileen McNaughton [Sat, 22 Aug 2015 01:35:29 +0000 (13:35 +1200)]
Merge pull request #6550 from pradpnayak/CRM-16813
--fixed net amount field during update of contribution amount
eileenmcnaugton [Fri, 21 Aug 2015 22:41:25 +0000 (10:41 +1200)]
CRM-17064 follow up - use presense of payment processor rather than contributeMode to determine if to be processed
Eileen McNaughton [Fri, 21 Aug 2015 21:38:33 +0000 (09:38 +1200)]
Merge pull request #6556 from eileenmcnaughton/CRM-17064
CRM-17064 transactions going to paypal express instead of pro
colemanw [Fri, 21 Aug 2015 20:06:50 +0000 (16:06 -0400)]
Merge pull request #6492 from eileenmcnaughton/CRM-17020
CRM-17020 remove unindexed join from activity report
Dave Greenberg [Fri, 21 Aug 2015 20:05:30 +0000 (13:05 -0700)]
Merge pull request #6552 from pradpnayak/CRM-16571
CRM-16571, fixed notice error when contribution is deleted
Coleman Watts [Fri, 21 Aug 2015 19:09:44 +0000 (15:09 -0400)]
Remove deprecated files from /bin
Monish Deb [Fri, 21 Aug 2015 14:37:46 +0000 (20:07 +0530)]
Merge pull request #6551 from eileenmcnaughton/CRM-17060
CRM-17060 fix for post code groups with IN not working
Sudha Bisht [Fri, 21 Aug 2015 14:33:23 +0000 (20:03 +0530)]
Removed unwanted code
Sudha Bisht [Fri, 21 Aug 2015 14:29:24 +0000 (19:59 +0530)]
Warning Fix
Sudha Bisht [Tue, 29 Sep 2015 07:09:13 +0000 (12:39 +0530)]
Minor fix
Sudha Bisht [Tue, 18 Aug 2015 13:28:18 +0000 (18:58 +0530)]
Minor Fix
Sudha Bisht [Tue, 18 Aug 2015 13:26:21 +0000 (18:56 +0530)]
Webtest Fix
monishdeb [Fri, 21 Aug 2015 14:28:30 +0000 (19:58 +0530)]
CRM-17057 fix - Advanced Search does not respect the selected Case Status filter
https://issues.civicrm.org/jira/browse/CRM-17057
Yashodha Chaku [Fri, 21 Aug 2015 12:25:36 +0000 (17:55 +0530)]
Merge pull request #6527 from yashodha/CRM-10808
CRM-10808: Campaign filter not available for Mailings in Adv Search b…
Sudha Bisht [Fri, 21 Aug 2015 11:14:11 +0000 (16:44 +0530)]
Warning Fix
eileenmcnaugton [Fri, 21 Aug 2015 09:34:50 +0000 (21:34 +1200)]
CRM-17064 transactions going to paypal express instead of pro
Sudha Bisht [Fri, 21 Aug 2015 06:21:00 +0000 (11:51 +0530)]
Fix for enable loggin in multisite
Pradeep Nayak [Fri, 21 Aug 2015 05:59:44 +0000 (11:29 +0530)]
CRM-16571, fixed notice error when contribution is deleted
----------------------------------------
* CRM-16571: undefined indexes when deleting a contribution
https://issues.civicrm.org/jira/browse/CRM-16571
eileenmcnaugton [Fri, 21 Aug 2015 05:55:26 +0000 (17:55 +1200)]
CRM-17060 fix for post code groups with IN not working
Yashodha Chaku [Fri, 21 Aug 2015 05:43:16 +0000 (11:13 +0530)]
Merge pull request #6538 from systopia/CRM-17047
declare retrieve function static
Pradeep Nayak [Fri, 21 Aug 2015 05:28:03 +0000 (10:58 +0530)]
--fixed net amount field during update of contribution amount
colemanw [Fri, 21 Aug 2015 00:14:30 +0000 (20:14 -0400)]
Merge pull request #6546 from colemanw/CRM-17059
CRM-17059 - Fix faulty relationship count in datatable
Eileen McNaughton [Thu, 20 Aug 2015 23:46:43 +0000 (11:46 +1200)]
Merge pull request #6522 from eileenmcnaughton/CRM-16802
CRM-16082 move responsibility for ensuring a domain group exists out …
Coleman Watts [Thu, 20 Aug 2015 22:19:06 +0000 (18:19 -0400)]
CRM-17059 - Fix faulty relationship count in datatable
Dave Greenberg [Thu, 20 Aug 2015 16:58:26 +0000 (09:58 -0700)]
Merge pull request #6540 from LevityNL/upstream-relationships-4.6
Fix relationships permissions (CRM-17045) for 4.6 branch
Monish Deb [Thu, 20 Aug 2015 16:53:54 +0000 (22:23 +0530)]
Merge pull request #6544 from yashodha/CRM-17048
CRM-17048: Only one Invoice is available and attached to all the acti…
yashodha [Thu, 20 Aug 2015 10:33:35 +0000 (16:03 +0530)]
CRM-17048: Only one Invoice is available and attached to all the activities
----------------------------------------
* CRM-17048: Only one Invoice is available and attached to all the activities
https://issues.civicrm.org/jira/browse/CRM-17048
CiviCRM [Thu, 20 Aug 2015 01:59:14 +0000 (18:59 -0700)]
Update version to 4.6.8
Kevin Levie [Thu, 20 Aug 2015 01:12:07 +0000 (03:12 +0200)]
Fix relationships permissions (CRM-17045) for 4.6 branch
Eileen McNaughton [Wed, 19 Aug 2015 21:40:02 +0000 (09:40 +1200)]
Merge pull request #6523 from eileenmcnaughton/CRM-16955
CRM-16955 move setting of contact_id to parent form
Dave Greenberg [Wed, 19 Aug 2015 17:45:48 +0000 (10:45 -0700)]
Merge pull request #6535 from LevityNL/upstream-relationships
Fix permission handling for relationships
Kurund Jalmi [Wed, 19 Aug 2015 15:06:38 +0000 (20:36 +0530)]
Merge pull request #6536 from monishdeb/4.6
Test case fix for Custom Value using '!=' operator
Tim Otten [Wed, 19 Aug 2015 14:51:07 +0000 (07:51 -0700)]
Merge pull request #6521 from totten/master-setting-misc
CRM-16373 - Config - Update metadata for multiple settings
systopia [Wed, 19 Aug 2015 10:40:56 +0000 (12:40 +0200)]
declare retrieve function static
Kevin Levie [Wed, 19 Aug 2015 09:29:41 +0000 (11:29 +0200)]
Added a space.
monishdeb [Wed, 19 Aug 2015 09:28:04 +0000 (14:58 +0530)]
Test case fix for Custom Value using !=
Yashodha Chaku [Wed, 19 Aug 2015 09:21:33 +0000 (14:51 +0530)]
Merge pull request #6534 from LevityNL/upstream
Fix sorting by date in datatables
Kevin Levie [Wed, 19 Aug 2015 06:33:57 +0000 (08:33 +0200)]
Fix permission handling for relationships
Tim Otten [Wed, 19 Aug 2015 06:00:42 +0000 (23:00 -0700)]
CRM_Mailing_BAO_MailingJob - Warning 'Strict Standards: Only variables should be assigned by reference'
yashodha [Wed, 19 Aug 2015 05:19:55 +0000 (10:49 +0530)]
minor fixes
Kevin Levie [Wed, 19 Aug 2015 04:34:09 +0000 (06:34 +0200)]
Fix sorting by date in datatables
projects / civicrm-core.git / log