civicrm-core.git
5 years agoMerge pull request #13293 from seamuslee001/nfc_additional_javascript_metadata
colemanw [Tue, 18 Dec 2018 03:22:11 +0000 (22:22 -0500)]
Merge pull request #13293 from seamuslee001/nfc_additional_javascript_metadata

(NFC) Just some additional package metadata

5 years agoMerge pull request #13306 from civicrm/5.9
Eileen McNaughton [Tue, 18 Dec 2018 03:19:18 +0000 (16:19 +1300)]
Merge pull request #13306 from civicrm/5.9

5.9 to master

5 years agoMerge pull request #13304 from mattwire/fixtargetcontactoncasecreate
Eileen McNaughton [Tue, 18 Dec 2018 03:16:26 +0000 (16:16 +1300)]
Merge pull request #13304 from mattwire/fixtargetcontactoncasecreate

dev/core#585 Fix setting target contact on activities when creating a case with activity sequence.

5 years agoMerge pull request #13301 from civicrm/5.9
Eileen McNaughton [Tue, 18 Dec 2018 01:01:23 +0000 (14:01 +1300)]
Merge pull request #13301 from civicrm/5.9

5.9

5 years agoMerge pull request #13303 from seamuslee001/5.9
Seamus Lee [Tue, 18 Dec 2018 01:00:48 +0000 (12:00 +1100)]
Merge pull request #13303 from seamuslee001/5.9

dev/core#593 - Fix quicksearch by email

5 years agoMerge pull request #13275 from eileenmcnaughton/export_more_im
Seamus Lee [Mon, 17 Dec 2018 23:20:36 +0000 (10:20 +1100)]
Merge pull request #13275 from eileenmcnaughton/export_more_im

[REF] Export add test for phone details, fix phone_type_id

5 years agoSpecify target contact ID when creating case activities in sequence
Matthew Wire (MJW Consulting) [Mon, 17 Dec 2018 21:25:08 +0000 (21:25 +0000)]
Specify target contact ID when creating case activities in sequence

5 years agoSwitch to buildOptions for activity case create
Matthew Wire (MJW Consulting) [Mon, 17 Dec 2018 21:24:45 +0000 (21:24 +0000)]
Switch to buildOptions for activity case create

5 years agoMerge pull request #13277 from ixiam/dev-netAmount_freeze
Seamus Lee [Mon, 17 Dec 2018 23:06:16 +0000 (10:06 +1100)]
Merge pull request #13277 from ixiam/dev-netAmount_freeze

Fix netAmount null object on freeze

5 years agoAdd in unit test to confirm fix of quicksearch filter on email
Seamus Lee [Mon, 17 Dec 2018 20:45:03 +0000 (07:45 +1100)]
Add in unit test to confirm fix of quicksearch filter on email

5 years agodev/core#593 - Fix quicksearch by email
Coleman Watts [Mon, 17 Dec 2018 17:11:02 +0000 (12:11 -0500)]
dev/core#593 - Fix quicksearch by email

5 years agoMerge pull request #13273 from eileenmcnaughton/ftype
Seamus Lee [Mon, 17 Dec 2018 20:21:47 +0000 (07:21 +1100)]
Merge pull request #13273 from eileenmcnaughton/ftype

dev/core#597 Fix broken api get filter on financial_type

5 years agoMerge pull request #13290 from eileenmcnaughton/recur_required
Eileen McNaughton [Mon, 17 Dec 2018 19:53:31 +0000 (08:53 +1300)]
Merge pull request #13290 from eileenmcnaughton/recur_required

Declare 'amount' as required on ContributionRecur api

5 years agoMerge pull request #12344 from jitendrapurohit/core-192
Eileen McNaughton [Mon, 17 Dec 2018 19:52:22 +0000 (08:52 +1300)]
Merge pull request #12344 from jitendrapurohit/core-192

dev/core#192 - Search builder fails for != smart group filter

5 years agoMerge pull request #13294 from seamuslee001/joomla_receipeients_compatability
Joe Murray [Mon, 17 Dec 2018 17:43:42 +0000 (12:43 -0500)]
Merge pull request #13294 from seamuslee001/joomla_receipeients_compatability

dev/joomla#3 CRM-21780 Fix Mailings Recipients box incompatabilites …

