civicrm-core.git
8 years agoCRM_16259 CIVI-3 Assigned lineitems proportionally for subsequent payments done on...
Edsel [Tue, 26 Jan 2016 13:36:51 +0000 (19:06 +0530)]
CRM_16259 CIVI-3 Assigned lineitems proportionally for subsequent payments done on participant

8 years agoMerge pull request #7680 from JMAConsulting/CRM-16259-9
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

8 years agoMerge pull request #7812 from eileenmcnaughton/master
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

8 years agoCRM-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

8 years agoMerge pull request #7768 from totten/master-test-boot
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

8 years agoCRM-17860 - HeadlessInterface - Docs
Tim Otten [Wed, 10 Feb 2016 03:30:03 +0000 (19:30 -0800)]
CRM-17860 - HeadlessInterface - Docs

8 years agoCRM-17860 - Civi\Test::e2e() - Add builder for end-to-end testing
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

8 years agoCRM-17860 - CiviTestListener - Fix bootstrap for end-to-end tests.
Tim Otten [Wed, 10 Feb 2016 03:26:11 +0000 (19:26 -0800)]
CRM-17860 - CiviTestListener - Fix bootstrap for end-to-end tests.

8 years agoCRM-17860 - CiviEnvBuilder - Allow variations on install() and uninstall()
Tim Otten [Wed, 10 Feb 2016 03:20:31 +0000 (19:20 -0800)]
CRM-17860 - CiviEnvBuilder - Allow variations on install() and uninstall()

8 years agoCRM_Utils_String - startsWith(), endsWith(), filterByWildcards()
Tim Otten [Wed, 10 Feb 2016 02:57:31 +0000 (18:57 -0800)]
CRM_Utils_String - startsWith(), endsWith(), filterByWildcards()

8 years agoCRM-17860 - EndToEndInterface - Docs
Tim Otten [Wed, 10 Feb 2016 02:08:38 +0000 (18:08 -0800)]
CRM-17860 - EndToEndInterface - Docs

8 years agoCivi\Core\Container - Simplify handling of `bootServices` using `setSynthetic()`
Tim Otten [Wed, 10 Feb 2016 01:36:16 +0000 (17:36 -0800)]
Civi\Core\Container - Simplify handling of `bootServices` using `setSynthetic()`

`bootServices` are services that must be setup before the container can be
instantiated -- but which should be available through the container.

We had been using some work-arounds with factory functions to get this
effect, but this was fairly verbose.  It's simpler to use the
`setSynthetic()` option.

8 years agoCRM-17860 - CiviTester - Split into separate class files
Tim Otten [Wed, 10 Feb 2016 00:33:54 +0000 (16:33 -0800)]
CRM-17860 - CiviTester - Split into separate class files

8 years agoCRM-17957 - Extension classloader - Reset whenever the mapper resets
Tim Otten [Tue, 9 Feb 2016 23:52:48 +0000 (15:52 -0800)]
CRM-17957 - Extension classloader - Reset whenever the mapper resets

8 years agoCRM-17860 - TransactionalInterface - Docs
Tim Otten [Tue, 9 Feb 2016 23:51:24 +0000 (15:51 -0800)]
CRM-17860 - TransactionalInterface - Docs

8 years agotests/phpunit - Declare `@group headless`
Tim Otten [Tue, 9 Feb 2016 21:57:16 +0000 (13:57 -0800)]
tests/phpunit - Declare `@group headless`

8 years agoAdd templates/CRM/common/unittests.tpl
Tim Otten [Tue, 9 Feb 2016 07:01:13 +0000 (23:01 -0800)]
Add templates/CRM/common/unittests.tpl

8 years agoCRM-17860 - Civi\Test - Add mixins for Headless, Hook, Transaction, and EndToEnd...
Tim Otten [Tue, 9 Feb 2016 02:58:22 +0000 (18:58 -0800)]
CRM-17860 - Civi\Test - Add mixins for Headless, Hook, Transaction, and EndToEnd functionality.

To describe the environment in which you want to run a test, add an
interface to the test class, e.g.

 * `HeadlessInterface` (along with optional `HookInterface` and `TransactionalInterface`)
 * `EndToEndInterface`

This is an alternative to other approaches like:

 * Extending a gigantic base-class (CiviUnitTestCase, CiviSeleniumTestCase)
 * Copy/paste a bunch of boiler-plate into your own class.

