colemanw [Wed, 9 Mar 2016 00:26:20 +0000 (19:26 -0500)]
Merge pull request #7943 from ujjwalwahi/master
CRM-18187 - Bug fix for enable a disabled group
Eileen McNaughton [Tue, 8 Mar 2016 22:50:38 +0000 (11:50 +1300)]
Merge pull request #7945 from eileenmcnaughton/priority
CRM-18134 test to see if priority_id sets to Normal by default & sinc…
eileen [Tue, 8 Mar 2016 22:16:59 +0000 (11:16 +1300)]
CRM-18134 test to see if priority_id sets to Normal by default & since it does, don't pass it in
Eileen McNaughton [Tue, 8 Mar 2016 21:43:15 +0000 (10:43 +1300)]
Merge pull request #7942 from saurabhbatra96/CRM-18169
CRM-18169 - Accounting Batch Export to CSV results in Fatal Error & Whitescreen
Eileen McNaughton [Tue, 8 Mar 2016 21:24:43 +0000 (10:24 +1300)]
Merge pull request #7841 from JMAConsulting/CRM-16526-2
CRM-16526 [fantastic PR that adds tests] Unit tests for Financial Type ACL test
Eileen McNaughton [Tue, 8 Mar 2016 20:05:29 +0000 (09:05 +1300)]
Merge pull request #7925 from eileenmcnaughton/CRM-18166
CRM-18166 Update receipt_date in IPN calls
Ujjwal Wahi [Tue, 8 Mar 2016 19:16:21 +0000 (00:46 +0530)]
CRM-18187 - Bug fix for enable a disabled group
----------------------------------------
* CRM-18187: Can't enable a disabled group
https://issues.civicrm.org/jira/browse/CRM-18187
Eileen McNaughton [Tue, 8 Mar 2016 09:40:58 +0000 (22:40 +1300)]
Merge pull request #7914 from jitendrapurohit/CRM-18061
CRM-18061 -- Test secret/publishable keys get overwritten with live keys on payment processor configuration save
Saurabh Batra [Tue, 8 Mar 2016 08:15:27 +0000 (13:45 +0530)]
CRM-18169 - https://issues.civicrm.org/jira/browse/CRM-18169
Monish Deb [Tue, 8 Mar 2016 06:19:29 +0000 (11:49 +0530)]
Merge pull request #7941 from rohankatkar/CRM-17182-simple-warningFix
Warning fix for QA
Web Access [Tue, 8 Mar 2016 06:10:00 +0000 (11:40 +0530)]
Warning fix for QA
Monish Deb [Tue, 8 Mar 2016 06:03:17 +0000 (11:33 +0530)]
Merge pull request #7917 from jitendrapurohit/CRM-17182additional
CRM-17182 -- fix when contribution id is empty
Monish Deb [Tue, 8 Mar 2016 04:55:43 +0000 (10:25 +0530)]
Merge pull request #7921 from monishdeb/CRM-16210
CRM-16210 fix where Uploading a file to an activity with multiple custom file fields removes the existing attached files
Monish Deb [Tue, 8 Mar 2016 04:50:09 +0000 (10:20 +0530)]
Merge pull request #7937 from monishdeb/CRM-18118
CRM-18118 QA changes
Eileen McNaughton [Tue, 8 Mar 2016 00:26:46 +0000 (13:26 +1300)]
Merge pull request #7908 from saurabhbatra96/CRM-17602
CRM-17602 - Check Logic when searching with Date Range
Eileen McNaughton [Mon, 7 Mar 2016 22:56:55 +0000 (11:56 +1300)]
Merge pull request #7898 from eileenmcnaughton/CRM-18134
CRM-18134 move api activity create on merge function to the BAO
eileenmcnaughton [Sat, 5 Mar 2016 02:58:33 +0000 (02:58 +0000)]
CRM-18166 Update receipt_date in IPN calls
Saurabh Batra [Mon, 7 Mar 2016 10:53:38 +0000 (16:23 +0530)]
Add layer of abstraction
deb.monish [Mon, 7 Mar 2016 20:40:03 +0000 (02:10 +0530)]
CRM-18118 QA changes
colemanw [Mon, 7 Mar 2016 18:57:15 +0000 (13:57 -0500)]
Merge pull request #7936 from PalanteJon/CRM-18173
CRM-18173 - show activities in dashlet in ascending, not descending o…
colemanw [Mon, 7 Mar 2016 18:49:05 +0000 (13:49 -0500)]
Merge pull request #7933 from jitendrapurohit/CRM-18140
CRM-18140 - Recurring PayPal transactions fail with 'Transaction ID n…
Jon goldberg [Mon, 7 Mar 2016 14:51:00 +0000 (09:51 -0500)]
CRM-18173 - show activities in dashlet in ascending, not descending order
Yashodha Chaku [Mon, 7 Mar 2016 11:54:34 +0000 (17:24 +0530)]
Merge pull request #7916 from jitendrapurohit/CRM-18037upgrade
upgrade handling for CRM-18037
jitendrapurohit [Mon, 7 Mar 2016 11:23:59 +0000 (16:53 +0530)]
remove unwanted variable
jitendrapurohit [Mon, 7 Mar 2016 11:21:27 +0000 (16:51 +0530)]
optimisation fixes
jitendrapurohit [Mon, 7 Mar 2016 09:47:59 +0000 (15:17 +0530)]
CRM-18140 - Recurring PayPal transactions fail with 'Transaction ID not set'
Monish Deb [Mon, 7 Mar 2016 09:00:47 +0000 (14:30 +0530)]
Merge pull request #7931 from monishdeb/CRM-18125-QA-fix
CRM-18125 QA fix
deb.monish [Mon, 7 Mar 2016 07:20:27 +0000 (12:50 +0530)]
CRM-18125 QA fix
Monish Deb [Mon, 7 Mar 2016 07:04:26 +0000 (12:34 +0530)]
Merge pull request #7892 from eileenmcnaughton/CRM-18125
CRM-18125 remove country_id from filter where state_province_id is pr…
colemanw [Sat, 5 Mar 2016 02:20:06 +0000 (21:20 -0500)]
Merge pull request #7923 from PalanteJon/CRM-18165
CRM-18165 - Fix display of activities when recurring activity is present
Jon goldberg [Sat, 5 Mar 2016 00:35:58 +0000 (19:35 -0500)]
CRM-18164 - Fix display of activities when recurring activity is present
deb.monish [Fri, 4 Mar 2016 20:03:42 +0000 (01:33 +0530)]
style fix
Monish Deb [Fri, 4 Mar 2016 20:01:33 +0000 (01:31 +0530)]
Merge pull request #7919 from JMAConsulting/CRM-18152
CRM-18152 Added extra condition to retrieve uf_group_id for module
deb.monish [Fri, 4 Mar 2016 18:11:03 +0000 (23:41 +0530)]
CRM-16210 fix
colemanw [Fri, 4 Mar 2016 16:44:42 +0000 (11:44 -0500)]
Merge pull request #7910 from agh1/merge-screen-close-tag
CRM-15789 - contact merge: restore </div> that was accidentally deleted
Edsel [Fri, 4 Mar 2016 13:35:28 +0000 (19:05 +0530)]
CRM-18152 Added webtest to support patch
----------------------------------------
* CRM-18152: On Behalf profile does not select org profile by default if contribution profiles are added prior to it
https://issues.civicrm.org/jira/browse/CRM-18152
jitendrapurohit [Fri, 4 Mar 2016 11:56:59 +0000 (17:26 +0530)]
minor fix - handle multiple priceset
Edsel [Fri, 4 Mar 2016 11:19:28 +0000 (16:49 +0530)]
CRM-18152 Added extra condition to retrieve uf_group_id for module
----------------------------------------
* CRM-18152: On Behalf profile does not select org profile by default if contribution profiles are added prior to it
https://issues.civicrm.org/jira/browse/CRM-18152
Monish Deb [Fri, 4 Mar 2016 11:15:30 +0000 (16:45 +0530)]
Merge pull request #7909 from monishdeb/CRM-18118
Crm 18118
Yashodha Chaku [Fri, 4 Mar 2016 10:35:41 +0000 (16:05 +0530)]
Merge pull request #7904 from jitendrapurohit/CRM-18102
CRM-18102 - Bug fix for contribution soft save in edit contribution
jitendrapurohit [Fri, 4 Mar 2016 10:25:57 +0000 (15:55 +0530)]
fix typo
jitendrapurohit [Fri, 4 Mar 2016 09:52:06 +0000 (15:22 +0530)]
CRM-17182 -- fix when contribution id is empty
Saurabh Batra [Fri, 4 Mar 2016 09:48:16 +0000 (15:18 +0530)]
Checkstyle fixes
Saurabh Batra [Fri, 4 Mar 2016 08:43:02 +0000 (14:13 +0530)]
Fix date range search for Activity
jitendrapurohit [Fri, 4 Mar 2016 08:40:57 +0000 (14:10 +0530)]
upgrade handling for CRM-18037
Monish Deb [Fri, 4 Mar 2016 08:36:59 +0000 (14:06 +0530)]
Merge pull request #7915 from rohankatkar/Upgrade-changes-for-7836
Upgrade Changes for #7836
Saurabh Batra [Fri, 4 Mar 2016 08:33:37 +0000 (14:03 +0530)]
Fix date range validation for Events
Saurabh Batra [Fri, 4 Mar 2016 08:23:44 +0000 (13:53 +0530)]
Fix tiny error in case search
Saurabh Batra [Fri, 4 Mar 2016 08:21:09 +0000 (13:51 +0530)]
Fix date range validation for Membership search.
Saurabh Batra [Fri, 4 Mar 2016 08:08:46 +0000 (13:38 +0530)]
Fix Date Range search for Mailing search.
Saurabh Batra [Fri, 4 Mar 2016 07:58:36 +0000 (13:28 +0530)]
Fix search date range for Cases.
Saurabh Batra [Fri, 4 Mar 2016 07:42:46 +0000 (13:12 +0530)]
Fix to errors not being shown properly.
Yashodha Chaku [Fri, 4 Mar 2016 06:59:37 +0000 (12:29 +0530)]
Merge pull request #7905 from otetard/CRM-18037
CRM-18037: default value for preferred_mail_format should be 'Both'.
jitendrapurohit [Fri, 4 Mar 2016 06:12:31 +0000 (11:42 +0530)]
add signature and minor optimisation
Peter Hartmann [Tue, 23 Feb 2016 05:54:44 +0000 (00:54 -0500)]
Fix for CRM-18061
Web Access [Fri, 4 Mar 2016 06:02:39 +0000 (11:32 +0530)]
Upgrade Changes for #7836
Andrew Hunt [Thu, 3 Mar 2016 22:21:48 +0000 (17:21 -0500)]
CRM-15789 - contact merge: restore </div> that was accidentally deleted
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
deb.monish [Thu, 3 Mar 2016 20:48:00 +0000 (02:18 +0530)]
minor fix for priceset
Monish Deb [Thu, 3 Mar 2016 19:31:58 +0000 (01:01 +0530)]
Merge pull request #7907 from JMAConsulting/CRM-18149
CRM-18149 Added extra condition for entity_table
deb.monish [Thu, 3 Mar 2016 19:24:29 +0000 (00:54 +0530)]
indentation fix
deb.monish [Thu, 3 Mar 2016 19:22:04 +0000 (00:52 +0530)]
CRM-18118 fix
Saurabh Batra [Thu, 3 Mar 2016 18:53:37 +0000 (00:23 +0530)]
CRM-17602 - https://issues.civicrm.org/jira/browse/CRM-17602
Edsel [Thu, 3 Mar 2016 13:11:30 +0000 (18:41 +0530)]
CRM-18149 Added extra condition for entity_table
----------------------------------------
* CRM-18149: Retrieval of On Behalf profiles for contributions from civicrm_uf_join needs to be more specifc
https://issues.civicrm.org/jira/browse/CRM-18149
Pradeep Nayak [Thu, 3 Mar 2016 11:25:59 +0000 (16:55 +0530)]
--CRM-16526, removed white space
Eileen McNaughton [Thu, 3 Mar 2016 11:16:18 +0000 (00:16 +1300)]
Merge pull request #7679 from JMAConsulting/CRM-16259-8
CRM-16259
Olivier Tétard [Thu, 3 Mar 2016 10:47:05 +0000 (11:47 +0100)]
CRM-18037: default value for preferred_mail_format should be 'Both'.
Default value should be “Both”, there is no need to find the
translated text for it. This prevents from having an empty default in
translated installations of CiviCRM.
Monish Deb [Thu, 3 Mar 2016 09:36:37 +0000 (15:06 +0530)]
Merge pull request #7895 from cividesk/CRM-18130-master
CRM-18130: Custom CSS URL not working if aliased or rewritten
jitendrapurohit [Thu, 3 Mar 2016 09:24:52 +0000 (14:54 +0530)]
use !empty()
Kajan [Wed, 24 Feb 2016 17:43:13 +0000 (17:43 +0000)]
CRM-18102 - Bug fix for contribution soft save in edit contribution
Eileen McNaughton [Thu, 3 Mar 2016 04:45:16 +0000 (17:45 +1300)]
Merge pull request #7885 from eileenmcnaughton/test-msg
Display malformed sql in test failures
Eileen McNaughton [Thu, 3 Mar 2016 00:53:45 +0000 (13:53 +1300)]
Merge pull request #7899 from eileenmcnaughton/CRM-18124-index
CRM-18124 add index to total_amount, receive_date
Monish Deb [Wed, 2 Mar 2016 11:21:15 +0000 (16:51 +0530)]
Merge pull request #7871 from monishdeb/master
CRM-18064 fix
CiviCRM [Wed, 2 Mar 2016 10:37:44 +0000 (02:37 -0800)]
Update version to 4.7.4
Yashodha Chaku [Wed, 2 Mar 2016 09:23:27 +0000 (14:53 +0530)]
Merge pull request #7891 from totten/fuzionnz-CRM-18098
CRM-18098. Move TCPDF from packages to composer.
eileen [Wed, 2 Mar 2016 04:03:30 +0000 (17:03 +1300)]
CRM-18124 add index to total_amount, receive_date
I merged the upgrade part before but missed this off
Eileen McNaughton [Wed, 2 Mar 2016 04:01:53 +0000 (17:01 +1300)]
Merge pull request #7889 from eileenmcnaughton/CRM-18124-index
CRM-18124 Add index to civicrm_contribution.total_amount.
eileen [Wed, 2 Mar 2016 02:31:40 +0000 (15:31 +1300)]
CRM-18134 move api contact create function to the BAO
Nicolas Ganivet [Tue, 1 Mar 2016 20:00:37 +0000 (13:00 -0700)]
CRM-18130: Custom CSS URL not working if aliased or rewritten
eileen [Tue, 1 Mar 2016 01:23:44 +0000 (14:23 +1300)]
CRM-18125 remove country_id from filter where state_province_id is present
The country_id is implcit in the state_province_id, but in the absence of a combined filter including it hurts performance
Change-Id: Ic311c4c438002e7390e2c0f7b21059bd26f618f3
Monish Deb [Tue, 1 Mar 2016 08:31:38 +0000 (14:01 +0530)]
Merge pull request #7887 from jitendrapurohit/CRM-17780
Crm 17780
Edsel [Tue, 1 Mar 2016 06:50:53 +0000 (12:20 +0530)]
CRM-16526 CIVI-3 Fixed Jenkins style issue
----------------------------------------
* CRM-16526: ACLs for Financial Types
https://issues.civicrm.org/jira/browse/CRM-16526
Edsel [Mon, 29 Feb 2016 14:12:49 +0000 (19:42 +0530)]
CRM-16526 Added more unit tests for financial acl
----------------------------------------
* CRM-16526: ACLs for Financial Types
https://issues.civicrm.org/jira/browse/CRM-16526
Edsel [Mon, 29 Feb 2016 13:44:41 +0000 (19:14 +0530)]
CRM-16526 Added new unit tests for financial acl
----------------------------------------
* CRM-16526: ACLs for Financial Types
https://issues.civicrm.org/jira/browse/CRM-16526
Edsel [Fri, 26 Feb 2016 13:35:14 +0000 (19:05 +0530)]
CRM-16526 CIVI-3 Added fix for style warning
----------------------------------------
* CRM-16526: ACLs for Financial Types
https://issues.civicrm.org/jira/browse/CRM-16526
Edsel [Fri, 26 Feb 2016 13:31:51 +0000 (19:01 +0530)]
CRM-16526 CIVI-3 Added unit test for permissioned financial types
----------------------------------------
* CRM-16526: ACLs for Financial Types
https://issues.civicrm.org/jira/browse/CRM-16526
Edsel [Mon, 22 Feb 2016 13:00:43 +0000 (18:30 +0530)]
CRM-16526 CIVI-3 Added unit tests for financial type and membership type
----------------------------------------
* CRM-16526: ACLs for Financial Types
https://issues.civicrm.org/jira/browse/CRM-16526
Monish Deb [Tue, 1 Mar 2016 06:27:19 +0000 (11:57 +0530)]
Merge pull request #7867 from rohankatkar/CRM-18050
CRM-18050: Cannot create price set with auto-renewing memberships
colemanw [Tue, 1 Mar 2016 02:27:16 +0000 (21:27 -0500)]
Merge pull request #7876 from sarehag/CRM-17508
CRM-17508:jquery datepicker doesn't inherit CMS language
Tim Otten [Tue, 1 Mar 2016 02:24:22 +0000 (18:24 -0800)]
CRM-18098 - composer.json - Add tcpdf to include_path (remove me later)
This provides backward-compatibility with extensions that call
`require_once 'tcpdf/tcpdf.php'`.
This notation is deprecated, and we should remove tcpdf from the include-path in the future.
Tim Otten [Tue, 1 Mar 2016 01:58:18 +0000 (17:58 -0800)]
CRM-18098 - TCPDF - Re-include "Times New Roman"
It was present in `civicrm-packages`, and someone might miss it if we take it away.
Tim Otten [Tue, 1 Mar 2016 01:54:13 +0000 (17:54 -0800)]
CRM-18098 - TCPDF - Remove unnecessary require_once
With CRM-18098, we can use the autoloader. And the require_once doesn't
work because the file is no longer in the include_path.
Chris Burgess [Mon, 29 Feb 2016 22:22:04 +0000 (11:22 +1300)]
CRM-18098. Update composer.lock
Chris Burgess [Mon, 29 Feb 2016 21:02:37 +0000 (10:02 +1300)]
CRM-18098. Call tcpdf-cleanup.sh from composer.
Tim Otten [Mon, 29 Feb 2016 20:44:33 +0000 (12:44 -0800)]
Merge pull request #7888 from totten/master-api-key
CRM-18112 - Additional permission for editing "api_key"
eileen [Mon, 29 Feb 2016 20:01:33 +0000 (09:01 +1300)]
CRM-18124 Add index to civicrm_contribution.total_amount.
Yashodha Chaku [Mon, 29 Feb 2016 09:05:54 +0000 (14:35 +0530)]
Merge pull request #7886 from sarehag/CRM-18114
CRM-18114: DB error when exporting contact using 'merge household' op…
Yashodha Chaku [Mon, 29 Feb 2016 08:05:23 +0000 (13:35 +0530)]
Merge pull request #7872 from chanzone/crm-fix-16722
CRM-16722 - Fixed token fails in event registration email
Eileen McNaughton [Mon, 29 Feb 2016 06:56:52 +0000 (19:56 +1300)]
Merge pull request #7884 from eileenmcnaughton/tests
further fixes to test hard-coding
eileenmcnaugton [Mon, 29 Feb 2016 06:49:26 +0000 (19:49 +1300)]
Display malformed sql in test failures
(yes, it might be the permission should be reviewed too as more nuanced options exist now but leaving that out of scope)
Monish Deb [Mon, 29 Feb 2016 06:34:56 +0000 (12:04 +0530)]
Merge pull request #7850 from jitendrapurohit/CRM-17968
CRM-17968 -- load users for joomla and WP
projects / civicrm-core.git / log