civicrm-core.git
7 years agoMerge pull request #9135 from tschuettler/CRM-19424
Yashodha Chaku [Thu, 29 Sep 2016 08:10:12 +0000 (13:40 +0530)]
Merge pull request #9135 from tschuettler/CRM-19424

CRM-19424 - Weekday names if week does not start on Sunday

7 years agoMerge pull request #9133 from jitendrapurohit/CRM-19410
Monish Deb [Thu, 29 Sep 2016 05:58:49 +0000 (11:28 +0530)]
Merge pull request #9133 from jitendrapurohit/CRM-19410

CRM-19410 - Save Custom Data and Expose formrule on inline edit addre…

7 years agoMerge pull request #9134 from jitendrapurohit/CRM-19423
Yashodha Chaku [Thu, 29 Sep 2016 05:12:21 +0000 (10:42 +0530)]
Merge pull request #9134 from jitendrapurohit/CRM-19423

CRM-19423 - Move required behavior of mail_format to formrule

7 years agoCRM-19417 - distmaker - Rename report file. Tweak edge-case for missing repos.
Tim Otten [Wed, 28 Sep 2016 19:21:08 +0000 (15:21 -0400)]
CRM-19417 - distmaker - Rename report file. Tweak edge-case for missing repos.

7 years agoMerge pull request #9131 from seamuslee001/product_syntax
colemanw [Wed, 28 Sep 2016 16:48:19 +0000 (12:48 -0400)]
Merge pull request #9131 from seamuslee001/product_syntax

Re-add prodcut create without array syntax test

7 years agoMake name required in the product api
Seamus Lee [Wed, 28 Sep 2016 15:59:33 +0000 (01:59 +1000)]
Make name required in the product api

7 years agoMerge pull request #9127 from seamuslee001/deleteerror-followup
colemanw [Wed, 28 Sep 2016 15:07:54 +0000 (11:07 -0400)]
Merge pull request #9127 from seamuslee001/deleteerror-followup

Enable InvalidID delete on all entites

7 years agoMerge pull request #9130 from totten/master-distmaker-report
Tim Otten [Wed, 28 Sep 2016 15:01:48 +0000 (11:01 -0400)]
Merge pull request #9130 from totten/master-distmaker-report

CRM-19417 - distmaker - Generate a JSON summary of build data

7 years agoMerge pull request #9124 from mlutfy/master-crm17991
colemanw [Wed, 28 Sep 2016 13:50:53 +0000 (09:50 -0400)]
Merge pull request #9124 from mlutfy/master-crm17991

CRM-17991: Fix Safari JS bug in COntribution popups (affects softcredits, pledges).

7 years agoCRM-19424 - Weekday names if week does not start on Sunday
Thomas Schüttler [Wed, 28 Sep 2016 12:57:17 +0000 (14:57 +0200)]
CRM-19424 - Weekday names if week does not start on Sunday

----------------------------------------
* CRM-19424: Weekday names if week does not start on Sunday
  https://issues.civicrm.org/jira/browse/CRM-19424

7 years agoCRM-19423 - Move required behavior of mail_format to formrule
jitendrapurohit [Wed, 28 Sep 2016 12:08:50 +0000 (17:38 +0530)]
CRM-19423 - Move required behavior of mail_format to formrule

7 years agoCRM-19410 - Save Custom Data and Expose formrule on inline edit address form
jitendrapurohit [Wed, 28 Sep 2016 09:29:19 +0000 (14:59 +0530)]
CRM-19410 - Save Custom Data and Expose formrule on inline edit address form

7 years agoMerge pull request #9129 from fuzionnz/CRM-19422
Yashodha Chaku [Wed, 28 Sep 2016 07:19:25 +0000 (12:49 +0530)]
Merge pull request #9129 from fuzionnz/CRM-19422

CRM-19422. Correct exception from job.group_rebuild

7 years agoMerge pull request #9132 from jitendrapurohit/CRM-19420
Yashodha Chaku [Wed, 28 Sep 2016 07:11:54 +0000 (12:41 +0530)]
Merge pull request #9132 from jitendrapurohit/CRM-19420

CRM-19420 - Fix ts in Contribution.tpl

7 years agoMerge pull request #9025 from tschuettler/patch-8
Yashodha Chaku [Wed, 28 Sep 2016 07:06:01 +0000 (12:36 +0530)]
Merge pull request #9025 from tschuettler/patch-8

CRM-19355