8 years agoCRM-17860 - CiviTester - Reset extensions when reinstalling schema.
Tim Otten [Tue, 9 Feb 2016 02:59:26 +0000 (18:59 -0800)]
CRM-17860 - CiviTester - Reset extensions when reinstalling schema.

This addresses a use-case where you have multiple extensions and run the
test-suites back-to-back.

8 years agoCRM-17860 - CiviTester - Rename `builder()` to `headless()`. Add `ext()` and `extDir()`.
Tim Otten [Mon, 8 Feb 2016 03:46:10 +0000 (19:46 -0800)]
CRM-17860 - CiviTester - Rename `builder()` to `headless()`. Add `ext()` and `extDir()`.

8 years agoMerge pull request #7811 from JKingsnorth/CRM-18042
Monish Deb [Mon, 15 Feb 2016 15:23:52 +0000 (20:53 +0530)]
Merge pull request #7811 from JKingsnorth/CRM-18042

CRM-18042: Add source to participant listing

8 years agoCRM-18042: Add source to participant listing
JKingsnorth [Mon, 15 Feb 2016 14:13:03 +0000 (14:13 +0000)]
CRM-18042: Add source to participant listing

8 years agoMerge pull request #7809 from jitendrapurohit/CRM-17799
Monish Deb [Mon, 15 Feb 2016 14:10:02 +0000 (19:40 +0530)]
Merge pull request #7809 from jitendrapurohit/CRM-17799

CRM-17799 -- Error type: Could not find a valid session key." when ad…

8 years agoMerge pull request #7810 from rohankatkar/CRM_18010_additionalchanges
Monish Deb [Mon, 15 Feb 2016 14:08:46 +0000 (19:38 +0530)]
Merge pull request #7810 from rohankatkar/CRM_18010_additionalchanges

Additional changes for Case, Campaign and Grant reports - CRM-18010

8 years agoAdditional changes for Case, Campaign and Grant reports
Web Access [Mon, 15 Feb 2016 13:08:36 +0000 (18:38 +0530)]
Additional changes for Case, Campaign and Grant reports

8 years agoCRM-17799 -- Error type: Could not find a valid session key." when adding activity...
jitendrapurohit [Mon, 15 Feb 2016 12:46:52 +0000 (18:16 +0530)]
CRM-17799 -- Error type: Could not find a valid session key." when adding activity via search task

8 years agoMerge pull request #7806 from eileenmcnaughton/CRM-18033
colemanw [Mon, 15 Feb 2016 02:24:32 +0000 (21:24 -0500)]
Merge pull request #7806 from eileenmcnaughton/CRM-18033

CRM-18033 don't remove disabled campaigns

8 years agoCRM-18033 don't remove disabled campaigns
eileenmcnaugton [Mon, 15 Feb 2016 01:53:10 +0000 (14:53 +1300)]
CRM-18033 don't remove disabled campaigns

8 years agoMerge pull request #7802 from eug48/CRM-17974
Eileen McNaughton [Sun, 14 Feb 2016 23:15:57 +0000 (12:15 +1300)]
Merge pull request #7802 from eug48/CRM-17974

CRM-17974 - fix typo in createIndexes

8 years agoMerge pull request #7803 from saurabhbatra96/CRM-17143
Eileen McNaughton [Sun, 14 Feb 2016 20:20:41 +0000 (09:20 +1300)]
Merge pull request #7803 from saurabhbatra96/CRM-17143

CRM-17143 - non-static method CRM_Campaign_Page_AJAX::campaignList() …

8 years agoCRM-17143 - non-static method CRM_Campaign_Page_AJAX::campaignList() should not be...
Saurabh Batra [Sun, 14 Feb 2016 18:46:57 +0000 (00:16 +0530)]
CRM-17143 - non-static method CRM_Campaign_Page_AJAX::campaignList() should not be called staticall

https://issues.civicrm.org/jira/browse/CRM-17143

8 years agoCRM-17974 - fix typo in createIndexes
eug48 [Sun, 14 Feb 2016 10:43:46 +0000 (21:43 +1100)]
CRM-17974 - fix typo in createIndexes

8 years agoMerge pull request #7801 from lcdservices/CRM-18028
colemanw [Sat, 13 Feb 2016 06:13:07 +0000 (01:13 -0500)]
Merge pull request #7801 from lcdservices/CRM-18028

CRM-18028 fix subscribeUrl token construction

8 years agoCRM-18028: dont encode url when constructed
Brian Shaughnessy [Sat, 13 Feb 2016 04:09:31 +0000 (23:09 -0500)]
CRM-18028: dont encode url when constructed

