eileen [Wed, 12 Sep 2018 05:00:16 +0000 (17:00 +1200)]
Extract query to generate annual totals and add test
colemanw [Thu, 11 Oct 2018 10:20:35 +0000 (06:20 -0400)]
Merge pull request #12495 from eileenmcnaughton/dragon_slayer
Slay dragons
yashodha [Thu, 11 Oct 2018 04:56:03 +0000 (10:26 +0530)]
CRM-21677 - more report clean up
Seamus Lee [Wed, 10 Oct 2018 21:33:20 +0000 (08:33 +1100)]
Merge pull request #12695 from eileenmcnaughton/mem2
Membership form - tidy up receipt code
eileen [Tue, 4 Sep 2018 00:09:16 +0000 (12:09 +1200)]
Fix order by on is_primary.
As pointed out in https://lab.civicrm.org/dev/mail/issues/26 the order by is not the
correct format for order_by and has no effect. I tested to make sure it was not
some magic.
I opted for (implict) ASC as the order by for non sms is ASC and further down
processing seems to overwrite each row as it happens so primary later
would overwrite earlier
Allen Shaw [Sun, 30 Sep 2018 00:41:09 +0000 (19:41 -0500)]
Toward CRM-19751: change db scmema so on_hold is INT instead of BOOLEAN.
John Kingsnorth [Wed, 10 Oct 2018 14:55:12 +0000 (15:55 +0100)]
Fix misleading comment for dupesInGroup()
The function does also work with smart groups, so remove the comment that says otherwise.
Eileen McNaughton [Wed, 10 Oct 2018 13:52:38 +0000 (14:52 +0100)]
Merge pull request #12828 from seamuslee001/lab_core_357
dev/core#357 Fix issue where user email addresses were keyed on email…
eileen [Wed, 10 Oct 2018 13:11:16 +0000 (14:11 +0100)]
Translate various settings information
eileen [Mon, 20 Aug 2018 05:17:26 +0000 (17:17 +1200)]
Move customValue retrieval to calling function.
After digging on CRM_Batch_Form_Entry I couldn't find any evidence that the groupTree property would ever be set
eileen [Mon, 20 Aug 2018 05:05:12 +0000 (17:05 +1200)]
Wrap membership receipt in an outer function.
This function is neither static nor shared & we work to replace the
other / put the parts that really are shared somewhere sensible
Eileen McNaughton [Wed, 10 Oct 2018 12:57:11 +0000 (13:57 +0100)]
Merge pull request #12918 from davejenx/job_process_memberships_tests
Added more unit tests for process_membership job: testProcessMembershipUpdateStatus
eileen [Tue, 9 Oct 2018 17:10:38 +0000 (18:10 +0100)]
Retain preferred array format while searching Money values.
The preferred BAO_Query format is ['BETWEEN' => [12.40 AND 13.50]] but this is currently being munged back
into legacy format, creating a test fail
Note that the search doesn't work properly with international commas, with, or without
this patch :-(
eileen [Tue, 17 Jul 2018 09:31:04 +0000 (21:31 +1200)]
Slay dragons
Eileen McNaughton [Wed, 10 Oct 2018 11:27:07 +0000 (12:27 +0100)]
Merge pull request #12906 from eileenmcnaughton/setting
[NFC] Convert some fields on admin display preferences to use metdata
Seamus Lee [Wed, 10 Oct 2018 10:29:57 +0000 (21:29 +1100)]
Merge pull request #12747 from mattwire/tabheader_extract_and_events
Extract selectedChild tabheader functionality and enable for Manage Events
Dave Jenkins [Wed, 10 Oct 2018 10:06:33 +0000 (11:06 +0100)]
Added more unit tests for process_membership job, checking that statuses are updated correctly in various cases where they should be and left alone in cases where they shouldn't. Adds new function testProcessMembershipUpdateStatus.
Eileen McNaughton [Wed, 10 Oct 2018 09:28:05 +0000 (10:28 +0100)]
Merge pull request #12916 from yashodha/report-fixes
CRM-21677 - report clean up
eileen [Tue, 9 Oct 2018 06:55:49 +0000 (07:55 +0100)]
Convert Preserve activity tab
Matthew Wire (MJW Consulting) [Thu, 16 Aug 2018 16:41:54 +0000 (17:41 +0100)]
Extract selectedChild tabheader functionality and enable for Manage Events
eileen [Mon, 8 Oct 2018 21:00:15 +0000 (22:00 +0100)]
Convert Contact Search to metadata driven
eileen [Mon, 8 Oct 2018 20:37:01 +0000 (21:37 +0100)]
Add metadata for editing contacts
eileen [Mon, 8 Oct 2018 20:27:33 +0000 (21:27 +0100)]
Convert 'Viewing Smart Groups' on admin display preferences to use metadata.
This has no functional impact - cleanup only
eileen [Mon, 8 Oct 2018 20:27:33 +0000 (21:27 +0100)]
Convert 'Viewing Smart Groups' on admin display preferences to use metadata.
This has no functional impact - cleanup only
Eileen McNaughton [Wed, 10 Oct 2018 08:27:00 +0000 (09:27 +0100)]
Merge pull request #12910 from monishdeb/dev-core-394
(dev/core#394) : Wildcards are ignored in some smart group criteria, when the smart group is directly generated for a mailing
Eileen McNaughton [Wed, 10 Oct 2018 08:09:42 +0000 (09:09 +0100)]
Merge pull request #12890 from dereklewis123/CW-905-2
core/384 CiviSMS does not fall back to non-primary mobile number
yashodha [Wed, 10 Oct 2018 06:19:35 +0000 (11:49 +0530)]
CRM-21677 - report clean up
Seamus Lee [Wed, 10 Oct 2018 02:33:55 +0000 (13:33 +1100)]
Merge pull request #12784 from eileenmcnaughton/cache
Do not treat an empty array as not set in caches.
Eileen McNaughton [Tue, 9 Oct 2018 20:42:18 +0000 (21:42 +0100)]
Merge pull request #12914 from eileenmcnaughton/record
Fix payment hangs when registering a user for a paid event without recording payment
Eileen McNaughton [Tue, 9 Oct 2018 20:38:53 +0000 (21:38 +0100)]
Merge pull request #12864 from eileenmcnaughton/export
Export - small cleanup
Monish Deb [Tue, 9 Oct 2018 12:00:37 +0000 (17:30 +0530)]
(dev/core#394) : Wildcards are ignored in some smart group criteria, when the smart group is directly generated for a mailing
Eileen McNaughton [Tue, 9 Oct 2018 19:47:57 +0000 (20:47 +0100)]
Merge pull request #12913 from wmortada/shorcuts
Fix typo in hook that enables links to be added to a block
Eileen McNaughton [Tue, 9 Oct 2018 19:47:06 +0000 (20:47 +0100)]
Merge pull request #12819 from mattwire/contributionrecur_contactname
Show contact name on recurring contribution view and improve consistency with Contribution/Membership view
eileen [Tue, 9 Oct 2018 18:07:26 +0000 (19:07 +0100)]
Fix payment hangs when registering a user for a paid event without recording payment
This is an alternative to https://github.com/civicrm/civicrm-core/pull/12888
I wasn't actually able to reproduce the issue but this solution, proposed by
Monish, seems safe & sensible
Eileen McNaughton [Tue, 9 Oct 2018 18:02:24 +0000 (19:02 +0100)]
Merge pull request #12841 from colemanw/richText
Skip html encoding rich-text fields
Eileen McNaughton [Tue, 9 Oct 2018 18:00:56 +0000 (19:00 +0100)]
Merge pull request #12912 from civicrm/totten-patch-1
Fix spelling error ("sript" vs "script")
William Mortada [Tue, 9 Oct 2018 18:00:55 +0000 (19:00 +0100)]
Fix typo in hook that enables links to be added to a block
Eileen McNaughton [Tue, 9 Oct 2018 16:50:42 +0000 (17:50 +0100)]
Merge pull request #12904 from yashodha/report-fixes
On reports make current employer available as a field for display
Eileen McNaughton [Tue, 9 Oct 2018 16:11:17 +0000 (17:11 +0100)]
Merge pull request #12891 from jmcclelland/issue418
ensure all valid relationship types are available
Tim Otten [Tue, 9 Oct 2018 15:55:55 +0000 (16:55 +0100)]
Update Drupal.php
If my username is going to be used for a grammatical edit, then we should get it right!
Tim Otten [Tue, 9 Oct 2018 14:44:12 +0000 (15:44 +0100)]
Fix spelling error ' script' rather than 'sript'
Eileen McNaughton [Tue, 9 Oct 2018 13:27:37 +0000 (14:27 +0100)]
Merge pull request #12824 from jmcclelland/issue389
Ensure relative dates are preserved for custom fields in smart group
Eileen McNaughton [Tue, 9 Oct 2018 13:23:34 +0000 (14:23 +0100)]
Merge pull request #12911 from civicrm/5.7
5.7 to master
Eileen McNaughton [Tue, 9 Oct 2018 13:22:49 +0000 (14:22 +0100)]
Merge pull request #12909 from eileenmcnaughton/57reg
Ensure hard-coded date ranges are preserved in smart groups
Eileen McNaughton [Tue, 9 Oct 2018 12:23:14 +0000 (13:23 +0100)]
Merge pull request #11821 from michaelmcandrew/500-http-response-code
Send an 500 http response code when an exception is encountered.
Eileen McNaughton [Tue, 9 Oct 2018 11:39:06 +0000 (12:39 +0100)]
Merge pull request #12873 from totten/master-short-long
Register "short" and "long" cache services
Jamie McClelland [Mon, 17 Sep 2018 17:02:03 +0000 (13:02 -0400)]
ensure date ranges are preserved in smart groups
See https://lab.civicrm.org/dev/core/issues/396
Eileen McNaughton [Tue, 9 Oct 2018 08:57:46 +0000 (09:57 +0100)]
Merge pull request #12903 from kainuk/drupal8-codegen-path
Added a path to the drupal8 path candidates to find civicrm.config.php
Eileen McNaughton [Tue, 9 Oct 2018 07:02:12 +0000 (08:02 +0100)]
Merge pull request #12908 from xurizaemon/GL425-warning_on_redirectToSSL
GL-425: Log a message if CiviCRM thinks SSL is not enabled
Eileen McNaughton [Tue, 9 Oct 2018 05:30:48 +0000 (06:30 +0100)]
Merge pull request #12907 from civicrm/5.7
5.7
Chris Burgess [Tue, 9 Oct 2018 05:16:24 +0000 (18:16 +1300)]
GL-425: Log a message if CiviCRM thinks SSL is not enabled
The enableSSL setting doesn't reliably detect the presence of SSL (especially
when behind SSL terminating proxies). This log message will allow people
affected by this behaviour to more readily debug it, because CiviCRM
will give them a clue to work with.
See https://lab.civicrm.org/dev/core/issues/425
Seamus Lee [Mon, 8 Oct 2018 23:48:44 +0000 (10:48 +1100)]
Merge pull request #12896 from seamuslee001/dev_core_421
dev/core#421 Fix issue where creating user driven message templates w…
Seamus Lee [Fri, 5 Oct 2018 02:31:38 +0000 (12:31 +1000)]
dev/core#421 Fix issue where creating user driven message templates was requireing the ssystem workflow message template permission as well
Wrap permission checking in the check_permissions param
Move Permission checking to BAO level from API
Allow for the fact that edit message templates permission should still be able to work on both sets of templates without the granular permissions. Also reduce duplication of code abit
Seamus Lee [Mon, 8 Oct 2018 20:59:53 +0000 (07:59 +1100)]
Merge pull request #12905 from totten/master-gitignore
Add `ext/` folder to .gitignore
Eileen McNaughton [Mon, 8 Oct 2018 16:44:19 +0000 (17:44 +0100)]
Merge pull request #12731 from eileenmcnaughton/setting_form
Setting form - start to sync preferences with Setting, using trait
eileen [Sun, 26 Aug 2018 23:34:00 +0000 (11:34 +1200)]
Make checkboxes save
Tim Otten [Mon, 8 Oct 2018 12:59:50 +0000 (13:59 +0100)]
Add `ext/` folder to .gitignore
This folder is populated in various build processes (civibuild's
`drupal-demo`, `wp-demo`, etc; as well as `distmaker`), and sometimes
I like to use it for personal things. Moreover, there is no committed
content inside here.
Eileen McNaughton [Mon, 8 Oct 2018 11:46:44 +0000 (12:46 +0100)]
Merge pull request #12902 from seamuslee001/towards_500
Move towards allowing sending 500 http errors back by switching civiE…
yashodha [Mon, 8 Oct 2018 11:41:04 +0000 (17:11 +0530)]
expose current employer in fields and display in results as well
Klaas Eikelboom [Mon, 8 Oct 2018 11:16:44 +0000 (13:16 +0200)]
Added a path to the drupal8 path candidates to find civicrm.config.php.drupal. So civbuild can find it
Seamus Lee [Mon, 8 Oct 2018 10:33:08 +0000 (21:33 +1100)]
Move towards allowing sending 500 http errors back by switching civiExit(1) to be just civiExit()
Seamus Lee [Mon, 8 Oct 2018 07:59:25 +0000 (18:59 +1100)]
Merge pull request #12898 from kenwest/dev_core_423
dev/core#423 MySQL 5.7 complains about 4.7.19 upgrade script
Eileen McNaughton [Sun, 7 Oct 2018 22:01:43 +0000 (23:01 +0100)]
Merge pull request #12829 from eileenmcnaughton/validate
Add validate api action for ContributionPage.submit
Eileen McNaughton [Sun, 7 Oct 2018 20:58:48 +0000 (21:58 +0100)]
Merge pull request #12900 from eileenmcnaughton/recur_tidy
[NFC] Minor cleanup, return preferred parameter
Tim Otten [Sun, 7 Oct 2018 15:07:04 +0000 (16:07 +0100)]
Merge pull request #12869 from dereklewis123/CW-892
Added missing field name in custom-field deletion dialog
eileen [Mon, 17 Sep 2018 02:58:42 +0000 (14:58 +1200)]
Add validate api action for ContributionPage.submit
eileen [Sun, 26 Aug 2018 22:39:51 +0000 (10:39 +1200)]
Move setting defaults to form
eileen [Sun, 26 Aug 2018 22:29:34 +0000 (10:29 +1200)]
Allow Preferences form to work from settings
eileen [Sun, 7 Oct 2018 10:54:25 +0000 (11:54 +0100)]
[NFC] Minor cleanup, return preferred parameter
The result parameter is the same as $recurring (save()) returns $this. But
it's more correct to return $recurring than result as
a) it's defined as a Contribute_BAO_ContributionRecur object which is correct.
b) it's the object passed through hooks
Eileen McNaughton [Sun, 7 Oct 2018 10:44:08 +0000 (11:44 +0100)]
Merge pull request #12899 from eileenmcnaughton/recur_tpl
Recur tpl
eileen [Sun, 7 Oct 2018 09:23:26 +0000 (10:23 +0100)]
Extract rows section of recur template to separate tpl, for readability
Eileen McNaughton [Sun, 7 Oct 2018 08:07:19 +0000 (09:07 +0100)]
Merge pull request #12821 from mattwire/updatesubscription_fix
Show recurring contribution links based on payment processor capabilities
Monish Deb [Sat, 6 Oct 2018 17:56:59 +0000 (23:26 +0530)]
Merge pull request #12875 from jitendrapurohit/core-411
dev/core#411 - Default currency shown on View participant and contrib…
Eileen McNaughton [Sat, 6 Oct 2018 17:49:11 +0000 (18:49 +0100)]
Merge pull request #12893 from samuelsov/NFC-datatables-style
(NFC) Make datatables in Activities Relationship tab adjust to screen size
Eileen McNaughton [Sat, 6 Oct 2018 15:14:13 +0000 (16:14 +0100)]
Merge pull request #12868 from mattwire/updatesubscription_datepicker
Switch UpdateSubscription to use datepicker
Eileen McNaughton [Sat, 6 Oct 2018 10:06:10 +0000 (11:06 +0100)]
Merge pull request #12897 from jmcclelland/issue422
ensure search on survey results works properly
Ken West [Sat, 6 Oct 2018 08:25:12 +0000 (18:25 +1000)]
MySQL 5.7 may bork when comparing datetime columns to '0000-00-00 00:00:00' so cast the column to a CHAR(20) when comparing
Jamie McClelland [Fri, 5 Oct 2018 20:55:51 +0000 (16:55 -0400)]
ensure search on survey results works properly
https://lab.civicrm.org/dev/core/issues/422
Monish Deb [Fri, 5 Oct 2018 20:38:25 +0000 (02:08 +0530)]
Merge pull request #12884 from colemanw/Remove
Remove crm.admin.js
Eileen McNaughton [Fri, 5 Oct 2018 13:41:57 +0000 (14:41 +0100)]
Merge pull request #12892 from yashodha/report-fixes
CRM-21677 - report clean up
Seamus Lee [Fri, 5 Oct 2018 02:32:15 +0000 (12:32 +1000)]
Merge pull request #12895 from civicrm/5.7
5.7
Tim Otten [Wed, 3 Oct 2018 21:39:59 +0000 (17:39 -0400)]
Merge pull request #12894 from seamuslee001/5.7
5.7
Tim Otten [Wed, 3 Oct 2018 14:55:02 +0000 (10:55 -0400)]
Update 5.6.0.md
Tim Otten [Wed, 3 Oct 2018 14:53:04 +0000 (10:53 -0400)]
Update 5.6.0.md
eileen [Sun, 23 Sep 2018 01:42:01 +0000 (13:42 +1200)]
Fix missing amount in soft credit mode
Andrew Hunt [Thu, 27 Sep 2018 20:53:46 +0000 (16:53 -0400)]
5.6.0 release notes: reorganize sections and fix up contributors
Alice Frumin [Thu, 27 Sep 2018 20:22:23 +0000 (16:22 -0400)]
5.6.0 release notes: bulk of edits
Andrew Hunt [Thu, 13 Sep 2018 16:18:48 +0000 (12:18 -0400)]
5.6.0 release notes: added boilerplate
Andrew Hunt [Thu, 13 Sep 2018 16:15:54 +0000 (12:15 -0400)]
5.6.0 release notes: raw from script
CiviCRM [Wed, 3 Oct 2018 18:28:56 +0000 (18:28 +0000)]
Set version to 5.8.alpha1
CiviCRM [Wed, 3 Oct 2018 18:24:33 +0000 (18:24 +0000)]
Set version to 5.7.beta1
Samuel Vanhove [Wed, 3 Oct 2018 15:45:26 +0000 (11:45 -0400)]
(NFC) Make datatables in Activities and Relationship tab adjust to the screen size
yashodha [Wed, 3 Oct 2018 14:16:56 +0000 (19:46 +0530)]
CRM-21677 - report clean up
Eileen McNaughton [Wed, 3 Oct 2018 00:25:43 +0000 (13:25 +1300)]
Merge pull request #12885 from yashodha/report-fixes
CRM-21677 - report clean up
Jamie McClelland [Tue, 2 Oct 2018 14:57:00 +0000 (10:57 -0400)]
ensure all valid relationship types are available
When adding relationships to search results, ensure all relationship
types, including ones that apply to any contact, are available to
choose.
https://lab.civicrm.org/dev/core/issues/418
dl617 [Tue, 2 Oct 2018 14:09:33 +0000 (15:09 +0100)]
core/384 fix the the problem with not using a non-primary mobile number
dl617 [Tue, 2 Oct 2018 12:09:07 +0000 (13:09 +0100)]
core/384 failing test for mobile phone type
Seamus Lee [Mon, 1 Oct 2018 21:39:59 +0000 (07:39 +1000)]
Merge pull request #12882 from colemanw/extpage
Fix invalid markup on extension page - remove dots from ids & classes
yashodha [Mon, 1 Oct 2018 11:19:33 +0000 (16:49 +0530)]
CRM-21677 - report clean up
Coleman Watts [Mon, 1 Oct 2018 01:36:14 +0000 (21:36 -0400)]
Remove crm.admin.js