civicrm-core.git
8 years agoFirst WIP for AJAX cleanup.
Mattias Michaux [Mon, 25 Apr 2016 15:16:49 +0000 (17:16 +0200)]
First WIP for AJAX cleanup.

8 years agoMerge pull request #8254 from eileenmcnaughton/4.7.7-rc
Tim Otten [Wed, 27 Apr 2016 20:38:12 +0000 (13:38 -0700)]
Merge pull request #8254 from eileenmcnaughton/4.7.7-rc

CRM-17984 getTree regression

8 years agoCRM-17984 - CustomGroupTest - Fix style errors
Tim Otten [Wed, 27 Apr 2016 18:52:47 +0000 (11:52 -0700)]
CRM-17984 - CustomGroupTest - Fix style errors

There were problems in this line:
 * The missing comma (required by Drupal style)
 * The use of literal CtrlA causes phpcs to produce invalid output

8 years agoFurther custom tree regression fix, where the label does not match the name the name...
eileenmcnaugton [Wed, 27 Apr 2016 08:13:41 +0000 (20:13 +1200)]
Further custom tree regression fix, where the label does not match the name the name is the key to use

8 years agoCRM-18469, CRM-17984 - getTree regression on multiple integers separated by the cnrtl...
eileenmcnaugton [Wed, 27 Apr 2016 07:37:02 +0000 (19:37 +1200)]
CRM-18469, CRM-17984 - getTree regression on multiple integers separated by the cnrtl char

8 years agoMerge pull request #8245 from colemanw/CRM-18006-b
Tim Otten [Wed, 27 Apr 2016 01:15:22 +0000 (18:15 -0700)]
Merge pull request #8245 from colemanw/CRM-18006-b

Last-minute upgrade fixes

8 years agoMerge pull request #8243 from totten/477rc-gettree-a
Eileen McNaughton [Tue, 26 Apr 2016 22:35:12 +0000 (10:35 +1200)]
Merge pull request #8243 from totten/477rc-gettree-a

CRM-18469, CRM-17984 - getTree - No more pass by reference

8 years agoCRM-16846 - Fix missing upgrade steps
Coleman Watts [Tue, 26 Apr 2016 20:58:21 +0000 (16:58 -0400)]
CRM-16846 - Fix missing upgrade steps

8 years agoMerge pull request #8232 from eileenmcnaughton/4.7.7-rc
Tim Otten [Tue, 26 Apr 2016 20:29:28 +0000 (13:29 -0700)]
Merge pull request #8232 from eileenmcnaughton/4.7.7-rc

CRM-18193 logging schema: fix mismatch between comment & code convention

8 years agoCRM-18006 - civicrm_install_canary - Ensure ENGINE is InnoDB
Tim Otten [Mon, 25 Apr 2016 23:13:07 +0000 (16:13 -0700)]
CRM-18006 - civicrm_install_canary - Ensure ENGINE is InnoDB

This should resolve warnings on systems where MyISAM was default engine.

8 years agoCRM-18006 - Specify db engine for civicrm_install_canary table
Coleman Watts [Sat, 23 Apr 2016 19:12:30 +0000 (15:12 -0400)]
CRM-18006 - Specify db engine for civicrm_install_canary table

8 years agoCRM-18469, CRM-17984 - getTree - No more pass by reference
Tim Otten [Tue, 26 Apr 2016 19:24:21 +0000 (12:24 -0700)]
CRM-18469, CRM-17984 - getTree - No more pass by reference

8 years agoCRM-18193 logging schema: fix mismatch between comment & code convention
eileen [Mon, 25 Apr 2016 22:36:43 +0000 (10:36 +1200)]
CRM-18193 logging schema: fix mismatch between comment & code convention

Comment suggests 'c_' to identify a non-CRM connection + timestamp to the hour + connection_id but code used 'con_'

I think the shorter version in comment is better as there is more real information space

8 years agoMerge pull request #8049 from eileenmcnaughton/revert-api
Tim Otten [Sat, 23 Apr 2016 05:42:22 +0000 (22:42 -0700)]
Merge pull request #8049 from eileenmcnaughton/revert-api

