civicrm-core.git
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 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

5 years ago5.8.0 release notes: incorporated late code changes
Andrew Hunt [Wed, 5 Dec 2018 18:44:23 +0000 (13:44 -0500)]
5.8.0 release notes: incorporated late code changes

5 years ago5.7.x release notes: listing and consistency
Andrew Hunt [Wed, 5 Dec 2018 18:21:33 +0000 (13:21 -0500)]
5.7.x release notes: listing and consistency

5 years agorelease-notes - Add 5.7.2
Tim Otten [Wed, 21 Nov 2018 03:33:59 +0000 (19:33 -0800)]
release-notes - Add 5.7.2

5 years agoAdd release-notes/5.7.1.md
Tim Otten [Wed, 21 Nov 2018 02:10:46 +0000 (18:10 -0800)]
Add release-notes/5.7.1.md

5 years ago5.6.1 release notes: consistency and listing
Andrew Hunt [Wed, 5 Dec 2018 18:11:58 +0000 (13:11 -0500)]
5.6.1 release notes: consistency and listing

5 years agorelease-notes/5.6.1.md - Update release date
Tim Otten [Tue, 23 Oct 2018 17:30:08 +0000 (10:30 -0700)]
release-notes/5.6.1.md - Update release date

5 years agoAdd release notes for 5.6.1
Tim Otten [Sun, 21 Oct 2018 19:23:47 +0000 (12:23 -0700)]
Add release notes for 5.6.1

5 years ago5.5.x release notes: standardizing and linking
Andrew Hunt [Wed, 5 Dec 2018 18:02:41 +0000 (13:02 -0500)]
5.5.x release notes: standardizing and linking

5 years agoUpdate 5.5.3 release notes
Tim Otten [Tue, 25 Sep 2018 17:22:29 +0000 (13:22 -0400)]
Update 5.5.3 release notes

5 years agoCherry-pick of 87cd0eda8c4f8c574db65133ff1d531e4334ec87 notes only
Andrew Hunt [Wed, 5 Dec 2018 17:55:36 +0000 (12:55 -0500)]
Cherry-pick of 87cd0eda8c4f8c574db65133ff1d531e4334ec87 notes only

5 years agoAdd release-notes/5.5.3.md
Tim Otten [Tue, 25 Sep 2018 03:42:56 +0000 (23:42 -0400)]
Add release-notes/5.5.3.md

5 years agorelease-notes - Add 5.5.2
Tim Otten [Thu, 20 Sep 2018 23:02:12 +0000 (16:02 -0700)]
release-notes - Add 5.5.2

5 years agoUpdate 5.5.1.md
Tim Otten [Wed, 12 Sep 2018 19:40:38 +0000 (12:40 -0700)]
Update 5.5.1.md

5 years agorelease-notes - Add draft notes for 5.5.1
Tim Otten [Wed, 12 Sep 2018 03:02:10 +0000 (20:02 -0700)]
release-notes - Add draft notes for 5.5.1

5 years ago5.8.0 release notes: organization and contributors
Andrew Hunt [Wed, 5 Dec 2018 17:45:43 +0000 (12:45 -0500)]
5.8.0 release notes: organization and contributors

5 years ago5.8.0 release notes: bulk of edits
Alice Frumin [Wed, 5 Dec 2018 17:10:12 +0000 (11:10 -0600)]
5.8.0 release notes: bulk of edits

* cleaning up formatting, starting from the top

* more progress on release notes

* more release notes progress

* more release notes progress

* first pass at release notes complete

* more clean up

5 years ago5.8.0 release notes: clustering for early review
Eileen McNaughton [Fri, 9 Nov 2018 00:30:20 +0000 (13:30 +1300)]
5.8.0 release notes: clustering for early review

- Update to group some code changes together

