civicrm-core.git
5 years ago[REF] Simple function extraction for buildMappingForm
Coleman Watts [Fri, 5 Jul 2019 13:53:32 +0000 (09:53 -0400)]
[REF] Simple function extraction for buildMappingForm

5 years agoMerge pull request #14693 from eileenmcnaughton/cust_field_sql
Monish Deb [Tue, 2 Jul 2019 09:13:03 +0000 (14:43 +0530)]
Merge pull request #14693 from eileenmcnaughton/cust_field_sql

[REF] remove instances of pass-by-reference where no change takes place

5 years agoMerge pull request #14503 from pradpnayak/ReportFix
Monish Deb [Tue, 2 Jul 2019 08:49:30 +0000 (14:19 +0530)]
Merge pull request #14503 from pradpnayak/ReportFix

$this->_selectedTables is not populated incase of boleen filters

5 years agoMerge pull request #14702 from demeritcowboy/why-is-php-case-insensitive-for-classnames
Eileen McNaughton [Tue, 2 Jul 2019 07:50:50 +0000 (19:50 +1200)]
Merge pull request #14702 from demeritcowboy/why-is-php-case-insensitive-for-classnames

dev/joomla#13 - followup - Some class names have wrong upper/lower case spelling

5 years agoMerge pull request #14689 from eileenmcnaughton/cust_field_create
Monish Deb [Tue, 2 Jul 2019 06:12:40 +0000 (11:42 +0530)]
Merge pull request #14689 from eileenmcnaughton/cust_field_create

[REF] extract prepareCreate from CustomField.create

5 years agoWIP
DemeritCowboy [Tue, 2 Jul 2019 06:05:45 +0000 (02:05 -0400)]
WIP

5 years agoMerge pull request #14699 from eileenmcnaughton/activity_search
Monish Deb [Tue, 2 Jul 2019 05:47:31 +0000 (11:17 +0530)]
Merge pull request #14699 from eileenmcnaughton/activity_search

[NFC][test] reformat activity search test

5 years agoMerge pull request #14700 from eileenmcnaughton/search
Monish Deb [Tue, 2 Jul 2019 05:46:41 +0000 (11:16 +0530)]
Merge pull request #14700 from eileenmcnaughton/search

[NFC][test] code formatting only

5 years ago[NFC][test] code formatting only SearchTest, SelectorTest
eileen [Tue, 2 Jul 2019 03:12:36 +0000 (15:12 +1200)]
[NFC][test] code formatting only SearchTest, SelectorTest

5 years ago[NFC][test] reformat activity search test
eileen [Tue, 2 Jul 2019 02:41:02 +0000 (14:41 +1200)]
[NFC][test] reformat activity search test

5 years agoMerge pull request #14695 from eileenmcnaughton/revert
Eileen McNaughton [Tue, 2 Jul 2019 02:35:05 +0000 (14:35 +1200)]
Merge pull request #14695 from eileenmcnaughton/revert

Remove failing assertion

5 years agoMerge pull request #14698 from civicrm/5.15
Eileen McNaughton [Tue, 2 Jul 2019 01:45:51 +0000 (13:45 +1200)]
Merge pull request #14698 from civicrm/5.15

5.15 to master

5 years agoMerge pull request #14692 from agh1/pseudoconstant-caps-5.15
Eileen McNaughton [Tue, 2 Jul 2019 01:45:27 +0000 (13:45 +1200)]
Merge pull request #14692 from agh1/pseudoconstant-caps-5.15

dev/joomla#13 lower-case C on CRM_Core_PseudoConstant breaks 5.14 upgrade on Joomla w/ CiviCase

5 years agoRemove failing assertion
eileen [Tue, 2 Jul 2019 00:25:45 +0000 (12:25 +1200)]
Remove failing assertion

This was a 'never worked' as the original call was doing no check. I changed it to do a check but
got confused & didn't realise thee check was actually failing when I merged. This check was never successful
we should remove it

