civicrm-core.git
5 years agoEvent Cart: fix start_date formatting in line items during checkout
Mathieu Lutfy [Wed, 1 May 2019 10:25:00 +0000 (06:25 -0400)]
Event Cart: fix start_date formatting in line items during checkout

5 years agoMerge pull request #14144 from eileenmcnaughton/dedupe4
Eileen McNaughton [Sun, 28 Apr 2019 23:40:01 +0000 (11:40 +1200)]
Merge pull request #14144 from eileenmcnaughton/dedupe4

dev/core#723 [REF] extract chunk of code that definitely does something.

5 years agoMerge pull request #14148 from eileenmcnaughton/dedupe8
Eileen McNaughton [Sun, 28 Apr 2019 22:34:25 +0000 (10:34 +1200)]
Merge pull request #14148 from eileenmcnaughton/dedupe8

[REF] extract getConflicts function

5 years ago[REF] extract chunk of code that definitely does something.
eileen [Sat, 27 Apr 2019 04:37:07 +0000 (16:37 +1200)]
[REF] extract chunk of code that definitely does something.

This is a really blunt extraction of a chunk of code whose Raison D'Etre I don't quite know as yet.

I've done the absolute minimum variable cleanup to keep it really clean in the first instance

5 years ago[REF] extract getConflicts function
eileen [Sat, 27 Apr 2019 06:36:12 +0000 (18:36 +1200)]
[REF] extract getConflicts function

This is for readability but I also want to add an api that retrieves conflicts without
trying a merge for more control

5 years agoMerge pull request #14151 from eileenmcnaughton/dedupe7
Seamus Lee [Sun, 28 Apr 2019 04:25:42 +0000 (14:25 +1000)]
Merge pull request #14151 from eileenmcnaughton/dedupe7

[REF] Extract get cfields function

5 years agoMerge pull request #14150 from eileenmcnaughton/last_free_jcal
Seamus Lee [Sat, 27 Apr 2019 23:18:23 +0000 (09:18 +1000)]
Merge pull request #14150 from eileenmcnaughton/last_free_jcal

dev/core#561 Remove last free jcalendar

5 years agoExtract get cfields function
eileen [Sat, 27 Apr 2019 05:48:38 +0000 (17:48 +1200)]
Extract get cfields function

5 years agoMerge pull request #14119 from eileenmcnaughton/recur_meta
Seamus Lee [Sat, 27 Apr 2019 21:54:54 +0000 (07:54 +1000)]
Merge pull request #14119 from eileenmcnaughton/recur_meta

dev/core#830 [REF] Add unit tests on contribution recur trxn_id, contribution recur processor id

5 years agoRemove last free jcalendar
eileen [Sat, 27 Apr 2019 07:34:20 +0000 (19:34 +1200)]
Remove last free jcalendar

This is the last jcalendar outside of buildDateRange instances.

It turns out to be 'just a form' and pretty straight forward

5 years agoMerge pull request #14146 from eileenmcnaughton/dedupe6
Seamus Lee [Sat, 27 Apr 2019 21:46:10 +0000 (07:46 +1000)]
Merge pull request #14146 from eileenmcnaughton/dedupe6

dev/core#723 [REF] Declare contactType var rather than using long array syntax.

5 years agoMerge pull request #14149 from eileenmcnaughton/exreport
Seamus Lee [Sat, 27 Apr 2019 21:44:41 +0000 (07:44 +1000)]
Merge pull request #14149 from eileenmcnaughton/exreport

[cleanup] remove CRM_Report_Form_Extended

5 years agoMerge pull request #14134 from stesi561/dev/core/248
Mathieu Lu [Sat, 27 Apr 2019 20:07:08 +0000 (16:07 -0400)]
Merge pull request #14134 from stesi561/dev/core/248

dev/core#248 - Fixes advanced search mailings results headers

5 years agoMerge pull request #14141 from seamuslee001/view_url_double_protocol_test
Seamus Lee [Sat, 27 Apr 2019 09:32:31 +0000 (19:32 +1000)]
Merge pull request #14141 from seamuslee001/view_url_double_protocol_test

(NFC) Expand unit test to show off double protocol error

