civicrm-core.git
6 years agoFix Undefined index: params in CRM_Event_BAO_Event::buildCustomProfile()
Wouter H [Thu, 16 Aug 2018 08:59:40 +0000 (10:59 +0200)]
Fix Undefined index: params in CRM_Event_BAO_Event::buildCustomProfile()

Added check to suppress notice: Undefined index: params in CRM_Event_BAO_Event::buildCustomProfile() which comes after returning to site from an online payment provider.

6 years agoMerge pull request #12677 from civicrm/5.5
Eileen McNaughton [Thu, 16 Aug 2018 08:44:55 +0000 (20:44 +1200)]
Merge pull request #12677 from civicrm/5.5

5.5 to master

6 years agoMerge pull request #12674 from totten/5.5-upgr-tpl-msg
Eileen McNaughton [Thu, 16 Aug 2018 08:44:20 +0000 (20:44 +1200)]
Merge pull request #12674 from totten/5.5-upgr-tpl-msg

Upgrader - When updating message templates, identify them by name

6 years agoMerge pull request #12670 from totten/5.5-perm-msg
Eileen McNaughton [Thu, 16 Aug 2018 06:44:05 +0000 (18:44 +1200)]
Merge pull request #12670 from totten/5.5-perm-msg

Refine upgrade message for `save Report Criteria`

6 years agoMerge pull request #12676 from civicrm/5.5
Eileen McNaughton [Thu, 16 Aug 2018 05:58:26 +0000 (17:58 +1200)]
Merge pull request #12676 from civicrm/5.5

5.5 to master

6 years agoMerge pull request #12673 from eileenmcnaughton/atest
Eileen McNaughton [Thu, 16 Aug 2018 05:58:03 +0000 (17:58 +1200)]
Merge pull request #12673 from eileenmcnaughton/atest

Test fix for intermittant error

6 years agoUpgrader - When updating message templates, identify them by name
Tim Otten [Thu, 16 Aug 2018 05:14:23 +0000 (22:14 -0700)]
Upgrader - When updating message templates, identify them by name

Also: Fix a layout issue caused by a typo in the `<li>` tag.

6 years agoLoosedn activityTest on country order.
eileen [Thu, 16 Aug 2018 03:49:11 +0000 (15:49 +1200)]
Loosedn activityTest on country order.

The order is no considered significant, be open minded

6 years ago(NFC) Upgrade - Improve example of an upgrade message for a new permission
Tim Otten [Wed, 15 Aug 2018 21:33:52 +0000 (14:33 -0700)]
(NFC) Upgrade - Improve example of an upgrade message for a new permission

@bgm pointed out that the permission name should be translated as well.
This left me wondering...  why do we bother with parameterizing the string
with a `%1` if it's all going to be translated anyway?

There is a plausible reason.  It's not super-critical, but it's plausible --
the permission name is used in more contexts (like the permission mgmt
screen in D7/WP *as well as* the upgrade screen).  This arrangement ensures
that the name appears the same in *all those contexts*, even in various
edge-cases of the translation lifecycle (e.g.  where the permission-names
have been translated but the upgrade-messages have not).  Again...  it's not
a big deal, but it is a slightly better default.

6 years agoUpgrade messages - When going through 5.4.*, the permission name should be legible
Tim Otten [Wed, 15 Aug 2018 21:36:10 +0000 (14:36 -0700)]
Upgrade messages - When going through 5.4.*, the permission name should be legible

6 years agoUpgrade messages - When going through 5.4.*, only display permission message once
Tim Otten [Wed, 15 Aug 2018 21:09:04 +0000 (14:09 -0700)]
Upgrade messages - When going through 5.4.*, only display permission message once

6 years agoMerge pull request #12666 from jmcclelland/issue328
Eileen McNaughton [Wed, 15 Aug 2018 20:06:58 +0000 (08:06 +1200)]
Merge pull request #12666 from jmcclelland/issue328

don't add query to developer tab if we are downloading the data

6 years agodon't add query to dev tab for each row
Jamie McClelland [Wed, 15 Aug 2018 14:37:35 +0000 (10:37 -0400)]
don't add query to dev tab for each row