- Update 5.8.0.md

  Note - we put this out in 5.6.1 so I removed on purpose

  > - **Joomla admin theme menu, empty blocks & padding clean-up  ([12956](https://github.com/civicrm/civicrm-core/pull/12956))**

- Move items that are clearly features to features & elaborate

- sort report fixes

- move a line to wordpress

- group code cleanup fixes

- note  php 7.3 support as reason for relevant PR, merge post-fix into strtolower work

5 years ago5.8.0 release notes: added boilerplate
Andrew Hunt [Thu, 8 Nov 2018 19:36:46 +0000 (14:36 -0500)]
5.8.0 release notes: added boilerplate

5 years ago5.8.0 release notes: raw from script
Andrew Hunt [Thu, 8 Nov 2018 19:34:51 +0000 (14:34 -0500)]
5.8.0 release notes: raw from script

5 years agoTypos, simplify if statement
Matthew Wire (MJW Consulting) [Wed, 5 Dec 2018 18:10:12 +0000 (18:10 +0000)]
Typos, simplify if statement

5 years agoMerge pull request #13188 from JMAConsulting/core-563
Seamus Lee [Wed, 5 Dec 2018 10:19:42 +0000 (21:19 +1100)]
Merge pull request #13188 from JMAConsulting/core-563

dev/core#563: Duplicate Case manager role fix

5 years agoMerge pull request #13217 from eileenmcnaughton/search_panes
Seamus Lee [Wed, 5 Dec 2018 05:43:34 +0000 (16:43 +1100)]
Merge pull request #13217 from eileenmcnaughton/search_panes

dev/core#529 open search panes when when reviewing smart groups if they have stuff selected

5 years agoApi3 - Add uf_user contact search param
Coleman Watts [Wed, 5 Dec 2018 03:53:19 +0000 (22:53 -0500)]
Api3 - Add uf_user contact search param

5 years agoMerge pull request #13229 from civicrm/5.8
Seamus Lee [Wed, 5 Dec 2018 02:42:38 +0000 (13:42 +1100)]
Merge pull request #13229 from civicrm/5.8

5.8

5 years agoMerge pull request #13227 from eileenmcnaughton/membership_type
Seamus Lee [Wed, 5 Dec 2018 00:31:46 +0000 (11:31 +1100)]
Merge pull request #13227 from eileenmcnaughton/membership_type

Fix period_type, duration_unit, duration_frequency to be required on membership type form

5 years agoMerge pull request #13209 from eileenmcnaughton/search_groups
Seamus Lee [Tue, 4 Dec 2018 23:23:26 +0000 (10:23 +1100)]
Merge pull request #13209 from eileenmcnaughton/search_groups

Add custom search handling for jcalendar converstion.

5 years agoCIVICRM-1118: Revert customData changes in EventInfo template.
Francis Whittle [Tue, 4 Dec 2018 22:14:30 +0000 (09:14 +1100)]
CIVICRM-1118: Revert customData changes in EventInfo template.

This reverts changes that break CKEditor integration from commit
c71da91daf7fa5c98da621720963b6a71d90bcdf.

5 years agoFix period_type, duration_unit, duration_frequency to be required on membership type...
eileen [Tue, 4 Dec 2018 21:56:52 +0000 (10:56 +1300)]
Fix period_type, duration_unit, duration_frequency to be required on membership type form

5 years agoMerge pull request #13220 from totten/master-tz-backend
Eileen McNaughton [Tue, 4 Dec 2018 22:18:11 +0000 (11:18 +1300)]
Merge pull request #13220 from totten/master-tz-backend

CRM-19115 - Synchronize PHP=>MySQL active timezone for all backend scripts

5 years agoMerge pull request #13218 from civicrm/revert-8765-CRM-19115
Eileen McNaughton [Tue, 4 Dec 2018 22:16:58 +0000 (11:16 +1300)]
Merge pull request #13218 from civicrm/revert-8765-CRM-19115

Revert "CRM-19115 - Always set the MySQL timezone offset before checking for …"

5 years agoMerge pull request #13225 from seamuslee001/rename_load_search_functions
Eileen McNaughton [Tue, 4 Dec 2018 22:16:24 +0000 (11:16 +1300)]
Merge pull request #13225 from seamuslee001/rename_load_search_functions

[REF] Rename recently added getUrlVariables getFormVariables function…

5 years agoFix mis-saving of price field values under localisation.
eileen [Tue, 4 Dec 2018 21:42:03 +0000 (10:42 +1300)]
Fix mis-saving of price field values under localisation.

The amount is being inappropriately cleaned in the BAO layer - these values should always be clean by the time they get here

5 years ago[REF] Rename recently added getUrlVariables getFormVariables functions to be loadStan...
Seamus Lee [Tue, 4 Dec 2018 20:44:07 +0000 (07:44 +1100)]
[REF] Rename recently added getUrlVariables getFormVariables functions to be loadStandardSearchOptionsFromUrl loadFormValues

5 years agoMerge pull request #13219 from eileenmcnaughton/fix_type
Seamus Lee [Tue, 4 Dec 2018 20:36:35 +0000 (07:36 +1100)]
Merge pull request #13219 from eileenmcnaughton/fix_type

Fix [unreleased]  typo from https://github.com/civicrm/civicrm-core/pull/13210

5 years agoMerge pull request #13169 from elisseck/dev/core/482
Monish Deb [Tue, 4 Dec 2018 18:43:19 +0000 (00:13 +0530)]
Merge pull request #13169 from elisseck/dev/core/482

dev/core/482 standardize contact edit form delete block behavior

5 years agoMerge pull request #13223 from colemanw/select2
Monish Deb [Tue, 4 Dec 2018 18:32:53 +0000 (00:02 +0530)]
Merge pull request #13223 from colemanw/select2

dev/core#573 Fix select2 height on public pages

5 years agoMerge pull request #13181 from eileenmcnaughton/financial_type_id_default
Monish Deb [Tue, 4 Dec 2018 18:27:40 +0000 (23:57 +0530)]
Merge pull request #13181 from eileenmcnaughton/financial_type_id_default

Set default financial_type_id for creating new payment processors (form & api)

5 years agoFix select2 height on public pages
Coleman Watts [Tue, 4 Dec 2018 12:52:42 +0000 (07:52 -0500)]
Fix select2 height on public pages

5 years agoCRM-19115 - Synchronize PHP=>MySQL active timezone for all backend scripts
Tim Otten [Tue, 4 Dec 2018 06:35:50 +0000 (22:35 -0800)]
CRM-19115 - Synchronize PHP=>MySQL active timezone for all backend scripts

5 years agoFix typo from https://github.com/civicrm/civicrm-core/pull/13210
eileen [Tue, 4 Dec 2018 04:20:47 +0000 (17:20 +1300)]
Fix typo from https://github.com/civicrm/civicrm-core/pull/13210

Looks like I tabbed it out without noticing the wrong param

5 years agoMerge pull request #13212 from eileenmcnaughton/export_wr
Seamus Lee [Tue, 4 Dec 2018 03:53:50 +0000 (14:53 +1100)]
Merge pull request #13212 from eileenmcnaughton/export_wr

Make world_region translate on advanced search field

5 years agoMerge pull request #13013 from eileenmcnaughton/search_defaults
Seamus Lee [Tue, 4 Dec 2018 03:53:23 +0000 (14:53 +1100)]
Merge pull request #13013 from eileenmcnaughton/search_defaults

Prototype for metadata based fields on search screens.

5 years agoRevert "CRM-19115 - Always set the MySQL timezone offset before checking for …"
Tim Otten [Tue, 4 Dec 2018 02:15:39 +0000 (18:15 -0800)]
Revert "CRM-19115 - Always set the MySQL timezone offset before checking for …"

5 years agoAdd world region to exportable fields
eileen [Mon, 3 Dec 2018 03:02:57 +0000 (16:02 +1300)]
Add world region to exportable fields

5 years agoDefine gettext translation for world_region
eileen [Mon, 3 Dec 2018 01:44:13 +0000 (14:44 +1300)]
Define gettext translation for world_region

5 years agodev/core#529 open search panes when when reviewing smart groups if they have stuff...
eileen [Mon, 3 Dec 2018 22:39:31 +0000 (11:39 +1300)]
dev/core#529 open search panes when when reviewing smart groups if they have stuff selected

To replicate - create a smart group based on an activity. Go into the group & go to edit smart group criteria - pane
is not open and risks being ignored.

I think this was just oversight in the tpl & the openedPanes should override any defaults for the pane

5 years agoPrototype for metadata based fields on search screens.
eileen [Thu, 25 Oct 2018 22:40:47 +0000 (11:40 +1300)]
Prototype for metadata based fields on search screens.

This is a first step towards making search screens more metadata driven. It switches the activity_type_id field
to being metadata-added and adds support for activity_type_id=1 via the url.

The setting of defaults is more like 'normal' forms where they are loaded & can be changed in the UI
rather than 'search methods' where they only work in conjunction with 'force'
(which also still works).

This comes out of my concern that
a) we already have url defaults added badly on this form &
b) we have had more than one PR to add more defaults - eg. https://github.com/civicrm/civicrm-core/pull/12455