5 years ago(NFC) Expand unit test to show off double protocol error
Seamus Lee [Sat, 27 Apr 2019 04:16:19 +0000 (14:16 +1000)]
(NFC) Expand unit test to show off double protocol error

Expand test to include situation if the Other protocol is set rather than a specific protocol

Make test portable

5 years ago[cleanup] remove CRM_Report_Form_Extended
eileen [Sat, 27 Apr 2019 06:48:09 +0000 (18:48 +1200)]
[cleanup] remove CRM_Report_Form_Extended

This file was added to core around 4.2 but for various reasons the ExtendedReport intiative
moved to an extension & it was never used. This just removes it

5 years agoDeclare contactType var rather than using long array syntax.
eileen [Sat, 27 Apr 2019 05:40:14 +0000 (17:40 +1200)]
Declare contactType var rather than using long array syntax.

Very small tidy up for legibility

5 years agoMerge pull request #14142 from eileenmcnaughton/dedupe2
Eileen McNaughton [Sat, 27 Apr 2019 05:45:44 +0000 (17:45 +1200)]
Merge pull request #14142 from eileenmcnaughton/dedupe2

 [REF] move gathering of location info to relevant function (towards dev/core#723)

5 years agoMerge pull request #14143 from eileenmcnaughton/dedupe3
Eileen McNaughton [Sat, 27 Apr 2019 05:31:01 +0000 (17:31 +1200)]
Merge pull request #14143 from eileenmcnaughton/dedupe3

dev/core#560 Remove a couple of instances of fatal errors in favour of throwing exceptions

5 years agoMerge pull request #14140 from eileenmcnaughton/dedupe
Seamus Lee [Sat, 27 Apr 2019 05:23:22 +0000 (15:23 +1000)]
Merge pull request #14140 from eileenmcnaughton/dedupe

[REF] Move the qfbug handling to it's own function (towards dev/core#723)

5 years agoMerge pull request #14128 from agileware/CIVICRM-1143
Seamus Lee [Sat, 27 Apr 2019 04:40:00 +0000 (14:40 +1000)]
Merge pull request #14128 from agileware/CIVICRM-1143

Fixed double protocol being added in link by CKEditor.

5 years agoRemove a couple of instances of fatal errors in favour of throwing exceptions
eileen [Sat, 27 Apr 2019 04:28:33 +0000 (16:28 +1200)]
Remove a couple of instances of fatal errors in favour of throwing exceptions

https://lab.civicrm.org/dev/core/issues/560

5 years ago[REF] move gathering of location info to relevant function
eileen [Sat, 27 Apr 2019 04:13:00 +0000 (16:13 +1200)]
[REF] move gathering of location info to relevant function

We have a loop that parses the migrationInfo to get just location fields which we loop through, but
migrationInfo is already available in the moveLocationInfo fn so we can just handle that param in there
& improve code readability (we do a little less array looping but it's pretty cheap & the code
readabiliity is a real issue here

5 years agoMove the qfbug handling to it's own function
eileen [Sat, 27 Apr 2019 03:58:34 +0000 (15:58 +1200)]
Move the qfbug handling to it's own function

This is a really toxi function. In order to save the pain or iterating multiple times through a small array
we are dealing with an awful lot of complexity. I'm changing this to iterate through it multiple
times in order to rationalise the code - I think performance is minimal & being able to read the code....

5 years agoMerge pull request #14139 from agh1/upgrade-rebuild-caseact-views
Seamus Lee [Sat, 27 Apr 2019 02:03:37 +0000 (12:03 +1000)]
Merge pull request #14139 from agh1/upgrade-rebuild-caseact-views

dev/core#832 CiviCase: rebuild case activity views during upgrade

5 years agodev/core#832 CiviCase: rebuild case activity views during upgrade
Andrew Hunt [Sat, 27 Apr 2019 00:10:33 +0000 (20:10 -0400)]
dev/core#832 CiviCase: rebuild case activity views during upgrade

5 years agoUse CRM_Core_I18n::isMultiLingual() to detect if is multilingual
Luke Stewart [Fri, 26 Apr 2019 21:49:51 +0000 (09:49 +1200)]
Use CRM_Core_I18n::isMultiLingual() to detect if is multilingual

5 years agoFix extra space
Luke Stewart [Fri, 26 Apr 2019 21:33:37 +0000 (09:33 +1200)]
Fix extra space

5 years agodev/core/248 - Fixes advanced search results headers mailings
Luke Stewart [Fri, 26 Apr 2019 08:00:45 +0000 (20:00 +1200)]
dev/core/248 - Fixes advanced search results headers mailings

Removes language from advanced search results mailings column
headers for non-multilingual sites.

5 years agoMerge pull request #14131 from colemanw/resourceList
Tim Otten [Fri, 26 Apr 2019 06:54:08 +0000 (23:54 -0700)]
Merge pull request #14131 from colemanw/resourceList

[REF] Use events for CMS resource loading

5 years agoAdd unit tests on contribution recur trxn_id, contribution recur processor id
eileen [Wed, 24 Apr 2019 07:01:32 +0000 (19:01 +1200)]
Add unit tests on contribution recur trxn_id, contribution recur processor id

This is preliminary cleanup towards exposing cancel_reason as a search field, as committed to in proposal to
add the field. This change

- adds unit tests for the trxn_id & processor_id fields
- makes the handling of them more generic
- adds contribution recur field data to the contribution query object so it can be accessed.

Some points about the last of these. Basically we have a situation where the query object needs metadata to
avoid field by field handling. We have done this is some wierd & wonderful ways with dependencies on 'import' &
'export' metadata info to the point where they were given to so many fields as to become meaningless.

I think this method is better - ie. just adding the additional metadata to the query class for all the entities it
deals with. A recently merged PR means 'where' data is still available using this method.

Also I have added uniquenames to the contribution recur fields. Uniquenames no longer really matter outside
- the query object
- profiles
- possibly import & export

We only really expose recurring contribution info through the query object of these so it should be safe. In a future happy
space apiv4 & namespacing will render uniquenames a distant memory.

I couldn't rip out the special handling entirely without dealing with the labels that go into the qill. I figure
we should merge this & then address that - but briefly the issue is that Matt has just changed all the labels
to not quite work in this context so we need to discuss / agree how to manage 'Recurring Contribution Trxn ID' vs
'Trxn ID'.

I also didn't want to rip out the special handling fully in advance of https://github.com/civicrm/civicrm-core/pull/14118
being merged as there could be a performance regression if we let more code hit that unnecessary join line

5 years agoMerge pull request #14133 from civicrm/5.13
Seamus Lee [Fri, 26 Apr 2019 02:53:00 +0000 (12:53 +1000)]
Merge pull request #14133 from civicrm/5.13

5.13

5 years agoMerge pull request #14132 from seamuslee001/5.13
Seamus Lee [Fri, 26 Apr 2019 01:03:59 +0000 (11:03 +1000)]
Merge pull request #14132 from seamuslee001/5.13

Add 5.12.4 release notes

5 years agoUpdate 5.12.4.md
Tim Otten [Thu, 25 Apr 2019 23:42:50 +0000 (16:42 -0700)]
Update 5.12.4.md

5 years agoUpdate 5.12.4.md
Tim Otten [Thu, 25 Apr 2019 23:42:03 +0000 (16:42 -0700)]
Update 5.12.4.md

5 years agoUpdate release notes
Seamus Lee [Thu, 25 Apr 2019 23:31:42 +0000 (09:31 +1000)]
Update release notes

5 years agoAdd 5.12.4 release notes
Seamus Lee [Thu, 25 Apr 2019 01:11:43 +0000 (11:11 +1000)]
Add 5.12.4 release notes

5 years agoUse events for CMS resource loading
Coleman Watts [Thu, 25 Apr 2019 14:41:49 +0000 (10:41 -0400)]
Use events for CMS resource loading

5 years agoMerge pull request #14086 from agh1/caseactqueryfix
Eileen McNaughton [Thu, 25 Apr 2019 22:03:34 +0000 (10:03 +1200)]
Merge pull request #14086 from agh1/caseactqueryfix

Case activity query performs poorly on large databases

5 years agoMerge pull request #14122 from colemanw/menubarHeight
Eileen McNaughton [Thu, 25 Apr 2019 21:52:30 +0000 (09:52 +1200)]
Merge pull request #14122 from colemanw/menubarHeight

[REF] Use variable for menubar height

5 years agoUse variable for menubar height
Coleman Watts [Wed, 24 Apr 2019 17:55:08 +0000 (13:55 -0400)]
Use variable for menubar height

5 years agoMerge pull request #13689 from eileenmcnaughton/no_record_payment
Monish Deb [Thu, 25 Apr 2019 11:24:25 +0000 (16:54 +0530)]
Merge pull request #13689 from eileenmcnaughton/no_record_payment

Call Payment.create from payment.cancel

5 years agoMerge pull request #14127 from civicrm/5.13
Seamus Lee [Thu, 25 Apr 2019 09:38:32 +0000 (19:38 +1000)]
Merge pull request #14127 from civicrm/5.13

5.13

5 years agoMerge pull request #14126 from seamuslee001/dev_core_880
Seamus Lee [Thu, 25 Apr 2019 09:38:10 +0000 (19:38 +1000)]
Merge pull request #14126 from seamuslee001/dev_core_880

Fix typo in DROP table query.

5 years agoMerge pull request #14045 from totten/master-ab-winning
Eileen McNaughton [Thu, 25 Apr 2019 07:34:45 +0000 (19:34 +1200)]
Merge pull request #14045 from totten/master-ab-winning

(REF; dev/core#873) MailingAB - Migrate "copy winner" logic from JS to PHP

5 years agoFix typo in DROP table query.
mark burdett [Wed, 24 Apr 2019 18:32:32 +0000 (11:32 -0700)]
Fix typo in DROP table query.

5 years agoMerge pull request #14110 from mattwire/caseactivitylinks_partial
Eileen McNaughton [Thu, 25 Apr 2019 04:34:03 +0000 (16:34 +1200)]
Merge pull request #14110 from mattwire/caseactivitylinks_partial

REF Don't pass activity object to addCaseActivityLinks

5 years agoMerge pull request #14112 from mattwire/action_filterlinks
Eileen McNaughton [Thu, 25 Apr 2019 04:26:02 +0000 (16:26 +1200)]
Merge pull request #14112 from mattwire/action_filterlinks

Add function filterLinks to return an array of links for an entity that can be used by the API / form layer to generate a link

5 years agoMerge pull request #14109 from mattwire/refactor_inboundemailshared
Eileen McNaughton [Thu, 25 Apr 2019 04:23:30 +0000 (16:23 +1200)]
Merge pull request #14109 from mattwire/refactor_inboundemailshared

REF Use shared function to check inbound email permissions

5 years agoMerge pull request #14121 from civicrm/revert-14063-core-553
Eileen McNaughton [Wed, 24 Apr 2019 23:54:01 +0000 (11:54 +1200)]
Merge pull request #14121 from civicrm/revert-14063-core-553

Revert "dev/core#553: Creating new event takes value from default value not from saved template for custom fields"

5 years agoMerge pull request #14117 from eileenmcnaughton/import_3
Seamus Lee [Wed, 24 Apr 2019 23:47:02 +0000 (09:47 +1000)]
Merge pull request #14117 from eileenmcnaughton/import_3

[REF] Follow up tidy up on import fixes

5 years agoFollow up tidy up on import - use same fn for address
eileen [Wed, 24 Apr 2019 03:33:56 +0000 (15:33 +1200)]
Follow up tidy up on import - use same fn for address

This is covered by testImportPrimaryAddressUpdate

5 years agoMerge pull request #14123 from mfb/drop-bug
Seamus Lee [Wed, 24 Apr 2019 21:30:23 +0000 (07:30 +1000)]
Merge pull request #14123 from mfb/drop-bug

dev/core#880: Fix typo in DROP table query.

5 years agoMerge pull request #14043 from eileenmcnaughton/import_2
Seamus Lee [Wed, 24 Apr 2019 20:09:10 +0000 (06:09 +1000)]
Merge pull request #14043 from eileenmcnaughton/import_2

Fix import primary phone, primary email, add tests

5 years agoFix typo in DROP table query.
mark burdett [Wed, 24 Apr 2019 18:32:32 +0000 (11:32 -0700)]
Fix typo in DROP table query.

5 years agoRevert "dev/core#553: Creating new event takes value from default value not from...
Yashodha Chaku [Wed, 24 Apr 2019 15:27:19 +0000 (20:57 +0530)]
Revert "dev/core#553: Creating new event takes value from default value not from saved template for custom fields"

5 years agoMerge pull request #13994 from eileenmcnaughton/recur_cancel
Matthew Wire [Wed, 24 Apr 2019 09:53:13 +0000 (10:53 +0100)]
Merge pull request #13994 from eileenmcnaughton/recur_cancel

dev/core#846 Convert Recurring forms to entity forms

5 years agoMerge pull request #14063 from JMAConsulting/core-553
Yashodha Chaku [Wed, 24 Apr 2019 07:00:25 +0000 (12:30 +0530)]
Merge pull request #14063 from JMAConsulting/core-553

dev/core#553: Creating new event takes value from default value not from saved template for custom fields

5 years agoFix handling of importing 'primary
eileen [Fri, 12 Apr 2019 07:51:50 +0000 (17:51 +1000)]
Fix handling of importing 'primary
' phone & email and enable test

Prior to this selecting 'Primary' as location_type_id for phone or email will result in duplicates.

This also simplifies the indexing to be by location type, as it is with addresses, as the code is kinda
confusing

5 years agoMerge pull request #14108 from mattwire/form_activity_hardcoded_ids
Eileen McNaughton [Tue, 23 Apr 2019 23:06:49 +0000 (09:06 +1000)]
Merge pull request #14108 from mattwire/form_activity_hardcoded_ids

REF Replace hardcoded IDs with pseudoconstants in activity form

5 years agoMerge pull request #14115 from civicrm/5.13
Seamus Lee [Tue, 23 Apr 2019 05:49:37 +0000 (15:49 +1000)]
Merge pull request #14115 from civicrm/5.13

5.13

5 years agoMerge pull request #14114 from lcdservices/5.13
Seamus Lee [Tue, 23 Apr 2019 04:17:21 +0000 (14:17 +1000)]
Merge pull request #14114 from lcdservices/5.13

dev/core#891 condition on id existenced when retrieving mailing hash

5 years agodev/core#891 condition on id existenced when retrieving mailing hash
Brian Shaughnessy [Tue, 23 Apr 2019 01:43:19 +0000 (21:43 -0400)]
dev/core#891 condition on id existenced when retrieving mailing hash

5 years agoMerge pull request #14084 from colemanw/UFFieldBAO
Seamus Lee [Tue, 23 Apr 2019 01:51:26 +0000 (11:51 +1000)]
Merge pull request #14084 from colemanw/UFFieldBAO

(REF) Standardize UFField create function

5 years agoAdd UFField to syntaxConformanceTest
Coleman Watts [Mon, 22 Apr 2019 12:22:13 +0000 (08:22 -0400)]
Add UFField to syntaxConformanceTest

5 years agoMerge pull request #14105 from eileenmcnaughton/import
Seamus Lee [Mon, 22 Apr 2019 20:27:38 +0000 (06:27 +1000)]
Merge pull request #14105 from eileenmcnaughton/import

 [REF] calll formatLocationBlock from parent function.

5 years agoMerge pull request #14107 from mattwire/formbuttons_formatting
Seamus Lee [Mon, 22 Apr 2019 20:27:18 +0000 (06:27 +1000)]
Merge pull request #14107 from mattwire/formbuttons_formatting

NFC Whitespace formatting for formButtons.tpl

5 years agoMerge pull request #14111 from mlutfy/sms-ts
Seamus Lee [Mon, 22 Apr 2019 20:26:53 +0000 (06:26 +1000)]
Merge pull request #14111 from mlutfy/sms-ts

Fix ts() usage in CRM_SMS_Form_Schedule

5 years agoReplace hardcoded IDs with pseudoconstants in activity form
Matthew Wire (MJW Consulting) [Mon, 22 Apr 2019 12:22:08 +0000 (13:22 +0100)]
Replace hardcoded IDs with pseudoconstants in activity form

5 years agoAdd function filterLinks to return an array of links for an entity that can be used...
Matthew Wire (MJW Consulting) [Mon, 22 Apr 2019 14:08:50 +0000 (15:08 +0100)]
Add function filterLinks to return an array of links for an entity that can be used by the API / form layer to generate a link

5 years agoRefactor-Don't pass activity object to addCaseActivityLinks
Matthew Wire (MJW Consulting) [Mon, 22 Apr 2019 12:38:00 +0000 (13:38 +0100)]
Refactor-Don't pass activity object to addCaseActivityLinks

5 years agoFix ts() usage in CRM_SMS_Form_Schedule
Mathieu Lutfy [Mon, 22 Apr 2019 13:20:28 +0000 (09:20 -0400)]
Fix ts() usage in CRM_SMS_Form_Schedule

5 years agoUse shared function to check inbound email permissions
Matthew Wire (MJW Consulting) [Mon, 22 Apr 2019 12:24:13 +0000 (13:24 +0100)]
Use shared function to check inbound email permissions

5 years ago(REF) Standardize UFField create function
Coleman Watts [Thu, 18 Apr 2019 18:00:51 +0000 (14:00 -0400)]
(REF) Standardize UFField create function

5 years agoFix creating Formatting fields in api and UI
Coleman Watts [Thu, 18 Apr 2019 17:52:25 +0000 (13:52 -0400)]
Fix creating Formatting fields in api and UI

5 years agoWhitespace formatting for formButtons.tpl
Matthew Wire (MJW Consulting) [Mon, 22 Apr 2019 11:54:41 +0000 (12:54 +0100)]
Whitespace formatting for formButtons.tpl

5 years agoRemove now-redundant if
eileen [Fri, 12 Apr 2019 07:55:15 +0000 (17:55 +1000)]
Remove now-redundant if

This is no longer called when location_type_id is empty

5 years ago[REF] calll formatLocationBlock from parent function.
eileen [Fri, 12 Apr 2019 07:18:11 +0000 (17:18 +1000)]
[REF] calll formatLocationBlock from parent function.

This is about starting to unnest the spaghetti of functions here.....
Just deprecating for now in case

5 years agoMerge pull request #14099 from seamuslee001/pledge_dates_contribution_form_conversion
Eileen McNaughton [Mon, 22 Apr 2019 08:03:25 +0000 (18:03 +1000)]
Merge pull request #14099 from seamuslee001/pledge_dates_contribution_form_conversion

Convert Pledge Calander Date and Start Date for pledges to use datepic…

5 years agoConvert Pledge Calander Date and Start Date for pleges to use datepicker rather than...
Seamus Lee [Sun, 21 Apr 2019 23:45:41 +0000 (09:45 +1000)]
Convert Pledge Calander Date and Start Date for pleges to use datepicker rather than jcalendar

5 years agoMerge pull request #14101 from civicrm/5.13
Seamus Lee [Mon, 22 Apr 2019 02:41:41 +0000 (12:41 +1000)]
Merge pull request #14101 from civicrm/5.13

5.13

5 years agoMerge pull request #14100 from seamuslee001/5.13
Seamus Lee [Mon, 22 Apr 2019 01:52:07 +0000 (11:52 +1000)]
Merge pull request #14100 from seamuslee001/5.13

Add release-notes/5.12.3.md

5 years agoAdd release-notes/5.12.3.md
Tim Otten [Sat, 20 Apr 2019 15:44:42 +0000 (08:44 -0700)]
Add release-notes/5.12.3.md

5 years agoMerge pull request #13890 from aydun/joomla#6
Seamus Lee [Mon, 22 Apr 2019 00:27:38 +0000 (10:27 +1000)]
Merge pull request #13890 from aydun/joomla#6

Fix bug preventing affecting `cv --user` on Joomla

5 years agoMerge pull request #14096 from colemanw/tags
colemanw [Sun, 21 Apr 2019 17:32:18 +0000 (13:32 -0400)]
Merge pull request #14096 from colemanw/tags

Add serialize metadata to tag used_for field

5 years agoRemove problematic serialize handing from conformance test
Coleman Watts [Sun, 21 Apr 2019 15:08:18 +0000 (11:08 -0400)]
Remove problematic serialize handing from conformance test

5 years agoMerge pull request #14088 from MegaphoneJon/membership-9
Eileen McNaughton [Sun, 21 Apr 2019 01:27:35 +0000 (11:27 +1000)]
Merge pull request #14088 from MegaphoneJon/membership-9

membership#9 - show user a notification on back-office renewals

5 years agoAdd serialize metadata to tag used_for field
Coleman Watts [Sun, 21 Apr 2019 00:24:08 +0000 (20:24 -0400)]
Add serialize metadata to tag used_for field

The used_for field is a comma separated list.

5 years agoMerge pull request #13963 from eileenmcnaughton/event_report
Seamus Lee [Sat, 20 Apr 2019 20:41:11 +0000 (06:41 +1000)]
Merge pull request #13963 from eileenmcnaughton/event_report

Readability cleanup on EventIncome report (towards bringing it under testing)

5 years agoMerge pull request #14094 from seamuslee001/node_dedupe_exception_test
colemanw [Sat, 20 Apr 2019 13:42:47 +0000 (09:42 -0400)]
Merge pull request #14094 from seamuslee001/node_dedupe_exception_test

(NFC) Add tests of retreiving notes for display on a contact record a…

5 years agoConvert Recurring forms to entity forms
eileen [Sun, 7 Apr 2019 21:50:56 +0000 (09:50 +1200)]
Convert Recurring forms to entity forms

5 years agoMerge pull request #14091 from civicrm/5.13
Eileen McNaughton [Sat, 20 Apr 2019 07:35:23 +0000 (17:35 +1000)]
Merge pull request #14091 from civicrm/5.13

5.13

5 years ago(NFC) Add tests of retreiving notes for display on a contact record and returning...
Seamus Lee [Sat, 20 Apr 2019 03:50:28 +0000 (13:50 +1000)]
(NFC) Add tests of retreiving notes for display on a contact record and returning DedupeExecptions for output on page

Update Unit test to check output of note browse as well

5 years agoMerge pull request #14073 from seamuslee001/dev_core_881_unit_test
Seamus Lee [Sat, 20 Apr 2019 03:20:55 +0000 (13:20 +1000)]
Merge pull request #14073 from seamuslee001/dev_core_881_unit_test

dev/core#881 Add in unit test demonstrating issue Stoob found with is…

5 years agoMerge pull request #14092 from eileenmcnaughton/search_513
Seamus Lee [Sat, 20 Apr 2019 02:18:43 +0000 (12:18 +1000)]
Merge pull request #14092 from eileenmcnaughton/search_513

dev/core#887 Fix fatal error on pledge search

5 years agoMerge pull request #14083 from grischard/patch-1
Eileen McNaughton [Sat, 20 Apr 2019 01:23:04 +0000 (11:23 +1000)]
Merge pull request #14083 from grischard/patch-1

Fix upgrade message db setting location

5 years agoReadability cleanup on EventIncome report to bring it under testing
eileen [Fri, 5 Apr 2019 01:15:12 +0000 (14:15 +1300)]
Readability cleanup on EventIncome report to bring it under testing

5 years agoMerge pull request #14052 from yashodha/dev-876
colemanw [Sat, 20 Apr 2019 01:06:08 +0000 (21:06 -0400)]
Merge pull request #14052 from yashodha/dev-876

(dev/core#876) Allow url to set IS NULL/ NOT NULL in report for opera…

5 years agoMerge pull request #14059 from Stoob/patch-2
colemanw [Sat, 20 Apr 2019 01:04:25 +0000 (21:04 -0400)]
Merge pull request #14059 from Stoob/patch-2

change is_override logic

5 years agoMerge pull request #14077 from pradpnayak/AutoComplete
colemanw [Sat, 20 Apr 2019 01:00:42 +0000 (21:00 -0400)]
Merge pull request #14077 from pradpnayak/AutoComplete

Fixed auto populate of contact refrence field on membership signup form