Monish Deb [Wed, 4 May 2016 06:53:52 +0000 (12:23 +0530)]
Merge pull request #8278 from jitendrapurohit/CRM-18472
CRM-18472 - Notice Fixes
Monish Deb [Wed, 4 May 2016 06:44:55 +0000 (12:14 +0530)]
Merge pull request #8044 from JKingsnorth/CRM-18320
CRM-18320: Fix URLs with ampersands in CiviMail
Monish Deb [Tue, 3 May 2016 13:29:11 +0000 (18:59 +0530)]
Merge pull request #8287 from monishdeb/CRM-18476
CRM-18476: Invalid argument supplied for foreach() in CRM_Extension_Browser->_discoverRemote()
Yashodha Chaku [Tue, 3 May 2016 10:01:53 +0000 (15:31 +0530)]
Merge pull request #8285 from eileenmcnaughton/remove_fn
CRM-18491 Remove unused function CRM_Core_Report::dateDisplay
deb.monish [Tue, 3 May 2016 09:15:52 +0000 (14:45 +0530)]
CRM-18476: Invalid argument supplied for foreach() in CRM_Extension_Browser->_discoverRemote()
Monish Deb [Tue, 3 May 2016 05:39:22 +0000 (11:09 +0530)]
Merge pull request #8276 from jitendrapurohit/CRM-18487
CRM-18487 - max date should be the last date of the year
eileen [Tue, 3 May 2016 05:22:30 +0000 (17:22 +1200)]
CRM-18491 Remove unused function CRM_Core_Report::dateDisplay
Monish Deb [Tue, 3 May 2016 05:11:51 +0000 (10:41 +0530)]
Merge pull request #8274 from jitendrapurohit/webtestfixes
CRM-18454 - pass proper id for datepicker of core and custom field
Monish Deb [Tue, 3 May 2016 05:04:58 +0000 (10:34 +0530)]
Merge pull request #8279 from rohankatkar/CRM-18484-webtest
CRM-18484: Webtest
colemanw [Tue, 3 May 2016 03:28:30 +0000 (23:28 -0400)]
Merge pull request #8280 from lcdservices/CRM-18489
CRM-18489 suppress billing block if waitlist
Brian Shaughnessy [Mon, 2 May 2016 15:11:11 +0000 (11:11 -0400)]
CRM-18489 suppress billing block if waitlist
Web Access [Mon, 2 May 2016 13:18:14 +0000 (18:48 +0530)]
Webtest-CRM-18484
jitendrapurohit [Mon, 2 May 2016 12:06:54 +0000 (17:36 +0530)]
CRM-18472 - Notice Fixes
Yashodha Chaku [Mon, 2 May 2016 09:50:20 +0000 (15:20 +0530)]
Merge pull request #8267 from yashodha/CRM-18484
CRM-18484 : Error thrown in Reports if one of the params for in betwe…
jitendrapurohit [Mon, 2 May 2016 06:19:03 +0000 (11:49 +0530)]
CRM-18454 - pass proper id for datepicker of core and custom field
Fix id of custom date field
jitendrapurohit [Mon, 2 May 2016 09:02:33 +0000 (14:32 +0530)]
CRM-18487 - max date should be the last date of the year
Monish Deb [Fri, 29 Apr 2016 17:53:38 +0000 (23:23 +0530)]
Merge pull request #8271 from rohankatkar/Webtests
CRM-18454: WebTest fixes
Monish Deb [Fri, 29 Apr 2016 17:52:30 +0000 (23:22 +0530)]
Merge pull request #8272 from jitendrapurohit/webtestfixes
CRM-18454 - webtest fixes
jitendrapurohit [Fri, 29 Apr 2016 13:30:59 +0000 (19:00 +0530)]
CRM-18454 - webtest fixes
Web Access [Fri, 29 Apr 2016 13:16:03 +0000 (18:46 +0530)]
Test fixes
Webtests fixes
Yashodha Chaku [Fri, 29 Apr 2016 12:51:19 +0000 (18:21 +0530)]
Merge pull request #8268 from jitendrapurohit/CRM-18289
CRM-18289 - Generated data
jitendrapurohit [Fri, 29 Apr 2016 10:34:09 +0000 (16:04 +0530)]
CRM-18289 - Generated data
yashodha [Fri, 29 Apr 2016 08:55:41 +0000 (14:25 +0530)]
CRM-18484 : Error thrown in Reports if one of the params for in between filter is NULL
----------------------------------------
* CRM-18484: Error thrown in Reports if one of the params for in between filter is NULL
https://issues.civicrm.org/jira/browse/CRM-18484
Yashodha Chaku [Fri, 29 Apr 2016 08:33:31 +0000 (14:03 +0530)]
Merge pull request #8211 from KarinG/CRM-18463
CRM-18463 - Not in between filter - not working properly.
Monish Deb [Fri, 29 Apr 2016 07:16:36 +0000 (12:46 +0530)]
Merge pull request #8255 from jitendrapurohit/CRM-18472
CRM-18472: Warning fix on search builder and notice fix
Monish Deb [Thu, 28 Apr 2016 16:39:15 +0000 (22:09 +0530)]
Merge pull request #8237 from monishdeb/CRM-18457
CRM-18457: Error on report form strlen() expects parameter 1 to be string
Yashodha Chaku [Thu, 28 Apr 2016 12:24:20 +0000 (17:54 +0530)]
Merge pull request #8224 from yashodha/CRM-18450
CRM-18450 : dmaster notice error
Yashodha Chaku [Thu, 28 Apr 2016 12:21:27 +0000 (17:51 +0530)]
Merge pull request #8253 from yashodha/CRM-18472
CRM-18472 : Notice fixes
Yashodha Chaku [Thu, 28 Apr 2016 12:17:52 +0000 (17:47 +0530)]
Merge pull request #8202 from agileware/master-crm-18356
CRM-18356: Fix incorrect logic Activity Report has when excluding NUL…
Yashodha Chaku [Thu, 28 Apr 2016 08:47:54 +0000 (14:17 +0530)]
Merge pull request #8206 from yashodha/fix.CRM-17893
CRM-17893: Cannot import custom field type Country
Monish Deb [Wed, 27 Apr 2016 17:23:24 +0000 (22:53 +0530)]
Merge pull request #8256 from jitendrapurohit/webtest
CRM-18454: webtest fixes
Monish Deb [Wed, 27 Apr 2016 17:23:11 +0000 (22:53 +0530)]
Merge pull request #8257 from rohankatkar/tests-fix-master
Webtests fixes: CRM-18454
jitendrapurohit [Wed, 27 Apr 2016 13:17:39 +0000 (18:47 +0530)]
CRM-18454: webtest fixes
CRM-18454: webtest fixes
Web Access [Wed, 27 Apr 2016 13:20:55 +0000 (18:50 +0530)]
Webtests fixes - CRM:18454
jitendrapurohit [Wed, 27 Apr 2016 09:59:27 +0000 (15:29 +0530)]
CRM-18472: Warning fix on search builder and notice fix
Monish Deb [Wed, 27 Apr 2016 09:11:12 +0000 (14:41 +0530)]
Merge pull request #8239 from jitendrapurohit/CRM-18471
CRM-18471: format money custom field
yashodha [Wed, 27 Apr 2016 07:55:48 +0000 (13:25 +0530)]
CRM-18472 : Notice fixes
----------------------------------------
* CRM-18472: Notice fixes
https://issues.civicrm.org/jira/browse/CRM-18472
jitendrapurohit [Tue, 26 Apr 2016 13:13:01 +0000 (18:43 +0530)]
CRM-18471: format money custom field
additional fixes
minor fixes
minor fix
deb.monish [Tue, 26 Apr 2016 11:53:58 +0000 (17:23 +0530)]
CRM-18457: Error on report form strlen() expects parameter 1 to be string
Tim Otten [Tue, 26 Apr 2016 22:47:22 +0000 (15:47 -0700)]
Merge pull request #8246 from PalanteJon/contributor-fix
[NFC] CONTRIBUTORS.txt fix
Tim Otten [Tue, 26 Apr 2016 21:56:34 +0000 (14:56 -0700)]
Merge pull request #8244 from civicrm/totten-patch-1
(NFC) Update CONTRIBUTING.md
Jon goldberg [Tue, 26 Apr 2016 21:34:02 +0000 (17:34 -0400)]
CONTRIBUTORS.txt fix
Tim Otten [Tue, 26 Apr 2016 20:12:38 +0000 (13:12 -0700)]
Update CONTRIBUTING.md
Monish Deb [Tue, 26 Apr 2016 16:48:22 +0000 (22:18 +0530)]
Merge pull request #8240 from jitendrapurohit/webtest
CRM-18454: webtest fixes
Monish Deb [Tue, 26 Apr 2016 16:46:52 +0000 (22:16 +0530)]
Merge pull request #8241 from rohankatkar/fix-webtests-master
Webtests fix: CRM-18454
Monish Deb [Tue, 26 Apr 2016 16:41:59 +0000 (22:11 +0530)]
Merge pull request #8198 from sqweets/megsss-case
CRM-18459 - Case activity emails not sent to any added Case Resources
Web Access [Tue, 26 Apr 2016 13:25:43 +0000 (18:55 +0530)]
Webtests fix: CRM-18454
jitendrapurohit [Tue, 26 Apr 2016 13:19:18 +0000 (18:49 +0530)]
CRM-18454: webtest fixes
CRM-18454: webtest fixes
Monish Deb [Tue, 26 Apr 2016 07:57:34 +0000 (13:27 +0530)]
Merge pull request #8226 from jitendrapurohit/CRM-18000
CRM-18000: Membership Batch Data Entry: Renewal not working
Monish Deb [Tue, 26 Apr 2016 07:51:39 +0000 (13:21 +0530)]
Merge pull request #8228 from jitendrapurohit/CRM-18035
CRM-18035: Deleting file / attachment causes Undefined index: tag_id …
Tim Otten [Mon, 25 Apr 2016 22:56:04 +0000 (15:56 -0700)]
Merge pull request #8231 from totten/master-478
Set version to 4.7.8. Add `set-version.php` script.
Tim Otten [Mon, 25 Apr 2016 22:17:02 +0000 (15:17 -0700)]
Set version to 4.7.8
Tim Otten [Mon, 25 Apr 2016 22:14:00 +0000 (15:14 -0700)]
tools/bin/scripts/set-version.php - Add helper script
This is similar to the function `do_update` in `releaser`, except that :
* It it doesn't care if you use the `$workdir/$version/export` directory structure or something else
* It it doesn't care if you push directly to the canonical repo or use a pull-request
jitendrapurohit [Mon, 25 Apr 2016 11:30:36 +0000 (17:00 +0530)]
CRM-18035: Deleting file / attachment causes Undefined index: tag_id in CRM_Core_BAO_EntityTag::del()
jitendrapurohit [Mon, 25 Apr 2016 11:20:32 +0000 (16:50 +0530)]
CRM-18000: Membership Batch Data Entry: Renewal not working
minor fix
yashodha [Mon, 25 Apr 2016 06:51:15 +0000 (12:21 +0530)]
CRM-18450 : dmaster notice error
----------------------------------------
* CRM-18450: dmaster notice error
https://issues.civicrm.org/jira/browse/CRM-18450
colemanw [Sat, 23 Apr 2016 18:23:04 +0000 (14:23 -0400)]
Merge pull request #8217 from colemanw/role
Fix event Default Role label
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
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
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
Coleman Watts [Sat, 23 Apr 2016 04:20:16 +0000 (00:20 -0400)]
Fix event Default Role label
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.
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.
eileenmcnaugton [Fri, 22 Apr 2016 08:42:08 +0000 (20:42 +1200)]
Sanitise ->interval
eileenmcnaugton [Fri, 22 Apr 2016 08:28:39 +0000 (20:28 +1200)]
Spec function for revert
eileenmcnaugton [Fri, 22 Apr 2016 05:54:14 +0000 (17:54 +1200)]
Logging schema update, fix connection_id
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
eileen [Wed, 13 Apr 2016 07:52:35 +0000 (19:52 +1200)]
fixes for tests when they run in suite, cache clearing etc
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
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
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
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
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
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)
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
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
eileen [Tue, 5 Apr 2016 22:26:48 +0000 (10:26 +1200)]
CRM-18360 Expose logging data through GET api
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
Eileen McNaughton [Wed, 30 Mar 2016 08:09:56 +0000 (21:09 +1300)]
Update api call, group param is deprecated
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
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
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
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
Coleman Watts [Sat, 23 Apr 2016 03:29:47 +0000 (23:29 -0400)]
CRM-17985 - Fix javascript error
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()
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.
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
KarinG [Fri, 22 Apr 2016 15:12:15 +0000 (09:12 -0600)]
CRM-18463 - Not in between filter - not working properly.
Monish Deb [Fri, 22 Apr 2016 14:02:00 +0000 (19:32 +0530)]
Merge pull request #8209 from jitendrapurohit/webtest
CRM-18454: webtest fixes
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
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
John Kingsnorth [Fri, 22 Apr 2016 13:34:19 +0000 (14:34 +0100)]
ActivityTest minor tidy (NFC)
Web Access [Fri, 22 Apr 2016 13:10:32 +0000 (18:40 +0530)]
Webtests Fixes
jitendrapurohit [Fri, 22 Apr 2016 13:08:31 +0000 (18:38 +0530)]
CRM-18454: webtest fixes
Web Access [Fri, 22 Apr 2016 13:04:37 +0000 (18:34 +0530)]
CRM-18050: Webtest
Eileen [Fri, 22 Apr 2016 09:24:48 +0000 (09:24 +0000)]
Fix Strict warning discovered in testing
Eileen [Fri, 22 Apr 2016 09:01:41 +0000 (09:01 +0000)]
CRM-5507 CRM-17984 fix regression when subType var is not leaking
Eileen [Fri, 22 Apr 2016 06:24:31 +0000 (06:24 +0000)]
Fix the RC regrsision
yashodha [Fri, 22 Apr 2016 06:24:12 +0000 (11:54 +0530)]
CRM-17893: Cannot import custom field type Country
----------------------------------------
* CRM-17893: Cannot import custom field type Country
https://issues.civicrm.org/jira/browse/CRM-17893
Eileen [Fri, 22 Apr 2016 06:10:44 +0000 (06:10 +0000)]
CRM-17984 test to demonstrate breakage
projects / civicrm-core.git / log