8 years agoCRM-18028 fix subscribeUrl token construction
Brian Shaughnessy [Sat, 13 Feb 2016 01:14:26 +0000 (20:14 -0500)]
CRM-18028 fix subscribeUrl token construction

8 years agoMerge pull request #7800 from colemanw/CRM-17953
colemanw [Sat, 13 Feb 2016 01:04:43 +0000 (20:04 -0500)]
Merge pull request #7800 from colemanw/CRM-17953

CRM-17953 - Fix redirects from extern

8 years agoCRM-17953 - Fix redirects from extern
Coleman Watts [Fri, 12 Feb 2016 21:02:20 +0000 (16:02 -0500)]
CRM-17953 - Fix redirects from extern

8 years agoMerge pull request #7798 from saurabhbatra96/CRM-17990
colemanw [Fri, 12 Feb 2016 20:41:13 +0000 (15:41 -0500)]
Merge pull request #7798 from saurabhbatra96/CRM-17990

CRM-17990 - Import Event Participants Error

8 years agoCRM-17990 - Import Event Participants Error
Saurabh Batra [Fri, 12 Feb 2016 13:42:22 +0000 (19:12 +0530)]
CRM-17990 - Import Event Participants Error

https://issues.civicrm.org/jira/browse/CRM-17990

8 years agoMerge pull request #7792 from seamuslee001/CRM-18021
Monish Deb [Fri, 12 Feb 2016 13:04:00 +0000 (18:34 +0530)]
Merge pull request #7792 from seamuslee001/CRM-18021

CRM-18021 Add in report viewing option for ab tests

8 years agoMerge pull request #7794 from PalanteJon/CRM-17029-4.7
Monish Deb [Fri, 12 Feb 2016 13:00:34 +0000 (18:30 +0530)]
Merge pull request #7794 from PalanteJon/CRM-17029-4.7

Crm-17029 4.7 - fix Add to Group profile setting doesn't work in petitions

8 years agoMerge pull request #7796 from eileenmcnaughton/CRM-18022
Monish Deb [Fri, 12 Feb 2016 11:08:29 +0000 (16:38 +0530)]
Merge pull request #7796 from eileenmcnaughton/CRM-18022

CRM-18022 fix performance on contribution repeat report

8 years agoMerge pull request #7661 from agileware/crm-17848
Monish Deb [Fri, 12 Feb 2016 06:29:52 +0000 (11:59 +0530)]
Merge pull request #7661 from agileware/crm-17848

CRM-17848: Round tax amount when calculated for contribution pages.

8 years agoMerge pull request #7782 from sarehag/CRM-18007
Monish Deb [Fri, 12 Feb 2016 04:47:57 +0000 (10:17 +0530)]
Merge pull request #7782 from sarehag/CRM-18007

CRM-18007:PCP: alpha pagination messed up

8 years agoCRM-18022 fix performance on contribution repeat report
eileenmcnaugton [Fri, 12 Feb 2016 03:52:01 +0000 (16:52 +1300)]
CRM-18022 fix performance on contribution repeat report

8 years agoCRM-17029 - fix notices
Jon goldberg [Thu, 11 Feb 2016 23:16:23 +0000 (18:16 -0500)]
CRM-17029 - fix notices

8 years agoCRM-17029 - Add to Group profile setting doesn't work on petitions
Jon goldberg [Thu, 11 Feb 2016 23:06:38 +0000 (18:06 -0500)]
CRM-17029 - Add to Group profile setting doesn't work on petitions

8 years agoCRM-18021 Add in report viewing option for ab tests
Seamus Lee [Thu, 11 Feb 2016 10:15:58 +0000 (10:15 +0000)]
CRM-18021 Add in report viewing option for ab tests

8 years agoMerge pull request #7791 from jitendrapurohit/CRM-18020
colemanw [Thu, 11 Feb 2016 15:06:22 +0000 (10:06 -0500)]
Merge pull request #7791 from jitendrapurohit/CRM-18020

CRM-18020 -- Getting Started Dashlet doubles when upgrading from 4.6.…

8 years agoAdd displayProfile() to toxic code alerts
Coleman Watts [Thu, 11 Feb 2016 15:04:04 +0000 (10:04 -0500)]
Add displayProfile() to toxic code alerts

