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 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
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
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
Tim Otten [Tue, 18 Aug 2015 03:50:40 +0000 (20:50 -0700)]
CRM-16373 - Config - Move static $_mailer to Civi\Core\Container
Tim Otten [Tue, 18 Aug 2015 19:30:30 +0000 (12:30 -0700)]
Merge pull request #6526 from totten/4.6-regen
CRM-16205 - regen.sh - Exclude cache, extension, dir/path settings, and third-party tables.
colemanw [Tue, 18 Aug 2015 17:31:34 +0000 (13:31 -0400)]
Merge pull request #6532 from colemanw/CRM-12527-2
CRM-12527 - Remove non-working header code from D8
Coleman Watts [Tue, 18 Aug 2015 17:20:35 +0000 (13:20 -0400)]
CRM-12527 - Remove non-working header code from D8
colemanw [Tue, 18 Aug 2015 17:03:18 +0000 (13:03 -0400)]
Merge pull request #6528 from colemanw/Common
JS cleanup
Coleman Watts [Tue, 18 Aug 2015 14:04:09 +0000 (10:04 -0400)]
JS cleanup
yashodha [Tue, 18 Aug 2015 13:12:59 +0000 (18:42 +0530)]
CRM-10808: Campaign filter not available for Mailings in Adv Search but is on Scheduled Mailings etc
----------------------------------------
* CRM-10808: Campaign filter not available for Mailings in Adv Search but is on Scheduled Mailings etc
https://issues.civicrm.org/jira/browse/CRM-10808
Tim Otten [Fri, 14 Aug 2015 05:59:39 +0000 (22:59 -0700)]
CRM-16205 - regen.sh - Exclude cache, extension, dir/path settings, and third-party tables.
Tim Otten [Tue, 18 Aug 2015 08:58:57 +0000 (01:58 -0700)]
Update civicrm_generated.mysql
Tim Otten [Tue, 18 Aug 2015 08:56:35 +0000 (01:56 -0700)]
Merge branch 'getting_started' of https://github.com/cividesk/civicrm-core into cividesk-getting_started
Tim Otten [Tue, 18 Aug 2015 08:54:33 +0000 (01:54 -0700)]
Merge pull request #6496 from totten/master-regen-leak
CRM-16205 - regen.sh - Exclude cache, extension, dir/path settings, and third-party tables.
Tim Otten [Tue, 18 Aug 2015 03:03:15 +0000 (20:03 -0700)]
CRM-16373 - Disintermediate oddball CIVICRM_GROUPTREE ($config->groupTree)
Tim Otten [Tue, 18 Aug 2015 02:43:52 +0000 (19:43 -0700)]
CRM-16373 - WebTest_Member - Remove references to CRM_Core_Config_Variables
Tim Otten [Tue, 18 Aug 2015 02:11:30 +0000 (19:11 -0700)]
CRM-16373 - Move formatUnitSize() from CRM_Core_Config to CRM_Utils_Number
Tim Otten [Tue, 18 Aug 2015 01:54:33 +0000 (18:54 -0700)]
CRM-16373 - Config - Migrate fiscalYearStart
Tim Otten [Tue, 18 Aug 2015 01:17:22 +0000 (18:17 -0700)]
CRM-16373 - Config - Declare settings for defaultContactStateProvince
Tim Otten [Tue, 18 Aug 2015 00:41:55 +0000 (17:41 -0700)]
CRM-16373 - Config - Migrate dateInputFormat, timeInputFormat
Tim Otten [Tue, 18 Aug 2015 00:04:43 +0000 (17:04 -0700)]
CRM-16373 - Config - Declare settings for dateformatTime, dateformatYear
Tim Otten [Mon, 17 Aug 2015 23:58:44 +0000 (16:58 -0700)]
CRM-16373 - Config - Declare settings for fieldSeparator, legacyEncoding
Tim Otten [Mon, 17 Aug 2015 23:52:52 +0000 (16:52 -0700)]
CRM-16373 - Config - Migrate `logging` to settings
Tim Otten [Mon, 17 Aug 2015 23:51:16 +0000 (16:51 -0700)]
CRM_Admin_Form_Setting - Report errors in saving settings
Tim Otten [Mon, 17 Aug 2015 22:29:28 +0000 (15:29 -0700)]
CRM-16373 - Setting, weekBegins - Use pseudoconstant
Tim Otten [Tue, 18 Aug 2015 00:39:43 +0000 (17:39 -0700)]
CRM_Admin_Form_Setting - Use Setting.getoptions
Tim Otten [Mon, 17 Aug 2015 07:09:49 +0000 (00:09 -0700)]
CRM-16373 - Config - Declare settings for geoAPIKey, geoProvider, mapAPIKey, mapProvider
Coleman Watts [Tue, 18 Aug 2015 01:42:54 +0000 (21:42 -0400)]
Move CKEDITOR related code to crm.ckeditor.js
Coleman Watts [Tue, 18 Aug 2015 01:33:14 +0000 (21:33 -0400)]
Ensure CRM.vars is always defined
eileenmcnaugton [Tue, 18 Aug 2015 00:42:17 +0000 (12:42 +1200)]
CRM-16955 move setting of contact_id to parent form
Eileen [Tue, 10 Mar 2015 05:23:46 +0000 (01:23 -0400)]
CRM-16082 move responsibility for ensuring a domain group exists out of core
Monish Deb [Mon, 17 Aug 2015 20:31:54 +0000 (02:01 +0530)]
Merge pull request #6510 from monishdeb/4.6
Test fixes for All kind of Custom Values
Tim Otten [Mon, 17 Aug 2015 07:31:43 +0000 (00:31 -0700)]
Merge pull request #6493 from eileenmcnaughton/CRM-17023
CRM-17023 - Search settings
Tim Otten [Mon, 17 Aug 2015 06:53:42 +0000 (23:53 -0700)]
CRM-16373 - Setting.getoptions - Read/execute callbacks from *.settings.php
projects / civicrm-core.git / log