5 years agoMerge pull request #13295 from andrewpthompson/andrewpthompson-dev-core-602
Joe Murray [Mon, 17 Dec 2018 17:43:15 +0000 (12:43 -0500)]
Merge pull request #13295 from andrewpthompson/andrewpthompson-dev-core-602

Fix PHP 7 strict warnings CRM_Core_DAO::getContactIDsFromComponent passed by reference

5 years agoFix netAmount null object on freeze
Luciano Spiegel [Mon, 17 Dec 2018 09:16:00 +0000 (10:16 +0100)]
Fix netAmount null object on freeze

5 years agoFix e-notice
andrewpthompson [Mon, 17 Dec 2018 01:37:24 +0000 (12:07 +1030)]
Fix e-notice

only variables should be passed by reference

5 years agoFix e-notice
andrewpthompson [Mon, 17 Dec 2018 01:36:38 +0000 (12:06 +1030)]
Fix e-notice

only variables should be passed by reference

5 years agoFix e-notice
andrewpthompson [Mon, 17 Dec 2018 01:35:24 +0000 (12:05 +1030)]
Fix e-notice

only variables should be passed by reference

5 years agoFix e-notice
andrewpthompson [Mon, 17 Dec 2018 01:33:54 +0000 (12:03 +1030)]
Fix e-notice

only variables should be passed by reference

5 years agoFix e-notice
andrewpthompson [Mon, 17 Dec 2018 01:32:55 +0000 (12:02 +1030)]
Fix e-notice

only variables should be passed by reference

5 years agodev/joomla#3 CRM-21780 Fix Mailings Receipients box incompatabilites with certain...
Seamus Lee [Mon, 17 Dec 2018 00:48:37 +0000 (11:48 +1100)]
dev/joomla#3 CRM-21780 Fix Mailings Receipients box incompatabilites with certain instances of Joomla

5 years ago(NFC) Just some additional package metadata
Seamus Lee [Mon, 17 Dec 2018 00:48:28 +0000 (11:48 +1100)]
(NFC) Just some additional package metadata

5 years agoMerge pull request #13292 from seamuslee001/CRM-21097
Seamus Lee [Mon, 17 Dec 2018 00:23:19 +0000 (11:23 +1100)]
Merge pull request #13292 from seamuslee001/CRM-21097

Generalise the UsersTableName Setting name to support Backdrop

5 years agoGeneralise the UsersTableName Setting name to support Backdrop
Seamus Lee [Sun, 16 Dec 2018 21:15:25 +0000 (08:15 +1100)]
Generalise the UsersTableName Setting name to support Backdrop

Set Deafault as well to be users

5 years agoDeclare 'amount' as required on ContributionRecur api
eileen [Sun, 16 Dec 2018 20:39:35 +0000 (09:39 +1300)]
Declare 'amount' as required on ContributionRecur api

This is effectively required already as you get a DB error without it.

The field is not required at the DB level (it probably should be that too) but
it has no default value so you wind up with