CRM-18332 - Logging.revert API

8 years agoCRM-18193 add default log_conn values for when interacting with mysql outside of...
Eileen [Sat, 23 Apr 2016 04:32:26 +0000 (04:32 +0000)]
CRM-18193 add default log_conn values for when interacting with mysql outside of CiviCRM.

In this instand @uniqueID will not be set. We had a go at setting it within the trigger but that was unreliable. Eventual decision was a string 'con_' to identify a system connection + a timestamp to hourly granularity + the connection id. Proposed further work is to specifically block the revert from the UI for these and add a higher permission or a 'yes I really really mean it' param to the revert api for these

8 years agoMerge pull request #8216 from totten/xurizaemon-CRM-17983
Tim Otten [Sat, 23 Apr 2016 04:33:39 +0000 (21:33 -0700)]
Merge pull request #8216 from totten/xurizaemon-CRM-17983

 CRM-17983 - Improve params for getContactRelationships

8 years agoCRM-17983, CRM-18401 - Swap loose/strict escaping
Tim Otten [Sat, 23 Apr 2016 03:55:38 +0000 (20:55 -0700)]
CRM-17983, CRM-18401 - Swap loose/strict escaping

The old names suggested that loose checking (`MysqlColumnName`) should be
the norm, and strict checking (`MysqlColumnNameStrict`) the exception.
Rather, strict should be the norm.

This also has a functional affect switching the new
`defaultSortAndPagerParams()` to use strict behavior.

8 years agoCRM-18193 - CRM_Logging_Differ - Improve interval checking
Tim Otten [Fri, 22 Apr 2016 22:12:49 +0000 (15:12 -0700)]
CRM-18193 - CRM_Logging_Differ - Improve interval checking

a.  This validates the interval in the constructor.  Previously, there were
two different functions which consumed the interval, but only one of them
validated.

b.  My brain does not understand what it means to addslashes for an interval
expression. This validation is based on the docs from mysql.com.

8 years agoSanitise ->interval
eileenmcnaugton [Fri, 22 Apr 2016 08:42:08 +0000 (20:42 +1200)]
Sanitise ->interval

8 years agoSpec function for revert
eileenmcnaugton [Fri, 22 Apr 2016 08:28:39 +0000 (20:28 +1200)]
Spec function for revert

8 years agoLogging schema update, fix connection_id
eileenmcnaugton [Fri, 22 Apr 2016 05:54:14 +0000 (17:54 +1200)]
Logging schema update, fix connection_id

8 years agoTest fix - test was relying on running slowly enough for the second to increment...
eileen [Wed, 13 Apr 2016 08:43:50 +0000 (20:43 +1200)]
Test fix - test was relying on running slowly enough for the second to increment. Use longer gap

8 years agofixes for tests when they run in suite, cache clearing etc
eileen [Wed, 13 Apr 2016 07:52:35 +0000 (19:52 +1200)]
fixes for tests when they run in suite, cache clearing etc

8 years agoCRM-18404 Rebuild triggers not including all tables
eileen [Wed, 13 Apr 2016 04:40:07 +0000 (16:40 +1200)]
CRM-18404 Rebuild triggers not including all tables

This is an alternate fix to the one proposed here https://github.com/civicrm/civicrm-core/pull/8017 - the test part of itis leveraging tests in the revert-api PR so I have added it into the PR

8 years agoCRM-18214 Add link to detail report for contact merge activities, with oid if applicable
eileen [Thu, 7 Apr 2016 04:38:18 +0000 (16:38 +1200)]
CRM-18214 Add link to detail report for contact merge activities, with oid if applicable

After merging all my other changes the only thing needed for the dedupe merge report was it to be linked from the summary report and
to redirect after merge to the comparison of the 2 contacts, covered in this commit

8 years agoCRM-18215 Fix grouping so that Merge activities are not sometimes lost
eileen [Thu, 7 Apr 2016 04:35:32 +0000 (16:35 +1200)]
CRM-18215 Fix grouping so that Merge activities are not sometimes lost

