Tim Otten [Sat, 3 Oct 2015 19:03:33 +0000 (15:03 -0400)]
docs/ - Update navigation, file structure, requirements
Tim Otten [Mon, 14 Sep 2015 00:23:19 +0000 (17:23 -0700)]
Add skeletal "docs"
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: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
Eileen McNaughton [Tue, 29 Sep 2015 09:03:14 +0000 (22:03 +1300)]
Merge pull request #6815 from eileenmcnaughton/CRM-17289
CRM-17289 limit membership_type entity reference to active types
Eileen McNaughton [Tue, 29 Sep 2015 08:04:13 +0000 (21:04 +1300)]
Merge pull request #6831 from eileenmcnaughton/CRM-17176-api-add
Crm 17176 api add navigation
eileenmcnaugton [Tue, 29 Sep 2015 07:59:14 +0000 (20:59 +1300)]
CRM-17289 add unite test for membership_type.getlist
eileenmcnaugton [Tue, 29 Sep 2015 07:38:55 +0000 (20:38 +1300)]
test class tidy-up
Let's not over-do the failure tests! We brought them from v2 but they don't add much
eileenmcnaugton [Sun, 27 Sep 2015 21:42:58 +0000 (10:42 +1300)]
CRM-17289 limit membership_type entity reference to active types
eileenmcnaugton [Tue, 29 Sep 2015 06:33:44 +0000 (19:33 +1300)]
CRM-17176 add Navigation api
Adding this was mostly to make the syntax conformance happy since adding a navigation.reset action:
eileenmcnaugton [Tue, 29 Sep 2015 06:30:59 +0000 (19:30 +1300)]
CRM-17176 add titles to navigation xml
Eileen McNaughton [Tue, 29 Sep 2015 06:22:07 +0000 (19:22 +1300)]
Merge pull request #6833 from eileenmcnaughton/email-test-fix
enable Single Value Alter test for email
eileenmcnaugton [Tue, 29 Sep 2015 03:47:00 +0000 (16:47 +1300)]
enable Single Value Alter test for email
Conflicts:
tests/phpunit/api/v3/SyntaxConformanceTest.php
yashodha [Tue, 29 Sep 2015 04:52:50 +0000 (10:22 +0530)]
CRM-12675: Contribution activities shown to users without permission
----------------------------------------
* CRM-12675: Contribution activities shown to users without permission
https://issues.civicrm.org/jira/browse/CRM-12675
Dave Greenberg [Tue, 29 Sep 2015 02:48:36 +0000 (22:48 -0400)]
Merge pull request #6829 from davecivicrm/CRM-16086
CRM-16086 - schema corrections.
eileenmcnaugton [Mon, 28 Sep 2015 10:48:28 +0000 (23:48 +1300)]
CRM-17294 renamed fields not passed to processor
Dave Greenberg [Tue, 29 Sep 2015 00:14:36 +0000 (20:14 -0400)]
CRM-16086 - schema corrections.
----------------------------------------
* CRM-16086: schema differences between upgrades and install
https://issues.civicrm.org/jira/browse/CRM-16086
Dave Greenberg [Mon, 28 Sep 2015 23:21:56 +0000 (19:21 -0400)]
Merge pull request #6828 from monishdeb/test-master
CRM-17287 Test fix for contribution note
monishdeb [Mon, 28 Sep 2015 20:55:57 +0000 (02:25 +0530)]
format fix
monishdeb [Mon, 28 Sep 2015 20:49:16 +0000 (02:19 +0530)]
Merge forward miss
monishdeb [Mon, 28 Sep 2015 20:24:41 +0000 (01:54 +0530)]
CRM-17287 Test fix for contribution note
----------------------------------------
* CRM-17287: Broken Unit Tests on master
https://issues.civicrm.org/jira/browse/CRM-17287
Dave Greenberg [Mon, 28 Sep 2015 17:59:10 +0000 (13:59 -0400)]
Merge pull request #6820 from eileenmcnaughton/master
enotice fix
Monish Deb [Mon, 28 Sep 2015 17:55:59 +0000 (23:25 +0530)]
Merge pull request #6825 from jitendrapurohit/CRM-17169reg
CRM-17169 -- Fix upgrade conflict
Dave Greenberg [Mon, 28 Sep 2015 17:40:18 +0000 (13:40 -0400)]
Merge pull request #6821 from davecivicrm/CRM-16274
CRM-16274 - Change permission for Add Contacts to Groups in reports t…
colemanw [Mon, 28 Sep 2015 16:02:07 +0000 (12:02 -0400)]
Merge pull request #6823 from colemanw/CRM-16353
CRM-16353 - For tables hidden by collapsed accordions, wait
colemanw [Mon, 28 Sep 2015 16:01:10 +0000 (12:01 -0400)]
Merge pull request #6827 from monishdeb/test-master
CRM-17287 Legacy support for group and tag
monishdeb [Mon, 28 Sep 2015 13:33:35 +0000 (19:03 +0530)]
format fixes
monishdeb [Mon, 28 Sep 2015 12:49:49 +0000 (18:19 +0530)]
legacy support for group and tag
jitendrapurohit [Mon, 28 Sep 2015 09:37:37 +0000 (15:07 +0530)]
CRM-17169 -- Fix upgrade conflict
Coleman Watts [Mon, 28 Sep 2015 03:15:19 +0000 (23:15 -0400)]
CRM-16353 - For tables hidden by collapsed accordions, wait
Dave Greenberg [Mon, 28 Sep 2015 02:19:26 +0000 (22:19 -0400)]
CRM-16274 - Change permission for Add Contacts to Groups in reports to be the same as for that task in search results.
----------------------------------------
* CRM-16274: Change the permission required for 'Add Contacts to Group' in reports to be consistent with other workflows
https://issues.civicrm.org/jira/browse/CRM-16274
eileenmcnaugton [Mon, 28 Sep 2015 01:41:46 +0000 (14:41 +1300)]
enotice fix
projects / civicrm-core.git / log