[nativecode=1364 ** Field 'amount' doesn't have a default value]

Note that making it required at the DB level won't change the need for this
patch & is separate. The api declares what is required at the api level
- somethings are required at the DB level but not at the api level as they are
calculated in the BAO

5 years agoMerge pull request #13257 from vinuvarshith/BASW-316-unable-to-mark-price-set-as...
Eileen McNaughton [Sat, 15 Dec 2018 02:27:42 +0000 (15:27 +1300)]
Merge pull request #13257 from vinuvarshith/BASW-316-unable-to-mark-price-set-as-inactive

Unable to mark price set field as inactive

5 years agoMerge pull request #13269 from eileenmcnaughton/acltesttrait
Eileen McNaughton [Sat, 15 Dec 2018 02:07:41 +0000 (15:07 +1300)]
Merge pull request #13269 from eileenmcnaughton/acltesttrait

[REF] Minor Test clean up

5 years agoMerge pull request #13216 from eileenmcnaughton/export_postal
Eileen McNaughton [Sat, 15 Dec 2018 02:06:59 +0000 (15:06 +1300)]
Merge pull request #13216 from eileenmcnaughton/export_postal

[REF] Export cleanup - filter at point of query on postal exports

5 years agoMerge pull request #13272 from eileenmcnaughton/mem_form
Monish Deb [Fri, 14 Dec 2018 13:12:38 +0000 (18:42 +0530)]
Merge pull request #13272 from eileenmcnaughton/mem_form

dev/core#595 Fix label default not being set on membership status form

5 years agoRemove Unwanted 'is_active' Param That Causes Issues On Save
varshith89 [Fri, 14 Dec 2018 06:51:27 +0000 (06:51 +0000)]
Remove Unwanted 'is_active' Param That Causes Issues On Save

5 years agoMerge pull request #13274 from civicrm/5.9
Eileen McNaughton [Fri, 14 Dec 2018 03:54:45 +0000 (16:54 +1300)]
Merge pull request #13274 from civicrm/5.9

5.9 to master

5 years agoFix phone_type_id in export per test
eileen [Thu, 13 Dec 2018 21:48:22 +0000 (10:48 +1300)]
Fix phone_type_id in export per test

5 years agoAdd test for phone type handling
eileen [Mon, 19 Nov 2018 05:57:19 +0000 (18:57 +1300)]
Add test for phone type handling

5 years agoExclude unpostallable contacts rather than write & delete
eileen [Mon, 3 Dec 2018 12:41:54 +0000 (01:41 +1300)]
Exclude unpostallable contacts rather than write & delete

5 years agoMerge pull request #13213 from eileenmcnaughton/export_array
Seamus Lee [Thu, 13 Dec 2018 20:44:20 +0000 (07:44 +1100)]
Merge pull request #13213 from eileenmcnaughton/export_array

[REF] Build single array of information about output specifications when exporting

5 years agoFix broken api get filter on financial_type
eileen [Thu, 13 Dec 2018 20:24:34 +0000 (09:24 +1300)]
Fix broken api get filter on financial_type

5 years agoFix label default not being set on membership status form
eileen [Thu, 13 Dec 2018 18:41:32 +0000 (07:41 +1300)]
Fix label default not being set on membership status form

5 years agoMerge pull request #13271 from seamuslee001/header_whitespace_fixes
Monish Deb [Thu, 13 Dec 2018 14:31:22 +0000 (20:01 +0530)]
Merge pull request #13271 from seamuslee001/header_whitespace_fixes

(NFC) whitespace header fixes

5 years agoRemove unused function from test class
eileen [Thu, 13 Dec 2018 02:51:58 +0000 (15:51 +1300)]
Remove unused function from test class

5 years ago(NFC) whitespace header fixes
Seamus Lee [Thu, 13 Dec 2018 09:31:26 +0000 (20:31 +1100)]
(NFC) whitespace header fixes

5 years agoRemove phone_type_id from special handling per review
eileen [Thu, 13 Dec 2018 06:16:19 +0000 (19:16 +1300)]
Remove phone_type_id from special handling per review

5 years agoMerge pull request #13270 from civicrm/5.9
Eileen McNaughton [Thu, 13 Dec 2018 06:43:36 +0000 (19:43 +1300)]
Merge pull request #13270 from civicrm/5.9

5.9

5 years agoMerge pull request #13268 from seamuslee001/copywrite_510
Eileen McNaughton [Thu, 13 Dec 2018 06:43:10 +0000 (19:43 +1300)]
Merge pull request #13268 from seamuslee001/copywrite_510

(NFC) Update Copyright in FiveTen upgrade file to be 2019

5 years agoMerge pull request #13267 from seamuslee001/copywrite_year_update
Eileen McNaughton [Thu, 13 Dec 2018 06:42:49 +0000 (19:42 +1300)]
Merge pull request #13267 from seamuslee001/copywrite_year_update

(NFC) Update Copyrite year to be 2019

5 years agoMerge pull request #13263 from eileenmcnaughton/api_ex
Seamus Lee [Thu, 13 Dec 2018 06:27:10 +0000 (17:27 +1100)]
Merge pull request #13263 from eileenmcnaughton/api_ex

dev/core#592 Add default for  in Exception class.

5 years agoFix export extra column on merge-same-address
eileen [Thu, 13 Dec 2018 06:14:16 +0000 (19:14 +1300)]
Fix export extra column on merge-same-address

5 years agoFix output of payment fields (per review)
eileen [Thu, 13 Dec 2018 05:32:22 +0000 (18:32 +1300)]
Fix output of payment fields (per review)

5 years agoCompress setting sql columns into output specification
eileen [Mon, 3 Dec 2018 03:51:34 +0000 (16:51 +1300)]
Compress setting sql columns into output specification

5 years agoMove sql column definition to to the processor class
eileen [Mon, 3 Dec 2018 03:48:54 +0000 (16:48 +1300)]
Move sql column definition to to the processor class

5 years agoAdd test for membership payment fields
eileen [Thu, 13 Dec 2018 05:17:33 +0000 (18:17 +1300)]
Add test for membership payment fields

5 years agoMerge pull request #13265 from eileenmcnaughton/mail_sub
Seamus Lee [Thu, 13 Dec 2018 03:56:56 +0000 (14:56 +1100)]
Merge pull request #13265 from eileenmcnaughton/mail_sub

dev/core#588 fix "CiviMail Draft" appears twice in non-Mosaico test emails

5 years agoComment fix
eileen [Thu, 13 Dec 2018 02:51:36 +0000 (15:51 +1300)]
Comment fix

5 years agoUse trait rather than parent class for acl test functions
eileen [Thu, 13 Dec 2018 02:48:54 +0000 (15:48 +1300)]
Use trait rather than parent class for acl test functions

This got separated out over a few recent commits (the first one seems to have somewhat
accidentally included the trait & then some others added using it. Am just pushing in this tidy up

5 years agoUpdate Copywrite in FiveTen upgrade file to be 2019
Seamus Lee [Thu, 13 Dec 2018 02:15:43 +0000 (13:15 +1100)]
Update Copywrite in FiveTen upgrade file to be 2019

5 years agoUpdate Copywrite year to be 2019
Seamus Lee [Thu, 13 Dec 2018 01:38:38 +0000 (12:38 +1100)]
Update Copywrite year to be 2019

5 years agoRevert "Adding [CiviMail Draft] on test mailing (for mosaico)"
eileen [Thu, 13 Dec 2018 00:55:36 +0000 (13:55 +1300)]
Revert "Adding [CiviMail Draft] on test mailing (for mosaico)"

This reverts commit 29cfa0ffae971c99116a2a0a069c4e486b83bffa.

5 years agoMerge pull request #13264 from civicrm/5.9
Eileen McNaughton [Thu, 13 Dec 2018 00:54:40 +0000 (13:54 +1300)]
Merge pull request #13264 from civicrm/5.9

5.9 to master

5 years agoMerge pull request #13258 from eileenmcnaughton/isam
Eileen McNaughton [Thu, 13 Dec 2018 00:26:11 +0000 (13:26 +1300)]
Merge pull request #13258 from eileenmcnaughton/isam

dev/core#591 Exclude civicrm_tmp% from isam check

5 years agoAdd default for in Exception class.
eileen [Thu, 13 Dec 2018 00:07:53 +0000 (13:07 +1300)]
Add default for  in Exception class.

More similar to parent & fixes a notice

5 years agoMerge pull request #13260 from civicrm/5.9
Eileen McNaughton [Wed, 12 Dec 2018 23:40:59 +0000 (12:40 +1300)]
Merge pull request #13260 from civicrm/5.9

5.9 to master

5 years agoMerge pull request #13256 from colemanw/dev/core#589
Eileen McNaughton [Wed, 12 Dec 2018 23:04:57 +0000 (12:04 +1300)]
Merge pull request #13256 from colemanw/dev/core#589

dev/core#589 - Fix saving autocomplete search preferences

5 years agoExclude civicrm_tmp% from isam check
eileen [Wed, 12 Dec 2018 22:52:54 +0000 (11:52 +1300)]
Exclude civicrm_tmp% from isam check

5 years agoMerge pull request #13240 from aydun/langswitch2
Eileen McNaughton [Wed, 12 Dec 2018 20:20:02 +0000 (09:20 +1300)]
Merge pull request #13240 from aydun/langswitch2

dev/translation#13 Enable users to choose their own language for accessing CiviCRM

5 years agoFix Setting 'is_active' Param For Price Set For Type Text
varshith89 [Wed, 12 Dec 2018 19:43:28 +0000 (19:43 +0000)]
Fix Setting 'is_active' Param For Price Set For Type Text

5 years agodev/core#589 - Fix saving autocomplete search preferences
Coleman Watts [Wed, 12 Dec 2018 15:30:15 +0000 (10:30 -0500)]
dev/core#589 - Fix saving autocomplete search preferences

5 years agoChange title for uiLanguages setting
Aidan Saunders [Wed, 12 Dec 2018 15:58:22 +0000 (15:58 +0000)]
Change title for uiLanguages setting

5 years agoMerge pull request #13253 from civicrm/5.9
Eileen McNaughton [Wed, 12 Dec 2018 02:54:39 +0000 (15:54 +1300)]
Merge pull request #13253 from civicrm/5.9

5.9 to master

5 years agoMerge pull request #13249 from colemanw/dev/core#582
Eileen McNaughton [Wed, 12 Dec 2018 02:54:00 +0000 (15:54 +1300)]
Merge pull request #13249 from colemanw/dev/core#582

dev/core#582 - Search Builder: Switch to new date/timepicker widget

5 years agoBetter support for search builder date fields
Coleman Watts [Mon, 10 Dec 2018 21:13:45 +0000 (16:13 -0500)]
Better support for search builder date fields

5 years agoSwitch search builder to use crmDatepicker
Coleman Watts [Mon, 10 Dec 2018 14:31:17 +0000 (09:31 -0500)]
Switch search builder to use crmDatepicker

5 years agoAdd testUiLanguages()
Aidan Saunders [Thu, 6 Dec 2018 13:30:56 +0000 (13:30 +0000)]
Add testUiLanguages()

5 years agodev/core#582 - Fix date icon in search builder
Coleman Watts [Mon, 10 Dec 2018 04:21:56 +0000 (23:21 -0500)]
dev/core#582 - Fix date icon in search builder

5 years agoEnable language selection on non-multilingual sites
Aidan Saunders [Wed, 5 Dec 2018 21:32:26 +0000 (21:32 +0000)]
Enable language selection on non-multilingual sites

5 years agoAdd uiLanguages setting
Aidan Saunders [Tue, 4 Dec 2018 16:40:53 +0000 (16:40 +0000)]
Add uiLanguages setting

5 years agoMerge pull request #13247 from seamuslee001/count_test_fix
Seamus Lee [Mon, 10 Dec 2018 00:40:14 +0000 (11:40 +1100)]
Merge pull request #13247 from seamuslee001/count_test_fix

(NFC) Fix PHP7.2 Count error on test testImportParserWtihEmployeeOfRelation…

5 years agoMerge pull request #13248 from civicrm/5.9
Eileen McNaughton [Sun, 9 Dec 2018 23:13:57 +0000 (12:13 +1300)]
Merge pull request #13248 from civicrm/5.9

5.9 to master

5 years agoMerge pull request #13246 from seamuslee001/locale_test_fix
Eileen McNaughton [Sun, 9 Dec 2018 23:13:21 +0000 (12:13 +1300)]
Merge pull request #13246 from seamuslee001/locale_test_fix

(RFC) Fix Locale Test by re-setting the locale used to en_US and by resetting the I18n singleton

5 years agoFix PHP7.2 Count error on test testImportParserWtihEmployeeOfRelationship
Seamus Lee [Sun, 9 Dec 2018 20:32:03 +0000 (07:32 +1100)]
Fix PHP7.2 Count error on test testImportParserWtihEmployeeOfRelationship

5 years agoFix Locale Test by re-setting the locale used to en_US
Seamus Lee [Sun, 9 Dec 2018 02:28:55 +0000 (13:28 +1100)]
Fix Locale Test by re-setting the locale used to en_US

Ensure that CRM_Core_I18n singleton is cleared as well

5 years agoMerge pull request #13245 from ray-wright/patch-2
Seamus Lee [Fri, 7 Dec 2018 23:20:13 +0000 (10:20 +1100)]
Merge pull request #13245 from ray-wright/patch-2

Standardize letter case

5 years agoMerge pull request #13243 from yashodha/campaign
Seamus Lee [Fri, 7 Dec 2018 22:14:59 +0000 (09:14 +1100)]
Merge pull request #13243 from yashodha/campaign

campaign cleanup

5 years agoStandardize letter case
ray-wright [Fri, 7 Dec 2018 21:52:07 +0000 (16:52 -0500)]
Standardize letter case

To match the rest of the actions on this menu (and the actions listed in Contact, Member task files) changed this to sentence case.

5 years agocampaign cleanup
yashodha [Fri, 7 Dec 2018 12:13:24 +0000 (17:43 +0530)]
campaign cleanup

5 years agoMerge pull request #13231 from yashodha/campaign
Seamus Lee [Thu, 6 Dec 2018 23:00:41 +0000 (10:00 +1100)]
Merge pull request #13231 from yashodha/campaign

clean up campaigns for reports

5 years agoMerge pull request #13239 from seamuslee001/lab_core_576
Eileen McNaughton [Thu, 6 Dec 2018 19:02:41 +0000 (08:02 +1300)]
Merge pull request #13239 from seamuslee001/lab_core_576

dev/core#576 Fix the generation of DAO files because version comparis…

5 years agodev/core#576 Fix the generation of DAO files because version comparision fails and...
Seamus Lee [Thu, 6 Dec 2018 08:59:49 +0000 (19:59 +1100)]
dev/core#576 Fix the generation of DAO files because version comparision fails and use standard version_compare function to assit us

5 years agoadd missing property so the results are shown properly
yashodha [Thu, 6 Dec 2018 07:42:11 +0000 (13:12 +0530)]
add missing property so the results are shown properly

5 years agoclean up campaigns for reports
yashodha [Wed, 5 Dec 2018 04:47:52 +0000 (10:17 +0530)]
clean up campaigns for reports

5 years agoSet version to 5.10.alpha1
CiviCRM [Thu, 6 Dec 2018 01:41:49 +0000 (01:41 +0000)]
Set version to 5.10.alpha1

5 years agoSet version to 5.9.beta1
CiviCRM [Thu, 6 Dec 2018 01:36:35 +0000 (01:36 +0000)]
Set version to 5.9.beta1

5 years agoMerge pull request #13197 from seamuslee001/lab_core_442
Eileen McNaughton [Wed, 5 Dec 2018 23:34:45 +0000 (12:34 +1300)]
Merge pull request #13197 from seamuslee001/lab_core_442

dev/core#442 Fix Style issues on word replacements, credit card expir…

5 years agoMerge pull request #13230 from colemanw/Api3
Eileen McNaughton [Wed, 5 Dec 2018 21:55:59 +0000 (10:55 +1300)]
Merge pull request #13230 from colemanw/Api3

Api3 - Add uf_user contact search param

5 years agoMerge pull request #13226 from eileenmcnaughton/price_amt
Seamus Lee [Wed, 5 Dec 2018 21:51:29 +0000 (08:51 +1100)]
Merge pull request #13226 from eileenmcnaughton/price_amt

dev/core#407 Fix mis-saving of price field values under localisation.

5 years agoMerge pull request #13088 from eileenmcnaughton/lybunt2
Seamus Lee [Wed, 5 Dec 2018 20:39:45 +0000 (07:39 +1100)]
Merge pull request #13088 from eileenmcnaughton/lybunt2

dev/core#518 Fix lybunt performance

5 years agoMerge pull request #13235 from civicrm/5.8
Eileen McNaughton [Wed, 5 Dec 2018 20:22:55 +0000 (09:22 +1300)]
Merge pull request #13235 from civicrm/5.8

5.8 to master

5 years agoMerge pull request #13228 from agileware/lab-core-572-5.8
Eileen McNaughton [Wed, 5 Dec 2018 20:22:23 +0000 (09:22 +1300)]
Merge pull request #13228 from agileware/lab-core-572-5.8

dev/core#572 Revert customData changes in EventInfo template.

5 years agoMerge pull request #13074 from agh1/5.8.0-releasenotes
Eileen McNaughton [Wed, 5 Dec 2018 20:21:59 +0000 (09:21 +1300)]
Merge pull request #13074 from agh1/5.8.0-releasenotes

5.8.0 release notes

5 years agoMerge pull request #13233 from mattwire/typos_simplify
Tim Otten [Wed, 5 Dec 2018 20:12:30 +0000 (12:12 -0800)]
Merge pull request #13233 from mattwire/typos_simplify

Typos, simplify if statement