7 years agoMerge pull request #9101 from monishdeb/CRM-19394
Monish Deb [Wed, 28 Sep 2016 07:01:48 +0000 (12:31 +0530)]
Merge pull request #9101 from monishdeb/CRM-19394

CRM-19394: Relative date ranges no longer stored in Smart Group criteria

7 years agoCRM-19420 - Fix ts in Contribution.tpl
jitendrapurohit [Wed, 28 Sep 2016 06:23:20 +0000 (11:53 +0530)]
CRM-19420 - Fix ts in Contribution.tpl

7 years agoCRM-19394: Relative date ranges no longer stored in Smart Group criteria
deb.monish [Fri, 23 Sep 2016 13:37:02 +0000 (19:07 +0530)]
CRM-19394: Relative date ranges no longer stored in Smart Group criteria

7 years agoCRM-19417 - distmaker JSON report - Tighten ordering, fix typo
Tim Otten [Wed, 28 Sep 2016 03:53:20 +0000 (23:53 -0400)]
CRM-19417 - distmaker JSON report - Tighten ordering, fix typo

7 years agoTest re-adding prodcut create without array syntax test
Seamus Lee [Wed, 28 Sep 2016 03:36:28 +0000 (13:36 +1000)]
Test re-adding prodcut create without array syntax test