Adding the query to the dev tab for each row consumes a lot of resources
for the informational gain we get.

6 years agodon't output to dev tab if dev tab won't be displayed
Jamie McClelland [Wed, 15 Aug 2018 14:36:00 +0000 (10:36 -0400)]
don't output to dev tab if dev tab won't be displayed

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

6 years agoMerge pull request #12661 from pradpnayak/report-error-gender
Eileen McNaughton [Tue, 14 Aug 2018 19:44:21 +0000 (07:44 +1200)]
Merge pull request #12661 from pradpnayak/report-error-gender

Fixed fatal error when Gender is selected in column

6 years agoMerge pull request #12656 from eileenmcnaughton/dev_tab
colemanw [Tue, 14 Aug 2018 19:04:09 +0000 (15:04 -0400)]
Merge pull request #12656 from eileenmcnaughton/dev_tab

Add SQL modes to developer tab

6 years agoFixed fatal error when Gender is selected in column
Pradeep Nayak [Tue, 14 Aug 2018 15:43:04 +0000 (16:43 +0100)]
Fixed fatal error when Gender is selected in column

6 years agoMerge pull request #12579 from eileenmcnaughton/export_another
colemanw [Tue, 14 Aug 2018 15:31:11 +0000 (11:31 -0400)]
Merge pull request #12579 from eileenmcnaughton/export_another

Export minor refactor Move household relationship types to the processor

6 years agoMerge pull request #12658 from eileenmcnaughton/report_function
Eileen McNaughton [Tue, 14 Aug 2018 07:25:34 +0000 (19:25 +1200)]
Merge pull request #12658 from eileenmcnaughton/report_function

[NFC] Minor function extraction in report class.

6 years agoMinor function extraction in report class.
eileen [Tue, 14 Aug 2018 02:39:06 +0000 (14:39 +1200)]
Minor function extraction in report class.

