Monish Deb [Sat, 19 May 2018 09:50:31 +0000 (15:20 +0530)]
Merge pull request #12165 from seamuslee001/activity_query_each
dev/core#117 Replace deprecated each with foreach in CRM/Activity/BAO…
Seamus Lee [Sat, 19 May 2018 04:15:27 +0000 (14:15 +1000)]
dev/core#117 Replace deprecated each with foreach in CRM/Activity/BAO/Query.php
colemanw [Thu, 17 May 2018 13:53:58 +0000 (09:53 -0400)]
Merge pull request #12154 from compucorp/122-fix-bug-with-action-links
dev/core#122 Wrong Action Links Shown for Reserved and Locked Option Groups
Michael Devery [Thu, 17 May 2018 11:01:17 +0000 (12:01 +0100)]
dev/core#122 Add check for DELETE flag before unsetting it
colemanw [Wed, 16 May 2018 19:45:48 +0000 (15:45 -0400)]
Merge pull request #11629 from JMAConsulting/CRM-21675
CRM-21675: scheduled reminders: limit to group doesn't support parent groups
colemanw [Wed, 16 May 2018 15:41:49 +0000 (11:41 -0400)]
Merge pull request #11772 from michaelmcandrew/CRM-21821-respect-nav-item-weight
CRM-21821 respect nav item weight
Monish Deb [Wed, 16 May 2018 13:09:22 +0000 (18:39 +0530)]
Merge pull request #12146 from seamuslee001/contribute_import_parser_count
(NFC) Fix cannot use count() on object that doesn't implement countab…
Eileen McNaughton [Wed, 16 May 2018 09:57:41 +0000 (21:57 +1200)]
Merge pull request #12000 from compucorp/timeline-name-edit-inplace
Add inplace edit for timeline name
Seamus Lee [Wed, 16 May 2018 09:46:37 +0000 (19:46 +1000)]
(NFC) Fix cannot use count() on object that doesn't implement countable in tests/phpunit/CRM/Contribute/Import/Parser/ContributionTest.php
Eileen McNaughton [Wed, 16 May 2018 09:18:20 +0000 (21:18 +1200)]
Merge pull request #12003 from vinuvarshith/dev/core/69-fix-state-province-name-token-issue
code/dev/69: Change Approach For Setting state_province_name
Eileen McNaughton [Wed, 16 May 2018 07:51:46 +0000 (19:51 +1200)]
Merge pull request #12011 from lcdservices/dev-financial-12
dev/financial#12 move soft credit item count to object property
Eileen McNaughton [Wed, 16 May 2018 07:49:03 +0000 (19:49 +1200)]
Merge pull request #12145 from civicrm/5.2
5.2 merge to master
Eileen McNaughton [Wed, 16 May 2018 07:48:24 +0000 (19:48 +1200)]
Merge pull request #12143 from seamuslee001/5.2
(NFC) Add in 5.1.0 and 5.1.1 mysql upgrade files
Eileen McNaughton [Wed, 16 May 2018 06:58:59 +0000 (18:58 +1200)]
Merge pull request #11962 from compucorp/55-hide-adding-option-value-for-locked-groups
Hide Adding Option Value for Locked Groups
Debarshi Bhaumik [Wed, 16 May 2018 06:51:44 +0000 (12:21 +0530)]
Fix unit tests
Seamus Lee [Wed, 16 May 2018 03:14:53 +0000 (13:14 +1000)]
Add in 5.1.0 and 5.1.1 mysql upgrade files
Eileen McNaughton [Wed, 16 May 2018 00:56:45 +0000 (12:56 +1200)]
Merge pull request #12135 from eileenmcnaughton/fgb_up
added unit test
Eileen McNaughton [Wed, 16 May 2018 00:45:46 +0000 (12:45 +1200)]
Merge pull request #12140 from seamuslee001/civicrm-version-filemode
(NFC) fix file permissions on civicrm-version.php
Eileen McNaughton [Wed, 16 May 2018 00:44:15 +0000 (12:44 +1200)]
Merge pull request #12141 from seamuslee001/file_perms_fix
Fix file perms on files back to 664
Tim Otten [Wed, 16 May 2018 00:29:24 +0000 (17:29 -0700)]
Add release notes for 5.1.1
Seamus Lee [Tue, 15 May 2018 23:28:13 +0000 (09:28 +1000)]
Fix file perms on files back to 664
Seamus Lee [Tue, 15 May 2018 23:23:55 +0000 (09:23 +1000)]
(NFC) fix file permissions on civicrm-version.php
Mathieu Lu [Tue, 15 May 2018 23:11:32 +0000 (19:11 -0400)]
Merge pull request #12139 from JMAConsulting/dev-drupal-17
(dev/drupal/17) Add Drupal8 support for getUFLocale()
Eileen McNaughton [Tue, 15 May 2018 23:05:48 +0000 (11:05 +1200)]
Merge pull request #12103 from seamuslee001/issue_footer
(NFC) Update view issues and report bugs link in footer to point to the lab
Eileen McNaughton [Tue, 15 May 2018 23:00:36 +0000 (11:00 +1200)]
Merge pull request #12024 from yashodha/price_custom_search
core/issues/74 - 'Price Set Details for Event Participants' gives DB …
Tim Otten [Tue, 15 May 2018 22:52:06 +0000 (15:52 -0700)]
Merge pull request #12130 from seamuslee001/karma_upgrade_2
(NFC) Update to latest versions of karma and jasmine used only in tes…
Seamus Lee [Tue, 15 May 2018 21:57:25 +0000 (07:57 +1000)]
Merge pull request #12106 from eileenmcnaughton/activity
[NFC] Cleanup on ActivityTest class.
Eileen McNaughton [Tue, 15 May 2018 21:03:41 +0000 (09:03 +1200)]
Merge pull request #12132 from eileenmcnaughton/membership_type_data
Add labels to membership type metadata, allowing for addField method to be used
deb.monish [Tue, 15 May 2018 18:40:59 +0000 (00:10 +0530)]
(dev/drupal/17) Add Drupal8 support for getUFLocale()
colemanw [Tue, 15 May 2018 18:36:13 +0000 (14:36 -0400)]
Merge pull request #11456 from jitendrapurohit/CRM-21598
CRM-21598 - Case Activity issues with custom Completed Status Type
Debarshi Bhaumik [Thu, 19 Apr 2018 07:19:36 +0000 (12:49 +0530)]
Add inplace edit for timeline name
Coleman Watts [Tue, 15 May 2018 16:49:58 +0000 (12:49 -0400)]
Tpl cleanup
Monish Deb [Tue, 15 May 2018 14:58:46 +0000 (20:28 +0530)]
Merge pull request #12136 from seamuslee001/nfc_disable_no_orderby_tests
(NFC) Disable tests performing quick search with no orderby as provin…
Coleman Watts [Tue, 15 May 2018 14:20:31 +0000 (10:20 -0400)]
Translate field labels
Michael Devery [Tue, 15 May 2018 11:13:54 +0000 (12:13 +0100)]
dev/core#55 Hide option to delete option value for locked option group
Michael Devery [Tue, 15 May 2018 11:02:53 +0000 (12:02 +0100)]
dev/core#55 Fix typos
Michael Devery [Tue, 15 May 2018 11:02:44 +0000 (12:02 +0100)]
dev/core#55 Remove option to delete option value for locked groups
Seamus Lee [Tue, 15 May 2018 08:48:42 +0000 (18:48 +1000)]
(NFC) Disable tests performing quick search with no orderby as proving to be problematic on different MySQL versions and add in warning in regards to the usage of CRM_Utils_SQL::supportStorageOfAccents()
Disable another flacky test
Eileen McNaughton [Tue, 15 May 2018 09:06:19 +0000 (21:06 +1200)]
Merge pull request #11877 from compucorp/CRM-21853-remove-implicit-is-multiple-change
CRM-21853: Do not change 'is_multiple' unless included in the params
deb.monish [Thu, 29 Mar 2018 13:26:54 +0000 (18:56 +0530)]
added unit test
Eileen McNaughton [Tue, 15 May 2018 07:46:48 +0000 (19:46 +1200)]
Merge pull request #12004 from samuelsov/dev/core#30#2
dev/core#30 export of contact master_id name only if there is a master_id given (rebase)
Eileen McNaughton [Tue, 15 May 2018 07:18:18 +0000 (19:18 +1200)]
Merge pull request #12093 from aniesshsethh/core_105
dev/core#105 Manage PCP URL Wrong for the notification email under wo…
eileen [Thu, 10 May 2018 02:20:01 +0000 (14:20 +1200)]
Cleanup on test class.
Remove some functions that were not testing what they said they were & clarify others. Improve
formatting & declaration of unused vars
Seamus Lee [Tue, 15 May 2018 07:01:08 +0000 (17:01 +1000)]
Merge pull request #12127 from eileenmcnaughton/cust_generic
Use getter function for entity id as on some forms is protected.
Eileen McNaughton [Tue, 15 May 2018 06:55:56 +0000 (18:55 +1200)]
Merge pull request #12113 from totten/JMAConsulting-dev-drupal-10
(dev/drupal#10) Make civicrm-version.php self-sufficient
eileen [Tue, 15 May 2018 02:14:50 +0000 (14:14 +1200)]
Add labels to membership type metadata, allowing for addField method to be used
Eileen McNaughton [Tue, 15 May 2018 00:37:13 +0000 (12:37 +1200)]
Merge pull request #12131 from seamuslee001/custom_field
Set Default values on is_active, is_searchable, is_view and is_active…
colemanw [Mon, 14 May 2018 22:23:42 +0000 (18:23 -0400)]
Merge pull request #12032 from jitendrapurohit/core-80
core/issues/80 - Current Employer is not reset after relationship is …
Seamus Lee [Mon, 14 May 2018 21:54:14 +0000 (07:54 +1000)]
Set Default values on is_active, is_searchable, is_view and is_active on civicrm_custom_field
Seamus Lee [Mon, 14 May 2018 21:36:04 +0000 (07:36 +1000)]
Merge pull request #12116 from eileenmcnaughton/cust_field
Add DB default of 0 for custom_group.is_multiple - CRM-21853
Seamus Lee [Mon, 14 May 2018 21:22:38 +0000 (07:22 +1000)]
(NFC) Update to latest versions of karma and jasmine used only in testing
colemanw [Mon, 14 May 2018 17:21:29 +0000 (13:21 -0400)]
Merge pull request #12124 from eileenmcnaughton/membership_metadata
Add field metadata to MembershipType schema info (xml)
Eileen McNaughton [Mon, 14 May 2018 05:32:08 +0000 (17:32 +1200)]
Merge pull request #12126 from eileenmcnaughton/membership_type
Preliminary cleanup for Custom data support for MembershipType form
eileen [Mon, 14 May 2018 04:24:15 +0000 (16:24 +1200)]
Use getter function for entity id as on some forms is protected.
Follow up to https://github.com/civicrm/civicrm-core/pull/12095
Eileen McNaughton [Mon, 14 May 2018 04:04:53 +0000 (16:04 +1200)]
Merge pull request #12125 from eileenmcnaughton/membership_config
[NFC] Fix leakage of Form entity
Matthew Wire [Sun, 6 May 2018 17:10:02 +0000 (18:10 +0100)]
Preliminary cleanup for Custom data support for MembershipType form
Eileen McNaughton [Mon, 14 May 2018 02:13:58 +0000 (14:13 +1200)]
Merge pull request #12123 from eileenmcnaughton/membership_type
Preliminary tidy up of MembershipType form (towards custom data support)
eileen [Mon, 14 May 2018 00:57:07 +0000 (12:57 +1200)]
Fix leakage of Form entity
eileen [Mon, 14 May 2018 00:55:48 +0000 (12:55 +1200)]
Add field metadata to MembershipType schema info (xml)
Eileen McNaughton [Mon, 14 May 2018 00:12:53 +0000 (12:12 +1200)]
Merge pull request #12122 from eileenmcnaughton/cudat
tpl extraction of shared code for customDataBlock
Matthew Wire [Sun, 6 May 2018 17:10:02 +0000 (18:10 +0100)]
Preliminary tidy up of MembershipType form (towards custom data support)
Eileen McNaughton [Sun, 13 May 2018 23:00:11 +0000 (11:00 +1200)]
Merge pull request #11908 from mattwire/membershiptype_customdata_support
Support hooks for MembershipType entity
eileen [Tue, 8 May 2018 06:00:21 +0000 (18:00 +1200)]
tpl extraction of shared code for customDataBlock
Seamus Lee [Sun, 13 May 2018 00:46:32 +0000 (10:46 +1000)]
Merge pull request #12121 from civicrm/5.2
5.2
Seamus Lee [Sun, 13 May 2018 00:45:31 +0000 (10:45 +1000)]
Merge pull request #12120 from eileenmcnaughton/fgb
Fgb
deb.monish [Tue, 8 May 2018 06:36:26 +0000 (12:06 +0530)]
revert some change and other fixes
deb.monish [Wed, 18 Apr 2018 18:38:36 +0000 (00:08 +0530)]
(dev/core/68) Fix DB Error on 'Find Participant' page when MySQL FULL_GROUP_BY_MODE is enabled
Matthew Wire [Sat, 12 May 2018 07:38:17 +0000 (08:38 +0100)]
Add create/edit pre/post hooks to MembershipType
eileen [Fri, 11 May 2018 21:59:26 +0000 (09:59 +1200)]
Add DB default of 0 for custom_group.is_multiple - CRM-21853
Jitendra Purohit [Thu, 26 Apr 2018 12:21:27 +0000 (17:51 +0530)]
core/issues/80 - Current Employer is not reset after relationship is updated
Additional fixes
Additional fixes
Monish Deb [Fri, 11 May 2018 04:12:17 +0000 (09:42 +0530)]
Merge pull request #12085 from seamuslee001/pledge_search_form_test
(NFC) Add unit test of submitting the Pledge Search Form
Tim Otten [Fri, 11 May 2018 03:15:09 +0000 (20:15 -0700)]
distmaker - Add deprecation notice to generated copies of civicrm-version.php
Tim Otten [Fri, 11 May 2018 03:14:26 +0000 (20:14 -0700)]
civicrm-version.php - Mark `civicrmVersion()` as deprecated
Tim Otten [Fri, 11 May 2018 02:43:49 +0000 (19:43 -0700)]
civicrm-version.php - Fix CMS detection in pre-booted Drupal8
Ex 1: Running `drush` commands
Ex 2: Running `cv` with `--level=cms-only`
Tim Otten [Fri, 11 May 2018 02:12:30 +0000 (19:12 -0700)]
civicrm-version.php - Fix CMS detection in pre-booted WordPress
Ex 1: Running `wp-cli` commands
Ex 2: Running `cv` with `--level=cms-only`
Tim Otten [Fri, 11 May 2018 00:57:08 +0000 (17:57 -0700)]
civicrm-version.php - Fix CMS detection in pre-booted Backdrop
Ex 1: Running `drush` commands
Ex 2: Running `cv` with `--level=cms-only`
Tim Otten [Fri, 11 May 2018 01:59:08 +0000 (18:59 -0700)]
CRM/Utils/System.php - Don't go through civicrm-version.php
In a typical environment, this is just an unnecessary file-load, and it
makes it harder to (someday) remove/deprecate `civicrm-version.php`.
Tim Otten [Fri, 11 May 2018 00:38:25 +0000 (17:38 -0700)]
civicrm-version.php - Internal helpers should use manifestly private namespace
The new helper functions in this file shouldn't be used externally; this
file is just an adapter for backward-compatibility. External callers should
still use `CRM_Utils_System::version()`, `civicrmVersion()`, or
`version.xml`.
Tim Otten [Thu, 10 May 2018 23:45:06 +0000 (16:45 -0700)]
civicrm-version.php - Keep civicrmVersion() in global namespace
The function has traditionally been in the global namespace, and it
should stay there for backward compatibility.
This patch looks big, but it's really just wrapping code inside new
`namespace ... { ... }` blocks.
Eileen McNaughton [Fri, 11 May 2018 00:19:20 +0000 (12:19 +1200)]
Merge pull request #12110 from kcristiano/5.2-11936
Re-Fix Case form task (export/print not working) (replace quick fix with proper fix)
Matthew Wire [Mon, 7 May 2018 08:24:09 +0000 (09:24 +0100)]
Further fixes to export
Matthew Wire [Mon, 7 May 2018 06:42:45 +0000 (07:42 +0100)]
Fix export
Matthew Wire [Thu, 5 Apr 2018 09:50:30 +0000 (10:50 +0100)]
Restore the entity specific field name to handle legacy code and allow tokens to work properly (eg. PDF letter)
Matthew Wire [Wed, 4 Apr 2018 11:51:12 +0000 (12:51 +0100)]
Fix Case form task regressions (export/print not working) since we switched to using CRM_Core_Form_Task
Eileen McNaughton [Thu, 10 May 2018 22:09:21 +0000 (10:09 +1200)]
Merge pull request #11996 from JMAConsulting/dev-core-68
(dev/core/68) Fix DB Error on 'Find Participant' page when MySQL FULL_GROUP_BY_MODE is enabled
Eileen McNaughton [Thu, 10 May 2018 21:31:43 +0000 (09:31 +1200)]
Merge pull request #11903 from MiyaNoctem/CRM-38-show-recurring-contributions-on-membership-modal
dev/core#38 Show Recurring Contributions on Membership Modal View
Monish Deb [Thu, 10 May 2018 19:45:58 +0000 (01:15 +0530)]
Merge pull request #12108 from colemanw/ApiExplorer
ApiExplorer - Output short array syntax
Camilo Rodriguez [Fri, 30 Mar 2018 15:24:11 +0000 (15:24 +0000)]
CRM-38: Show Recurring Contributions on Membership Modal View
Currently, when viewing a membership from contact's detailed view (on
memberships tab), it is hard to tell if a membership has any recurring
contributions associated to it, even though you can see all payments done for
the membership.
Added a recurring contributions section below the contributions table
currently being shown, by loading recurring contributions using ajax call to
load list of recurring contributions.
Added recurring contributionslist to membership edit view using ajax call.
Coleman Watts [Thu, 10 May 2018 15:13:21 +0000 (11:13 -0400)]
ApiExplorer - Output short array syntax
Monish Deb [Thu, 10 May 2018 14:28:49 +0000 (19:58 +0530)]
Merge pull request #12104 from lcdservices/dev-core-108
dev/core#108 reset address array when setting new event location
Tim Otten [Thu, 10 May 2018 01:56:48 +0000 (18:56 -0700)]
Merge pull request #12105 from totten/master-karma-sr
karma.conf.js - Switch singleRun back to `false` default
Seamus Lee [Thu, 10 May 2018 00:22:24 +0000 (10:22 +1000)]
Merge pull request #12102 from seamuslee001/nfc_constant_moneytext
(NFC) Fix use of undefined constant USD in MoneyTest
Tim Otten [Thu, 10 May 2018 00:05:03 +0000 (17:05 -0700)]
karma.conf.js - Switch singleRun back to `false` default
It's useful to have two ways of running the Karma test suite:
* For continuous integration, run once and report back with a file.
(This has been `karma start --browsers PhantomJS --single-run --reporters dots,junit`.)
* For local dev, run in a watch/live/monitoring mode which auto-executes any time you edit the JS code.
(This has been `karma start`)
This partially reverts a recent change so that the second one works the same
way as before.
Brian Shaughnessy [Wed, 9 May 2018 22:24:43 +0000 (18:24 -0400)]
dev/core#108 reset address array when setting new event location
Seamus Lee [Wed, 9 May 2018 22:14:59 +0000 (08:14 +1000)]
Update view issues and report bugs link in footer to point to the lab
Seamus Lee [Wed, 9 May 2018 21:47:14 +0000 (07:47 +1000)]
Merge pull request #12070 from eileenmcnaughton/loggin_fix
Fix fatal error on logging tab when hook alters logging tables.
Seamus Lee [Wed, 9 May 2018 21:33:58 +0000 (07:33 +1000)]
(NFC) Fix use of undefined constant USD in MoneyTest
colemanw [Wed, 9 May 2018 13:06:58 +0000 (09:06 -0400)]
Merge pull request #12101 from seamuslee001/upgrade_karma_phantomjs_launcher
Upgrade Karma phantomjs launcher to latest version
Seamus Lee [Wed, 9 May 2018 05:20:49 +0000 (15:20 +1000)]
Upgrade Karma phantomjs launcher to latest version
colemanw [Wed, 9 May 2018 03:40:36 +0000 (23:40 -0400)]
Merge pull request #12097 from eileenmcnaughton/relationshipTypeForm
Fix Relationship Type form to use the metadata for fields & api in postProcess
projects / civicrm-core.git / log