So I think we should define how we really want entity data to be used with search forms & move towards it.

Note also that the tpls for Contribution Search and one of the contact search panes have been amended to
be metadata driven. I haven't tried to align with that in this step but it should be down the track

5 years agoMerge pull request #13214 from aydun/getcontextvalues
Tim Otten [Mon, 3 Dec 2018 22:23:22 +0000 (14:23 -0800)]
Merge pull request #13214 from aydun/getcontextvalues

 Add \Civi\Token\TokenProcessor::getContextValues()

5 years agoMerge pull request #13192 from aydun/no_dao_free
Seamus Lee [Mon, 3 Dec 2018 20:24:29 +0000 (07:24 +1100)]
Merge pull request #13192 from aydun/no_dao_free

Remove '$dao->free()' part 1

5 years agoMerge pull request #13207 from JMAConsulting/core-11
Seamus Lee [Mon, 3 Dec 2018 19:28:11 +0000 (06:28 +1100)]
Merge pull request #13207 from JMAConsulting/core-11

dev/core#11: Email - send now error screen should display earlier

5 years agoFirst round of '$dao->free()' removals
Aidan Saunders [Mon, 3 Dec 2018 14:05:46 +0000 (14:05 +0000)]
First round of '$dao->free()' removals

5 years agoAdd new testing helper: assertArrayValuesEqual($a1, $a2) - compare array values
Aidan Saunders [Thu, 29 Nov 2018 12:59:13 +0000 (12:59 +0000)]
Add new testing helper: assertArrayValuesEqual($a1, $a2) - compare array values