This mirrors a similar refactor in the extended reports class (which also
allows it to be called from more than one place

6 years agoRemove nbsp handling (now it no longer works)
eileen [Tue, 14 Aug 2018 02:32:56 +0000 (14:32 +1200)]
Remove nbsp handling (now it no longer works)

6 years agoMerge pull request #12657 from civicrm/5.5
Eileen McNaughton [Tue, 14 Aug 2018 00:23:09 +0000 (12:23 +1200)]
Merge pull request #12657 from civicrm/5.5

5.5

6 years agoMerge pull request #12634 from seamuslee001/dev_core_273
Seamus Lee [Tue, 14 Aug 2018 00:20:01 +0000 (10:20 +1000)]
Merge pull request #12634 from seamuslee001/dev_core_273

dev/core/#273 Fix issue where sending an SMS with the To Field in the…

6 years agoAdd SQL modes to developer tab
eileen [Tue, 14 Aug 2018 00:14:29 +0000 (12:14 +1200)]
Add SQL modes to developer tab

6 years agodev/core/#273 Fix issue where sending an SMS with the To Field in the provider params...
Seamus Lee [Wed, 8 Aug 2018 04:38:25 +0000 (14:38 +1000)]
dev/core/#273 Fix issue where sending an SMS with the To Field in the provider params set did not work and fix handling of do_not_sms

Add test of error message

6 years agoMerge pull request #11923 from lcdservices/GL-44
Eileen McNaughton [Mon, 13 Aug 2018 10:31:56 +0000 (22:31 +1200)]
Merge pull request #11923 from lcdservices/GL-44

GL-44 admin price field options on event info page

6 years agoMerge pull request #12643 from jmcclelland/issue320
colemanw [Mon, 13 Aug 2018 00:06:58 +0000 (20:06 -0400)]
Merge pull request #12643 from jmcclelland/issue320

filter current employer report by all groups

6 years agoMerge pull request #12632 from mattwire/joomla_civimenu
colemanw [Sun, 12 Aug 2018 23:30:35 +0000 (19:30 -0400)]
Merge pull request #12632 from mattwire/joomla_civimenu

Drop custom CSS for Joomla CiviCRM menu so it works with shoreditch theme

6 years agoMerge pull request #12463 from JMAConsulting/dev-core-237
colemanw [Sun, 12 Aug 2018 23:17:35 +0000 (19:17 -0400)]
Merge pull request #12463 from JMAConsulting/dev-core-237

dev/core#237 : Hide Drupal8 Administer Menu bar on CiviCRM pages and move navigation js hacks to respective CMS js

6 years agoMerge pull request #12645 from KarinG/FinancialAuditCompleteMembershipTest
Eileen McNaughton [Sun, 12 Aug 2018 23:14:22 +0000 (11:14 +1200)]
Merge pull request #12645 from KarinG/FinancialAuditCompleteMembershipTest

[phpunit test only] - Add one additional data integrity check to ensure that after Edit Fin…

6 years agoMerge pull request #12648 from civicrm/5.5
Eileen McNaughton [Sun, 12 Aug 2018 23:08:59 +0000 (11:08 +1200)]
Merge pull request #12648 from civicrm/5.5

5.5 to master

6 years agoMerge pull request #12646 from eileenmcnaughton/option_group_cache
colemanw [Sun, 12 Aug 2018 23:01:38 +0000 (19:01 -0400)]
Merge pull request #12646 from eileenmcnaughton/option_group_cache

Fix option group caching issue.

6 years agoFix option group caching issue.
eileen [Sun, 12 Aug 2018 07:16:12 +0000 (19:16 +1200)]
Fix option group caching issue.

Per https://lab.civicrm.org/dev/core/issues/304 in some cases the api
cache has already been built so adding a new option_group
is not picked up causing a crash

6 years agoAdd one additional data integrity check to ensure that after Edit Financial Items...
KarinG [Sat, 11 Aug 2018 23:20:19 +0000 (17:20 -0600)]
Add one additional data integrity check to ensure that after Edit Financial Items add up to total_amount at Contribution level.

6 years agoMerge pull request #12576 from colemanw/userPerm
Monish Deb [Sat, 11 Aug 2018 14:00:55 +0000 (19:30 +0530)]
Merge pull request #12576 from colemanw/userPerm

Fix CRM_ACL_API::whereClause to respect $contactId param

6 years agoMerge pull request #12644 from civicrm/5.5
Eileen McNaughton [Sat, 11 Aug 2018 02:12:00 +0000 (14:12 +1200)]
Merge pull request #12644 from civicrm/5.5

5.5 to master

6 years agoMerge pull request #12640 from xurizaemon/GL316-cache_key_no_whitespace
Eileen McNaughton [Sat, 11 Aug 2018 02:11:32 +0000 (14:11 +1200)]
Merge pull request #12640 from xurizaemon/GL316-cache_key_no_whitespace

(dev/core#316) Fix crash on Memcache systems when session key involves whitespace

6 years agodev/core#316 - Update long string cache key test results
Tim Otten [Fri, 10 Aug 2018 22:52:42 +0000 (15:52 -0700)]
dev/core#316 - Update long string cache key test results

This is replaces 95b65673b6259be3a02ed6510e7562939d35b6c8.  The intent is to
have a delimiter every ten chars so that it's easy to read/confirm the
length of the string.

The delimiter was space, but this became a longer encoded char (`-20`)
and threw off the numbers. Switching to dash just gives a different encoded char.
To get the counts right, it needs ot be a pass-through char... like underscore.

6 years agoMerge pull request #12631 from JMAConsulting/dev-access-10-1
Seamus Lee [Fri, 10 Aug 2018 22:11:50 +0000 (08:11 +1000)]
Merge pull request #12631 from JMAConsulting/dev-access-10-1

dev/accessibility#10 : Moved datepicker widget to a separate file

6 years agofilter current employer report by all groups
Jamie McClelland [Fri, 10 Aug 2018 20:09:15 +0000 (16:09 -0400)]
filter current employer report by all groups

Code only filtered by static groups before.

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

6 years ago(NFC) CRM_Utils_Cache::create - Update docblock for 'name' param
Tim Otten [Fri, 10 Aug 2018 19:43:02 +0000 (12:43 -0700)]
(NFC) CRM_Utils_Cache::create - Update docblock for 'name' param

6 years agoMove datepicker widget to a separate file
deb.monish [Tue, 7 Aug 2018 13:25:32 +0000 (18:55 +0530)]
Move datepicker widget to a separate file

6 years agoadditional fixes
deb.monish [Wed, 18 Jul 2018 12:51:18 +0000 (18:21 +0530)]
additional fixes

6 years agodev/core#237 : Hide Drupal8 Administer Menu bar on CiviCRM pages
deb.monish [Fri, 13 Jul 2018 05:25:02 +0000 (10:55 +0530)]
dev/core#237 : Hide Drupal8 Administer Menu bar on CiviCRM pages

6 years agoIssue #316: Update long string cache key test results
Chris Burgess [Fri, 10 Aug 2018 11:55:14 +0000 (23:55 +1200)]
Issue #316: Update long string cache key test results

6 years agoIssue #316: Ensure Container caches have safe prefixes
Chris Burgess [Fri, 10 Aug 2018 11:44:34 +0000 (23:44 +1200)]
Issue #316: Ensure Container caches have safe prefixes

6 years agoIssue #316: Expand cache key test coverage with emoji
Chris Burgess [Fri, 10 Aug 2018 10:11:54 +0000 (22:11 +1200)]
Issue #316: Expand cache key test coverage with emoji

6 years agoIssue #316: Update tests for whitespace escaping
Chris Burgess [Fri, 10 Aug 2018 10:05:55 +0000 (22:05 +1200)]
Issue #316: Update tests for whitespace escaping

6 years agoAvoid calling Cache::cleanKey() twice in quick succession
Chris Burgess [Thu, 9 Aug 2018 21:23:04 +0000 (09:23 +1200)]
Avoid calling Cache::cleanKey() twice in quick succession

Since this method is performance related and called frequently,
no need to recalculate results from preg_replace_callback() with
the same inputs.

6 years agoIssue #316: Exclude spaces from cache keys for Memcache compatibility
Chris Burgess [Thu, 9 Aug 2018 21:21:59 +0000 (09:21 +1200)]
Issue #316: Exclude spaces from cache keys for Memcache compatibility

- https://lab.civicrm.org/dev/core/issues/316
- https://github.com/memcached/memcached/blob/master/doc/protocol.txt

6 years agoMerge pull request #12603 from jitendrapurohit/core-295
Eileen McNaughton [Thu, 9 Aug 2018 09:54:06 +0000 (21:54 +1200)]
Merge pull request #12603 from jitendrapurohit/core-295

dev/core#295 - Allow default 'from' email to be  set in New email form

6 years agoMerge pull request #12594 from eileenmcnaughton/sales_tax_trait
Eileen McNaughton [Thu, 9 Aug 2018 03:34:21 +0000 (15:34 +1200)]
Merge pull request #12594 from eileenmcnaughton/sales_tax_trait

Minor refactor, use sales tax trait to simplify sales tax functions

6 years agoMerge pull request #12633 from seamuslee001/symfony_upgrade
Eileen McNaughton [Wed, 8 Aug 2018 21:46:22 +0000 (09:46 +1200)]
Merge pull request #12633 from seamuslee001/symfony_upgrade

Upgrade symfony in lockfile to be 2.8 which is supported version of 2…

6 years agoMerge pull request #12619 from mattwire/caseview_contactlink
colemanw [Wed, 8 Aug 2018 02:27:49 +0000 (22:27 -0400)]
Merge pull request #12619 from mattwire/caseview_contactlink

Make contact name into a link on Manage Case for single client

6 years agoUpdate Unit test to ensure it locks in 2.8 and include polyfil
Seamus Lee [Wed, 8 Aug 2018 01:06:37 +0000 (11:06 +1000)]
Update Unit test to ensure it locks in 2.8 and include polyfil

6 years agoUpgrade symfony in lockfile to be 2.8 which is supported version of 2.x series
Seamus Lee [Tue, 7 Aug 2018 22:38:01 +0000 (08:38 +1000)]
Upgrade symfony in lockfile to be 2.8 which is supported version of 2.x series

6 years agoDrop custom CSS for Joomla CiviCRM menu so it works with shoreditch theme
Matthew Wire (MJW Consulting) [Tue, 7 Aug 2018 16:20:43 +0000 (17:20 +0100)]
Drop custom CSS for Joomla CiviCRM menu so it works with shoreditch theme

6 years agoMake contact name into a link on Manage Case for single client
Matthew Wire (MJW Consulting) [Fri, 3 Aug 2018 16:26:41 +0000 (17:26 +0100)]
Make contact name into a link on Manage Case for single client

6 years agoMerge pull request #12630 from eileenmcnaughton/comment_bool
Eileen McNaughton [Tue, 7 Aug 2018 07:47:49 +0000 (19:47 +1200)]
Merge pull request #12630 from eileenmcnaughton/comment_bool

[NFC] comment fixes relating to doc blocks, spelling

6 years agoMerge pull request #12629 from KarinG/FinancialAuditAddTests
Eileen McNaughton [Tue, 7 Aug 2018 04:41:08 +0000 (16:41 +1200)]
Merge pull request #12629 from KarinG/FinancialAuditAddTests

Follow up on #12611 - adding in three data-integrity assertions.

6 years ago[NFC] comment fixes relating to doc blocks, spelling
eileen [Tue, 7 Aug 2018 04:25:54 +0000 (16:25 +1200)]
[NFC] comment fixes relating to doc blocks, spelling

6 years agoMerge pull request #12627 from eileenmcnaughton/caching_pp
Seamus Lee [Tue, 7 Aug 2018 04:08:15 +0000 (14:08 +1000)]
Merge pull request #12627 from eileenmcnaughton/caching_pp

Use cached version of payment processor.

6 years agoMerge pull request #12559 from eileenmcnaughton/activity_part_2
Seamus Lee [Tue, 7 Aug 2018 04:07:48 +0000 (14:07 +1000)]
Merge pull request #12559 from eileenmcnaughton/activity_part_2

Activity display, switch to more performance getActivities function (from deprecatedGetActivities)

6 years agoFollow up on #12611 - adding in three data-integrity assertions.
KarinG [Tue, 7 Aug 2018 01:40:36 +0000 (19:40 -0600)]
Follow up on #12611 - adding in three data-integrity assertions.

6 years agoMerge pull request #12444 from mattwire/fixduplicatecaseactivities
Eileen McNaughton [Mon, 6 Aug 2018 20:49:17 +0000 (08:49 +1200)]
Merge pull request #12444 from mattwire/fixduplicatecaseactivities

dev/core#245 Fix duplicate activities showing on case activities tab when they have multiple target/assignee contacts

6 years agoMerge pull request #12625 from colemanw/recVer
Eileen McNaughton [Mon, 6 Aug 2018 19:48:02 +0000 (07:48 +1200)]
Merge pull request #12625 from colemanw/recVer

Bump recommended php version to 7.1 and min recommended to 7.0

6 years agoUse cached version of payment processor.
eileen [Mon, 6 Aug 2018 06:40:32 +0000 (18:40 +1200)]
Use cached version of payment processor.

I am hitting a slightly obscure bug in Redis that is solved by this change.

Per https://github.com/eileenmcnaughton/nz.co.fuzion.omnipaymultiprocessor/issues/55
we have an issue whereby Omnipay adds the gateway to a variable on class when processing payments.

In some cases this gateway will not serialize into a key under Redis causing a fatal.

However, we don't really need it to - the payment processor that we are aiming to cache is
'as loaded' not 'as used'. The caching of the processors appears to have been removed in
the past because of issues around domains -however, I think we can get
past that by changing the cache key.

6 years agodev/core#295 - Allow default 'from' email to be set in New email form
Jitendra Purohit [Tue, 31 Jul 2018 11:25:05 +0000 (16:55 +0530)]
dev/core#295 - Allow default 'from' email to be  set in New email form

6 years agoMerge pull request #12620 from mattwire/fileoncase_activityparams
colemanw [Mon, 6 Aug 2018 01:50:14 +0000 (21:50 -0400)]
Merge pull request #12620 from mattwire/fileoncase_activityparams

Don't duplicate activity when filing on case

6 years agoMerge pull request #12609 from mattwire/joomla_cron_timezone
Seamus Lee [Sun, 5 Aug 2018 22:18:36 +0000 (08:18 +1000)]
Merge pull request #12609 from mattwire/joomla_cron_timezone

Make sure Joomla timezone is set for cron jobs

6 years agoMerge pull request #12611 from KarinG/FinancialAudit
Eileen McNaughton [Sun, 5 Aug 2018 21:15:38 +0000 (09:15 +1200)]
Merge pull request #12611 from KarinG/FinancialAudit

[PHPUnit test only] Adding in assertions re: Line Item and Contribution data-integrity.

6 years agoBump recommended php version to 7.1 and min recommended to 7.0
Coleman Watts [Sat, 4 Aug 2018 22:30:38 +0000 (18:30 -0400)]
Bump recommended php version to 7.1 and min recommended to 7.0

6 years agoAdd comments
KarinG [Sat, 4 Aug 2018 15:19:59 +0000 (09:19 -0600)]
Add comments

6 years agoMerge pull request #12612 from eileenmcnaughton/more_lower
colemanw [Sat, 4 Aug 2018 13:02:13 +0000 (09:02 -0400)]
Merge pull request #12612 from eileenmcnaughton/more_lower

Further removal of instance of using LOWER() rather than relying on mysql non-case-sensitivity.

6 years agoPass ExportProcessor object instead of queryMode & ExportMode
eileen [Sat, 28 Jul 2018 04:24:10 +0000 (16:24 +1200)]
Pass ExportProcessor object instead of queryMode & ExportMode

6 years agoMove household relationship types to the processor
eileen [Thu, 26 Jul 2018 13:26:20 +0000 (01:26 +1200)]
Move household relationship types to the processor

m

6 years agoMerge pull request #12621 from JKingsnorth/remove-unused-vars-process-parti
colemanw [Sat, 4 Aug 2018 01:35:20 +0000 (21:35 -0400)]
Merge pull request #12621 from JKingsnorth/remove-unused-vars-process-parti

Remove unused variables from process_participants job

6 years agoMerge pull request #12608 from eileenmcnaughton/export_sigs
colemanw [Sat, 4 Aug 2018 00:28:16 +0000 (20:28 -0400)]
Merge pull request #12608 from eileenmcnaughton/export_sigs

Stop passing imProviders & phoneTypes - use CRM_Core_PseudoConstant:getLabel

6 years agoMerge pull request #12026 from michaelmcandrew/pass-mailingJobId-to-hookTokenValues
Eileen McNaughton [Fri, 3 Aug 2018 23:09:28 +0000 (11:09 +1200)]
Merge pull request #12026 from michaelmcandrew/pass-mailingJobId-to-hookTokenValues

pass mailingJobId to hook_tokenValues

6 years agoRemove unused variables
JKingsnorth [Fri, 3 Aug 2018 22:25:23 +0000 (23:25 +0100)]
Remove unused variables

6 years agoSet activity params correctly when filing an activity on case
Matthew Wire (MJW Consulting) [Fri, 3 Aug 2018 16:31:17 +0000 (17:31 +0100)]
Set activity params correctly when filing an activity on case

6 years agoFurther removal of instance of using LOWER() rather than relying on mysql non-case...
eileen [Thu, 2 Aug 2018 02:02:06 +0000 (14:02 +1200)]
Further removal of instance of using LOWER() rather than relying on mysql non-case-sensitivity.

Note I could not find any way to call this so I added deprecation notices

Per #12494 the use of LOWER

hurts performance
fails to return results on some char sets
messes with REGEX
This is part of a continued (we removed from contribution search fields last year)
staggered approach to removing this old mechanism

6 years agoMerge pull request #12618 from colemanw/teenly
Eileen McNaughton [Fri, 3 Aug 2018 08:33:52 +0000 (20:33 +1200)]
Merge pull request #12618 from colemanw/teenly

Fix teeny typo

6 years agoFix teeny typo
Coleman Watts [Fri, 3 Aug 2018 04:28:34 +0000 (00:28 -0400)]
Fix teeny typo

6 years agoMerge pull request #12617 from civicrm/5.5
Eileen McNaughton [Fri, 3 Aug 2018 03:36:53 +0000 (15:36 +1200)]
Merge pull request #12617 from civicrm/5.5

5.5

6 years agoMerge pull request #12616 from eileenmcnaughton/report_date
Seamus Lee [Fri, 3 Aug 2018 03:28:23 +0000 (13:28 +1000)]
Merge pull request #12616 from eileenmcnaughton/report_date

Test fix, update activity report adds a this.month filter by default, accomodate

6 years agoTest fix, update activity report adds a this.month fiter by default so make dates...
eileen [Thu, 2 Aug 2018 23:33:44 +0000 (11:33 +1200)]
Test fix, update activity report adds a this.month fiter by default so make dates movable.

I also put time at the end of the day to avoid bounciness on status being overdue

6 years agoMerge pull request #12595 from eileenmcnaughton/payment_processor_domain
colemanw [Thu, 2 Aug 2018 09:08:16 +0000 (05:08 -0400)]
Merge pull request #12595 from eileenmcnaughton/payment_processor_domain

API : Set current domain as a sensible default for payment processor

6 years agoMerge remote-tracking branch 'origin/5.5'
Tim Otten [Thu, 2 Aug 2018 01:26:48 +0000 (18:26 -0700)]
Merge remote-tracking branch 'origin/5.5'

6 years ago5.4.0.md - Tweak cache notes
Tim Otten [Wed, 1 Aug 2018 21:03:16 +0000 (14:03 -0700)]
5.4.0.md - Tweak cache notes

6 years ago5.4.0 release notes (#12605)
Andrew Hunt [Wed, 1 Aug 2018 03:38:58 +0000 (23:38 -0400)]
5.4.0 release notes (#12605)

* 5.4.0 release notes: raw from script

* 5.4.0 release notes: added boilerplate

* 5.4.0 release notes: finished documenting changes

* 5.4.0 release notes: updated contributors

6 years agoSet version to 5.6.alpha1
CiviCRM [Thu, 2 Aug 2018 01:18:07 +0000 (01:18 +0000)]
Set version to 5.6.alpha1

6 years agoSet version to 5.5.beta1
CiviCRM [Thu, 2 Aug 2018 01:06:54 +0000 (01:06 +0000)]
Set version to 5.5.beta1

6 years agoMerge pull request #12607 from colemanw/caseDetails
Eileen McNaughton [Wed, 1 Aug 2018 21:16:31 +0000 (09:16 +1200)]
Merge pull request #12607 from colemanw/caseDetails

dev/core#289 - Fix links on case dashboard

6 years agoMerge pull request #12610 from mattwire/recurtab_sort_desc
Eileen McNaughton [Wed, 1 Aug 2018 21:15:03 +0000 (09:15 +1200)]
Merge pull request #12610 from mattwire/recurtab_sort_desc

dev/core/issues/277 Sort recurring contributions by newest first

6 years agoMerge pull request #12606 from JMAConsulting/custom-value-update
colemanw [Wed, 1 Aug 2018 16:36:39 +0000 (12:36 -0400)]
Merge pull request #12606 from JMAConsulting/custom-value-update

Customvalue ID is ignored

6 years agofor Jenkins.
KarinG [Wed, 1 Aug 2018 16:11:17 +0000 (10:11 -0600)]
for Jenkins.

6 years agoremove Initials.
KarinG [Wed, 1 Aug 2018 14:34:07 +0000 (08:34 -0600)]
remove Initials.

6 years agoAdding in assertions re: lineItem and Contribution data-integrity.
KarinG [Wed, 1 Aug 2018 14:22:22 +0000 (08:22 -0600)]
Adding in assertions re: lineItem and Contribution data-integrity.

6 years agoFix duplicate activities showing on case activities tab when they have multiple targe...
Matthew Wire [Sun, 8 Jul 2018 17:20:30 +0000 (18:20 +0100)]
Fix duplicate activities showing on case activities tab when they have multiple target/assignee contacts