5 years ago[REF] remove instances of pass-by-reference where no change takes place
eileen [Mon, 1 Jul 2019 23:01:08 +0000 (11:01 +1200)]
[REF] remove instances of pass-by-reference where no change takes place

I did a grep on these and the passed params are not altered - down with php4

5 years agoUse correct caps for CRM_Core_PseudoConstant everywhere
Andrew Hunt [Mon, 1 Jul 2019 21:53:29 +0000 (17:53 -0400)]
Use correct caps for CRM_Core_PseudoConstant everywhere

5 years agoMerge pull request #14688 from eileenmcnaughton/revert
Eileen McNaughton [Mon, 1 Jul 2019 21:55:15 +0000 (09:55 +1200)]
Merge pull request #14688 from eileenmcnaughton/revert

 Fix erroneous variable passed to callAPISuccessGetValue

5 years agodev/joomla#13 CiviCase: use correct caps for CRM_Core_PseudoConstant
Andrew Hunt [Mon, 1 Jul 2019 21:26:44 +0000 (17:26 -0400)]
dev/joomla#13 CiviCase: use correct caps for CRM_Core_PseudoConstant

5 years ago[REF] extract prepareCreate from CustomField.create
eileen [Mon, 1 Jul 2019 11:38:00 +0000 (23:38 +1200)]
[REF] extract prepareCreate from CustomField.create

Straight forward extraction - cleaning up code with a view to offering a more efficient wrapping function

5 years agoFix erroneous variabl passed to callAPISuccessGetValue
eileen [Mon, 1 Jul 2019 11:17:16 +0000 (23:17 +1200)]
Fix erroneous variabl passed to callAPISuccessGetValue

5 years agoMerge pull request #14671 from eileenmcnaughton/cust_field
colemanw [Mon, 1 Jul 2019 11:16:29 +0000 (07:16 -0400)]
Merge pull request #14671 from eileenmcnaughton/cust_field

[REF] transform the setting of defaults in CustomField::create to be like (some) other entities

5 years agoMerge pull request #14687 from eileenmcnaughton/matt
Eileen McNaughton [Mon, 1 Jul 2019 08:58:45 +0000 (20:58 +1200)]
Merge pull request #14687 from eileenmcnaughton/matt

Deprecate some deprecated address functions: defaultCurrencySymbol

5 years agoMerge pull request #14244 from greenpeace-cee/fix-contribution-overwrite
Eileen McNaughton [Mon, 1 Jul 2019 06:37:21 +0000 (18:37 +1200)]
Merge pull request #14244 from greenpeace-cee/fix-contribution-overwrite

dev/financial#50 - Fix contributions and participants getting overwritten

5 years agoMerge pull request #14587 from samuelsov/lab1058
Eileen McNaughton [Mon, 1 Jul 2019 06:34:29 +0000 (18:34 +1200)]
Merge pull request #14587 from samuelsov/lab1058

