civicrm-core.git
8 years agoCRM-13244 - ActionMapping - Strictly use MappingInterface
Tim Otten [Tue, 4 Aug 2015 00:10:38 +0000 (17:10 -0700)]
CRM-13244 - ActionMapping - Strictly use MappingInterface

8 years agoCRM-13244 - RecipientBuilder - Move entity-specific bits to ActionMappings
Tim Otten [Sat, 1 Aug 2015 12:45:07 +0000 (05:45 -0700)]
CRM-13244 - RecipientBuilder - Move entity-specific bits to ActionMappings

8 years agoCRM-13244 - Move buildRecipientContacts into new class. Split into smaller functions.
Tim Otten [Wed, 29 Jul 2015 10:54:16 +0000 (03:54 -0700)]
CRM-13244 - Move buildRecipientContacts into new class. Split into smaller functions.

Note: This was originally written as a series of smaller changes, but they
were squashed.  For more detailed history, check totten's repo for
alternative history leading up to, eg, 9e4d69e.

8 years agoCRM-13244 - prepareMailingQuery - Use CRM_Utils_SQL_Select
Tim Otten [Tue, 28 Jul 2015 08:49:29 +0000 (01:49 -0700)]
CRM-13244 - prepareMailingQuery - Use CRM_Utils_SQL_Select

8 years agoCRM-13244 - ActionSchedule\Mapping - Privatize various fields
Tim Otten [Wed, 29 Jul 2015 03:26:04 +0000 (20:26 -0700)]
CRM-13244 - ActionSchedule\Mapping - Privatize various fields

These fields are kind of stupid and are mostly only used within the Mapping
class.

The main external usage was for looking up a mapping record by
`entity_value`.  However, this can be made simpler now that mapping IDs are
constant.

8 years agoCRM-13244 - ActionSchedule - Externalize getMappings
Tim Otten [Wed, 29 Jul 2015 02:11:51 +0000 (19:11 -0700)]
CRM-13244 - ActionSchedule - Externalize getMappings

8 years agoCRM-13244 - ActionSchedule - Extract entity-specific logic for tokens and dropdowns.
Tim Otten [Mon, 27 Jul 2015 07:24:52 +0000 (00:24 -0700)]
CRM-13244 - ActionSchedule - Extract entity-specific logic for tokens and dropdowns.

The `ActionSchedule` BAO had a ton of duplicate, helter-skelter code for
looking up specific details about specific entities and mappings.  The
mapping class (`CRM_Core_DAO_ActionMapping`) had an anemic model.  The
mapping records could be modified in the DB, but in practice this was
pointless because they depended on so many hard-coded lookups.  And there
were some confusing variable names (sel1, sel2, sel3, etc) and
variable-shuffling.

This revision moves several entity-specific bits into new classes
(`Civi\ActionSchedule\Mapping` and `CRM_Core_ActionScheduleTmp`), abandons
the pretense of DB editing, centralizes mapping-related lookups, and replaces
various references to `CRM_Core_DAO_ActionMapping`.

This is envisioned as an intermediate step; the two classes are still a bit
heavy (mixing together logic for unrelated entities) and should be split
further.

8 years agoCRM_Core_BAO_ActionScheduleTest - Fix racy test
Tim Otten [Fri, 31 Jul 2015 23:58:06 +0000 (16:58 -0700)]
CRM_Core_BAO_ActionScheduleTest - Fix racy test

8 years agoCRM-13244 - CRM_Core_BAO_ActionScheduleTest - Add some event examples
Tim Otten [Fri, 31 Jul 2015 02:07:47 +0000 (19:07 -0700)]
CRM-13244 - CRM_Core_BAO_ActionScheduleTest - Add some event examples

8 years agoCRM-13244 - CRM_Core_BAO_ActionSchedule - Simplify `sendMailing()`
Tim Otten [Fri, 24 Jul 2015 09:34:45 +0000 (02:34 -0700)]
CRM-13244 - CRM_Core_BAO_ActionSchedule - Simplify `sendMailing()`