7 years agoCRM-19393 Do not transalate when managing log tables (#9102)
Seamus Lee [Wed, 28 Sep 2016 03:23:46 +0000 (13:23 +1000)]
CRM-19393 Do not transalate when managing log tables (#9102)

* CRM-19393 Do not transalate when managing log tables

* CRM-19393 Add tests of logging in multilingual mode

This reverts commit ac4d69b5539513c31209c5dd42d0b22b03c20c99.

* Fix Syntax Conformance test by skipping product

* Jenkins fix

7 years agoCRM-19417 - distmaker - JSON format should better match upgrade checker
Tim Otten [Wed, 28 Sep 2016 02:53:50 +0000 (22:53 -0400)]
CRM-19417 - distmaker - JSON format should better match upgrade checker

7 years agoCRM-19417 - distmaker - Change report to JSON
Tim Otten [Wed, 28 Sep 2016 02:16:53 +0000 (22:16 -0400)]
CRM-19417 - distmaker - Change report to JSON

7 years agoCRM-19417 - distmaker - Change report to key-value format. Add version.
Tim Otten [Wed, 28 Sep 2016 01:33:33 +0000 (21:33 -0400)]
CRM-19417 - distmaker - Change report to key-value format. Add version.

7 years agoCRM-19422. Correct exception from job.group_rebuild
Chris Burgess [Wed, 28 Sep 2016 01:32:18 +0000 (14:32 +1300)]
CRM-19422. Correct exception from job.group_rebuild

7 years agoCRM-19417 - distmaker - Generate report about git revisions
Tim Otten [Wed, 28 Sep 2016 00:42:59 +0000 (20:42 -0400)]
CRM-19417 - distmaker - Generate report about git revisions

7 years agoEnable InvalidID delete on all entites
Seamus Lee [Tue, 27 Sep 2016 21:53:58 +0000 (07:53 +1000)]
Enable InvalidID delete on all entites

7 years agoEnable api_v3_syntaxConformaceTest::testInvalidID_delete (#9068)
Seamus Lee [Tue, 27 Sep 2016 21:47:30 +0000 (07:47 +1000)]
Enable api_v3_syntaxConformaceTest::testInvalidID_delete (#9068)

* Enable api_v3_SyntaxConformanceTest delete with wrong id

* Remove unneded if and remove debugging

* Remove debugging

* Tidy up fix for CustomValue tear down

7 years agoMerge pull request #9121 from totten/master-zanzibar
Tim Otten [Tue, 27 Sep 2016 21:32:36 +0000 (17:32 -0400)]
Merge pull request #9121 from totten/master-zanzibar

CRM-18006 - CRM_Dedupe_MergerTest - Fix regression

7 years agoMerge pull request #9047 from civicrm/CRM-19371
Monish Deb [Tue, 27 Sep 2016 21:22:02 +0000 (02:52 +0530)]
Merge pull request #9047 from civicrm/CRM-19371

Fix for CRM-19371

7 years agoReduce whitespace at bottom of dashboard
Coleman Watts [Tue, 27 Sep 2016 21:15:36 +0000 (17:15 -0400)]
Reduce whitespace at bottom of dashboard

7 years agoUse already existing addTrailingSlash function
Michael McAndrew [Tue, 27 Sep 2016 20:34:18 +0000 (21:34 +0100)]
Use already existing addTrailingSlash function

7 years agoMerge pull request #9119 from twomice/CRM-19408_extension_getremote_api_test
colemanw [Tue, 27 Sep 2016 18:21:57 +0000 (14:21 -0400)]
Merge pull request #9119 from twomice/CRM-19408_extension_getremote_api_test

Unit test for CRM-19408

7 years agoCRM-17991: Fix Safari JS bug in COntribution popups (affects softcredits, pledges).
Mathieu Lutfy [Tue, 27 Sep 2016 15:21:27 +0000 (11:21 -0400)]
CRM-17991: Fix Safari JS bug in COntribution popups (affects softcredits, pledges).

7 years agoMerge pull request #8266 from eileenmcnaughton/CRM-18482
colemanw [Tue, 27 Sep 2016 15:14:30 +0000 (11:14 -0400)]
Merge pull request #8266 from eileenmcnaughton/CRM-18482

CRM-18482 import - don't fill acl_contact_cache immediately before em…

7 years agoMerge pull request #9116 from tschuettler/patch-11
Monish Deb [Tue, 27 Sep 2016 10:49:50 +0000 (16:19 +0530)]
Merge pull request #9116 from tschuettler/patch-11

CRM-19413 - CiviMail: Test mail notice errors: undefined index

7 years agoMerge pull request #9094 from tschuettler/patch-10
Yashodha Chaku [Tue, 27 Sep 2016 10:42:11 +0000 (16:12 +0530)]
Merge pull request #9094 from tschuettler/patch-10

CRM-19402 - Include On Hold date for OptOuts in Contact Summary ...

7 years agoUpdate Mailing.php
tschuettler [Tue, 27 Sep 2016 09:49:41 +0000 (11:49 +0200)]
Update Mailing.php

Replace parent check with &&

7 years agoMerge pull request #9052 from seamuslee001/CRM-19372
Monish Deb [Tue, 27 Sep 2016 08:56:10 +0000 (14:26 +0530)]
Merge pull request #9052 from seamuslee001/CRM-19372

CRM-19372 allow payment processors to define an array of accepted cre…

7 years agoMove current label to description and add shorter label in
Seamus Lee [Tue, 27 Sep 2016 07:56:24 +0000 (17:56 +1000)]
Move current label to description and add shorter label in

7 years agoFix error found by Jitendra and add form validation on the credit card type checking...
Seamus Lee [Mon, 26 Sep 2016 21:00:34 +0000 (07:00 +1000)]
Fix error found by Jitendra and add form validation on the credit card type checking against options for payment processor

7 years agoFix test class
Seamus Lee [Fri, 16 Sep 2016 12:46:09 +0000 (22:46 +1000)]
Fix test class

7 years agoFix storing of credit cards in database and add tests in
Seamus Lee [Fri, 16 Sep 2016 06:23:08 +0000 (16:23 +1000)]
Fix storing of credit cards in database and add tests in

7 years agoCRM-19372 allow payment processors to define an array of accepted credit card types
Seamus Lee [Fri, 16 Sep 2016 04:48:11 +0000 (14:48 +1000)]
CRM-19372 allow payment processors to define an array of accepted credit card types

7 years agoCRM-18006 - CRM_Dedupe_MergerTest - Fix regression
Tim Otten [Mon, 26 Sep 2016 23:32:35 +0000 (19:32 -0400)]
CRM-18006 - CRM_Dedupe_MergerTest - Fix regression

InnoDB and MyISAM may have different edge-cases in how the default
orderings.  However, for deduping, the order is arbitrary. This
patch makes the test order-insensitive.

7 years agoMerge pull request #9080 from davidjosephhayes/master
colemanw [Mon, 26 Sep 2016 23:32:25 +0000 (19:32 -0400)]
Merge pull request #9080 from davidjosephhayes/master

Fix permission check

7 years agoMerge pull request #9112 from seamuslee001/CRM-16876-futher-fix
colemanw [Mon, 26 Sep 2016 23:29:24 +0000 (19:29 -0400)]
Merge pull request #9112 from seamuslee001/CRM-16876-futher-fix

CRM-16876 Ensure that foreign countires are also capitalised when hid…

7 years agoUnit test for CRM-19408.
Allen Shaw [Mon, 26 Sep 2016 21:34:14 +0000 (16:34 -0500)]
Unit test for CRM-19408.

7 years agoMerge pull request #9086 from samuelsov/CRM-18157
colemanw [Mon, 26 Sep 2016 21:19:03 +0000 (17:19 -0400)]
Merge pull request #9086 from samuelsov/CRM-18157

CRM-18157 - Make the mail format required

7 years agoFix menu scroll position
Coleman Watts [Mon, 26 Sep 2016 21:06:59 +0000 (17:06 -0400)]
Fix menu scroll position

7 years agoMerge pull request #9118 from colemanw/media
colemanw [Mon, 26 Sep 2016 20:35:01 +0000 (16:35 -0400)]
Merge pull request #9118 from colemanw/media

Responsive width for dashboard columns

7 years agoMerge pull request #9110 from twomice/CRM-19408_extension_getremote_api
colemanw [Mon, 26 Sep 2016 20:16:20 +0000 (16:16 -0400)]
Merge pull request #9110 from twomice/CRM-19408_extension_getremote_api

Fix CRM-19408: Create extension.getremote API

7 years agoResponsive width for dashboard columns
Coleman Watts [Mon, 26 Sep 2016 19:34:20 +0000 (15:34 -0400)]
Responsive width for dashboard columns

7 years agoMerge pull request #9117 from colemanw/Tweak
colemanw [Mon, 26 Sep 2016 19:27:36 +0000 (15:27 -0400)]
Merge pull request #9117 from colemanw/Tweak

Tweak quicksearch menu style

7 years agoTweak quicksearch menu style
Coleman Watts [Mon, 26 Sep 2016 18:07:04 +0000 (14:07 -0400)]
Tweak quicksearch menu style

7 years agoMerge pull request #9115 from JKingsnorth/CRM-19412
colemanw [Mon, 26 Sep 2016 16:41:04 +0000 (12:41 -0400)]
Merge pull request #9115 from JKingsnorth/CRM-19412

CRM-19412: Add event ID class to additional participant template

7 years agoUpdate Mailing.php
tschuettler [Mon, 26 Sep 2016 16:03:54 +0000 (18:03 +0200)]
Update Mailing.php

removed whitespace

7 years ago CRM-19413 CiviMail: Test mail notice errors: undefined index
tschuettler [Mon, 26 Sep 2016 15:55:23 +0000 (17:55 +0200)]
CRM-19413  CiviMail: Test mail notice errors: undefined index

7 years agoMerge pull request #9100 from spirit-q2/CRM-19401
colemanw [Mon, 26 Sep 2016 15:53:16 +0000 (11:53 -0400)]
Merge pull request #9100 from spirit-q2/CRM-19401

Crm 19401

7 years ago CRM-19413 - CiviMail: Test mail notice errors: undefined index
tschuettler [Mon, 26 Sep 2016 15:49:46 +0000 (17:49 +0200)]
CRM-19413 - CiviMail: Test mail notice errors: undefined index

7 years agoMerge pull request #9107 from colemanw/CRM-19405
colemanw [Mon, 26 Sep 2016 15:40:10 +0000 (11:40 -0400)]
Merge pull request #9107 from colemanw/CRM-19405

CRM-19405 - Fix custom date fields on contribution batch profiles

7 years agoMerge pull request #9113 from civicrm/4.7.12-rc
Tim Otten [Mon, 26 Sep 2016 15:02:23 +0000 (11:02 -0400)]
Merge pull request #9113 from civicrm/4.7.12-rc

4.7.12 rc

7 years agoCRM-19405 - Fix custom date fields on batch profiles
Coleman Watts [Sun, 25 Sep 2016 20:43:37 +0000 (16:43 -0400)]
CRM-19405 - Fix custom date fields on batch profiles

7 years agoCRM-19412: Add event ID class to additional participant template
JKingsnorth [Mon, 26 Sep 2016 13:44:41 +0000 (14:44 +0100)]
CRM-19412: Add event ID class to additional participant template

7 years agoMerge pull request #8850 from JMAConsulting/CRM-16189-8
Monish Deb [Mon, 26 Sep 2016 10:42:37 +0000 (16:12 +0530)]
Merge pull request #8850 from JMAConsulting/CRM-16189-8

[ready-for-core-team-review]CRM-16189 Added settings for 'Always post to Accounts Receivable'

7 years agoMerge pull request #9104 from totten/4.7.12-phpoffice
Tim Otten [Mon, 26 Sep 2016 02:25:15 +0000 (22:25 -0400)]
Merge pull request #9104 from totten/4.7.12-phpoffice

CRM-19381, CRM-19404 - Update PHP Office. Recommend PHP 5.3.23+.

7 years agoCRM-16876 Ensure that foreign countires are also capitalised when hiding country...
Seamus Lee [Mon, 26 Sep 2016 01:22:15 +0000 (11:22 +1000)]
CRM-16876 Ensure that foreign countires are also capitalised when hiding country for local mailing

7 years agoFix CRM-19408: Create extension.getremote API
Allen Shaw [Sun, 25 Sep 2016 21:42:27 +0000 (16:42 -0500)]
Fix CRM-19408: Create extension.getremote API

7 years ago--CRM-16189, minor fix to code
Pradeep Nayak [Sun, 25 Sep 2016 21:21:59 +0000 (02:51 +0530)]
--CRM-16189, minor fix to code

7 years agoCRM-16189, make static variable null once financial accounting are recorded successfully
Pradeep Nayak [Thu, 22 Sep 2016 12:20:17 +0000 (17:50 +0530)]
CRM-16189, make static variable null once financial accounting are recorded successfully

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoCRM-16189, changed the title
Pradeep Nayak [Tue, 20 Sep 2016 12:15:00 +0000 (17:45 +0530)]
CRM-16189, changed the title

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoCRM-16189, removed white spaces
Pradeep Nayak [Mon, 29 Aug 2016 13:21:58 +0000 (18:51 +0530)]
CRM-16189, removed white spaces

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoCRM-16189, added condition to create account receivable entry for completed contribution
Pradeep Nayak [Thu, 25 Aug 2016 22:07:53 +0000 (03:37 +0530)]
CRM-16189, added condition to create account receivable entry for completed contribution

----------------------------------------
* CRM-16189:
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoCRM-16189, generalized code to create account receivable entries for completed contri...
Pradeep Nayak [Thu, 25 Aug 2016 21:04:20 +0000 (02:34 +0530)]
CRM-16189, generalized code to create account receivable entries for completed contribution

----------------------------------------
* CRM-16189:
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoCRM-16189, removed white space
Pradeep Nayak [Thu, 11 Aug 2016 03:27:01 +0000 (08:57 +0530)]
CRM-16189, removed white space

----------------------------------------
* CRM-16189:
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoCRM-16189, added code to create transaction for participant
Pradeep Nayak [Thu, 11 Aug 2016 03:24:58 +0000 (08:54 +0530)]
CRM-16189, added code to create transaction for participant

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoCRM-16189, added code to create accounts receivable transaction for participant payment
Pradeep Nayak [Thu, 11 Aug 2016 03:02:36 +0000 (08:32 +0530)]
CRM-16189, added code to create accounts receivable transaction for participant payment

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoCRM-16189, (AA-44) added function to create entries for Account Receivable
Pradeep Nayak [Thu, 11 Aug 2016 02:18:47 +0000 (07:48 +0530)]
CRM-16189, (AA-44) added function to create entries for Account Receivable

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoCRM-16189 Added settings for 'Always post to Accounts Receivable'
Pradeep Nayak [Tue, 9 Aug 2016 21:05:57 +0000 (02:35 +0530)]
CRM-16189 Added settings for 'Always post to Accounts Receivable'

----------------------------------------
* CRM-16189: Improve support for Accrual Method bookkeeping
  https://issues.civicrm.org/jira/browse/CRM-16189

7 years agoFix undefined variable
Coleman Watts [Sun, 25 Sep 2016 20:43:18 +0000 (16:43 -0400)]
Fix undefined variable

7 years agoMerge pull request #9065 from seamuslee001/hide_downloaded_extensions
Tim Otten [Sun, 25 Sep 2016 02:33:03 +0000 (22:33 -0400)]
Merge pull request #9065 from seamuslee001/hide_downloaded_extensions

(NFC) ignore downloaded extensions in drupal-demo civibuild

7 years agoCRM-19404 - Re-allow installation on 5.3.4, but include warning.
Tim Otten [Sat, 24 Sep 2016 17:13:17 +0000 (13:13 -0400)]
CRM-19404 - Re-allow installation on 5.3.4, but include warning.

7 years agoCRM-19404 Set 5.3.23 as minimum php version on install
Seamus Lee [Fri, 23 Sep 2016 01:33:36 +0000 (11:33 +1000)]
CRM-19404 Set 5.3.23 as minimum php version on install

7 years agoAdd message around bare minimum php version
Seamus Lee [Thu, 22 Sep 2016 23:43:17 +0000 (09:43 +1000)]
Add message around bare minimum php version

7 years agoUpgrade phpword to be php7 compatiable
Seamus Lee [Sun, 18 Sep 2016 02:36:47 +0000 (12:36 +1000)]
Upgrade phpword to be php7 compatiable

7 years agoMerge pull request #9007 from tschuettler/patch-7
Yashodha Chaku [Fri, 23 Sep 2016 14:58:58 +0000 (20:28 +0530)]
Merge pull request #9007 from tschuettler/patch-7

CRM-19335

7 years agoMerge pull request #9090 from seamuslee001/CRM-18006
Yashodha Chaku [Fri, 23 Sep 2016 14:42:21 +0000 (20:12 +0530)]
Merge pull request #9090 from seamuslee001/CRM-18006

CRM-18006 Change temporary tables to use InnoDB engine

7 years agoCRM-19401 - more generalized solution
spirit [Fri, 23 Sep 2016 06:17:27 +0000 (09:17 +0300)]
CRM-19401 - more generalized solution

----------------------------------------
* CRM-19401: Integer list option custom fields do not render properly in reports
  https://issues.civicrm.org/jira/browse/CRM-19401

7 years agoAlter a couple of other tables to InnoDB from MyISAM
Seamus Lee [Fri, 23 Sep 2016 01:26:58 +0000 (11:26 +1000)]
Alter a couple of other tables to InnoDB from MyISAM

7 years agoCRM-19401 - Integer list option custom fields do not render properly in reports ...
spirit [Thu, 22 Sep 2016 20:29:51 +0000 (23:29 +0300)]
CRM-19401 - Integer list option custom fields do not render properly in reports - FIXED

----------------------------------------
* CRM-19401: Integer list option custom fields do not render properly in reports
  https://issues.civicrm.org/jira/browse/CRM-19401

7 years agoMerge remote-tracking branch 'civi/4.7.12-rc'
Coleman Watts [Thu, 22 Sep 2016 18:42:28 +0000 (14:42 -0400)]
Merge remote-tracking branch 'civi/4.7.12-rc'

7 years agoMerge pull request #9092 from jitendrapurohit/revertCRM-19265fix
colemanw [Thu, 22 Sep 2016 18:22:30 +0000 (14:22 -0400)]
Merge pull request #9092 from jitendrapurohit/revertCRM-19265fix

revert #8937

7 years agoMerge pull request #9096 from colemanw/CRM-19378
Monish Deb [Thu, 22 Sep 2016 16:23:18 +0000 (21:53 +0530)]
Merge pull request #9096 from colemanw/CRM-19378

CRM-19378 - Fix rendering frozen wysiwyg fields

7 years agoCRM-19378 - Fix rendering frozen wysiwyg fields
Coleman Watts [Thu, 22 Sep 2016 15:01:41 +0000 (11:01 -0400)]
CRM-19378 - Fix rendering frozen wysiwyg fields

7 years agoCRM-18157 Checkstyle
Samuel Vanhove [Thu, 22 Sep 2016 14:14:41 +0000 (10:14 -0400)]
CRM-18157 Checkstyle

7 years agoUpdate Email.tpl
tschuettler [Thu, 22 Sep 2016 12:42:16 +0000 (14:42 +0200)]
Update Email.tpl

7 years agoCRM-19402 - Include On Hold date for OptOuts in Contact Summary ...
tschuettler [Thu, 22 Sep 2016 12:35:55 +0000 (14:35 +0200)]
CRM-19402 - Include On Hold date for OptOuts in Contact Summary ...

... for muliple bulk email adresses option

7 years agorevert #8937
jitendrapurohit [Thu, 22 Sep 2016 07:46:03 +0000 (13:16 +0530)]
revert #8937

7 years agoCRM-18006 Change temporary tables to use InnoDB engine
Seamus Lee [Thu, 22 Sep 2016 06:57:30 +0000 (06:57 +0000)]
CRM-18006 Change temporary tables to use InnoDB engine

7 years agoCRM-19384 - distmaker - Publish README.md in tarballs
Tim Otten [Thu, 22 Sep 2016 04:35:33 +0000 (00:35 -0400)]
CRM-19384 - distmaker - Publish README.md in tarballs