Fixing the display of checkboxes in event confirm / thank you (dev/core#1058)

5 years agoMerge pull request #14686 from eileenmcnaughton/search_cancel
Eileen McNaughton [Mon, 1 Jul 2019 06:17:38 +0000 (18:17 +1200)]
Merge pull request #14686 from eileenmcnaughton/search_cancel

Fix failing test by changing expected date format

5 years agoDeprecate some deprecated address functions: defaultCurrencySymbol
Matthew Wire (MJW Consulting) [Tue, 18 Jun 2019 09:54:24 +0000 (10:54 +0100)]
Deprecate some deprecated address functions: defaultCurrencySymbol

5 years agoMerge pull request #14654 from JMAConsulting/dev-1079
Eileen McNaughton [Mon, 1 Jul 2019 05:10:14 +0000 (17:10 +1200)]
Merge pull request #14654 from JMAConsulting/dev-1079

dev-core#1079: Improper character encoding breaks xml processor

5 years agoMerge pull request #14682 from demeritcowboy/div-div-div-div-div
Eileen McNaughton [Mon, 1 Jul 2019 04:38:39 +0000 (16:38 +1200)]
Merge pull request #14682 from demeritcowboy/div-div-div-div-div

dev/core#1086 - Mismatched div and /div tags in caseTypeDetails.html

5 years agoFix failing test by changing expected date format
eileen [Mon, 1 Jul 2019 04:28:19 +0000 (16:28 +1200)]
Fix failing test by changing expected date format

We have been seeing failures on testCancelledFilter on day one of the month - the reason seems to be
that we are expecting, but not receiving, a date format with a leading zero in the qill. This would
pass for much of the month but fail during the single digit days. This doesn't seem like a regreession to
me - just a test-error surfaced by changes in https://github.com/eileenmcnaughton/civicrm-core/commit/6e7cc0f578e814459b1e1b80c7a922684da46140#diff-984fd916f4708bb4b370841ae0ab69e5R465

5 years agoMerge pull request #14683 from eileenmcnaughton/unserial2
Eileen McNaughton [Mon, 1 Jul 2019 02:09:40 +0000 (14:09 +1200)]
Merge pull request #14683 from eileenmcnaughton/unserial2

Block classes in unserialize field for IDE cheer

5 years agoMerge pull request #14681 from eileenmcnaughton/format
colemanw [Mon, 1 Jul 2019 00:45:21 +0000 (20:45 -0400)]
Merge pull request #14681 from eileenmcnaughton/format

[NFC][test] reformat jobTest class

5 years agoBlock classes in unserialize field for IDE cheer
eileen [Mon, 1 Jul 2019 00:21:49 +0000 (12:21 +1200)]
Block classes in unserialize field for IDE cheer

5 years agoone too many divs
DemeritCowboy [Sun, 30 Jun 2019 23:52:34 +0000 (19:52 -0400)]
one too many divs

5 years ago[NFC][test] reformat jobTest class
eileen [Sun, 30 Jun 2019 23:00:18 +0000 (11:00 +1200)]
[NFC][test] reformat jobTest class

5 years agoMerge pull request #14679 from colemanw/Improve
Eileen McNaughton [Sun, 30 Jun 2019 22:31:32 +0000 (10:31 +1200)]
Merge pull request #14679 from colemanw/Improve

Improve protected field metadata

5 years agoImprove protected field metadata
Coleman Watts [Sun, 30 Jun 2019 04:33:30 +0000 (00:33 -0400)]
Improve protected field metadata

5 years agoMerge pull request #14677 from civicrm/5.15
Eileen McNaughton [Sat, 29 Jun 2019 23:52:53 +0000 (11:52 +1200)]
Merge pull request #14677 from civicrm/5.15

5.15 to master

5 years agoMerge pull request #14656 from eileenmcnaughton/ad_hoc_mailing
Eileen McNaughton [Sat, 29 Jun 2019 23:52:16 +0000 (11:52 +1200)]
Merge pull request #14656 from eileenmcnaughton/ad_hoc_mailing

dev/core#1030 fix mis-saving of hidden smart group when sending mail from search builder

5 years ago[REF] transform the setting of defaults in CustomField::create to be like (some)...
eileen [Fri, 28 Jun 2019 22:42:25 +0000 (10:42 +1200)]
[REF] transform the setting of defaults in CustomField::create to be like (some) other entities

This patter (massaging the params & then copying) is more consistent. PR also moves creating the transaction to the start of the fn

I am cleaning up towards adding a bulk function that can be utilised by api v4 to create multiple fields with some efficiency on
sql statements (which matters when adding 2 or more fields to a large table)

5 years agoMerge pull request #14670 from eileenmcnaughton/cust_field_2
Seamus Lee [Sat, 29 Jun 2019 00:01:47 +0000 (10:01 +1000)]
Merge pull request #14670 from eileenmcnaughton/cust_field_2

[REF] do not receive  by reference in CustomField::create

5 years agoMerge pull request #14477 from eileenmcnaughton/part_defaults
Seamus Lee [Fri, 28 Jun 2019 23:05:47 +0000 (09:05 +1000)]
Merge pull request #14477 from eileenmcnaughton/part_defaults

URL support for some params in event search

5 years ago[REF] do not receive by reference in CustomField::create
eileen [Fri, 28 Jun 2019 22:43:33 +0000 (10:43 +1200)]
[REF] do not receive  by reference in CustomField::create

I audited the places where this is called in core and the  object is not later interogated for changes

5 years agoMerge pull request #14625 from eileenmcnaughton/cust_rel_fix
Seamus Lee [Fri, 28 Jun 2019 22:24:49 +0000 (08:24 +1000)]
Merge pull request #14625 from eileenmcnaughton/cust_rel_fix

dev/core#389 Fix custom data relative date searching

5 years agoMerge pull request #14669 from civicrm/5.15
Eileen McNaughton [Fri, 28 Jun 2019 22:18:11 +0000 (10:18 +1200)]
Merge pull request #14669 from civicrm/5.15

5.15

5 years agoMerge pull request #14657 from eileenmcnaughton/smart_15
Seamus Lee [Fri, 28 Jun 2019 22:16:36 +0000 (08:16 +1000)]
Merge pull request #14657 from eileenmcnaughton/smart_15

Remove cached smart group entries when removing from a group

5 years agoStore header to statics in unit tests
eileen [Fri, 28 Jun 2019 22:07:29 +0000 (10:07 +1200)]
Store header to statics in unit tests

5 years agodev/core#1074 fix failure of actions from manage groups screen
eileen [Thu, 27 Jun 2019 11:37:19 +0000 (23:37 +1200)]
dev/core#1074 fix failure of actions from manage groups screen

5 years agodev/core#1030 fix mis-saving of hidden smart group when sending mail from search...
eileen [Thu, 27 Jun 2019 12:56:31 +0000 (00:56 +1200)]
dev/core#1030 fix mis-saving of hidden smart group when sending mail from search builder

Fixes a bug where sending a civimail from search builder was sending out to the wrong list

5 years agoMerge pull request #14256 from greenpeace-cee/innodb-log-tables
Seamus Lee [Fri, 28 Jun 2019 22:01:49 +0000 (08:01 +1000)]
Merge pull request #14256 from greenpeace-cee/innodb-log-tables

dev/core#663 - Use InnoDB engine for extended log tables

5 years agoMerge pull request #14665 from seamuslee001/mechanisenros_key
Eileen McNaughton [Fri, 28 Jun 2019 21:46:10 +0000 (09:46 +1200)]
Merge pull request #14665 from seamuslee001/mechanisenros_key

Add in Andrei Mondoc(mecachisenros) to contributor key

5 years agoMerge pull request #14666 from demeritcowboy/finborg
Eileen McNaughton [Fri, 28 Jun 2019 21:45:45 +0000 (09:45 +1200)]
Merge pull request #14666 from demeritcowboy/finborg

dev/core#1082 - test demonstrating message template mixup

5 years agotest demonstrating dev/core#1082
DemeritCowboy [Fri, 28 Jun 2019 08:59:35 +0000 (04:59 -0400)]
test demonstrating dev/core#1082

5 years agoAdd in Andrei Mondoc(mecachisenros) to contributor key
Seamus Lee [Fri, 28 Jun 2019 05:09:01 +0000 (15:09 +1000)]
Add in Andrei Mondoc(mecachisenros) to contributor key

5 years agoMerge pull request #13477 from mecachisenros/invoice-line-items
Seamus Lee [Fri, 28 Jun 2019 05:57:29 +0000 (15:57 +1000)]
Merge pull request #13477 from mecachisenros/invoice-line-items

Fix incorrect display of Line Items created via API when printing invoice (for Participants)

5 years agoMerge pull request #14664 from civicrm/5.15
Eileen McNaughton [Fri, 28 Jun 2019 03:55:40 +0000 (15:55 +1200)]
Merge pull request #14664 from civicrm/5.15

5.15

5 years agoMerge pull request #14659 from seamuslee001/5.15
Eileen McNaughton [Fri, 28 Jun 2019 01:50:19 +0000 (13:50 +1200)]
Merge pull request #14659 from seamuslee001/5.15

dev/core#1082 properly regenerate civicrm_generated file

5 years agoMerge pull request #14660 from colemanw/apiKeyCheck
Eileen McNaughton [Fri, 28 Jun 2019 01:39:03 +0000 (13:39 +1200)]
Merge pull request #14660 from colemanw/apiKeyCheck

 Move api_key read/write permission checks from api to BAO

5 years agoMerge pull request #14622 from eileenmcnaughton/recordpartial
colemanw [Fri, 28 Jun 2019 01:16:43 +0000 (21:16 -0400)]
Merge pull request #14622 from eileenmcnaughton/recordpartial

[REF] Copy assignProportional Line items back into Payment.create function

5 years agoMerge pull request #14650 from eileenmcnaughton/cust_field_create
colemanw [Fri, 28 Jun 2019 01:10:57 +0000 (21:10 -0400)]
Merge pull request #14650 from eileenmcnaughton/cust_field_create

[REF] minor code cleanup - move indexExist calculation to the only place in the code that needs it

5 years agoMerge pull request #14651 from eileenmcnaughton/cust_field_2
colemanw [Fri, 28 Jun 2019 01:09:37 +0000 (21:09 -0400)]
Merge pull request #14651 from eileenmcnaughton/cust_field_2

[REF] Remove columnName field

5 years agoadd test for invoice line items
Andrei Mondoc [Thu, 27 Jun 2019 16:37:19 +0000 (17:37 +0100)]
add test for invoice line items

5 years agoRemove cached smart group entries when removing from a group
eileen [Thu, 27 Jun 2019 13:23:43 +0000 (01:23 +1200)]
Remove cached smart group entries when removing from a group

In 5.15 we have added fixes for smart groups regarding removed entries. Possibly related to this but also possibly pre-existing
I'm seeing contacts who have been removed from smart groups showing up after removal in search results for the duration of the smart group cache.

Regardless the fix feels safe, sensible and correct so I'm comfortable targetting the rc without further research as to whether it
is a regression. The fix being removal of the cache entry when the group entry is removed.

5 years agoretrieve LineItems by contributionID regardless of component
Andrei Mondoc [Wed, 16 Jan 2019 21:35:40 +0000 (21:35 +0000)]
retrieve LineItems by contributionID regardless of component

5 years agoMove api_key write permission checks from api to BAO
Coleman Watts [Thu, 27 Jun 2019 22:57:08 +0000 (18:57 -0400)]
Move api_key write permission checks from api to BAO

5 years agoMove api_key read permission checks from api to BAO
Seamus Lee [Mon, 20 May 2019 22:34:52 +0000 (08:34 +1000)]
Move api_key read permission checks from api to BAO

5 years agodev/core#1082 properly regenerate civicrm_generated file
Seamus Lee [Thu, 27 Jun 2019 22:53:35 +0000 (08:53 +1000)]
dev/core#1082 properly regenerate civicrm_generated file

5 years agoMerge pull request #14645 from colemanw/noAmp
Eileen McNaughton [Thu, 27 Jun 2019 11:57:10 +0000 (23:57 +1200)]
Merge pull request #14645 from colemanw/noAmp

Remove superfluous pass-by-ref in api3

5 years agodev-core#1079: Improper character encoding breaks xml processor
Monish Deb [Thu, 27 Jun 2019 11:33:28 +0000 (17:03 +0530)]
dev-core#1079: Improper character encoding breaks xml processor

5 years agodev/core#389 Fix custom data relative date searching
eileen [Fri, 31 May 2019 00:47:30 +0000 (12:47 +1200)]
dev/core#389 Fix custom data relative date searching

This addresses a fairly old regression where smart groups based on relative dates stopped being relative

5 years agoMerge pull request #14653 from eileenmcnaughton/test_clean
Eileen McNaughton [Thu, 27 Jun 2019 08:29:26 +0000 (20:29 +1200)]
Merge pull request #14653 from eileenmcnaughton/test_clean

[REF + test] extract buildFieldChangeSql and add unit test

5 years agoMerge pull request #14637 from seamuslee001/unit_test_dev_core_1069
Eileen McNaughton [Thu, 27 Jun 2019 06:53:35 +0000 (18:53 +1200)]
Merge pull request #14637 from seamuslee001/unit_test_dev_core_1069

[Test] Add in unit test attempting to demonstrate issue caused by dev…

5 years ago[REF + test] extract buildFieldChangeSql and add unit test
eileen [Thu, 27 Jun 2019 06:22:49 +0000 (18:22 +1200)]
[REF + test] extract buildFieldChangeSql and add unit test

5 years agoMerge pull request #14649 from eileenmcnaughton/test_clean
Eileen McNaughton [Thu, 27 Jun 2019 06:08:53 +0000 (18:08 +1200)]
Merge pull request #14649 from eileenmcnaughton/test_clean

[NFC] formatting on test class cleanup

5 years ago[NFC] formatting on test class cleanup
eileen [Thu, 27 Jun 2019 02:30:57 +0000 (14:30 +1200)]
[NFC] formatting on test class cleanup

5 years agoMerge pull request #14652 from eileenmcnaughton/cust_field_3
Eileen McNaughton [Thu, 27 Jun 2019 04:45:59 +0000 (16:45 +1200)]
Merge pull request #14652 from eileenmcnaughton/cust_field_3

[REF] extract createOptionValue function in CustomField::create

5 years ago[REF] extract createOptionValue function in CustomField::create
eileen [Thu, 27 Jun 2019 03:23:55 +0000 (15:23 +1200)]
[REF] extract createOptionValue function in CustomField::create

5 years agoRemove columnName field
eileen [Thu, 27 Jun 2019 03:16:40 +0000 (15:16 +1200)]
Remove columnName field

This field always holds the same information as ['column_name']. It was introduced
before https://github.com/civicrm/civicrm-core/pull/1206/files which removed some of it's
use but not the variable. There is test coverage on passing in column_name
in testCreateCustomFieldColumnName

5 years agoMerge pull request #14646 from colemanw/pledgeSpec
Eileen McNaughton [Thu, 27 Jun 2019 03:01:44 +0000 (15:01 +1200)]
Merge pull request #14646 from colemanw/pledgeSpec

Removing unused spec function

5 years ago[REF] minor code cleanup - move indexExist calculation to the only place in the code...
eileen [Thu, 27 Jun 2019 02:59:03 +0000 (14:59 +1200)]
[REF] minor code cleanup - move indexExist calculation to the only place in the code that needs it

Readability fix

5 years agoMerge pull request #14643 from eileenmcnaughton/schemah
Eileen McNaughton [Thu, 27 Jun 2019 01:47:28 +0000 (13:47 +1200)]
Merge pull request #14643 from eileenmcnaughton/schemah

Remove a few places where pass by reference is used but does not need to be

5 years agoRemoving unused spec function
Coleman Watts [Thu, 27 Jun 2019 01:06:47 +0000 (21:06 -0400)]
Removing unused spec function

5 years agoRemove superfluous pass-by-ref in api3
Coleman Watts [Thu, 27 Jun 2019 01:04:03 +0000 (21:04 -0400)]
Remove superfluous pass-by-ref in api3

5 years agoRemove a few places where pass by reference is used but does not need to be
eileen [Thu, 27 Jun 2019 00:24:43 +0000 (12:24 +1200)]
Remove a few places where pass by reference is used but does not need to be

5 years agoMerge pull request #14642 from civicrm/5.15
Eileen McNaughton [Wed, 26 Jun 2019 23:11:25 +0000 (11:11 +1200)]
Merge pull request #14642 from civicrm/5.15

5.15

5 years agoMerge pull request #14571 from eileenmcnaughton/mem
Seamus Lee [Wed, 26 Jun 2019 22:50:09 +0000 (08:50 +1000)]
Merge pull request #14571 from eileenmcnaughton/mem

dev/core#1038 partial - fix checksum url for cancelling recurring with mid in the url

5 years agoMerge pull request #14641 from agh1/fix-cron-help-link
Seamus Lee [Wed, 26 Jun 2019 22:18:29 +0000 (08:18 +1000)]
Merge pull request #14641 from agh1/fix-cron-help-link

Scheduled jobs: replace outdated wiki link

5 years agoScheduled jobs: replace outdated wiki link
Andrew Hunt [Wed, 26 Jun 2019 15:43:27 +0000 (11:43 -0400)]
Scheduled jobs: replace outdated wiki link

5 years agoMerge pull request #14601 from seamuslee001/dev_core_1067
Eileen McNaughton [Wed, 26 Jun 2019 05:48:45 +0000 (17:48 +1200)]
Merge pull request #14601 from seamuslee001/dev_core_1067

dev/core#1067 Clean Money before creating Campaign record and add test

5 years agoMerge pull request #14626 from eileenmcnaughton/notice
Eileen McNaughton [Wed, 26 Jun 2019 00:05:32 +0000 (12:05 +1200)]
Merge pull request #14626 from eileenmcnaughton/notice

Fix notice on editing contribution

5 years agoFix notice on editing contribution
eileen [Mon, 24 Jun 2019 02:43:16 +0000 (14:43 +1200)]
Fix notice on editing contribution

5 years agoMerge pull request #14499 from mattwire/extract_getdefaultroleid
Seamus Lee [Tue, 25 Jun 2019 22:23:35 +0000 (08:23 +1000)]
Merge pull request #14499 from mattwire/extract_getdefaultroleid

REF Extract getDefaultRoleID for add participant

5 years agoMerge pull request #14634 from colemanw/checklist
Tim Otten [Tue, 25 Jun 2019 21:58:14 +0000 (14:58 -0700)]
Merge pull request #14634 from colemanw/checklist

Add checklist-model angular module

5 years agoMerge pull request #14636 from colemanw/revertDate
Seamus Lee [Tue, 25 Jun 2019 21:56:23 +0000 (07:56 +1000)]
Merge pull request #14636 from colemanw/revertDate

Partially revert "Update example dates from 2009 to current year"

5 years agoMerge pull request #14597 from colemanw/Reset
Seamus Lee [Tue, 25 Jun 2019 21:50:28 +0000 (07:50 +1000)]
Merge pull request #14597 from colemanw/Reset

Reset language at end of localized api call

5 years agoMerge pull request #14638 from civicrm/5.15
Eileen McNaughton [Tue, 25 Jun 2019 21:46:02 +0000 (09:46 +1200)]
Merge pull request #14638 from civicrm/5.15

5.15 to master

5 years agoMerge pull request #14624 from eileenmcnaughton/force_defaults
Seamus Lee [Tue, 25 Jun 2019 21:37:50 +0000 (07:37 +1000)]
Merge pull request #14624 from eileenmcnaughton/force_defaults

dev/core#1059 Fix contribution search to work with url parameters in force mode

5 years agoMerge pull request #14618 from eileenmcnaughton/5.15
Seamus Lee [Tue, 25 Jun 2019 21:37:14 +0000 (07:37 +1000)]
Merge pull request #14618 from eileenmcnaughton/5.15

dev/core#926 & dev/core#1048 Fix group search builder bugs

5 years ago[Test] Add in unit test attempting to demonstrate issue caused by dev/core#1069
Seamus Lee [Tue, 25 Jun 2019 21:16:02 +0000 (07:16 +1000)]
[Test] Add in unit test attempting to demonstrate issue caused by dev/core#1069

5 years agoMerge pull request #14632 from colemanw/datePicker
Eileen McNaughton [Tue, 25 Jun 2019 20:43:42 +0000 (08:43 +1200)]
Merge pull request #14632 from colemanw/datePicker

Handle relative start & end dates passed to datepicker widget

5 years agoPartially revert "Update example dates from 2009 to current year"
Coleman Watts [Tue, 25 Jun 2019 20:33:31 +0000 (16:33 -0400)]
Partially revert "Update example dates from 2009 to current year"

This reverts most of commit 86ef49af1894a4e68a9bf84d40bb5fa0cb98c586.