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
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
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
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
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'.
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
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
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.
Nicolas Ganivet [Tue, 1 Mar 2016 20:00:37 +0000 (13:00 -0700)]
CRM-18130: Custom CSS URL not working if aliased or rewritten
Monish Deb [Tue, 1 Mar 2016 08:31:38 +0000 (14:01 +0530)]
Merge pull request #7887 from jitendrapurohit/CRM-17780
Crm 17780
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
eileenmcnaugton [Mon, 29 Feb 2016 06:12:02 +0000 (19:12 +1300)]
further fixes to test hard-coding
Yashodha Chaku [Mon, 29 Feb 2016 06:01:24 +0000 (11:31 +0530)]
Merge pull request #7873 from sarehag/master
CRM-17767:Expose Campaign ID as a column in Campaign Dashboard page
Eileen McNaughton [Mon, 29 Feb 2016 04:38:14 +0000 (17:38 +1300)]
Merge pull request #7881 from eileenmcnaughton/master
Test fixes, tests were failing when run in isolation due to inconsist…
eileenmcnaugton [Mon, 29 Feb 2016 04:01:25 +0000 (17:01 +1300)]
Test fixes, tests were failing when run in isolation due to inconsistent set up
Eileen McNaughton [Mon, 29 Feb 2016 02:17:44 +0000 (15:17 +1300)]
Merge pull request #7856 from eileenmcnaughton/CRM-18095
CRM-18095 cache the debugLogger to save some file_exists checks
Eileen McNaughton [Mon, 29 Feb 2016 02:12:29 +0000 (15:12 +1300)]
Merge pull request #7879 from eileenmcnaughton/CRM-18109
CRM-18109 fix to earlier commit on this issue
sarehag [Sun, 28 Feb 2016 13:52:06 +0000 (14:52 +0100)]
CRM-18114: DB error when exporting contact using 'merge household' option
eileen [Sun, 28 Feb 2016 05:06:04 +0000 (18:06 +1300)]
CRM-18109 fix to earlier commit on this issue
sarehag [Sat, 27 Feb 2016 13:51:55 +0000 (14:51 +0100)]
CRM-17508: removed whitespace on row 755
sarehag [Sat, 27 Feb 2016 11:30:46 +0000 (12:30 +0100)]
CRM-17508:jquery datepicker doesn't inherit CMS language
sarehag [Fri, 26 Feb 2016 21:53:49 +0000 (22:53 +0100)]
CRM-17767:Expose Campaign ID as a column in Campaign Dashboard page
Tim Otten [Fri, 26 Feb 2016 20:07:08 +0000 (12:07 -0800)]
CRM-18112 - Additional permission for editing "api_key"
chanzone [Fri, 26 Feb 2016 14:05:26 +0000 (22:05 +0800)]
CRM-16722 - Fixed token fails in event registration email
jitendrapurohit [Fri, 26 Feb 2016 13:16:41 +0000 (18:46 +0530)]
minor fix
jitendrapurohit [Fri, 26 Feb 2016 13:00:39 +0000 (18:30 +0530)]
CRM-17780 -- Allow multiple-selection of Events by Title on Searches
Tim Otten [Thu, 25 Feb 2016 21:22:30 +0000 (13:22 -0800)]
Merge pull request #7864 from eileenmcnaughton/tidy
minor tidy ups
Eileen McNaughton [Thu, 25 Feb 2016 19:10:12 +0000 (08:10 +1300)]
Merge pull request #7865 from eileenmcnaughton/CRM-18109
CRM-18109 towards removal of unindexed queries
deb.monish [Thu, 25 Feb 2016 16:28:34 +0000 (21:58 +0530)]
CRM-18064 fix
Chris Burgess [Thu, 25 Feb 2016 14:20:41 +0000 (03:20 +1300)]
CRM-18098. Move TCPDF from packages to composer.
Web Access [Thu, 25 Feb 2016 13:04:54 +0000 (18:34 +0530)]
Warning fix
Web Access [Thu, 25 Feb 2016 12:49:06 +0000 (18:19 +0530)]
CRM-18050: Cannot create price set with auto-renewing memberships
eileenmcnaugton [Fri, 19 Feb 2016 06:13:19 +0000 (19:13 +1300)]
CRM-18109 towards removal of unindexed queries
Kurund Jalmi [Thu, 25 Feb 2016 07:23:51 +0000 (12:53 +0530)]
Merge pull request #7836 from eileenmcnaughton/master
Towards deprecating contributionType in favour of financialType
Kurund Jalmi [Thu, 25 Feb 2016 05:43:26 +0000 (11:13 +0530)]
Merge pull request #7860 from monishdeb/CRM-18079
CRM-18079 fix
eileenmcnaugton [Thu, 25 Feb 2016 01:07:04 +0000 (14:07 +1300)]
minor tidy ups
Eileen McNaughton [Wed, 24 Feb 2016 21:53:16 +0000 (10:53 +1300)]
Merge pull request #7831 from xurizaemon/CRM-15678-fix_drupal_release_versions
CRM-15768, make Drupal module version consistent with other Drupal modules
eileen [Tue, 23 Feb 2016 23:58:06 +0000 (12:58 +1300)]
CRM-18095 cache the debugLogger to save some file_exists checks
Eileen McNaughton [Wed, 24 Feb 2016 21:35:40 +0000 (10:35 +1300)]
Merge pull request #7863 from eileenmcnaughton/CRM-18093
CRM-18093 point query debugging to separate log file
eileen [Wed, 24 Feb 2016 20:57:57 +0000 (09:57 +1300)]
CRM-18093 point query debugging to separate log file
deb.monish [Wed, 24 Feb 2016 11:55:21 +0000 (17:25 +0530)]
CRM-18079 fix
Eileen McNaughton [Wed, 24 Feb 2016 02:37:54 +0000 (15:37 +1300)]
Merge pull request #7855 from eileenmcnaughton/CRM-18094
CRM-18094 output queries for debugging using print_r rather than the …
Eileen McNaughton [Wed, 24 Feb 2016 00:36:06 +0000 (13:36 +1300)]
Merge pull request #7854 from eileenmcnaughton/CRM-18091
CRM-18091 disambiguate TRUE as not meaning 'backtrace'
eileen [Tue, 23 Feb 2016 23:01:08 +0000 (12:01 +1300)]
CRM-18094 output queries for debugging using print_r rather than the crufty var_dump routine.
eileen [Tue, 23 Feb 2016 22:57:10 +0000 (11:57 +1300)]
CRM-18091 disambiguate TRUE as not meaning 'backtrace'
Tim Otten [Tue, 23 Feb 2016 20:57:41 +0000 (12:57 -0800)]
Merge pull request #7848 from agh1/phpcs-fix
style fixes based upon updated phpcs Drupal standard
Eileen McNaughton [Tue, 23 Feb 2016 18:21:56 +0000 (07:21 +1300)]
Merge pull request #7035 from eileenmcnaughton/CRM-17435-dist
CRM-17435 Add option to generate drupal_7 directory version
jitendrapurohit [Tue, 23 Feb 2016 13:13:21 +0000 (18:43 +0530)]
minor fix
jitendrapurohit [Tue, 23 Feb 2016 12:48:51 +0000 (18:18 +0530)]
CRM-17968 -- load users for joomla and WP
eileen [Tue, 20 Oct 2015 04:57:52 +0000 (17:57 +1300)]
CRM-17435 Add option to generate drupal_7 directory version
Eileen McNaughton [Tue, 23 Feb 2016 02:30:45 +0000 (15:30 +1300)]
Merge pull request #7839 from eileenmcnaughton/CRM-18078
CRM-18078 make receipt_date available to templates
Eileen McNaughton [Tue, 23 Feb 2016 02:30:23 +0000 (15:30 +1300)]
Merge pull request #7845 from eileenmcnaughton/CRM-18085
CRM-18085 remove redundant code line
Andrew Hunt [Tue, 23 Feb 2016 01:30:26 +0000 (20:30 -0500)]
style fixes based upon updated phpcs Drupal standard
eileen [Mon, 22 Feb 2016 21:57:27 +0000 (10:57 +1300)]
CRM-18085 remove redundant code line
Change-Id: Ib312f987253661dfbea6f8a82e7c592f68367178
Eileen McNaughton [Mon, 22 Feb 2016 21:48:55 +0000 (10:48 +1300)]
Merge pull request #7844 from eileenmcnaughton/report-sql
Report sql
eileen [Mon, 22 Feb 2016 20:51:13 +0000 (09:51 +1300)]
remove trailing space
Change-Id: I3328795138cc7fd5babac10b7f6c171a8ed96d93
eileen [Mon, 22 Feb 2016 20:51:02 +0000 (09:51 +1300)]
Display sql in developer tab in ContributionDetail report
Change-Id: Ia4626ced7f00344825a7bc66e1718d7e2505856d
colemanw [Mon, 22 Feb 2016 16:36:34 +0000 (11:36 -0500)]
Merge pull request #7842 from jeromelebleu/patch-18083
CRM-18083 Trigger crmLoad for each child group when they are shown
Jérôme Lebleu [Mon, 22 Feb 2016 13:22:52 +0000 (14:22 +0100)]
CRM-18083 Trigger crmLoad for each group child when they are shown
Kurund Jalmi [Mon, 22 Feb 2016 08:17:46 +0000 (13:47 +0530)]
Merge pull request #7837 from eileenmcnaughton/CRM-18077
CRM-18077 pledge receipting dependent on page config
Eileen McNaughton [Mon, 22 Feb 2016 07:31:29 +0000 (20:31 +1300)]
Merge pull request #7834 from saurabhbatra96/CRM-18044
CRM-18044 - : Missing argument 4 for CRM_Custom_Form_CustomData::setG…
Eileen [Mon, 22 Feb 2016 07:28:12 +0000 (20:28 +1300)]
CRM-18078 make receipt_date available to templates
eileenmcnaugton [Mon, 22 Feb 2016 01:51:58 +0000 (14:51 +1300)]
CRM-18077 pledge receipting dependent on page config
eileenmcnaugton [Mon, 22 Feb 2016 01:24:49 +0000 (14:24 +1300)]
minor code simplification, call sendMail directly
eileenmcnaugton [Sun, 21 Feb 2016 23:45:56 +0000 (12:45 +1300)]
Towards deprecating contributionType in favour of financialType
Make sure financialType is availabel (& preferred). This commit does not attempt to
change any existing templates
Saurabh Batra [Sun, 21 Feb 2016 15:38:05 +0000 (21:08 +0530)]
CRM-18044 - : Missing argument 4 for CRM_Custom_Form_CustomData::setGroupTree(),
https://issues.civicrm.org/jira/browse/CRM-18044
colemanw [Sat, 20 Feb 2016 15:21:53 +0000 (10:21 -0500)]
Merge pull request #7832 from lgleim/patch-1
Fix CRON-breaking bug in Drupal6.php
Lars Gleim [Sat, 20 Feb 2016 08:32:51 +0000 (09:32 +0100)]
Remove white space at end of the line
projects / civicrm-core.git / log