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
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 [Fri, 26 Feb 2016 21:53:49 +0000 (22:53 +0100)]
CRM-17767:Expose Campaign ID as a column in Campaign Dashboard page
chanzone [Fri, 26 Feb 2016 14:05:26 +0000 (22:05 +0800)]
CRM-16722 - Fixed token fails in event registration email
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
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
Lars Gleim [Sat, 20 Feb 2016 08:19:32 +0000 (09:19 +0100)]
Fix indentation of commit
76eeb93
Lars Gleim [Fri, 19 Feb 2016 21:21:03 +0000 (22:21 +0100)]
Update Drupal6.php
Include previously issing getUsersTableName() function from CRM/Utils/System/Drupal.php.
Fixes broken CRON on CiviCRM 4.7 Drupal 6 installations.
Eileen McNaughton [Fri, 19 Feb 2016 03:38:28 +0000 (16:38 +1300)]
Merge pull request #7822 from JMAConsulting/CRM-16188-5
--CRM-16188, added examples
Eileen McNaughton [Fri, 19 Feb 2016 03:37:43 +0000 (16:37 +1300)]
Merge pull request #7828 from seamuslee001/CRM-18066
CRM-18066 Include Display name as an option on CIviCRM relationship reports
Eileen McNaughton [Fri, 19 Feb 2016 03:37:24 +0000 (16:37 +1300)]
Merge pull request #7830 from lcdservices/CRM-18067
CRM-18067 allow overriding source during batch member entry
Chris Burgess [Thu, 18 Feb 2016 23:34:14 +0000 (12:34 +1300)]
Refs CRM-15768, make CiviCRM Drupal module version consistent with other Drupal modules.
Drupal module version strings include the core version as 6.x, 7.x, 8.x.
The sed regex has been stripping this information, which leads to CiviCRM being reported somewhat inconsistently in Drupal's update checks. This change better preserves the core version prefix when building CiviCRM releases.
A fix for this was previously committed to civicrm-drupal, but did not "stick" due to the sed in the release build scripts overwriting that.
Brian Shaughnessy [Thu, 18 Feb 2016 21:18:52 +0000 (16:18 -0500)]
CRM-18067 allow overriding source during batch member entry
Seamus Lee [Thu, 18 Feb 2016 20:12:03 +0000 (20:12 +0000)]
Include Display name as an option on CIviCRM relationship reports
Monish Deb [Thu, 18 Feb 2016 10:06:44 +0000 (15:36 +0530)]
Merge pull request #7821 from rohankatkar/CRM-17121
CRM-17121: Advanced Search on Event Type OR Address returns only Event results
Monish Deb [Thu, 18 Feb 2016 09:21:00 +0000 (14:51 +0530)]
Merge pull request #7826 from jitendrapurohit/CRM-18039
CRM-18039 -- Do not set default for blocks if in update mode
jitendrapurohit [Thu, 18 Feb 2016 06:21:48 +0000 (11:51 +0530)]
typo fix
jitendrapurohit [Thu, 18 Feb 2016 06:17:51 +0000 (11:47 +0530)]
CRM-18039 -- Do not set default for blocks if in update mode
Eileen McNaughton [Wed, 17 Feb 2016 19:16:45 +0000 (08:16 +1300)]
Merge pull request #7687 from JMAConsulting/CRM-16259-2
Crm 16259 2
Pradeep Nayak [Wed, 17 Feb 2016 17:48:58 +0000 (23:18 +0530)]
CRM-16259, added comment block for function
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 17 Feb 2016 17:32:07 +0000 (23:02 +0530)]
--CRM-16188, added examples
Web Access [Wed, 17 Feb 2016 13:23:30 +0000 (18:53 +0530)]
CRM-17121: Advanced Search on Event Type OR Address returns only Event results
CiviCRM [Wed, 17 Feb 2016 08:22:49 +0000 (00:22 -0800)]
Update version to 4.7.3
Pradeep Nayak [Wed, 17 Feb 2016 05:16:29 +0000 (10:46 +0530)]
--CRM-16259, added examples
Pradeep Nayak [Wed, 17 Feb 2016 05:15:19 +0000 (10:45 +0530)]
--CRM-16259, used api document to create examples
Pradeep Nayak [Sat, 13 Feb 2016 13:41:34 +0000 (19:11 +0530)]
--CRM-16259, added check for is pay later for pending contribution
Pradeep Nayak [Sat, 13 Feb 2016 11:31:13 +0000 (17:01 +0530)]
--CRM-16259, added entity_table check in join, simplified code
Pradeep Nayak [Wed, 27 Jan 2016 23:42:31 +0000 (05:12 +0530)]
CRM-16259, minor fix and added test for pending with partial payment
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 27 Jan 2016 22:32:27 +0000 (04:02 +0530)]
CRM-16259, changes for pending status for adding payments and added unit test
CRM-16259#
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Conflicts:
tests/phpunit/api/v3/PaymentTest.php
Pradeep Nayak [Wed, 27 Jan 2016 22:24:21 +0000 (03:54 +0530)]
CRM-16259, added BAO to record payment in case of pending status and unit test
----------------------------------------
* CRM-16259: Create Payment API
https://issues.civicrm.org/jira/browse/CRM-16259
Pradeep Nayak [Wed, 27 Jan 2016 22:22:31 +0000 (03:52 +0530)]
--CRM-16259, allow status to be changed from pending to partialy paid
Conflicts:
CRM/Contribute/BAO/Contribution.php
colemanw [Wed, 17 Feb 2016 02:06:09 +0000 (21:06 -0500)]
Merge pull request #7817 from jitendrapurohit/CRM-17038
CRM-17038 -- custom tokens not replaced for schedule reminder
Eileen McNaughton [Tue, 16 Feb 2016 22:43:38 +0000 (11:43 +1300)]
Merge pull request #7819 from saurabhbatra96/CRM-18036
CRM-18036 - Non- static methods being called statically and non-stati…
Eileen McNaughton [Tue, 16 Feb 2016 18:44:05 +0000 (07:44 +1300)]
Merge pull request #7685 from JMAConsulting/CRM-16188-4
CRM-16188, added order api for cancel action with test
Saurabh Batra [Tue, 16 Feb 2016 18:04:09 +0000 (23:34 +0530)]
CRM-18036 - Non- static methods being called statically and non-statically.
https://issues.civicrm.org/jira/browse/CRM-18036
Pradeep Nayak [Tue, 16 Feb 2016 17:06:51 +0000 (22:36 +0530)]
--CRM-16188, fixed jenkins style check
Pradeep Nayak [Fri, 12 Feb 2016 04:34:06 +0000 (10:04 +0530)]
--CRM-16188, added test to check transitioncomponent function
Pradeep Nayak [Fri, 12 Feb 2016 04:32:52 +0000 (10:02 +0530)]
CRM-16188, fetch line item using contribution_id when entity is contribution
----------------------------------------
* CRM-16188: Create an order API
https://issues.civicrm.org/jira/browse/CRM-16188
Pradeep Nayak [Fri, 12 Feb 2016 04:31:50 +0000 (10:01 +0530)]
--CRM-16188, reverted back the changes since contribution status id is needed in transitioncomponent function
Pradeep Nayak [Thu, 11 Feb 2016 12:07:30 +0000 (17:37 +0530)]
--CRM-16188, added changes as per Eileen's comment
Pradeep Nayak [Wed, 27 Jan 2016 21:12:59 +0000 (02:42 +0530)]
CRM-16188, added order api for cancel action with test
----------------------------------------
* CRM-16188: Create an order API
https://issues.civicrm.org/jira/browse/CRM-16188
Monish Deb [Tue, 16 Feb 2016 10:27:17 +0000 (15:57 +0530)]
Merge pull request #7814 from eileenmcnaughton/master
CRM-17751 add extra check to prevent error
jitendrapurohit [Tue, 16 Feb 2016 09:47:14 +0000 (15:17 +0530)]
CRM-11153 -- custom tokens not replaced for schedule reminder
eileenmcnaugton [Tue, 16 Feb 2016 08:29:26 +0000 (21:29 +1300)]
CRM-17751 add extra check to prevent error
It turns out the refund_trxn_id can be set erroneously - this might be a form issue - but we also want to avoid an error here
Eileen McNaughton [Tue, 16 Feb 2016 05:17:58 +0000 (18:17 +1300)]
Merge pull request #7680 from JMAConsulting/CRM-16259-9
CRM-16259 permissions for payment api
Eileen McNaughton [Tue, 16 Feb 2016 05:15:22 +0000 (18:15 +1300)]
Merge pull request #7812 from eileenmcnaughton/master
CRM-17837 add email is on hold to lybunt report options
eileen [Tue, 16 Feb 2016 03:32:15 +0000 (16:32 +1300)]
CRM-17837 add email is on hold to lybunt report options
Tim Otten [Mon, 15 Feb 2016 23:19:23 +0000 (15:19 -0800)]
Merge pull request #7768 from totten/master-test-boot
CRM-17860 - Improve PHPUnit helpers to better support extensions
Tim Otten [Wed, 10 Feb 2016 03:30:03 +0000 (19:30 -0800)]
CRM-17860 - HeadlessInterface - Docs
Tim Otten [Wed, 10 Feb 2016 03:26:23 +0000 (19:26 -0800)]
CRM-17860 - Civi\Test::e2e() - Add builder for end-to-end testing
Tim Otten [Wed, 10 Feb 2016 03:26:11 +0000 (19:26 -0800)]
CRM-17860 - CiviTestListener - Fix bootstrap for end-to-end tests.
Tim Otten [Wed, 10 Feb 2016 03:20:31 +0000 (19:20 -0800)]
CRM-17860 - CiviEnvBuilder - Allow variations on install() and uninstall()
Tim Otten [Wed, 10 Feb 2016 02:57:31 +0000 (18:57 -0800)]
CRM_Utils_String - startsWith(), endsWith(), filterByWildcards()
Tim Otten [Wed, 10 Feb 2016 02:08:38 +0000 (18:08 -0800)]
CRM-17860 - EndToEndInterface - Docs
projects / civicrm-core.git / log