8 years agoCRM-18020 -- Getting Started Dashlet doubles when upgrading from 4.6.12 to Future...
jitendrapurohit [Thu, 11 Feb 2016 13:07:39 +0000 (18:37 +0530)]
CRM-18020 -- Getting Started Dashlet doubles when upgrading from 4.6.12 to Future Versions

8 years agoMerge pull request #7789 from rohankatkar/CRM18010_Additional_Changes
Monish Deb [Thu, 11 Feb 2016 09:44:32 +0000 (15:14 +0530)]
Merge pull request #7789 from rohankatkar/CRM18010_Additional_Changes

Minor Changes for CRM-18010

8 years agoMinor Changes for CRM-18010
Web Access [Thu, 11 Feb 2016 09:24:40 +0000 (14:54 +0530)]
Minor Changes for CRM-18010

8 years agoMerge pull request #7779 from jitendrapurohit/CRM-17993
Monish Deb [Thu, 11 Feb 2016 05:57:14 +0000 (11:27 +0530)]
Merge pull request #7779 from jitendrapurohit/CRM-17993

CRM-17993 -- Participant Listing Report: total paid doubled when multiple fee options selected

8 years agoMerge pull request #7781 from rohankatkar/CRM-18010
Monish Deb [Thu, 11 Feb 2016 05:54:28 +0000 (11:24 +0530)]
Merge pull request #7781 from rohankatkar/CRM-18010

CRM-18010: Ensure type of each report filters

8 years agoMerge pull request #7788 from eileenmcnaughton/lybunt-tidy
Eileen McNaughton [Thu, 11 Feb 2016 05:37:26 +0000 (18:37 +1300)]
Merge pull request #7788 from eileenmcnaughton/lybunt-tidy

Lybunt follow on tidy up.

8 years agoMerge pull request #7787 from eileenmcnaughton/master
Eileen McNaughton [Thu, 11 Feb 2016 05:37:17 +0000 (18:37 +1300)]
Merge pull request #7787 from eileenmcnaughton/master

CRM-18018 fix lybunt report regression

8 years agoMerge pull request #7785 from sarehag/CRM-18014-Swedish-counties
Yashodha Chaku [Thu, 11 Feb 2016 05:14:14 +0000 (10:44 +0530)]
Merge pull request #7785 from sarehag/CRM-18014-Swedish-counties

CRM-18014:Missspelled county names in Sweden

8 years agoLybunt follow on tidy up.
eileen [Thu, 11 Feb 2016 03:25:22 +0000 (16:25 +1300)]
Lybunt follow on tidy up.

It has been pointed out to me the status clause is no longer used in this report - removing references to it

Also, reset the various arrays constructed in the report.

8 years agoCRM-18018 fix lybunt report regression
eileen [Thu, 11 Feb 2016 03:07:10 +0000 (16:07 +1300)]
CRM-18018 fix lybunt report regression

8 years agoMerge pull request #7786 from konadave/CRM-18017
Eileen McNaughton [Thu, 11 Feb 2016 02:03:00 +0000 (15:03 +1300)]
Merge pull request #7786 from konadave/CRM-18017

CRM-18017 add regions to manage premiums template...

8 years agoMerge pull request #7783 from JKingsnorth/CRM-18013
colemanw [Wed, 10 Feb 2016 23:43:53 +0000 (18:43 -0500)]
Merge pull request #7783 from JKingsnorth/CRM-18013

CRM-18013: Profile default value issue

8 years agoCRM-18017 add regions to manage premiums template
David Reedy Jr [Wed, 10 Feb 2016 23:40:50 +0000 (17:40 -0600)]
CRM-18017 add regions to manage premiums template

8 years agoCRM-18013: Profile default value issue
JKingsnorth [Wed, 10 Feb 2016 16:19:03 +0000 (16:19 +0000)]
CRM-18013: Profile default value issue

8 years agoCRM-18010: Ensure type of each report filters
Web Access [Wed, 10 Feb 2016 13:03:29 +0000 (18:33 +0530)]
CRM-18010: Ensure type of each report filters

8 years agoCRM-16259 CIVI-3 Modified permission checks for payment api
Edsel [Wed, 10 Feb 2016 11:28:58 +0000 (16:58 +0530)]
CRM-16259 CIVI-3 Modified permission checks for payment api

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259 CIVI-3 Added api test for checking permissions for payment API
Edsel [Wed, 27 Jan 2016 15:08:16 +0000 (20:38 +0530)]
CRM-16259 CIVI-3 Added api test for checking permissions for payment API

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259 CIVI-3 Switched to using API exception instead of API create error
Edsel [Wed, 27 Jan 2016 12:53:53 +0000 (18:23 +0530)]
CRM-16259 CIVI-3 Switched to using API exception instead of API create error

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoCRM-16259 CIVI-3 Added permissions for payment api
Edsel [Wed, 27 Jan 2016 12:42:15 +0000 (18:12 +0530)]
CRM-16259 CIVI-3 Added permissions for payment api

