Dave Greenberg [Tue, 6 Oct 2015 18:55:44 +0000 (11:55 -0700)]
Merge pull request #6893 from seamuslee001/CRM-17341
CRM-17341 Include Hold date in the display of Emails on contact records to show…
colemanw [Tue, 6 Oct 2015 18:26:05 +0000 (14:26 -0400)]
Merge pull request #6806 from colemanw/CRM-16980
CRM-16980 - Improve case role handing
Kurund Jalmi [Tue, 6 Oct 2015 06:38:48 +0000 (12:08 +0530)]
Merge pull request #6890 from monishdeb/46merge
4.6.9 merge-forward
Seamus Lee [Tue, 6 Oct 2015 03:23:50 +0000 (03:23 +0000)]
Include Hold date in the display of Emails on contact records to show when the address was put on hold
Dave Greenberg [Mon, 5 Oct 2015 23:15:53 +0000 (16:15 -0700)]
Merge pull request #6880 from eileenmcnaughton/CRM-17329
CRM-17329 fix over-zealous setting of recurring and add unit test
Dave Greenberg [Mon, 5 Oct 2015 22:03:14 +0000 (15:03 -0700)]
Merge pull request #6886 from jaapjansma/CRM-17338
Fixed #CRM-17338
Eileen McNaughton [Mon, 5 Oct 2015 20:56:46 +0000 (09:56 +1300)]
Merge pull request #6812 from eileenmcnaughton/CRM-17075
CRM-17075 further fix to using entity reference for membership_type_i…
monishdeb [Mon, 5 Oct 2015 04:54:41 +0000 (10:24 +0530)]
Relationship count fix
monishdeb [Mon, 21 Sep 2015 14:39:14 +0000 (20:09 +0530)]
Revert CRM-17067 fix
----------------------------------------
* CRM-17067: New relationship permission enforcement has result to related membership not created via public pages
https://issues.civicrm.org/jira/browse/CRM-17067
monishdeb [Mon, 21 Sep 2015 14:17:36 +0000 (19:47 +0530)]
minor change
monishdeb [Mon, 21 Sep 2015 13:49:45 +0000 (19:19 +0530)]
Revert "revert CRM-16711 fix "
This reverts commit
1ca927cc816b21e779ebc0e9e5e2dd3bd275debd.
monishdeb [Wed, 26 Aug 2015 06:00:20 +0000 (11:30 +0530)]
format fixes
monishdeb [Wed, 26 Aug 2015 05:28:02 +0000 (10:58 +0530)]
CRM-17067 fix - New relationship permission enforcement has result to related membership not created via public pages
https://issues.civicrm.org/jira/browse/CRM-17067
Guanhuan Chen [Fri, 2 Oct 2015 15:35:14 +0000 (16:35 +0100)]
Condense credit note number query
eileen [Thu, 1 Oct 2015 23:56:47 +0000 (12:56 +1300)]
CRM-17326 add isset check to timezone retrieval
This addresses an e-notice
Change-Id: I82d3314bc2e28cca64ec9f4ed4d64477c50b7303
Adam Roses Wight [Thu, 1 Oct 2015 08:50:24 +0000 (01:50 -0700)]
CRM-17322 output upgrade as text
This adds the 'text' array to the output params. There is a patch in drush to
print this rather than the html. wp-cli could do with such a patch too but out-of-scope here
Change-Id: Ib8ea9a2e056e225904cb96b2d0de815148ad3f8b
Guanhuan Chen [Thu, 1 Oct 2015 12:18:15 +0000 (13:18 +0100)]
Add unit test for createCreditNoteId
Guanhuan Chen [Thu, 1 Oct 2015 12:17:39 +0000 (13:17 +0100)]
Add credit note id if a contribution is created with cancelled/refunded status
Guanhuan Chen [Thu, 1 Oct 2015 11:46:28 +0000 (12:46 +0100)]
Refactor redundant code with reusable function
Guanhuan Chen [Tue, 29 Sep 2015 16:54:27 +0000 (17:54 +0100)]
Generate a sequential credit note id when a contribution is cancelled or refunded
Guanhuan Chen [Tue, 29 Sep 2015 15:59:41 +0000 (16:59 +0100)]
Fix credit note sequence issue
eileenmcnaugton [Wed, 30 Sep 2015 10:19:50 +0000 (23:19 +1300)]
CRM-17311 wrap call to watchdog in function_exists
Coleman Watts [Tue, 29 Sep 2015 00:22:33 +0000 (20:22 -0400)]
Fix test failures
Coleman Watts [Sun, 27 Sep 2015 18:28:14 +0000 (14:28 -0400)]
Add unit tests for CRM_Utils_Type
Monish Deb [Mon, 5 Oct 2015 17:24:51 +0000 (22:54 +0530)]
Merge pull request #6884 from yashodha/CRM-17328
CRM-17328: Almost all sample dashlet reports are broken
Dave Greenberg [Mon, 5 Oct 2015 17:15:22 +0000 (10:15 -0700)]
Merge pull request #6876 from davecivicrm/CRM-17292
CRM-17292 - Fix default permissions on Contact Reports. Should be vie…
Jaap Jansma [Mon, 5 Oct 2015 14:04:39 +0000 (16:04 +0200)]
Fixed #CRM-17338
yashodha [Mon, 5 Oct 2015 08:35:17 +0000 (14:05 +0530)]
CRM-17328: Almost all sample dashlet reports are broken
----------------------------------------
* CRM-17328: Almost all 'sample' dashlet reports are broken
https://issues.civicrm.org/jira/browse/CRM-17328
eileenmcnaugton [Sun, 4 Oct 2015 08:28:45 +0000 (21:28 +1300)]
CRM-17329 fix over-zealous setting of recurring and add unit test
Tim Otten [Sat, 3 Oct 2015 21:03:27 +0000 (17:03 -0400)]
Merge pull request #6878 from totten/master-upgstg
CRM-17330 - Fix upgrade of `disable_core_css` setting
Tim Otten [Sat, 3 Oct 2015 14:36:07 +0000 (10:36 -0400)]
CRM-17330 - Fix upgrade of `disable_core_css` setting
Dave Greenberg [Sat, 3 Oct 2015 02:22:27 +0000 (22:22 -0400)]
CRM-17292 - Fix default permissions on Contact Reports. Should be view all contacts, NOT administer CiviCRM.
----------------------------------------
* CRM-17292: Contact Reports incorrectly requires 'administer reports' permission
https://issues.civicrm.org/jira/browse/CRM-17292
Dave Greenberg [Sat, 3 Oct 2015 02:02:55 +0000 (22:02 -0400)]
Merge pull request #6874 from PalanteJon/CRM-17241
CRM-17241 - modify template and PHP for membership renewal to support…
Eileen McNaughton [Sat, 3 Oct 2015 00:56:22 +0000 (13:56 +1300)]
Merge pull request #6867 from saurabhbatra96/comment-fixes
Comment fixes for CRM/Mailing/ and CRM/Report/Page directories.
Jon goldberg [Fri, 2 Oct 2015 20:22:48 +0000 (16:22 -0400)]
CRM-17241 - modify template and PHP for membership renewal to support renewing multiple terms on credit card renewal
Saurabh Batra [Fri, 2 Oct 2015 15:56:55 +0000 (21:26 +0530)]
Fixed the errors Jenkins pointed out.
Saurabh Batra [Fri, 2 Oct 2015 07:11:21 +0000 (12:41 +0530)]
Comment fixes for CRM/Mailing directory.
Saurabh Batra [Thu, 1 Oct 2015 18:29:30 +0000 (23:59 +0530)]
comment fixes for Report/Page
Dave Greenberg [Fri, 2 Oct 2015 03:02:59 +0000 (23:02 -0400)]
Merge pull request #6597 from jitendrapurohit/CRM-12078
CRM-12078 -- Change Inherited Membership status to expired instead of…
Dave Greenberg [Thu, 1 Oct 2015 14:25:48 +0000 (10:25 -0400)]
Merge pull request #6864 from xurizaemon/CRM-16820
CRM-16820. Check curl info and regex result.
Yashodha Chaku [Thu, 1 Oct 2015 06:07:46 +0000 (11:37 +0530)]
Merge pull request #6865 from yashodha/fix-message
fix the version for 4.7
Monish Deb [Thu, 1 Oct 2015 06:04:36 +0000 (11:34 +0530)]
Merge pull request #6863 from monishdeb/46merge
4.7 broken links on Drupal upgrade
yashodha [Thu, 1 Oct 2015 05:07:34 +0000 (10:37 +0530)]
fix the version for 4.7
Chris Burgess [Thu, 1 Oct 2015 02:51:35 +0000 (15:51 +1300)]
CRM-16820. Check curl info and regex result.
Dave Greenberg [Thu, 1 Oct 2015 01:48:52 +0000 (21:48 -0400)]
Merge pull request #6850 from mattwire/CRM-17113
Don't allow user with ACL 'View Event Participants' to change fee selections
monishdeb [Wed, 30 Sep 2015 21:37:48 +0000 (03:07 +0530)]
4.7 broken links on Drupal upgrade
colemanw [Wed, 30 Sep 2015 21:31:40 +0000 (17:31 -0400)]
Merge pull request #6862 from PalanteJon/CRM-17315
CRM-17315 - CiviReport - Membership Contribution Details report - ind…
Jon goldberg [Wed, 30 Sep 2015 21:25:15 +0000 (17:25 -0400)]
CRM-17315 - CiviReport - Membership Contribution Details report - index the temporary table to prevent unindexed joins when calculating statistics
colemanw [Wed, 30 Sep 2015 15:50:04 +0000 (11:50 -0400)]
Merge pull request #6861 from totten/master-getsrt-setting
gettingStartedUrl - Declare setting metadata
colemanw [Wed, 30 Sep 2015 15:43:43 +0000 (11:43 -0400)]
Merge pull request #6847 from colemanw/CRM-17232
CRM-17232 - Remove reference to undefined ck
colemanw [Wed, 30 Sep 2015 15:41:54 +0000 (11:41 -0400)]
Merge pull request #6837 from eileenmcnaughton/CRM-17176
CRM-17176 Add report menu rebuild function & api …
Tim Otten [Wed, 30 Sep 2015 14:59:58 +0000 (10:59 -0400)]
gettingStartedUrl - Declare setting metadata
CiviCRM [Wed, 30 Sep 2015 14:49:54 +0000 (07:49 -0700)]
Update version to 4.7.alpha3
Kurund Jalmi [Wed, 30 Sep 2015 13:15:51 +0000 (18:45 +0530)]
Merge pull request #6860 from monishdeb/46merge
4.6.9 merge-forward
monishdeb [Wed, 30 Sep 2015 07:30:20 +0000 (13:00 +0530)]
4.6.5 upgrade failure
Coleman Watts [Tue, 29 Sep 2015 00:22:33 +0000 (20:22 -0400)]
Fix test failures
Coleman Watts [Mon, 28 Sep 2015 02:38:50 +0000 (22:38 -0400)]
Only allow group inline edit when appropriate
Coleman Watts [Sun, 27 Sep 2015 18:28:14 +0000 (14:28 -0400)]
Add unit tests for CRM_Utils_Type
Coleman Watts [Sun, 27 Sep 2015 15:24:25 +0000 (11:24 -0400)]
Fixes for CRM_Utils_Type
eileenmcnaugton [Thu, 24 Sep 2015 15:15:45 +0000 (03:15 +1200)]
CRM-17278 autorenew not checked in some circumstances
eileenmcnaugton [Thu, 24 Sep 2015 12:17:48 +0000 (00:17 +1200)]
CRM-17275 Contact.duplicate api test
eileenmcnaugton [Thu, 24 Sep 2015 12:08:10 +0000 (00:08 +1200)]
CRM-17275 Import - allow contact WITH external identifier to match one without
eileenmcnaugton [Thu, 24 Sep 2015 09:34:53 +0000 (21:34 +1200)]
CRM-17275 Import parser: add test for what IS workding
jitendrapurohit [Thu, 24 Sep 2015 11:06:50 +0000 (16:36 +0530)]
CRM-17251 - Book-keeping report displays rows inaccurately when contribution amount has been edited
eileen [Fri, 18 Sep 2015 00:26:39 +0000 (12:26 +1200)]
CRM-17242 notice fix
eileenmcnaugton [Mon, 14 Sep 2015 08:20:50 +0000 (20:20 +1200)]
CRM-17215 fix auto-renew not showing on radio options
Fix the scenario where auto-renew is blocked because multiple duration configurations are available
in a price set but need not be blocked as they are mutually exclusive
Kurund Jalmi [Wed, 30 Sep 2015 10:46:23 +0000 (16:16 +0530)]
Merge pull request #6858 from eileenmcnaughton/comments
Comments
Yashodha Chaku [Wed, 30 Sep 2015 10:05:54 +0000 (15:35 +0530)]
Merge pull request #6857 from yashodha/CRM-17184
CRM-17184: Some States (Departments) are missing from El Salvador
eileenmcnaugton [Wed, 30 Sep 2015 10:00:48 +0000 (23:00 +1300)]
comment fixes
eileenmcnaugton [Wed, 30 Sep 2015 09:32:52 +0000 (22:32 +1300)]
comment fixes
eileenmcnaugton [Wed, 30 Sep 2015 04:17:25 +0000 (17:17 +1300)]
comments fix up
yashodha [Wed, 30 Sep 2015 08:51:17 +0000 (14:21 +0530)]
fix generated data
yashodha [Wed, 30 Sep 2015 07:54:40 +0000 (13:24 +0530)]
CRM-17184: Some States (Departments) are missing from El Salvador
----------------------------------------
* CRM-17184: Some "States" (Departments) are missing from El Salvador
https://issues.civicrm.org/jira/browse/CRM-17184
Monish Deb [Wed, 30 Sep 2015 07:32:46 +0000 (13:02 +0530)]
Merge pull request #6855 from monishdeb/test-master
4.7 alpha2 test failure fix
Anthony Nemirovsky [Tue, 29 Sep 2015 02:53:59 +0000 (15:53 +1300)]
CRM-17176 add button to reset reports
CRM-17176 fix line break
eileenmcnaugton [Tue, 29 Sep 2015 02:04:40 +0000 (15:04 +1300)]
CRM-17176 further fix to navigation reset
The reset was stealing menu items from other menus as a result of the having the same name
monishdeb [Wed, 30 Sep 2015 05:49:41 +0000 (11:19 +0530)]
test failure fix
eileenmcnaugton [Thu, 10 Sep 2015 22:09:47 +0000 (10:09 +1200)]
add rest of navigation BAO to help satisfy syntax conformance test
Anthony Nemirovsky [Tue, 8 Sep 2015 07:17:17 +0000 (19:17 +1200)]
CRM-17176 Add report menu rebuild function & api
This is code extracted from a bunch of improvements by Giant Rabbit. It adds a function to rebuild the report menu
I have given this an api interface (& moved the functions around a little)
wmf CRM-17176 enhance navigation-reset to accept domain as a parameter
CRM-17176 navigation reset api - fix type
Tim Otten [Tue, 29 Sep 2015 22:19:20 +0000 (18:19 -0400)]
crm.ckeditor.js - s/angular/_/
Tim Otten [Tue, 29 Sep 2015 22:13:23 +0000 (18:13 -0400)]
CRM-17232 - crm.ckeditor.js - Emit `change` after changes
For reasons unknown, ckeditor does not emit its own change event when a user
modifies content.
Matthew Wire [Tue, 29 Sep 2015 22:10:12 +0000 (23:10 +0100)]
Don't allow user with ACL 'View Event Participants' to change fee selections
colemanw [Tue, 29 Sep 2015 22:06:15 +0000 (18:06 -0400)]
Merge pull request #6849 from mattwire/CRM-17109
CRM-17109 Simple modification to the Custom.tpl template to use jQuery DatePicker for all *_date fields.
Matthew Wire [Tue, 29 Sep 2015 21:59:55 +0000 (22:59 +0100)]
Simple modification to the Custom.tpl template to use jQuery DatePicker for all *_date fields.
colemanw [Tue, 29 Sep 2015 21:42:19 +0000 (17:42 -0400)]
Merge pull request #6841 from jitendrapurohit/CRM-17286
CRM-17286 - Add Soft Credit Amount, Soft Credit Type, Soft Credit For…
colemanw [Tue, 29 Sep 2015 21:12:33 +0000 (17:12 -0400)]
Merge pull request #6772 from eileenmcnaughton/CRM-17253
CRM-17253 omit expensive unused information from token query
colemanw [Tue, 29 Sep 2015 21:10:47 +0000 (17:10 -0400)]
Merge pull request #6775 from eileenmcnaughton/CRM-17254
CRM-17254 retrieving groups: don't append extra params
Coleman Watts [Tue, 29 Sep 2015 20:42:26 +0000 (16:42 -0400)]
CRM-17232 - Remove reference to undefined ck
colemanw [Tue, 29 Sep 2015 19:55:07 +0000 (15:55 -0400)]
Merge pull request #6846 from colemanw/CRM-16444
CRM-16444 - Cleanup CKEdior configurator to use Civi::paths()
Coleman Watts [Tue, 29 Sep 2015 19:50:56 +0000 (15:50 -0400)]
CRM-16444 - Cleanup CKEdior configurator to use Civi::paths()
Eileen McNaughton [Tue, 29 Sep 2015 19:50:43 +0000 (08:50 +1300)]
Merge pull request #6826 from eileenmcnaughton/CRM-17294
CRM-17294 renamed fields not passed to processor
Tim Otten [Tue, 29 Sep 2015 17:28:02 +0000 (13:28 -0400)]
Merge pull request #6842 from totten/master-req534
Update minimum PHP to 5.3.4
Tim Otten [Tue, 29 Sep 2015 15:34:26 +0000 (11:34 -0400)]
Update minimum PHP to 5.3.4
Yashodha Chaku [Tue, 29 Sep 2015 13:41:04 +0000 (19:11 +0530)]
Merge pull request #6839 from yashodha/CRM-17302
CRM-17302: Fix component for contribution activities
Monish Deb [Tue, 29 Sep 2015 12:15:42 +0000 (17:45 +0530)]
Merge pull request #6743 from jitendrapurohit/CRM-17182
CRM-17182 -- Renaming a price option / fee level breaks event partici…
Yashodha Chaku [Tue, 29 Sep 2015 11:42:12 +0000 (17:12 +0530)]
Merge pull request #6836 from yashodha/CRM-12675
CRM-12675: Contribution activities shown to users without permission
jitendrapurohit [Tue, 29 Sep 2015 11:41:54 +0000 (17:11 +0530)]
CRM-17286 - Add Soft Credit Amount, Soft Credit Type, Soft Credit For, Soft Credit For Contribution ID to contribution export/select fields
Monish Deb [Tue, 29 Sep 2015 10:50:18 +0000 (16:20 +0530)]
Merge pull request #6840 from monishdeb/test-master
CRM-17287 fix for XML Exports
monishdeb [Tue, 29 Sep 2015 09:46:12 +0000 (15:16 +0530)]
CRM-17287 fix for XML Exports
----------------------------------------
* CRM-17287: Broken Unit Tests on master
https://issues.civicrm.org/jira/browse/CRM-17287
yashodha [Tue, 29 Sep 2015 09:36:00 +0000 (15:06 +0530)]
CRM-17302: Fix component for contribution activities
----------------------------------------
* CRM-17302: Fix component for contribution activities
https://issues.civicrm.org/jira/browse/CRM-17302
projects / civicrm-core.git / log