Eileen McNaughton [Thu, 19 May 2016 09:28:59 +0000 (21:28 +1200)]
Merge pull request #8403 from eileenmcnaughton/cust_tree
CRM-18504: Fix error in validating sub type by entity
Eileen McNaughton [Thu, 19 May 2016 01:22:37 +0000 (13:22 +1200)]
Merge pull request #8397 from seamuslee001/CRM-18559
CRM-18559 sync functions from master which seem to resolve this in th…
eileen [Wed, 18 May 2016 21:31:39 +0000 (09:31 +1200)]
Port tests from master
JKingsnorth [Tue, 17 May 2016 15:31:16 +0000 (03:31 +1200)]
CRM-18504: Fix error in validating sub type by entity
Eileen McNaughton [Wed, 18 May 2016 20:21:43 +0000 (08:21 +1200)]
Merge pull request #8393 from agileware/4.6-crm-18290
CRM-18290: Edits to activities are not saved in CiviCase
Seamus Lee [Wed, 18 May 2016 08:02:06 +0000 (08:02 +0000)]
CRM-18559 sync functions from master which seem to resolve this in the same but more elegant way
yashodha [Fri, 25 Mar 2016 08:46:45 +0000 (14:16 +0530)]
CRM-18290: Edits to activities are not saved in CiviCase
----------------------------------------
* CRM-18290: Edits to activities are not saved in CiviCase
https://issues.civicrm.org/jira/browse/CRM-18290
Eileen McNaughton [Tue, 17 May 2016 20:14:16 +0000 (08:14 +1200)]
Merge pull request #8388 from davejenx/CRM-18567
CRM-18567 - stristr was called with arguments in wrong order, causing…
Eileen McNaughton [Tue, 17 May 2016 13:46:45 +0000 (01:46 +1200)]
Merge pull request #8373 from davejenx/CRM-18559
CRM-18559 - the value returned from validateSubTypeByEntity() does no…
Dave Jenkins [Tue, 17 May 2016 13:30:52 +0000 (14:30 +0100)]
CRM-18567 - stristr was called with arguments in wrong order, causing not to be exploded correctly when comma-separated.
Dave Jenkins [Mon, 16 May 2016 16:53:32 +0000 (17:53 +0100)]
CRM-18559 - the value returned from validateSubTypeByEntity() does not include value separators, so they need to be added for the query.
Chris Burgess [Thu, 17 Mar 2016 07:41:40 +0000 (20:41 +1300)]
CRM-16898. Remove debugging in html5lib.
Mathieu Lutfy [Mon, 9 May 2016 21:32:23 +0000 (17:32 -0400)]
Merge pull request #8327 from mlutfy/46-crm18518-1
CRM-18518: Trivial translation string fix.
Mathieu Lutfy [Mon, 9 May 2016 16:39:03 +0000 (12:39 -0400)]
CRM-18518: Trivial translation string fix.
Eileen McNaughton [Mon, 9 May 2016 04:20:29 +0000 (14:20 +1000)]
Merge pull request #8297 from eileenmcnaughton/api
Api 4.6
colemanw [Mon, 9 May 2016 01:53:47 +0000 (21:53 -0400)]
Merge pull request #8321 from mlutfy/46-crm18518
CRM-18518: ts() string fixes.
eileen [Sun, 8 May 2016 22:23:46 +0000 (08:23 +1000)]
Further changes to sync with 4.7
The changes affect 2 function signatures but in minor ways and add 2 functions
eileen [Sun, 8 May 2016 22:13:40 +0000 (08:13 +1000)]
Towards syncing 4.6 api with 4.7, no changes, only new code
Mathieu Lutfy [Sun, 8 May 2016 21:49:06 +0000 (17:49 -0400)]
CRM-18518: ts() string fixes.
Eileen McNaughton [Sun, 8 May 2016 21:20:46 +0000 (07:20 +1000)]
Merge pull request #8262 from seamuslee001/CRM-17693-46-2
CRM-17693 backport to 4.6 increasing default export field sizes to 25…
Eileen McNaughton [Sun, 8 May 2016 12:25:38 +0000 (22:25 +1000)]
Merge pull request #8290 from mollux/types
Add extra Mysql types and rules + tests similar to 4.7
CiviCRM [Wed, 4 May 2016 21:05:25 +0000 (14:05 -0700)]
Update version to 4.6.17
Tim Otten [Wed, 4 May 2016 18:17:57 +0000 (11:17 -0700)]
Merge pull request #8291 from totten/4.6-17952
(Backport) CRM-17952 - Escape HTML in body_text field on "Headers, Footers, and Automated Messages"
Mattias Michaux [Thu, 17 Mar 2016 07:14:12 +0000 (20:14 +1300)]
CRM-17952. Escape HTML in body_text field on "Headers, Footers, and Automated Messages"
Mattias Michaux [Tue, 3 May 2016 21:01:08 +0000 (23:01 +0200)]
Whitespace fixes.
Mattias Michaux [Tue, 3 May 2016 20:54:24 +0000 (22:54 +0200)]
Added validate check to CRM_Utils_Sort sort name.
Mattias Michaux [Tue, 3 May 2016 20:53:59 +0000 (22:53 +0200)]
Added extra Mysql types and rules + tests similar to 4.7
Eileen McNaughton [Mon, 2 May 2016 12:18:30 +0000 (00:18 +1200)]
Merge pull request #8275 from mollux/CRM-17983-4.6
CRM-17983 4.6
Mattias Michaux [Mon, 2 May 2016 08:46:11 +0000 (10:46 +0200)]
Typo fix.
Mattias Michaux [Mon, 2 May 2016 08:39:13 +0000 (10:39 +0200)]
Cleanup to have same behaviour as 4.7.
Mattias Michaux [Mon, 2 May 2016 08:37:08 +0000 (10:37 +0200)]
Fixed 2 other issues.
Mattias Michaux [Thu, 28 Apr 2016 22:31:41 +0000 (00:31 +0200)]
Bare minimum patch for 4.6
Eileen McNaughton [Fri, 29 Apr 2016 02:08:24 +0000 (14:08 +1200)]
Merge pull request #8263 from seamuslee001/CRM-17983-46-titlefix
CRM-17983 Fix error in data type as found by Dave
Seamus Lee [Thu, 28 Apr 2016 22:02:01 +0000 (22:02 +0000)]
CRM-17983 Fix error in data type as found by Dave
Seamus Lee [Wed, 27 Apr 2016 23:19:06 +0000 (23:19 +0000)]
CRM-17693 backport to 4.6 increasing default export field sizes to 255 for varchar columns
Eileen McNaughton [Wed, 27 Apr 2016 23:15:33 +0000 (11:15 +1200)]
Merge pull request #8252 from eileenmcnaughton/regression
CRM-18469, CRM-17984 - getTree regression on multiple integers separa…
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
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
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
Eileen McNaughton [Wed, 27 Apr 2016 05:25:54 +0000 (17:25 +1200)]
Merge pull request #8248 from eileenmcnaughton/pass_by_ref
Pass by ref - fix for strict warning regression picked up on the RC
eileen [Tue, 26 Apr 2016 22:51:31 +0000 (10:51 +1200)]
Further pass-by-ref fixes following on from customGroup signature change
Change-Id: I4398472485f27165b197f00bf36d518509681242
Tim Otten [Tue, 26 Apr 2016 19:24:21 +0000 (12:24 -0700)]
CRM-18469, CRM-17984 - getTree - No more pass by reference
Change-Id: Ia2eb6d2bf64055dc546d2b73ec3ce310846a40f5
Eileen McNaughton [Sun, 24 Apr 2016 20:20:29 +0000 (08:20 +1200)]
Merge pull request #8221 from eileenmcnaughton/s
Ports from master
eileenmcnaugton [Wed, 20 Apr 2016 10:10:38 +0000 (22:10 +1200)]
CRM-17983 fix for contactRelationships query
eileenmcnaugton [Sun, 24 Apr 2016 03:17:27 +0000 (15:17 +1200)]
CRM-17983, CRM-18401. Input validation
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
Eileen [Fri, 22 Apr 2016 06:10:44 +0000 (06:10 +0000)]
CRM-17984 test to demonstrate breakage
Conflicts:
CRM/Core/BAO/CustomGroup.php
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.
Chris Burgess [Fri, 22 Apr 2016 05:48:37 +0000 (17:48 +1200)]
CRM-17983, CRM-18401. Input validation.
Mattias Michaux [Wed, 20 Apr 2016 22:44:27 +0000 (00:44 +0200)]
Minimal check to validate relationship params.
Conflicts:
CRM/Contact/Page/AJAX.php
Eileen McNaughton [Sat, 23 Apr 2016 02:46:12 +0000 (14:46 +1200)]
Merge pull request #8212 from KarinG/CRM-18463-4.6
CRM-18463-4.6 - Not in between filter - not working properly.
KarinG [Fri, 22 Apr 2016 16:50:57 +0000 (10:50 -0600)]
CRM-18463-4.6 - Not in between filter - not working properly.
Eileen McNaughton [Fri, 22 Apr 2016 08:30:54 +0000 (20:30 +1200)]
Merge pull request #8183 from eileenmcnaughton/sub_type
CRM-17984. Ensure input for subtype is valid; if not then do not use …
Chris Burgess [Mon, 11 Apr 2016 09:07:02 +0000 (21:07 +1200)]
CRM-17984. Ensure input for subtype is valid; if not then do not use it to filter custom fields.
Eileen McNaughton [Mon, 18 Apr 2016 23:37:53 +0000 (11:37 +1200)]
Enotice fix for test env (#8156)
Andrew Perry [Sat, 16 Apr 2016 02:04:05 +0000 (12:04 +1000)]
CRM-17846 - Fixing lock name to be less than 64 characters for MySQL 5.7 compatibility (#7984)
* CRM-17846 - Fixing lock name to be less than 64 characters for MySQL 5.7 compatibility - 4.6LTS
* Removing spaces to make Jenkins happy
* Applying MySQL Lock fix contribution from Eileen
* Fixing spacing to keep Jenkins happy
* Use 4.6 version settings call
Jitendra Purohit [Thu, 14 Apr 2016 09:00:19 +0000 (14:30 +0530)]
CRM-18364: Reply-To field depopulates when saving then continuing a draft mailing (#8137)
Laryn - CEDC.org [Wed, 13 Apr 2016 10:46:00 +0000 (05:46 -0500)]
CRM-17361 - Fix Address fields when used in Contact get api (#8093)
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
* CRM-17361 -- Extend Contact getoptions to include Address fields
CiviCRM [Wed, 6 Apr 2016 13:52:43 +0000 (06:52 -0700)]
Update version to 4.6.16
Monish Deb [Wed, 6 Apr 2016 12:29:11 +0000 (17:59 +0530)]
Merge pull request #8090 from pradpnayak/CRM-16617-4-6
--CRM-16617, code fixing for install, changed the parameters of function
Pradeep Nayak [Tue, 5 Apr 2016 20:57:36 +0000 (02:27 +0530)]
--CRM-16617, code fixing for install, changed the parameters of function
Conflicts:
CRM/Core/DAO.php
colemanw [Wed, 30 Mar 2016 17:46:27 +0000 (13:46 -0400)]
Merge pull request #6707 from pradpnayak/CRM-16617
[pending core team review] CRM-16617
Monish Deb [Tue, 29 Mar 2016 07:43:05 +0000 (13:13 +0530)]
Merge pull request #8011 from agh1/multi-paypal-ipn
CRM-18107 PayPal Standard IPN fails with multiple processors
Yashodha Chaku [Wed, 23 Mar 2016 08:35:29 +0000 (14:05 +0530)]
Merge pull request #8014 from cividesk/CRM-18280-4.6
Fix for CRM-18280
Monish Deb [Wed, 23 Mar 2016 08:20:05 +0000 (13:50 +0530)]
Merge pull request #7929 from eileenmcnaughton/CRM-18156
CRM-18156 don't false positive on security update available
Monish Deb [Wed, 23 Mar 2016 05:06:22 +0000 (10:36 +0530)]
Merge pull request #7939 from seamuslee001/CRM-18181-46
CRM-18181 Get all mailings that use mailings that an acled user can see
Nicolas Ganivet [Wed, 23 Mar 2016 03:11:07 +0000 (21:11 -0600)]
Fix for CRM-18280
Andrew Hunt [Mon, 21 Mar 2016 22:20:19 +0000 (18:20 -0400)]
CRM-18107 PayPal Standard IPN fails if payment processor id != payment processor type id
Yashodha Chaku [Mon, 21 Mar 2016 05:04:31 +0000 (10:34 +0530)]
Merge pull request #7994 from laryn/patch-6
Reproduce CRM-18092 fix for 4.6
colemanw [Sat, 19 Mar 2016 00:23:05 +0000 (20:23 -0400)]
Merge pull request #8003 from PalanteJon/CRM-18264-4.6
CRM-18264 - Fix potential upgrade crash when adding Getting Started d…
Jon goldberg [Fri, 18 Mar 2016 19:45:53 +0000 (15:45 -0400)]
CRM-18264 - Fix potential upgrade crash when adding Getting Started dashlet
Laryn [Fri, 18 Mar 2016 14:33:34 +0000 (09:33 -0500)]
Trying again on the indentation.
Laryn [Fri, 18 Mar 2016 14:13:25 +0000 (09:13 -0500)]
Fixing indentation
colemanw [Fri, 18 Mar 2016 13:06:37 +0000 (09:06 -0400)]
Merge pull request #8000 from monishdeb/CRM-16210
CRM-16210 fix backporting to 4.6
deb.monish [Fri, 18 Mar 2016 07:16:23 +0000 (12:46 +0530)]
CRM-16210 fix backporting to 4.6
Laryn [Thu, 17 Mar 2016 16:36:08 +0000 (11:36 -0500)]
Reproduce CRM-18092 fix for 4.6
Reproduce this fix for 4.6
https://github.com/civicrm/civicrm-core/commit/
0f578135c6f9d151fd2e4fef230ec0f91418224b
Yashodha Chaku [Tue, 15 Mar 2016 10:31:55 +0000 (16:01 +0530)]
Merge pull request #7870 from JKingsnorth/CRM-18109-4.6
CRM-18109 (4.6) towards removal of unindexed queries
Yashodha Chaku [Mon, 14 Mar 2016 04:49:35 +0000 (10:19 +0530)]
Merge pull request #7958 from JMAConsulting/CRM-18204-4.6
Crm 18204 4.6
Monish Deb [Fri, 11 Mar 2016 14:14:37 +0000 (19:44 +0530)]
Merge pull request #7964 from jitendrapurohit/CRM-18209
CRM-18209 - show payment fields if other-amount already contains a va…
jitendrapurohit [Fri, 11 Mar 2016 10:34:45 +0000 (16:04 +0530)]
CRM-18209 - show payment fields if other-amount already contains a valid amount
Pradeep Nayak [Fri, 11 Mar 2016 08:40:25 +0000 (14:10 +0530)]
--CRM-18204, modified code to use checkProfileType function
Pradeep Nayak [Thu, 10 Mar 2016 13:56:41 +0000 (19:26 +0530)]
CRM-18204, removed extra action for 4.6
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
Pradeep Nayak [Thu, 10 Mar 2016 13:49:53 +0000 (19:19 +0530)]
--CRM-18204, remove Create mode, Edit mode, listing mode and HMTL form snippet links if uf group type is not contact
Pradeep Nayak [Thu, 10 Mar 2016 13:48:52 +0000 (19:18 +0530)]
CRM-18204, used contact type and contact sub type for checking uf group type
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
Conflicts:
CRM/UF/Page/Group.php
Pradeep Nayak [Thu, 10 Mar 2016 13:45:47 +0000 (19:15 +0530)]
CRM-18204, used contact type and contact sub type for checking uf group type
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
colemanw [Wed, 9 Mar 2016 20:38:25 +0000 (15:38 -0500)]
Merge pull request #7275 from agh1/petition-custom-fields
[fixed-for-master] Survey custom fields in petition UI
Seamus Lee [Wed, 9 Mar 2016 02:09:03 +0000 (02:09 +0000)]
Ensure that we are only running the Mailings query when we have found mailings
Seamus Lee [Tue, 8 Mar 2016 01:03:39 +0000 (01:03 +0000)]
CRM-18181 Get all mailings that use mailings that an acled user can see
Eileen McNaughton [Mon, 7 Mar 2016 01:21:29 +0000 (14:21 +1300)]
Merge pull request #7930 from eileenmcnaughton/4.6
CRM-18091 disambiguate TRUE as not meaning 'backtrace'
eileen [Tue, 23 Feb 2016 22:57:10 +0000 (11:57 +1300)]
CRM-18091 disambiguate TRUE as not meaning 'backtrace'
eileenmcnaugton [Mon, 7 Mar 2016 00:43:51 +0000 (13:43 +1300)]
CRM-18156 don't false positive on security update available
colemanw [Fri, 4 Mar 2016 16:44:55 +0000 (11:44 -0500)]
Merge pull request #7911 from agh1/merge-screen-close-tag-46
CRM-15789 - contact merge: restore </div> that was accidentally deleted
Monish Deb [Fri, 4 Mar 2016 05:57:37 +0000 (11:27 +0530)]
Merge pull request #7912 from seamuslee001/CRM-18155-46
CRM-18155 Remove membership_type_id from legacyConvertFormValues
Seamus Lee [Fri, 4 Mar 2016 01:33:10 +0000 (01:33 +0000)]
CRM-18155 Remove membership_type_id from legacyConvertFormValues
Andrew Hunt [Thu, 3 Mar 2016 22:37:20 +0000 (17:37 -0500)]
CRM-15789 - contact merge: restore </div> that was accidentally deleted
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
Monish Deb [Thu, 3 Mar 2016 09:36:59 +0000 (15:06 +0530)]
Merge pull request #7896 from cividesk/CRM-18130-4.6
CRM-18130: Custom CSS URL not working if aliased or rewritten
CiviCRM [Wed, 2 Mar 2016 09:37:05 +0000 (01:37 -0800)]
Update version to 4.6.15
Yashodha Chaku [Wed, 2 Mar 2016 07:23:25 +0000 (12:53 +0530)]
Merge pull request #7897 from totten/4.6-tcpdf
CRM-18098. Move TCPDF from packages to composer.
projects / civicrm-core.git / log