----------------------------------------
* CRM-16259: Create Payment API
  https://issues.civicrm.org/jira/browse/CRM-16259

8 years agoadd comment
jitendrapurohit [Wed, 10 Feb 2016 10:13:11 +0000 (15:43 +0530)]
add comment

8 years agoCRM-17993 -- Participant Listing Report: total paid doubled when multiple fee options...
jitendrapurohit [Wed, 10 Feb 2016 09:58:37 +0000 (15:28 +0530)]
CRM-17993 -- Participant Listing Report: total paid doubled when multiple fee options selected

8 years agoCRM-18014-Missspelled county names in Sweden
sarehag [Wed, 10 Feb 2016 02:28:11 +0000 (03:28 +0100)]
CRM-18014-Missspelled county names in Sweden

8 years agoCRM-18007:PCP: alpha pagination messed up
sarehag [Wed, 10 Feb 2016 00:29:17 +0000 (01:29 +0100)]
CRM-18007:PCP: alpha pagination messed up

8 years agoMerge pull request #7777 from eileenmcnaughton/master
Eileen McNaughton [Tue, 9 Feb 2016 23:12:32 +0000 (12:12 +1300)]
Merge pull request #7777 from eileenmcnaughton/master

CRM-17882 fix index name

8 years agoCRM-17882 fix index name
eileen [Tue, 9 Feb 2016 22:02:40 +0000 (11:02 +1300)]
CRM-17882 fix index name

8 years agoMerge pull request #7767 from eileenmcnaughton/master
Eileen McNaughton [Tue, 9 Feb 2016 21:42:55 +0000 (10:42 +1300)]
Merge pull request #7767 from eileenmcnaughton/master

CRM-17999 add index to civicrm_contribution.contribution_source

8 years agoMerge pull request #7776 from totten/master-ang-test
Tim Otten [Tue, 9 Feb 2016 21:39:26 +0000 (13:39 -0800)]
Merge pull request #7776 from totten/master-ang-test

Civi\Angular\ManagerTest - Fix false-negative

8 years agoCivi\Angular\ManagerTest - Fix false-negative
Tim Otten [Tue, 9 Feb 2016 21:05:47 +0000 (13:05 -0800)]
Civi\Angular\ManagerTest - Fix false-negative

The test is a bit overzealous.  To ensure that the 'settings' are being
processed, it checks to ensure that some settings (any settings) are
defined.  However, it looks for 2+ settings, and it's enough look for 1+.

8 years agoCRM-17999 add index to civicrm_contribution.contribution_source
eileen [Tue, 9 Feb 2016 00:50:28 +0000 (13:50 +1300)]
CRM-17999 add index to civicrm_contribution.contribution_source

Change-Id: Ia187634fa7b58c63a365f652894e7f3bb298ec35

8 years agoMerge pull request #7775 from routinet/CRM17995
Tim Otten [Tue, 9 Feb 2016 20:22:22 +0000 (12:22 -0800)]
Merge pull request #7775 from routinet/CRM17995

Revert portion of CRM17748

8 years agoMerge pull request #7774 from totten/master-dash-err
colemanw [Tue, 9 Feb 2016 20:06:14 +0000 (15:06 -0500)]
Merge pull request #7774 from totten/master-dash-err

CRM-17982 - CRM_Core_Config_MagicMerge - Fix warning on demos sites

8 years agoRevert portion of CRM17748
Steve Binkowski [Tue, 9 Feb 2016 18:58:20 +0000 (13:58 -0500)]
Revert portion of CRM17748

8 years agoCRM_Utils_File::createDir - Better docs
Tim Otten [Tue, 9 Feb 2016 18:45:40 +0000 (10:45 -0800)]
CRM_Utils_File::createDir - Better docs

8 years agoCRM_Core_Config_MagicMerge - Fix warning on demos sites
Tim Otten [Tue, 9 Feb 2016 18:42:40 +0000 (10:42 -0800)]
CRM_Core_Config_MagicMerge - Fix warning on demos sites