5 years agoAdd tests for TokenProcessor::getContextValues()
Aidan Saunders [Thu, 29 Nov 2018 13:00:40 +0000 (13:00 +0000)]
Add tests for TokenProcessor::getContextValues()

5 years agoEnhance getContextValues() to collect subfield values
Aidan Saunders [Mon, 19 Nov 2018 20:31:34 +0000 (20:31 +0000)]
Enhance getContextValues() to collect subfield values

5 years agoAdd \Civi\Token\TokenProcessor::getContextValues() from Tim
Aidan Saunders [Mon, 3 Dec 2018 12:09:08 +0000 (12:09 +0000)]
Add \Civi\Token\TokenProcessor::getContextValues() from Tim

5 years agoMerge pull request #13210 from eileenmcnaughton/search_ref
Seamus Lee [Mon, 3 Dec 2018 00:29:55 +0000 (11:29 +1100)]
Merge pull request #13210 from eileenmcnaughton/search_ref

[REF] refactor shared search functions in pre-Process

5 years agoMerge pull request #13206 from eileenmcnaughton/pledge_jcal
Seamus Lee [Sun, 2 Dec 2018 23:50:34 +0000 (10:50 +1100)]
Merge pull request #13206 from eileenmcnaughton/pledge_jcal

dev/core#561 Convert Pledge Payment form to use datepicker rather tha…

5 years agoMerge pull request #13208 from seamuslee001/final_custom_search_conversion_561
Seamus Lee [Sun, 2 Dec 2018 22:21:46 +0000 (09:21 +1100)]
Merge pull request #13208 from seamuslee001/final_custom_search_conversion_561

dev/core#561 Convert DateAdded and Tagged Contributions custom search…

5 years ago[REF] refactor shared search functions in pre-Process
eileen [Sun, 2 Dec 2018 21:28:57 +0000 (10:28 +1300)]
[REF] refactor shared search functions in pre-Process