8 years agoCRM-13244 - CRM_Core_BAO_ActionSchedule - Use TokenProcessor instead of replaceCompon...
Tim Otten [Fri, 24 Jul 2015 07:10:23 +0000 (00:10 -0700)]
CRM-13244 - CRM_Core_BAO_ActionSchedule - Use TokenProcessor instead of replaceComponentTokens

8 years agoCRM-13244 - CRM_Core_BAO_ActionSchedule - Simplify `sendReminder`
Tim Otten [Fri, 24 Jul 2015 02:18:22 +0000 (19:18 -0700)]
CRM-13244 - CRM_Core_BAO_ActionSchedule - Simplify `sendReminder`

The old `sendReminder()` had too many responsibilities (loading token data
and processing token data and sending emails and sending SMS's), contained
lots of duplicate code, and did pointless variable shuffling.  The Smarty
and HTML parameters were enforced inconsistently, and the "From" address had
weird side-effects, ad nauseum.

This commit splits `sendReminder()` into three pieces:
 * `TokenCompatSubscriber` for filling in token data.
 * `sendReminderSms()` for sending SMS.
 * `sendReminderEmail()` for sending email.

8 years agoCRM-13244 - Civi\Token - Add new class for processing messages with tokens.
Tim Otten [Thu, 23 Jul 2015 07:11:45 +0000 (00:11 -0700)]
CRM-13244 - Civi\Token - Add new class for processing messages with tokens.

8 years agoCRM-13244 - CRM_Core_BAO_ActionSchedule - Comment about seemingly dead code
Tim Otten [Tue, 21 Jul 2015 03:39:45 +0000 (20:39 -0700)]
CRM-13244 - CRM_Core_BAO_ActionSchedule - Comment about seemingly dead code

8 years agoCRM-13244 - ActionSchedule - Normalize static references
Tim Otten [Tue, 21 Jul 2015 03:38:05 +0000 (20:38 -0700)]
CRM-13244 - ActionSchedule - Normalize static references

Some code uses "self::" and other use "CRM_Core_BAO_ActionSchedule::". It'll
be easier to reorganize if the notation is consistent.

8 years agoCRM-13244 - ActionSchedule - Extract methods from sendMailings
Tim Otten [Tue, 21 Jul 2015 03:12:46 +0000 (20:12 -0700)]
CRM-13244 - ActionSchedule - Extract methods from sendMailings

New methods
 * listMailingTokens()
 * prepareMailingQuery()
 * prepareMailingTokens()
 * createMailingActivity()

8 years agoCRM-13244 - ActionScheduleTest - Use some tokens
Tim Otten [Tue, 21 Jul 2015 05:15:03 +0000 (22:15 -0700)]
CRM-13244 - ActionScheduleTest - Use some tokens

8 years agoCRM-16355 - bgm addon to change CMS locale - make it temporary
Tim Otten [Sat, 25 Jul 2015 03:41:29 +0000 (20:41 -0700)]
CRM-16355 - bgm addon to change CMS locale - make it temporary

8 years agoCRM-16355 - bgm addon to change CMS locale - cleanup
Tim Otten [Sat, 25 Jul 2015 01:03:06 +0000 (18:03 -0700)]
CRM-16355 - bgm addon to change CMS locale - cleanup

8 years agoCRM-16355 - bgm addon to change CMS locale
Samuel Vanhove [Wed, 29 Apr 2015 22:38:16 +0000 (18:38 -0400)]
CRM-16355 - bgm addon to change CMS locale

8 years agoCRM-16355 - checkstyle typos
Samuel Vanhove [Wed, 29 Apr 2015 00:06:14 +0000 (20:06 -0400)]
CRM-16355 - checkstyle typos

8 years agoCRM-16355 - checkstyle typos
Samuel Vanhove [Tue, 28 Apr 2015 23:58:02 +0000 (19:58 -0400)]
CRM-16355 - checkstyle typos

8 years agoCRM-16355 - communication language choices order + help text fixes
Samuel Vanhove [Tue, 28 Apr 2015 23:46:09 +0000 (19:46 -0400)]
CRM-16355 - communication language choices order + help text fixes

8 years agoCRM-16355 - cleanup, use of CRM_Core_I18n::language instead of a new function
Samuel Vanhove [Tue, 28 Apr 2015 23:08:59 +0000 (19:08 -0400)]
CRM-16355 - cleanup, use of CRM_Core_I18n::language instead of a new function

8 years agoCRM-16355 - add the contact filter based on language and dynamic language change
Samuel Vanhove [Mon, 27 Apr 2015 03:18:13 +0000 (23:18 -0400)]
CRM-16355 - add the contact filter based on language and dynamic language change

8 years agoCRM-16355 - UI and database - fixup
Tim Otten [Mon, 27 Jul 2015 06:04:08 +0000 (23:04 -0700)]
CRM-16355 - UI and database - fixup

8 years agoCRM-16355 - UI and database
Samuel Vanhove [Sat, 25 Apr 2015 23:09:47 +0000 (19:09 -0400)]
CRM-16355 - UI and database

8 years agoMerge pull request #6789 from jdax/fixing_drupal_text_confusion
Dave Greenberg [Sat, 26 Sep 2015 22:22:26 +0000 (18:22 -0400)]
Merge pull request #6789 from jdax/fixing_drupal_text_confusion

CRM-17264 Profile: Duplicate User Notice Text Is Confusing

8 years agoMerge branch '4.6' into master
Coleman Watts [Sat, 26 Sep 2015 16:16:57 +0000 (12:16 -0400)]
Merge branch '4.6' into master

Conflicts:
CRM/Upgrade/Incremental/sql/4.6.9.mysql.tpl

8 years agoMerge pull request #6805 from colemanw/case
colemanw [Sat, 26 Sep 2015 15:53:31 +0000 (11:53 -0400)]
Merge pull request #6805 from colemanw/case

Fix submitting multiple addRole popups on caseView

8 years agoFix submitting multiple addRole popups on caseView
Coleman Watts [Sat, 26 Sep 2015 15:53:05 +0000 (11:53 -0400)]
Fix submitting multiple addRole popups on caseView

8 years agoMerge pull request #6799 from yashodha/CRM-17221
Kurund Jalmi [Fri, 25 Sep 2015 19:00:11 +0000 (00:30 +0530)]
Merge pull request #6799 from yashodha/CRM-17221

CRM-17221: Phuket spelt incorrectly as Phaket in states/counties table

8 years agoMerge pull request #6801 from jitendrapurohit/casefix
Monish Deb [Fri, 25 Sep 2015 15:53:27 +0000 (21:23 +0530)]
Merge pull request #6801 from jitendrapurohit/casefix

CRM-17282 -- Fix DB error on Add/Manage Case

8 years agoFix DB error on Add/Manage Case
jitendrapurohit [Fri, 25 Sep 2015 11:38:33 +0000 (17:08 +0530)]
Fix DB error on Add/Manage Case

8 years agoMerge pull request #6796 from monishdeb/CRM-17270
Monish Deb [Fri, 25 Sep 2015 07:18:55 +0000 (12:48 +0530)]
Merge pull request #6796 from monishdeb/CRM-17270

CRM-17270 fix - Custom country multi-select fields used in a Drupal V…

8 years agoCRM-17221: Phuket spelt incorrectly as Phaket in states/counties table
yashodha [Fri, 25 Sep 2015 04:12:47 +0000 (09:42 +0530)]
CRM-17221: Phuket spelt incorrectly as Phaket in states/counties table

----------------------------------------
* CRM-17221: Phuket spelt incorrectly as Phaket in states/counties table
  https://issues.civicrm.org/jira/browse/CRM-17221

8 years agoMerge pull request #6752 from TobiasLounsbury/UFJoin_Delete
Eileen McNaughton [Fri, 25 Sep 2015 02:18:43 +0000 (14:18 +1200)]
Merge pull request #6752 from TobiasLounsbury/UFJoin_Delete

Added api UFJoin::delete

8 years agoMerge pull request #6798 from eileenmcnaughton/master
Eileen McNaughton [Fri, 25 Sep 2015 02:16:19 +0000 (14:16 +1200)]
Merge pull request #6798 from eileenmcnaughton/master

API tests: add test to see if preferred language works

8 years agoAPI tests: add test to see if preferred language works
eileen [Thu, 24 Sep 2015 21:34:17 +0000 (09:34 +1200)]
API tests: add test to see if preferred language works

8 years agoMerge pull request #6780 from pradpnayak/CRM-17240
Dave Greenberg [Thu, 24 Sep 2015 14:20:04 +0000 (10:20 -0400)]
Merge pull request #6780 from pradpnayak/CRM-17240

--CRM-17240, made financial type mandatory on create of price field v…

8 years agoCRM-17270 fix - Custom country multi-select fields used in a Drupal View display...
monishdeb [Thu, 24 Sep 2015 13:18:18 +0000 (18:48 +0530)]
CRM-17270 fix - Custom country multi-select fields used in a Drupal View display the four digit ID number instead of the name of the country

https://issues.civicrm.org/jira/browse/CRM-17270

8 years ago--CRM-17240, fixed tests
Pradeep Nayak [Thu, 24 Sep 2015 11:01:06 +0000 (16:31 +0530)]
--CRM-17240, fixed tests

8 years agoMerge pull request #6777 from yashodha/CRM-17237
Yashodha Chaku [Thu, 24 Sep 2015 07:52:35 +0000 (13:22 +0530)]
Merge pull request #6777 from yashodha/CRM-17237

CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERV…

8 years agoMerge pull request #6792 from colemanw/multisite
colemanw [Wed, 23 Sep 2015 21:09:45 +0000 (17:09 -0400)]
Merge pull request #6792 from colemanw/multisite

Remove multisite extension

8 years agoRemove multisite extension
Coleman Watts [Wed, 23 Sep 2015 19:57:26 +0000 (15:57 -0400)]
Remove multisite extension

8 years agoAdd icon to profile form button
Coleman Watts [Wed, 23 Sep 2015 19:54:03 +0000 (15:54 -0400)]
Add icon to profile form button

8 years agoUpdate version to 4.7.alpha2
CiviCRM [Wed, 23 Sep 2015 18:05:23 +0000 (11:05 -0700)]
Update version to 4.7.alpha2

8 years agoremoved unwanted files
Kurund Jalmi [Wed, 23 Sep 2015 17:35:48 +0000 (23:05 +0530)]
removed unwanted files

8 years agoinlclude localization file
Kurund Jalmi [Wed, 23 Sep 2015 16:17:31 +0000 (21:47 +0530)]
inlclude localization file

8 years agoCRM-17264: Profile: Duplicate User Notice Text Is Confusing
Nikki Murray [Wed, 23 Sep 2015 14:30:39 +0000 (10:30 -0400)]
CRM-17264: Profile: Duplicate User Notice Text Is Confusing

8 years agoMerge pull request #6791 from monishdeb/47alpha1-upgrade-fix
Monish Deb [Wed, 23 Sep 2015 14:20:03 +0000 (19:50 +0530)]
Merge pull request #6791 from monishdeb/47alpha1-upgrade-fix

4.7.alpha1 upgrade fixes

8 years agoCRM-16873: OnBehalf fix for multilingual
monishdeb [Wed, 23 Sep 2015 14:09:16 +0000 (19:39 +0530)]
CRM-16873: OnBehalf fix for multilingual

----------------------------------------
* CRM-16873: Migrating OnBehalf to ProfileContact
  https://issues.civicrm.org/jira/browse/CRM-16873

8 years ago4.7.alpha1 upgrade fix
jitendrapurohit [Wed, 23 Sep 2015 11:30:20 +0000 (17:00 +0530)]
4.7.alpha1 upgrade fix

8 years agoinclude civi.php in distmaker
jitendrapurohit [Wed, 23 Sep 2015 09:58:53 +0000 (15:28 +0530)]
include civi.php in distmaker

8 years ago47alpha1 upgrade fix
monishdeb [Wed, 23 Sep 2015 10:06:53 +0000 (15:36 +0530)]
47alpha1 upgrade fix

8 years agoMerge pull request #6790 from totten/master-fys
colemanw [Wed, 23 Sep 2015 01:02:32 +0000 (21:02 -0400)]
Merge pull request #6790 from totten/master-fys

CRM-16373 - Fix default for fiscalYearStart

8 years agoCRM-16373 - Fix default for fiscalYearStart
Tim Otten [Wed, 23 Sep 2015 00:50:52 +0000 (17:50 -0700)]
CRM-16373 - Fix default for fiscalYearStart

8 years agoMerge pull request #6788 from joannechester/crm-16195-rename-and-reorder
Dave Greenberg [Tue, 22 Sep 2015 23:26:28 +0000 (16:26 -0700)]
Merge pull request #6788 from joannechester/crm-16195-rename-and-reorder

CRM-16195-rename-and-reorder

8 years agoMerge pull request #6520 from mlutfy/4.6-crm17034
Dave Greenberg [Tue, 22 Sep 2015 23:05:01 +0000 (16:05 -0700)]
Merge pull request #6520 from mlutfy/4.6-crm17034

CRM-17034 : PriceField tax_amount should not be rounded

8 years agoCRM-16195-after-regen.sh
joannechester [Tue, 22 Sep 2015 22:59:02 +0000 (08:59 +1000)]
CRM-16195-after-regen.sh

8 years agoMerge pull request #6787 from jitendrapurohit/CRM-17204
Dave Greenberg [Tue, 22 Sep 2015 22:48:01 +0000 (15:48 -0700)]
Merge pull request #6787 from jitendrapurohit/CRM-17204

CRM-17204 - Empty Current Employer profile field disables employer re…

8 years agoMerge pull request #6783 from eileenmcnaughton/CRM-17258
Eileen McNaughton [Tue, 22 Sep 2015 22:37:35 +0000 (10:37 +1200)]
Merge pull request #6783 from eileenmcnaughton/CRM-17258

CRM-17258 add created_id, owner_id to report_instances

8 years agoCRM-17264: Profile: Duplicate User Notice Text Is Confusing
Nikki Murray [Tue, 22 Sep 2015 21:24:07 +0000 (17:24 -0400)]
CRM-17264: Profile: Duplicate User Notice Text Is Confusing

8 years agoFixing text to make it more clear that the user has an account but is not registered...
Nikki Murray [Tue, 22 Sep 2015 21:17:01 +0000 (17:17 -0400)]
Fixing text to make it more clear that the user has an account but is not registered for an event

8 years agoMerge pull request #6778 from eileenmcnaughton/CRM-17255
Dave Greenberg [Tue, 22 Sep 2015 18:27:35 +0000 (11:27 -0700)]
Merge pull request #6778 from eileenmcnaughton/CRM-17255

CRM-17255 group.api ACLS : do not exclude hidden groups for ACL users

8 years agoMerge pull request #6759 from davecivicrm/CRM-16029
Dave Greenberg [Tue, 22 Sep 2015 16:27:16 +0000 (09:27 -0700)]
Merge pull request #6759 from davecivicrm/CRM-16029

CRM-16029 - fix for create new financial type in when account relatio…

8 years agoMerge pull request #6786 from monishdeb/CRM-17247
Monish Deb [Tue, 22 Sep 2015 14:36:45 +0000 (20:06 +0530)]
Merge pull request #6786 from monishdeb/CRM-17247

CRM-17247 fix - Vaildation fails silently on required fields (Drupal …

8 years agoMerge pull request #6782 from monishdeb/CRM-17252
Monish Deb [Tue, 22 Sep 2015 13:04:58 +0000 (18:34 +0530)]
Merge pull request #6782 from monishdeb/CRM-17252

CRM-17252 fix - Advanced Search by Group broken

8 years agoCRM-16195-rename-and-reorder
joannechester [Tue, 22 Sep 2015 12:32:56 +0000 (22:32 +1000)]
CRM-16195-rename-and-reorder

8 years agoCRM-17204 - Empty Current Employer profile field disables employer relationship
jitendrapurohit [Tue, 22 Sep 2015 12:32:52 +0000 (18:02 +0530)]
CRM-17204 - Empty Current Employer profile field disables employer relationship

8 years agoCRM-17247 fix - Vaildation fails silently on required fields (Drupal user editing)
monishdeb [Tue, 22 Sep 2015 09:46:20 +0000 (15:16 +0530)]
CRM-17247 fix - Vaildation fails silently on required fields (Drupal user editing)

https://issues.civicrm.org/jira/browse/CRM-17247

8 years agonotice fix
yashodha [Tue, 22 Sep 2015 05:35:23 +0000 (11:05 +0530)]
notice fix

8 years agoCRM-17258 add created_id, owner_id to report_instances
eileen [Mon, 21 Sep 2015 22:51:15 +0000 (10:51 +1200)]
CRM-17258 add created_id, owner_id to report_instances

8 years agoCRM-17252 fix - Advanced Search by Group broken
monishdeb [Mon, 21 Sep 2015 20:57:16 +0000 (02:27 +0530)]
CRM-17252 fix - Advanced Search by Group broken

https://issues.civicrm.org/jira/browse/CRM-17252

8 years agoMerge pull request #6779 from JKingsnorth/patch-1
Dave Greenberg [Mon, 21 Sep 2015 17:53:02 +0000 (10:53 -0700)]
Merge pull request #6779 from JKingsnorth/patch-1

Version fix

8 years agoMerge pull request #6767 from colemanw/CRM-17131
Monish Deb [Mon, 21 Sep 2015 14:19:34 +0000 (19:49 +0530)]
Merge pull request #6767 from colemanw/CRM-17131

CRM-17131 - Fix where clause

8 years agoVersion fix
John Kingsnorth [Mon, 21 Sep 2015 13:52:35 +0000 (14:52 +0100)]
Version fix

8 years ago--CRM-17240, made financial type mandatory on create of price field value through api
Pradeep Nayak [Mon, 21 Sep 2015 13:34:42 +0000 (19:04 +0530)]
--CRM-17240, made financial type mandatory on create of price field value through api

8 years agominor fixes
yashodha [Mon, 21 Sep 2015 13:31:28 +0000 (19:01 +0530)]
minor fixes

8 years agoCRM-17237: more fixes
yashodha [Mon, 21 Sep 2015 11:38:19 +0000 (17:08 +0530)]
CRM-17237: more fixes

----------------------------------------
* CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
  https://issues.civicrm.org/jira/browse/CRM-17237

8 years agoMerge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-21-15-52-41
Kurund Jalmi [Mon, 21 Sep 2015 10:34:02 +0000 (16:04 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-21-15-52-41

Conflicts:
CRM/Contribute/BAO/ContributionPage.php
CRM/Core/Resources.php

8 years agoMerge pull request #6712 from jitendrapurohit/CRM-17146-tests
Yashodha Chaku [Mon, 21 Sep 2015 09:34:52 +0000 (15:04 +0530)]
Merge pull request #6712 from jitendrapurohit/CRM-17146-tests

Test to check CRM-17146 - include trxn_date in completetransaction API

8 years agoCRM-17255 group.api ACLS : do not exclude hidden groups for ACL users
eileenmcnaugton [Mon, 21 Sep 2015 08:25:37 +0000 (20:25 +1200)]
CRM-17255 group.api ACLS : do not exclude hidden groups for ACL users

This commit prevents hidden groups from being filtered out of api results by the check
permission function. The api permission check is fairly new so this only hones the check

8 years agoCRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
yashodha [Mon, 21 Sep 2015 08:05:09 +0000 (13:35 +0530)]
CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule

----------------------------------------
* CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
  https://issues.civicrm.org/jira/browse/CRM-17237

8 years agoMerge pull request #6776 from totten/master-setting-redux
Tim Otten [Mon, 21 Sep 2015 07:46:00 +0000 (00:46 -0700)]
Merge pull request #6776 from totten/master-setting-redux

CRM-16373 - $config - Separate runtime and boot services

8 years agoFix api_v3_ContactTest.testContactGetBy*Username
Tim Otten [Mon, 21 Sep 2015 06:50:02 +0000 (23:50 -0700)]
Fix api_v3_ContactTest.testContactGetBy*Username

8 years agoConstruct runtime+extensions+container through boot services
Tim Otten [Sun, 20 Sep 2015 23:17:06 +0000 (16:17 -0700)]
Construct runtime+extensions+container through boot services

8 years agoConvert $config->userSystem to boot service
Tim Otten [Sat, 19 Sep 2015 08:33:57 +0000 (01:33 -0700)]
Convert $config->userSystem to boot service

8 years agoCRM-16373 - Bootstrap subsystems in more predictable order
Tim Otten [Sat, 19 Sep 2015 05:09:01 +0000 (22:09 -0700)]
CRM-16373 - Bootstrap subsystems in more predictable order

Several subsystems were initialized on-demand. This had a weird side-effect
where the container would start initializing and call another service, which
would then (indirectly) try to initialize another container. The two container
instances would not be the same.

This revision enforces a more carefully considered sequence of events (which
will be documented in the wiki page, "Bootstrap Reference").

8 years agoCRM_Core_Error - Don't display HTML crash when running tests
Tim Otten [Sat, 19 Sep 2015 05:03:20 +0000 (22:03 -0700)]
CRM_Core_Error - Don't display HTML crash when running tests

8 years agoCRM-16373 - MagicMerge - Improve comments/readability.
Tim Otten [Sat, 19 Sep 2015 01:00:30 +0000 (18:00 -0700)]
CRM-16373 - MagicMerge - Improve comments/readability.

8 years agoMerge pull request #6774 from totten/master-fs25
Tim Otten [Mon, 21 Sep 2015 03:54:45 +0000 (20:54 -0700)]
Merge pull request #6774 from totten/master-fs25

composer.json - Use symfony/filesystem circa 2.5

8 years agocomposer.json - Use symfony/filesystem circa 2.5
Tim Otten [Mon, 21 Sep 2015 03:00:00 +0000 (20:00 -0700)]
composer.json - Use symfony/filesystem circa 2.5

The rest of the Symfony components are targetting ~2.5, but some reason
we're autoselecting `symfony/filesystem` ~2.7.  That produces errors on
`test-debian6-1`.

8 years agoMerge pull request #6773 from civicrm/eileenmcnaughton-patch-1
Eileen McNaughton [Mon, 21 Sep 2015 02:24:27 +0000 (14:24 +1200)]
Merge pull request #6773 from civicrm/eileenmcnaughton-patch-1

CRM-16555 add code-comments

8 years agoCRM-16555 add code-comments
Eileen McNaughton [Mon, 21 Sep 2015 02:01:34 +0000 (14:01 +1200)]
CRM-16555 add code-comments

The patch added for CRM-16555 should not have been needed as the intention was that the function to getValidProcessors handling for mode would have worked. Adding some comments to indicate this for next time someone looks at it.

8 years agoMerge pull request #6771 from seamuslee001/CRM-17231-Master
Dave Greenberg [Fri, 18 Sep 2015 23:55:35 +0000 (16:55 -0700)]
Merge pull request #6771 from seamuslee001/CRM-17231-Master

CRM-17231 Allow for Multipart Report to be included in the Email Processor

8 years agoMerge pull request #6769 from monishdeb/CRM-17191
Monish Deb [Fri, 18 Sep 2015 22:22:29 +0000 (03:52 +0530)]
Merge pull request #6769 from monishdeb/CRM-17191

CRM-17246 fix - Contact name showing in Contribution summary report

8 years agoPHPCS fixes
Seamus Lee [Fri, 18 Sep 2015 04:43:38 +0000 (04:43 +0000)]
PHPCS fixes

8 years agoFurther tweeks following testing
Seamus Lee [Fri, 18 Sep 2015 04:34:20 +0000 (04:34 +0000)]
Further tweeks following testing

8 years agoPHPCS fixes
Seamus Lee [Wed, 16 Sep 2015 23:45:37 +0000 (23:45 +0000)]
PHPCS fixes