Apparently, createDir() will return FALSE if the folder already exists *or*
if the creation-act fails.  We only want to display a warning if the
creation-act fails.

8 years agoMerge pull request #7684 from JMAConsulting/CRM-16188-3
Eileen McNaughton [Tue, 9 Feb 2016 17:09:13 +0000 (06:09 +1300)]
Merge pull request #7684 from JMAConsulting/CRM-16188-3

CRM-16188, added order api for delete action and test

8 years agoMerge pull request #7771 from nielosz/group_titles
colemanw [Tue, 9 Feb 2016 16:04:58 +0000 (11:04 -0500)]
Merge pull request #7771 from nielosz/group_titles

CRM-18001 - Group titles undefined in groups list

8 years agoMerge pull request #7769 from sarehag/CRM-17994
colemanw [Tue, 9 Feb 2016 15:56:53 +0000 (10:56 -0500)]
Merge pull request #7769 from sarehag/CRM-17994

CRM-17994:Default state/province not working

8 years agoMerge pull request #7770 from monishdeb/CRM-17831
Monish Deb [Tue, 9 Feb 2016 13:09:35 +0000 (18:39 +0530)]
Merge pull request #7770 from monishdeb/CRM-17831

CRM-17831 fix

8 years agoCRM-18001 - Group titles undefined in groups list
Niels Heinemann [Tue, 9 Feb 2016 12:45:54 +0000 (13:45 +0100)]
CRM-18001 - Group titles undefined in groups list

----------------------------------------
* CRM-18001: Group titles undefined in groups list
  https://issues.civicrm.org/jira/browse/CRM-18001

8 years agoCRM-17831 fix
deb.monish [Tue, 9 Feb 2016 11:21:57 +0000 (16:51 +0530)]
CRM-17831 fix

8 years agoMerge pull request #7763 from monishdeb/CRM-17485
Eileen McNaughton [Tue, 9 Feb 2016 00:48:33 +0000 (13:48 +1300)]
Merge pull request #7763 from monishdeb/CRM-17485

CRM-17485 fix

8 years agoMerge pull request #7752 from eileenmcnaughton/master
Eileen McNaughton [Tue, 9 Feb 2016 00:47:59 +0000 (13:47 +1300)]
Merge pull request #7752 from eileenmcnaughton/master

CRM-17951 form fixes to make chargeback more consistent with refund b…

8 years agoMerge pull request #7766 from totten/master-upg-fix
Tim Otten [Tue, 9 Feb 2016 00:09:03 +0000 (16:09 -0800)]
Merge pull request #7766 from totten/master-upg-fix

Migrate+upgrade - Another fix for running with a DB that has foreign/unsupported paths

8 years agoCRM_Utils_File::findFiles() - Fail gracefully if directory doesn't exist
Tim Otten [Mon, 8 Feb 2016 22:32:15 +0000 (22:32 +0000)]
CRM_Utils_File::findFiles() - Fail gracefully if directory doesn't exist

8 years agoMerge pull request #7765 from colemanw/CRM-17992
colemanw [Mon, 8 Feb 2016 16:51:12 +0000 (11:51 -0500)]
Merge pull request #7765 from colemanw/CRM-17992

CRM-17992 - Fix financial type label

8 years agoCRM-17992 - Fix financial type label
Coleman Watts [Mon, 8 Feb 2016 16:50:10 +0000 (11:50 -0500)]
CRM-17992 - Fix financial type label

8 years agoCRM-17485 fix
deb.monish [Mon, 8 Feb 2016 10:59:41 +0000 (16:29 +0530)]
CRM-17485 fix

8 years ago--CRM-16188, added changes suggested by Eileen
Pradeep Nayak [Fri, 29 Jan 2016 14:03:45 +0000 (19:33 +0530)]
--CRM-16188, added changes suggested by Eileen

8 years agoCRM-16188, added order api for delete action and test
Pradeep Nayak [Wed, 27 Jan 2016 21:08:05 +0000 (02:38 +0530)]
CRM-16188, added order api for delete action and test

----------------------------------------
* CRM-16188: Create an order API
  https://issues.civicrm.org/jira/browse/CRM-16188

8 years agoMerge pull request #7754 from jitendrapurohit/CRM-17949
Monish Deb [Mon, 8 Feb 2016 09:39:19 +0000 (15:09 +0530)]
Merge pull request #7754 from jitendrapurohit/CRM-17949

CRM-17949 -- unable to save data in custom data tab