This simply reduces some duplicate code in the search forms

5 years agoConvert last 2 Custom searches to be converted
Seamus Lee [Sun, 2 Dec 2018 21:03:20 +0000 (08:03 +1100)]
Convert last 2 Custom searches to be converted

5 years agoAdd custom search handling for jcalendar converstion.
eileen [Sun, 2 Dec 2018 20:55:11 +0000 (09:55 +1300)]
Add custom search handling for jcalendar converstion.

I used the methodology from ContribSybunt. I duplicated rather than
shared it because I think the future of these searches is to be more separated from each ohter

5 years agodev/core#561 Convert DateAdded and Tagged Contributions custom searches to using...
Seamus Lee [Sun, 2 Dec 2018 20:53:59 +0000 (07:53 +1100)]
dev/core#561 Convert DateAdded and Tagged Contributions custom searches to using datepicker rather than jcalendar

5 years agoMake 'overdue' function robust by using strtotime comparisons
eileen [Sun, 2 Dec 2018 20:39:17 +0000 (09:39 +1300)]
Make 'overdue' function robust by using strtotime comparisons

5 years agoMerge pull request #13203 from seamuslee001/activity_search_core_561
Eileen McNaughton [Sun, 2 Dec 2018 20:22:50 +0000 (09:22 +1300)]
Merge pull request #13203 from seamuslee001/activity_search_core_561

dev/core#561 Convert Activity Custom Search from jcalendar to datepic…

5 years agodev/core#11: Email - send now error screen should display earlier
Monish Deb [Sun, 2 Dec 2018 19:46:43 +0000 (01:16 +0530)]
dev/core#11: Email - send now error screen should display earlier

5 years agoMerge pull request #13196 from seamuslee001/price_lab_core_561
Seamus Lee [Sun, 2 Dec 2018 10:10:00 +0000 (21:10 +1100)]
Merge pull request #13196 from seamuslee001/price_lab_core_561

dev/core#561 Replace jacalendar with datepicker in Price Field Form

5 years agoMerge pull request #13200 from JMAConsulting/mail-23
Seamus Lee [Sun, 2 Dec 2018 09:43:16 +0000 (20:43 +1100)]
Merge pull request #13200 from JMAConsulting/mail-23

dev/mail#23: Bounce processing doesn't catch pattern 'user doesn't exist'

5 years agodev/core#561 Replace jacalendar with datepicker in Price Field Form
Seamus Lee [Fri, 30 Nov 2018 22:39:25 +0000 (22:39 +0000)]
dev/core#561 Replace jacalendar with datepicker in Price Field Form

Update Display of Field dates as well

5 years agodev/mail#23: Bounce processing doesn't catch pattern 'user doesn't exis'
Monish Deb [Sat, 1 Dec 2018 18:59:01 +0000 (00:29 +0530)]
dev/mail#23: Bounce processing doesn't catch pattern 'user doesn't exis'

5 years agoMerge pull request #13173 from christianwach/issue-557
colemanw [Sun, 2 Dec 2018 04:20:47 +0000 (23:20 -0500)]
Merge pull request #13173 from christianwach/issue-557

Prevent viewport jump when toggling help on "Administer CiviCRM" screen

5 years agoMerge pull request #13190 from JMAConsulting/core-565
colemanw [Sun, 2 Dec 2018 04:15:02 +0000 (23:15 -0500)]
Merge pull request #13190 from JMAConsulting/core-565

dev-core#565: Make subject field of Note, inline editable in contact summary page

5 years agodev/core#561 Convert Pledge Payment form to use datepicker rather than jcalendar
Seamus Lee [Sun, 2 Dec 2018 01:07:26 +0000 (12:07 +1100)]
dev/core#561 Convert Pledge Payment form to use datepicker rather than jcalendar

5 years agoMerge pull request #13194 from seamuslee001/lab_core_498
Eileen McNaughton [Sun, 2 Dec 2018 02:25:04 +0000 (15:25 +1300)]
Merge pull request #13194 from seamuslee001/lab_core_498

dev/core#498 Update Mailing Report to fix undefined property error

