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
JKingsnorth [Wed, 10 Feb 2016 16:19:03 +0000 (16:19 +0000)]
CRM-18013: Profile default value issue
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
eileen [Tue, 9 Feb 2016 22:02:40 +0000 (11:02 +1300)]
CRM-17882 fix index name
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
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
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+.
eileen [Tue, 9 Feb 2016 00:50:28 +0000 (13:50 +1300)]
CRM-17999 add index to civicrm_contribution.contribution_source
Change-Id: Ia187634fa7b58c63a365f652894e7f3bb298ec35
Tim Otten [Tue, 9 Feb 2016 20:22:22 +0000 (12:22 -0800)]
Merge pull request #7775 from routinet/CRM17995
Revert portion of CRM17748
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
Steve Binkowski [Tue, 9 Feb 2016 18:58:20 +0000 (13:58 -0500)]
Revert portion of CRM17748
Tim Otten [Tue, 9 Feb 2016 18:45:40 +0000 (10:45 -0800)]
CRM_Utils_File::createDir - Better docs
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.
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
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
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
Monish Deb [Tue, 9 Feb 2016 13:09:35 +0000 (18:39 +0530)]
Merge pull request #7770 from monishdeb/CRM-17831
CRM-17831 fix
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
deb.monish [Tue, 9 Feb 2016 11:21:57 +0000 (16:51 +0530)]
CRM-17831 fix
Eileen McNaughton [Tue, 9 Feb 2016 00:48:33 +0000 (13:48 +1300)]
Merge pull request #7763 from monishdeb/CRM-17485
CRM-17485 fix
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…
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
Tim Otten [Mon, 8 Feb 2016 22:32:15 +0000 (22:32 +0000)]
CRM_Utils_File::findFiles() - Fail gracefully if directory doesn't exist
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
Coleman Watts [Mon, 8 Feb 2016 16:50:10 +0000 (11:50 -0500)]
CRM-17992 - Fix financial type label
deb.monish [Mon, 8 Feb 2016 10:59:41 +0000 (16:29 +0530)]
CRM-17485 fix
Pradeep Nayak [Fri, 29 Jan 2016 14:03:45 +0000 (19:33 +0530)]
--CRM-16188, added changes suggested by Eileen
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
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
Monish Deb [Mon, 8 Feb 2016 08:50:07 +0000 (14:20 +0530)]
Merge pull request #7723 from KarinG/JIRA-17952
JIRA-17952 - adding currency into the AJAX request.
Yashodha Chaku [Mon, 8 Feb 2016 07:58:28 +0000 (13:28 +0530)]
Merge pull request #7760 from barnabycourt/pledge_summary
CRM-17987 Allow grouping pledge summary report by financial type.
Tim Otten [Mon, 8 Feb 2016 07:20:32 +0000 (23:20 -0800)]
Merge pull request #7762 from totten/master-fix-stupid-sql
CRM-17951 - Fix bad SQL that causes systemic failures
Tim Otten [Mon, 8 Feb 2016 06:37:40 +0000 (22:37 -0800)]
CRM-17951 - Fix bad SQL that causes systemic failures
colemanw [Sun, 7 Feb 2016 19:05:44 +0000 (14:05 -0500)]
Merge pull request #7761 from lcdservices/CRM-17988
CRM-17988: fix member source in search builder
Brian Shaughnessy [Sun, 7 Feb 2016 03:31:51 +0000 (22:31 -0500)]
CRM-17988: fix member source in search builder
Barnaby Court [Sun, 7 Feb 2016 02:20:03 +0000 (21:20 -0500)]
CRM-17987 Allow grouping pledge summary report by financial type.
colemanw [Sun, 7 Feb 2016 00:44:58 +0000 (19:44 -0500)]
Merge pull request #7758 from colemanw/phpVer
Better deprecation warning about older php versions.
Coleman Watts [Sat, 6 Feb 2016 02:52:05 +0000 (21:52 -0500)]
Better deprecation warning about older php versions.
Eileen McNaughton [Fri, 5 Feb 2016 19:53:28 +0000 (08:53 +1300)]
Merge pull request #7757 from civicrm/eileenmcnaughton-patch-1
CRM-17951 fix capitalisation on upgrade insert
Eileen McNaughton [Fri, 5 Feb 2016 19:53:13 +0000 (08:53 +1300)]
CRM-17951 fix capitalisation on upgrade insert
Yashodha Chaku [Fri, 5 Feb 2016 09:37:31 +0000 (15:07 +0530)]
Merge pull request #7755 from yashodha/update-contributors
Update contributors list
yashodha [Fri, 5 Feb 2016 08:37:21 +0000 (14:07 +0530)]
Update contributors list
Monish Deb [Fri, 5 Feb 2016 07:16:11 +0000 (12:46 +0530)]
Merge pull request #7753 from rohankatkar/CRM-17878
CRM-17878
jitendrapurohit [Fri, 5 Feb 2016 06:52:36 +0000 (12:22 +0530)]
CRM-17949 -- unable to save data in custom data tab
Yashodha Chaku [Fri, 5 Feb 2016 05:23:03 +0000 (10:53 +0530)]
Merge pull request #7746 from yashodha/4.7.CRM-17908
CRM-17908:text version of header/footer not used when auto-generating
eileen [Fri, 5 Feb 2016 03:55:38 +0000 (16:55 +1300)]
CRM-17951 form fixes to make chargeback more consistent with refund behaviour
Eileen McNaughton [Fri, 5 Feb 2016 03:37:35 +0000 (16:37 +1300)]
Merge pull request #7749 from eileenmcnaughton/master
CRM-17951 add support for a financial account for refunds & chargebacks
Coleman Watts [Thu, 4 Feb 2016 20:14:13 +0000 (13:14 -0700)]
API Explorer: Use Civi::paths instead of global $civicrm_root
colemanw [Thu, 4 Feb 2016 19:25:49 +0000 (12:25 -0700)]
Merge pull request #7750 from agh1/petition-uf-block
CRM-17969 petitions should use common profile block template
Eileen McNaughton [Thu, 4 Feb 2016 19:14:53 +0000 (08:14 +1300)]
Merge pull request #7748 from eileenmcnaughton/transaction_view
CRM-17951 modify transaction view to show the financial account of th…
Andrew Hunt [Thu, 4 Feb 2016 18:42:30 +0000 (13:42 -0500)]
CRM-17969 petitions should use common profile block template
----------------------------------------
* CRM-17969: Free HTML field shows entry box in petitions
https://issues.civicrm.org/jira/browse/CRM-17969
eileen [Thu, 4 Feb 2016 10:54:31 +0000 (23:54 +1300)]
CRM-17951 add Contribution Status of Chargeback
Eileen McNaughton [Thu, 4 Feb 2016 12:20:25 +0000 (01:20 +1300)]
Merge pull request #7747 from eileenmcnaughton/xml
Fix schema for financial_trxn, on code review the status_id is contri…
eileen [Thu, 4 Feb 2016 10:22:00 +0000 (23:22 +1300)]
CRM-17951 add support for having an account relationship for refunds.
The support covers the relationship 'falling back' to current behaviour if a Contra/Credit Revenue Account is
entry is not configured for the financial type.
eileen [Thu, 4 Feb 2016 05:44:39 +0000 (18:44 +1300)]
CRM-17951 add Chargeback & refund account relationships and Chargeback status
eileen [Thu, 4 Feb 2016 11:33:33 +0000 (00:33 +1300)]
CRM-17951 modify transaction view to show the financial account of the transaction
Previously it was showing the financial type of the contribution - but the payment could have a different financial account, although that would not be the norm and for most users no difference would be apparent. I added a group_concat in case there are multiple accounts associated with a transaction now, or in the future.
Note we have separately discussed exposing line item detail - this got stalled on how to make it look tidy in the UI
eileen [Thu, 4 Feb 2016 10:55:27 +0000 (23:55 +1300)]
Fix schema for financial_trxn, on code review the status_id is contribution_status_id
The comment implied it was financial_item_status_id but existing values/ code do not support this
yashodha [Thu, 4 Feb 2016 10:36:03 +0000 (16:06 +0530)]
CRM-17908: more fixes
----------------------------------------
* CRM-17908: text version of header/footer not used when auto-generating text version of email
https://issues.civicrm.org/jira/browse/CRM-17908
yashodha [Thu, 4 Feb 2016 10:30:46 +0000 (16:00 +0530)]
CRM-17908 - text version of header/footer not used when auto-generating text version of email
https://issues.civicrm.org/jira/browse/CRM-17908
Eileen McNaughton [Thu, 4 Feb 2016 09:37:09 +0000 (22:37 +1300)]
Merge pull request #7745 from eileenmcnaughton/CRM-17951-refactor
CRM-17951 preliminary refactoring to improve code legibility
yashodha [Thu, 4 Feb 2016 09:35:05 +0000 (15:05 +0530)]
CRM-17908:text version of header/footer not used when auto-generating
----------------------------------------
* CRM-17908: text version of header/footer not used when auto-generating text version of email
https://issues.civicrm.org/jira/browse/CRM-17908
yashodha [Thu, 4 Feb 2016 07:04:35 +0000 (12:34 +0530)]
CRM-17908:text version of header/footer not used when auto-generating
----------------------------------------
* CRM-17908: text version of header/footer not used when auto-generating text version of email
https://issues.civicrm.org/jira/browse/CRM-17908
eileen [Thu, 4 Feb 2016 05:44:39 +0000 (18:44 +1300)]
CRM-17951 preliminary refactoring to improve code legibility
Change-Id: I51fcaf6898dee9e32b56ea9fbe5b9d4c9bc457a6
Eileen McNaughton [Thu, 4 Feb 2016 04:03:18 +0000 (17:03 +1300)]
Merge pull request #7743 from eileenmcnaughton/entityFinancialAccount
Add Entity Financial Account api
Tim Otten [Thu, 4 Feb 2016 03:53:47 +0000 (20:53 -0700)]
Merge pull request #7744 from totten/master-upg-baddir
CRM_Core_Config, Upgrade Tests - Display warning when mkdir fails
Tim Otten [Thu, 4 Feb 2016 03:40:57 +0000 (20:40 -0700)]
Merge pull request #7742 from totten/master-perm
Remove unnecessary executable bits
Tim Otten [Thu, 4 Feb 2016 03:16:20 +0000 (20:16 -0700)]
CRM_Core_Config - Display warning when mkdir fails
eileen [Thu, 4 Feb 2016 01:19:36 +0000 (14:19 +1300)]
Add Entity Financial Account api
(to support testing)
Tim Otten [Thu, 4 Feb 2016 00:22:29 +0000 (17:22 -0700)]
Remove unnecessary executable bits
colemanw [Thu, 4 Feb 2016 00:00:39 +0000 (17:00 -0700)]
Merge pull request #7739 from twomice/CRM_17609
CRM_17609: Correct user->contact sync in Drupal 8.
Tim Otten [Wed, 3 Feb 2016 23:57:28 +0000 (16:57 -0700)]
Merge pull request #7727 from totten/master-psr4
CRM-17957 - Allow extensions to register with PHP classloader (PSR-4)
Tim Otten [Wed, 3 Feb 2016 23:56:36 +0000 (16:56 -0700)]
Merge pull request #7737 from totten/master-cv-env
CiviTest/bootstrap.php - Change env handling in `cv()`
Tim Otten [Wed, 3 Feb 2016 23:43:36 +0000 (16:43 -0700)]
Merge pull request #7741 from eileenmcnaughton/tests
Add default to function signature
Tim Otten [Wed, 3 Feb 2016 21:37:07 +0000 (14:37 -0700)]
Merge pull request #7740 from civicrm/revert-7717-CRM-17908
Revert "CRM-17908: text version of header/footer not used when auto-generatin…"
eileen [Wed, 3 Feb 2016 21:30:14 +0000 (10:30 +1300)]
Add default to function signature
Allen Shaw [Wed, 3 Feb 2016 20:45:03 +0000 (14:45 -0600)]
CRM_17609: Correct user->contact sync in Drupal 8.
Tim Otten [Wed, 3 Feb 2016 21:12:13 +0000 (14:12 -0700)]
Revert "CRM-17908: text version of header/footer not used when auto-generatin…"
Tim Otten [Wed, 3 Feb 2016 20:29:24 +0000 (13:29 -0700)]
CiviTest/bootstrap.php - Change env handling in `cv()`
In Ubuntu's php-cli, the php.ini overrides `variables_order` with `GPCS` --
which destroys `$_ENV`.
This seems pretty stupid... perhaps they conflated `variables_order` with
`request_order`.
At any rate, we'll have to do statey-swappy `putenv()` things instead.
Yashodha Chaku [Wed, 3 Feb 2016 12:14:36 +0000 (17:44 +0530)]
Merge pull request #7734 from yashodha/4.7-version-fix
Update version to 4.7.2
yashodha [Wed, 3 Feb 2016 12:10:33 +0000 (17:40 +0530)]
Update version to 4.7.2
Eileen McNaughton [Wed, 3 Feb 2016 11:00:18 +0000 (00:00 +1300)]
Merge pull request #7732 from eileenmcnaughton/CRM-17951
CRM-17951 Add function to safe-add option values in upgrade
Eileen McNaughton [Wed, 3 Feb 2016 10:46:46 +0000 (23:46 +1300)]
Merge pull request #7726 from eileenmcnaughton/CRM-17775
CRM-17775 fix indexes on table civicrm_financial_item
eileen [Wed, 3 Feb 2016 09:54:28 +0000 (22:54 +1300)]
CRM-17951 Add function to safe-add option values in upgrade
eileen [Tue, 2 Feb 2016 23:42:52 +0000 (12:42 +1300)]
CRM-17775 fix indexes on table civicrm_financial_item
colemanw [Wed, 3 Feb 2016 05:35:21 +0000 (22:35 -0700)]
Merge pull request #7729 from colemanw/CRM-17960
CRM-17960 - Handle redirects in popups
Coleman Watts [Wed, 3 Feb 2016 05:20:48 +0000 (22:20 -0700)]
CRM-17960 - Handle redirects in popups
Yashodha Chaku [Wed, 3 Feb 2016 05:20:27 +0000 (10:50 +0530)]
Merge pull request #7722 from kcristiano/17593
CRM-17593 -Update comment for change from role based permission to ca…
Yashodha Chaku [Wed, 3 Feb 2016 05:12:54 +0000 (10:42 +0530)]
Merge pull request #7717 from yashodha/CRM-17908
CRM-17908: text version of header/footer not used when auto-generatin…
Tim Otten [Wed, 3 Feb 2016 03:16:54 +0000 (20:16 -0700)]
CRM-17957 - Allow extensions to register with PHP classloader (PSR-4)
For example, in info.xml, add:
```
<classloader>
<psr4 prefix="Civi\Foo\Bar\" path="src" />
</classloader>
```
KarinG [Tue, 2 Feb 2016 23:14:06 +0000 (16:14 -0700)]
JIRA-17952 - adding currency into the AJAX request.
Eileen McNaughton [Wed, 3 Feb 2016 01:18:38 +0000 (14:18 +1300)]
Merge pull request #7724 from eileenmcnaughton/CRM-17775-test
CRM-17775 Add safe function for dropping indexes
eileen [Wed, 3 Feb 2016 00:10:57 +0000 (13:10 +1300)]
CRM-17775 Add safe function for dropping indexes
Eileen McNaughton [Tue, 2 Feb 2016 23:10:50 +0000 (12:10 +1300)]
Merge pull request #7686 from JMAConsulting/CRM-16188-5
CRM-16188, added order api for create action with test
Tim Otten [Tue, 2 Feb 2016 20:02:59 +0000 (13:02 -0700)]
Merge pull request #7641 from totten/master-test-cv
CRM-17860 - Align bootstrap logic in tests; looser coupling
Kevin Cristiano [Tue, 2 Feb 2016 19:01:38 +0000 (12:01 -0700)]
CRM-17593 -Update comment for change from role based permission to capabilties based permissions
----------------------------------------
* CRM-17593: Certain Permissions are hard coded to 'Administrator' in CRM_Core_Permission_WordPress
https://issues.civicrm.org/jira/browse/CRM-17593
colemanw [Tue, 2 Feb 2016 18:50:45 +0000 (11:50 -0700)]
Merge pull request #7718 from jitendrapurohit/multi-installfix
revert #5287 to avoid exception after non-English installation
colemanw [Tue, 2 Feb 2016 18:33:47 +0000 (11:33 -0700)]
Merge pull request #7689 from eileenmcnaughton/CRM-17881
CRM-17881 extend createIndex function to create combined indexes
colemanw [Tue, 2 Feb 2016 18:31:25 +0000 (11:31 -0700)]
Merge pull request #7637 from jmcclelland/CRM-17812
CRM-17812 - enable anonymous access to angular extension pages
colemanw [Tue, 2 Feb 2016 18:28:48 +0000 (11:28 -0700)]
Merge pull request #7714 from colemanw/Improve
Improve navigation menu item edit form
colemanw [Tue, 2 Feb 2016 18:27:05 +0000 (11:27 -0700)]
Merge pull request #7716 from twomice/drupal8_master
Toward CRM-17917, support for Drupal 8
projects / civicrm-core.git / log