Change-Id: I729703c51768955b02e8d85c1297fdf10c90cbe1

8 years agoCRM-18193 do not pass log_date_id to detail report if the log_conn_id is sufficient
eileen [Thu, 7 Apr 2016 04:29:02 +0000 (16:29 +1200)]
CRM-18193 do not pass log_date_id to detail report if the log_conn_id is sufficient

Prior to CRM-18193 the connection was estimated using the a log_date_range + log_conn_id. After CRM-18193 the connection_id is unique
and the log_date is not required (and could make the result less accurate

Change-Id: I72c8cf254720654003154702b45e7f0a0b8aabe5

8 years agoCRM-18193 do not require log_date
eileen [Wed, 6 Apr 2016 23:18:36 +0000 (11:18 +1200)]
CRM-18193 do not require log_date

Log_date should be an optional report parameter reflecting the changes in CRM-18193 to make the connection_id unique

8 years agoCRM-18366 Fix contact logging detail to show all related changes & revert all related...
eileen [Wed, 6 Apr 2016 07:51:37 +0000 (19:51 +1200)]
CRM-18366 Fix contact logging detail to show all related changes & revert all related changes

This report switches from a hard-coded list of contact related tables to considering all tables with an FK to civicrm_contact, including entity_tag
group_subscription, batch, financial_item etc. The revert makes the same switch.

Note that with this change a full subset may still not be retrieved - in order to get that you need to enable the changes from CRM-18193 & apply all patches related to that issue (one will build on this)

8 years agoCRM-18193 remove arbitrary setting of log_date when not provided.
eileen [Wed, 6 Apr 2016 02:23:38 +0000 (14:23 +1200)]
CRM-18193 remove arbitrary setting of log_date when not provided.

In order to be able to ignore the log_conn_date where it is not relevant the logging detail reports need to stop making up a log_conn_date where one is not provided. The code that does that was part of the inital report commit and on removing it I could not replicate any issues - ie. accessing the detail reports without criteria worked fine

8 years agoCRM-18193 Make log_date optional for revert / retrieving changes where uniqueID is...
eileen [Tue, 5 Apr 2016 22:26:48 +0000 (10:26 +1200)]
CRM-18193 Make log_date optional for revert / retrieving changes where uniqueID is in play

8 years agoCRM-18360 Expose logging data through GET api
eileen [Tue, 5 Apr 2016 22:26:48 +0000 (10:26 +1200)]
CRM-18360 Expose logging data through GET api

8 years agoCRM-18332 add first cut of api for revert actions
eileen [Thu, 31 Mar 2016 08:18:50 +0000 (21:18 +1300)]
CRM-18332 add first cut of api for revert actions

Later I expect to add more parameters & deal with situation when log_date is not passed

8 years agoUpdate api call, group param is deprecated
Eileen McNaughton [Wed, 30 Mar 2016 08:09:56 +0000 (21:09 +1300)]
Update api call, group param is deprecated

8 years agoCRM-18193 add routine for converting log tables to support new log_conn_id format...
eileen [Wed, 16 Mar 2016 17:38:27 +0000 (06:38 +1300)]
CRM-18193 add routine for converting log tables to support new log_conn_id format & hook spec

i

8 years agoCRM-18193 create all new log tables with log_conn_id = varchar(17)
eileen [Tue, 15 Mar 2016 22:57:23 +0000 (11:57 +1300)]
CRM-18193 create all new log tables with log_conn_id = varchar(17)

This provides support for the unique id rather than the non-unique connection id

Change-Id: Ia2ce2f1854d1f6f90095585dbb3924f704be38b5

8 years agoCRM-18193 adapt reports to expect a 17 char string rather than 24 char varchar for...
eileen [Tue, 15 Mar 2016 02:32:22 +0000 (15:32 +1300)]
CRM-18193 adapt reports to expect a 17 char string rather than 24 char varchar for log_conn_id

This is in anticipation of us converting to unique IDs for these fields

8 years agoMerge pull request #8215 from colemanw/CRM-17985
colemanw [Sat, 23 Apr 2016 03:33:09 +0000 (23:33 -0400)]
Merge pull request #8215 from colemanw/CRM-17985

CRM-17985 - Fix javascript error

8 years agoCRM-17985 - Fix javascript error
Coleman Watts [Sat, 23 Apr 2016 03:29:47 +0000 (23:29 -0400)]
CRM-17985 - Fix javascript error

8 years agoMerge pull request #8205 from eileenmcnaughton/break_fix
Tim Otten [Sat, 23 Apr 2016 01:38:19 +0000 (18:38 -0700)]
Merge pull request #8205 from eileenmcnaughton/break_fix

(Followup) CRM-17984 - Regression in getTree()

8 years agoCRM-17984 - CRM_Core_BAO_CustomGroup - Extract whereListHas()
Tim Otten [Sat, 23 Apr 2016 00:19:07 +0000 (17:19 -0700)]
CRM-17984 - CRM_Core_BAO_CustomGroup - Extract whereListHas()

This seems to have been a rather fiddly bit of SQL that was duplicated in the past.

8 years agoMerge pull request #8210 from JKingsnorth/patch-6
Eileen McNaughton [Fri, 22 Apr 2016 19:45:31 +0000 (07:45 +1200)]
Merge pull request #8210 from JKingsnorth/patch-6

(NFC) ActivityTest minor tidy

8 years agoMerge pull request #8209 from jitendrapurohit/webtest
Monish Deb [Fri, 22 Apr 2016 14:02:00 +0000 (19:32 +0530)]
Merge pull request #8209 from jitendrapurohit/webtest

CRM-18454: webtest fixes

8 years agoMerge pull request #8208 from rohankatkar/WebtestFixes-master
Monish Deb [Fri, 22 Apr 2016 13:47:33 +0000 (19:17 +0530)]
Merge pull request #8208 from rohankatkar/WebtestFixes-master

Webtests Fixes: CRM-18454

8 years agoMerge pull request #8207 from rohankatkar/CRM-18050-webtest
Monish Deb [Fri, 22 Apr 2016 13:46:42 +0000 (19:16 +0530)]
Merge pull request #8207 from rohankatkar/CRM-18050-webtest

CRM-18050: Webtest

8 years agoActivityTest minor tidy (NFC)
John Kingsnorth [Fri, 22 Apr 2016 13:34:19 +0000 (14:34 +0100)]
ActivityTest minor tidy (NFC)

8 years agoWebtests Fixes
Web Access [Fri, 22 Apr 2016 13:10:32 +0000 (18:40 +0530)]
Webtests Fixes

8 years agoCRM-18454: webtest fixes
jitendrapurohit [Fri, 22 Apr 2016 13:08:31 +0000 (18:38 +0530)]
CRM-18454: webtest fixes

8 years agoCRM-18050: Webtest
Web Access [Fri, 22 Apr 2016 13:04:37 +0000 (18:34 +0530)]
CRM-18050: Webtest

8 years agoFix Strict warning discovered in testing
Eileen [Fri, 22 Apr 2016 09:24:48 +0000 (09:24 +0000)]
Fix Strict warning discovered in testing

8 years agoCRM-5507 CRM-17984 fix regression when subType var is not leaking
Eileen [Fri, 22 Apr 2016 09:01:41 +0000 (09:01 +0000)]
CRM-5507 CRM-17984 fix regression when subType var is not leaking

8 years agoFix the RC regrsision
Eileen [Fri, 22 Apr 2016 06:24:31 +0000 (06:24 +0000)]
Fix the RC regrsision

8 years agoCRM-17984 test to demonstrate breakage
Eileen [Fri, 22 Apr 2016 06:10:44 +0000 (06:10 +0000)]
CRM-17984 test to demonstrate breakage

8 years agoCRM-17983, CRM-18401. Input validation.
Chris Burgess [Fri, 22 Apr 2016 05:48:37 +0000 (17:48 +1200)]
CRM-17983, CRM-18401. Input validation.

8 years agoMerge pull request #8187 from kenwest/CRM-18275
Monish Deb [Fri, 22 Apr 2016 05:37:26 +0000 (11:07 +0530)]
Merge pull request #8187 from kenwest/CRM-18275

CRM-18275 sort contact's Activity list by descending date order

8 years agoMinimal check to validate relationship params.
Mattias Michaux [Wed, 20 Apr 2016 22:44:27 +0000 (00:44 +0200)]
Minimal check to validate relationship params.

8 years agoMerge pull request #8197 from jitendrapurohit/webtest
Yashodha Chaku [Fri, 22 Apr 2016 04:49:32 +0000 (10:19 +0530)]
Merge pull request #8197 from jitendrapurohit/webtest

CRM-18454: webtest fixes

8 years agoMerge pull request #8034 from eileenmcnaughton/CRM-18310
Tim Otten [Fri, 22 Apr 2016 02:59:01 +0000 (19:59 -0700)]
Merge pull request #8034 from eileenmcnaughton/CRM-18310

CRM-18310 add tests for debug logging and fix test-identified error

8 years agoMerge pull request #7988 from eileenmcnaughton/CRM-18193
Tim Otten [Fri, 22 Apr 2016 02:44:24 +0000 (19:44 -0700)]
Merge pull request #7988 from eileenmcnaughton/CRM-18193

CRM-18193, CRM-18104, CRM-18180 logging definition enhancements

8 years agoCRM-18275 make consistent with CRM-18173
Ken West [Fri, 22 Apr 2016 01:52:19 +0000 (11:52 +1000)]
CRM-18275 make consistent with CRM-18173

8 years agoAdd tests for logging functionality to ensure the tables are still creating well
eileen [Wed, 9 Mar 2016 03:37:34 +0000 (16:37 +1300)]
Add tests for logging functionality to ensure the tables are still creating well

Change-Id: I6ef4d48d16e25d232b0f46e7ce3cf5d569e7053c

8 years agoCRM-18180 allow non-standard table names in logging reports
eileen [Tue, 8 Mar 2016 00:31:44 +0000 (13:31 +1300)]
CRM-18180 allow non-standard table names in logging reports

8 years agoCRM-18104 Hook for hook for defining log tables.
eileenmcnaugton [Wed, 24 Feb 2016 23:34:15 +0000 (12:34 +1300)]
CRM-18104 Hook for hook for defining log tables.

Allows defining ENGINE and any indexes

8 years agoMerge pull request #8199 from colemanw/CRM-18456
colemanw [Thu, 21 Apr 2016 21:53:27 +0000 (17:53 -0400)]
Merge pull request #8199 from colemanw/CRM-18456

CRM-18456 - Catch api case permission exceptions

8 years agoMerge pull request #8048 from eileenmcnaughton/revert
Tim Otten [Thu, 21 Apr 2016 21:49:46 +0000 (14:49 -0700)]
Merge pull request #8048 from eileenmcnaughton/revert

CRM-18332 - Logging report - Extract methods storeDB() & revert()

8 years agoCRM-18456 - Catch api case permission exceptions
Coleman Watts [Thu, 21 Apr 2016 19:06:30 +0000 (15:06 -0400)]
CRM-18456 - Catch api case permission exceptions

8 years agoCRM-18454: webtest fixes
jitendrapurohit [Thu, 21 Apr 2016 13:24:18 +0000 (18:54 +0530)]
CRM-18454: webtest fixes

8 years agoMerge pull request #8185 from yashodha/CRM-18438
Monish Deb [Thu, 21 Apr 2016 11:21:15 +0000 (16:51 +0530)]
Merge pull request #8185 from yashodha/CRM-18438

CRM-18438: fix currency for payment info

8 years agoMerge pull request #8184 from rohankatkar/Webtest-CRM-18438
Monish Deb [Thu, 21 Apr 2016 10:06:07 +0000 (15:36 +0530)]
Merge pull request #8184 from rohankatkar/Webtest-CRM-18438

Webtest for CRM-18438

8 years agoMerge pull request #8194 from rohankatkar/CRM-18421-QA-Fix
Monish Deb [Thu, 21 Apr 2016 09:22:23 +0000 (14:52 +0530)]
Merge pull request #8194 from rohankatkar/CRM-18421-QA-Fix

CRM-18421: QA warning fix

8 years agoCRM-18421: QA warning fix
Web Access [Thu, 21 Apr 2016 06:18:40 +0000 (11:48 +0530)]
CRM-18421: QA warning fix

8 years agoMerge pull request #8149 from JKingsnorth/CRM-18421
Monish Deb [Thu, 21 Apr 2016 06:09:18 +0000 (11:39 +0530)]
Merge pull request #8149 from JKingsnorth/CRM-18421

CRM-18421: Fix getContactMailings() notice

8 years agoMerge pull request #8182 from jitendrapurohit/CRM-18434
Monish Deb [Thu, 21 Apr 2016 06:03:56 +0000 (11:33 +0530)]
Merge pull request #8182 from jitendrapurohit/CRM-18434

CRM-18434 - First and last names for billing not displayed in confirm…

8 years agoCRM-18310 add tests for debug logging, fix caching error
eileen [Tue, 29 Mar 2016 04:28:32 +0000 (17:28 +1300)]
CRM-18310 add tests for debug logging, fix caching error

8 years agoCRM-18332 - Logging report - Extract methods storeDB() & revert()
eileen [Thu, 31 Mar 2016 04:32:04 +0000 (17:32 +1300)]
CRM-18332 - Logging report - Extract methods storeDB() & revert()

8 years agoMerge pull request #8193 from colemanw/scardinius-issue-CRM-16911
colemanw [Wed, 20 Apr 2016 20:00:25 +0000 (16:00 -0400)]
Merge pull request #8193 from colemanw/scardinius-issue-CRM-16911

CiviMail: distinct events in API Mailing stats

8 years agoCRM-16911 - Add title to api field
Coleman Watts [Wed, 20 Apr 2016 19:21:40 +0000 (15:21 -0400)]
CRM-16911 - Add title to api field

----------------------------------------
* CRM-16911: AB reporting takes the total number of open instead of the unique
  https://issues.civicrm.org/jira/browse/CRM-16911

8 years agoMerge pull request #8191 from jitendrapurohit/webtest
Monish Deb [Wed, 20 Apr 2016 18:13:57 +0000 (23:43 +0530)]
Merge pull request #8191 from jitendrapurohit/webtest

webtest fixes

8 years agoMerge pull request #8127 from lcdservices/CRM-18402
colemanw [Wed, 20 Apr 2016 17:33:38 +0000 (13:33 -0400)]
Merge pull request #8127 from lcdservices/CRM-18402

CRM-18402 ensure admin statuses are not used

8 years agoMerge pull request #8186 from kenwest/CRM-18445
colemanw [Wed, 20 Apr 2016 16:01:57 +0000 (12:01 -0400)]
Merge pull request #8186 from kenwest/CRM-18445

CRM-18445 don't 'Assign Case Role' to client

8 years agoMerge pull request #8188 from kenwest/CRM-18447
colemanw [Wed, 20 Apr 2016 15:25:19 +0000 (11:25 -0400)]
Merge pull request #8188 from kenwest/CRM-18447

CRM-18447 Can't create Survey if Events have 'is required' custom data

8 years agowebtest fixes
jitendrapurohit [Wed, 20 Apr 2016 13:22:48 +0000 (18:52 +0530)]
webtest fixes

8 years agoCRM-18438: Webtest
Web Access [Wed, 20 Apr 2016 09:56:58 +0000 (15:26 +0530)]
CRM-18438: Webtest

Minor changes

Warning fix

8 years agoCRM-18447 Cannot create Survey when Events have 'is required' custom data
Ken West [Wed, 20 Apr 2016 11:58:06 +0000 (21:58 +1000)]
CRM-18447 Cannot create Survey when Events have 'is required' custom data

8 years agoCRM-18275 sort contact's Activity list by descending date order
Ken West [Wed, 20 Apr 2016 11:37:47 +0000 (21:37 +1000)]
CRM-18275 sort contact's Activity list by descending date order

8 years agoextend webtest to check CRM-18434
jitendrapurohit [Wed, 20 Apr 2016 11:31:14 +0000 (17:01 +0530)]
extend webtest to check CRM-18434

8 years agoCRM-18445 don't 'Assign Case Role' to client
Ken West [Wed, 20 Apr 2016 11:19:03 +0000 (21:19 +1000)]
CRM-18445 don't 'Assign Case Role' to client

8 years agoCRM-18438: fix currency for payment info
yashodha [Wed, 20 Apr 2016 10:26:48 +0000 (15:56 +0530)]
CRM-18438: fix currency for payment info

----------------------------------------
* CRM-18438: Default currency shown in contribution selector
  https://issues.civicrm.org/jira/browse/CRM-18438

8 years agoMerge pull request #8175 from yashodha/CRM-18438
Monish Deb [Wed, 20 Apr 2016 10:08:04 +0000 (15:38 +0530)]
Merge pull request #8175 from yashodha/CRM-18438

CRM-18438: Default currency shown in contribution selector

8 years agoCRM-18434 - First and last names for billing not displayed in confirmation screen
jitendrapurohit [Wed, 20 Apr 2016 08:56:07 +0000 (14:26 +0530)]
CRM-18434 - First and last names for billing not displayed in confirmation screen

8 years agoMerge pull request #8174 from jitendrapurohit/CRM-18420
Monish Deb [Wed, 20 Apr 2016 06:22:56 +0000 (11:52 +0530)]
Merge pull request #8174 from jitendrapurohit/CRM-18420

CRM-18420 : Details field of a scheduled reminder contains raw HTML

8 years agoMerge pull request #8171 from totten/master-trigger-log2
Eileen McNaughton [Wed, 20 Apr 2016 00:50:00 +0000 (12:50 +1200)]
Merge pull request #8171 from totten/master-trigger-log2

CRM-18212 - Allow triggers to be managed offline

8 years agoMerge pull request #8178 from monishdeb/CRM-18436
Monish Deb [Tue, 19 Apr 2016 19:45:12 +0000 (01:15 +0530)]
Merge pull request #8178 from monishdeb/CRM-18436

CRM-18436: Non-mandatory custom rich text fields are mandatory in advanced search

8 years agoCRM-18436: Non-mandatory custom rich text fields are mandatory in advanced search
deb.monish [Tue, 19 Apr 2016 19:09:35 +0000 (00:39 +0530)]
CRM-18436: Non-mandatory custom rich text fields are mandatory in advanced search

8 years agoCRM-18438: Default currency shown in contribution selector
yashodha [Tue, 19 Apr 2016 13:31:41 +0000 (19:01 +0530)]
CRM-18438: Default currency shown in contribution selector

----------------------------------------
* CRM-18438: Default currency shown in contribution selector
  https://issues.civicrm.org/jira/browse/CRM-18438

8 years agoCRM-18420 : Details field of a scheduled reminder contains raw HTML
jitendrapurohit [Tue, 19 Apr 2016 12:51:18 +0000 (18:21 +0530)]
CRM-18420 : Details field of a scheduled reminder contains raw HTML

8 years agoOrnery test fix - more flushing of statics (#8172)
Eileen McNaughton [Tue, 19 Apr 2016 09:23:29 +0000 (21:23 +1200)]
Ornery test fix - more flushing of statics (#8172)

8 years agoMerge pull request #8161 from eileenmcnaughton/CRM-18303-follow-up
Monish Deb [Tue, 19 Apr 2016 06:49:05 +0000 (12:19 +0530)]
Merge pull request #8161 from eileenmcnaughton/CRM-18303-follow-up

CRM-18303 follow up fix

8 years agoMerge pull request #8164 from jitendrapurohit/CRM-18411
Monish Deb [Tue, 19 Apr 2016 06:23:48 +0000 (11:53 +0530)]
Merge pull request #8164 from jitendrapurohit/CRM-18411

CRM-18411 fix for missing argument

8 years agoCRM-18411 fix for missing argument
Stephen Palmstrom [Mon, 18 Apr 2016 09:17:36 +0000 (14:47 +0530)]
CRM-18411 fix for missing argument