5 years agoMerge pull request #13201 from seamuslee001/event_template_cleanup
Eileen McNaughton [Sun, 2 Dec 2018 02:21:43 +0000 (15:21 +1300)]
Merge pull request #13201 from seamuslee001/event_template_cleanup

Remove Defunct Templates from CiviMail

5 years agoMerge pull request #13204 from seamuslee001/nfc_checksum_dao
Eileen McNaughton [Sun, 2 Dec 2018 01:55:37 +0000 (14:55 +1300)]
Merge pull request #13204 from seamuslee001/nfc_checksum_dao

(NFC) Regenerate DAO Checksums after changes to codegen

5 years ago(NFC) Regenerate DAO Checksums after changes to codegen
Seamus Lee [Sat, 1 Dec 2018 23:58:09 +0000 (10:58 +1100)]
(NFC) Regenerate DAO Checksums after changes to codegen

5 years agoMerge pull request #13198 from seamuslee001/event_search_561
Seamus Lee [Sat, 1 Dec 2018 21:48:59 +0000 (08:48 +1100)]
Merge pull request #13198 from seamuslee001/event_search_561

dev/core#561 Remove jcalendar from the Event Aggregate Custom Search

5 years agoMerge pull request #13195 from seamuslee001/npm_update
Eileen McNaughton [Sat, 1 Dec 2018 21:45:28 +0000 (10:45 +1300)]
Merge pull request #13195 from seamuslee001/npm_update

Update npm dependencies to fix audit issues

5 years agoMerge pull request #13176 from aydun/flatten_fix
Eileen McNaughton [Sat, 1 Dec 2018 21:42:46 +0000 (10:42 +1300)]
Merge pull request #13176 from aydun/flatten_fix

Flatten fix

5 years agodev/core#561 Convert Activtiy Custom Search from jcalendar to datepicker and fix...
Seamus Lee [Sat, 1 Dec 2018 21:40:27 +0000 (08:40 +1100)]
dev/core#561 Convert Activtiy Custom Search from jcalendar to datepicker and fix indenting in tpl file

5 years agoMerge pull request #13199 from seamuslee001/lab_core_125
Eileen McNaughton [Sat, 1 Dec 2018 21:40:56 +0000 (10:40 +1300)]
Merge pull request #13199 from seamuslee001/lab_core_125

dev/core#125 Fix Doc url to custom fields user documentation

5 years agoMerge pull request #13186 from aydun/override_active_tokens
Eileen McNaughton [Sat, 1 Dec 2018 21:28:06 +0000 (10:28 +1300)]
Merge pull request #13186 from aydun/override_active_tokens

(REF) Allow subclasses of AbstractTokenSubscriber to override the determination of active tokens.

5 years agoRemove Defunct Templates from CiviMail
Seamus Lee [Sat, 1 Dec 2018 20:32:53 +0000 (20:32 +0000)]
Remove Defunct Templates from CiviMail

5 years agodev/core#561 Remove jcalendar from the Event Aggregate Custom Search
Seamus Lee [Sat, 1 Dec 2018 05:56:19 +0000 (05:56 +0000)]
dev/core#561 Remove jcalendar from the Event Aggregate Custom Search

5 years agodev/core#125 Fix Doc url to custom fields user documentation
Seamus Lee [Sat, 1 Dec 2018 08:26:17 +0000 (08:26 +0000)]
dev/core#125 Fix Doc url to custom fields user documentation

5 years agodev/core#442 Fix Style issues on word replacements, credit card expiry date section...
Seamus Lee [Sat, 1 Dec 2018 05:37:41 +0000 (05:37 +0000)]
dev/core#442 Fix Style issues on word replacements, credit card expiry date section, dedupe execptions and tags and groups section

5 years agoMerge pull request #13193 from civicrm/5.8
Seamus Lee [Fri, 30 Nov 2018 23:24:18 +0000 (10:24 +1100)]
Merge pull request #13193 from civicrm/5.8

5.8

5 years agoUpdate npm dependancies to fix audit issues
Seamus Lee [Fri, 30 Nov 2018 22:17:23 +0000 (22:17 +0000)]
Update npm dependancies to fix audit issues