Seamus Lee [Mon, 6 Jun 2016 06:06:34 +0000 (16:06 +1000)]
Sync file from 4.7
Seamus Lee [Mon, 6 Jun 2016 00:26:30 +0000 (10:26 +1000)]
Fix syntax and tests
Seamus Lee [Mon, 6 Jun 2016 00:12:36 +0000 (10:12 +1000)]
Fix validation
Seamus Lee [Sun, 5 Jun 2016 23:36:07 +0000 (09:36 +1000)]
CRM-18772 Backport check to see if column already exists
CiviCRM [Mon, 6 Jun 2016 22:33:01 +0000 (15:33 -0700)]
Update version to 4.6.19
Eileen McNaughton [Mon, 6 Jun 2016 19:27:00 +0000 (13:27 -0600)]
Merge pull request #8517 from colemanw/noResults
css/civicrmNavigation.css
Eileen McNaughton [Mon, 6 Jun 2016 19:14:17 +0000 (13:14 -0600)]
Merge pull request #8512 from systopia/CRM-17235-4.6.13
LTS patch for CRM-17235
Coleman Watts [Sun, 5 Jun 2016 21:54:33 +0000 (15:54 -0600)]
CRM-18652 - Improve style of no-results item
Conflicts:
css/civicrmNavigation.css
Eileen McNaughton [Mon, 6 Jun 2016 17:05:29 +0000 (11:05 -0600)]
Merge pull request #8515 from eileenmcnaughton/pdf
Pdf
Tim Otten [Sat, 21 May 2016 03:58:26 +0000 (20:58 -0700)]
CRM-16898 - Replace debug code in html5lib
Tim Otten [Sat, 21 May 2016 03:49:51 +0000 (20:49 -0700)]
Revert "CRM-16898. Remove debugging in html5lib."
This reverts commit
693cb3279584278ccbb3eaa1394999c7a69d7bf6.
colemanw [Mon, 6 Jun 2016 02:57:40 +0000 (20:57 -0600)]
Merge pull request #8505 from rollox/patch-3
CRM-18743 - Undefined variable $order
rollox [Mon, 6 Jun 2016 00:27:42 +0000 (01:27 +0100)]
CRM-18743 - Undefined variable $order
Fix notice/error "Undefined variable: order in CRM_Contact_BAO_Query->prepareOrderBy()" on user/# screen if the viewed user page is linked to a contact record in Civi.
Also submitted to master.
Eileen McNaughton [Sun, 5 Jun 2016 23:18:45 +0000 (17:18 -0600)]
Merge pull request #8468 from eileenmcnaughton/groups46
CRM-18683 fix handling on UTC time in smart groups
Eileen McNaughton [Sun, 5 Jun 2016 20:54:50 +0000 (14:54 -0600)]
Merge pull request #8496 from seamuslee001/CRM-18652-46
CRM-18652 4.6 backport Show no results label in quick search
eileen [Sun, 5 Jun 2016 19:46:30 +0000 (13:46 -0600)]
CRM-18683 follow up change to xml (also in master)
This circumvents a bug in DAO code generation
Eileen McNaughton [Sun, 5 Jun 2016 18:53:31 +0000 (12:53 -0600)]
Merge pull request #8492 from seamuslee001/CRM-18708
CRM-18708: subtype custom field import issue
Eileen McNaughton [Sun, 5 Jun 2016 15:46:27 +0000 (09:46 -0600)]
Merge pull request #8070 from sunilpawar/CRM-18349-4.6
CRM 18349
eileenmcnaugton [Sun, 22 May 2016 22:02:31 +0000 (10:02 +1200)]
CRM-18683 4.6.17 ver of upgrade script
eileenmcnaugton [Sun, 15 May 2016 23:18:27 +0000 (11:18 +1200)]
CRM-18142 fix use of uninidexed TIMESTAMPDIFF function
This removes function comparisons in favour of direct comparisons on cache date functions
Conflicts:
CRM/Contact/BAO/GroupContactCache.php
Civi/ActionSchedule/RecipientBuilder.php
eileen [Sat, 7 May 2016 23:18:10 +0000 (09:18 +1000)]
CRM-18516 Convert the date fields relating to group caching & acl caching timestamp
Conflicts:
CRM/Upgrade/Incremental/sql/4.7.8.mysql.tpl
xml/schema/ACL/Cache.xml
Seamus Lee [Sun, 5 Jun 2016 07:48:20 +0000 (17:48 +1000)]
CRM-18652 fix bug found in testing
Effy Elden [Mon, 23 May 2016 14:32:17 +0000 (10:32 -0400)]
CRM-18652 - Localize label for no results
----------------------------------------
* CRM-18652: Quick search should provide feedback to user if no matches are found
https://issues.civicrm.org/jira/browse/CRM-18652
Effy Elden [Sun, 22 May 2016 05:19:32 +0000 (01:19 -0400)]
CRM-18652 - Show 'no matches' if quick search returns no results
----------------------------------------
* CRM-18652: Quick search should provide feedback to user if no matches are found
https://issues.civicrm.org/jira/browse/CRM-18652
Eileen McNaughton [Sun, 5 Jun 2016 08:24:01 +0000 (02:24 -0600)]
Merge pull request #8489 from GinkgoFJG/CRM-18753
CRM-18753: Missing class results in 500 error when extensions make API requests
Eileen McNaughton [Sun, 5 Jun 2016 06:45:35 +0000 (00:45 -0600)]
Merge pull request #8234 from PalanteJon/CRM-18468-4.6
LTS: CRM-18468 - Recurring Contributions - don't use mid for subscrip…
Eileen McNaughton [Sun, 5 Jun 2016 06:26:47 +0000 (00:26 -0600)]
Merge pull request #8073 from cividesk/CRM-18353-4.6
CRM-18353 skip url from IDS check
root [Thu, 2 Jun 2016 12:08:17 +0000 (17:38 +0530)]
CRM-18708: subtype custom field import issue
Frank J. Gómez [Sun, 5 Jun 2016 05:51:06 +0000 (23:51 -0600)]
CRM-18753: Decremented version number to match the current version.
Frank J. Gómez [Sun, 5 Jun 2016 05:49:51 +0000 (23:49 -0600)]
CRM-18753: Add class left out of previous backporting efforts.
Eileen McNaughton [Sun, 5 Jun 2016 05:22:33 +0000 (23:22 -0600)]
Merge pull request #8473 from cividesk/CRM-10230-4.6
CRM-10230 Custom fields text type with limited length not validated
Eileen McNaughton [Sun, 5 Jun 2016 04:56:38 +0000 (22:56 -0600)]
Merge pull request #7731 from andrew-cormick-dockery/CRM-17959-46
CRM-17959 - allow URL to be redirected if the queue ID is invalid but…
CiviCRM [Thu, 2 Jun 2016 04:28:15 +0000 (21:28 -0700)]
Update version to 4.6.18
Tim Otten [Thu, 2 Jun 2016 03:16:14 +0000 (20:16 -0700)]
Merge pull request #8340 from jitendrapurohit/CRM-18239
CRM-18239 - 4.6 fix CiviCRM: view my contact permission results in us…
sunil [Tue, 31 May 2016 06:32:36 +0000 (12:02 +0530)]
CRM-10230 Custom fields text type with limited length not validated
colemanw [Fri, 27 May 2016 22:19:18 +0000 (18:19 -0400)]
Merge pull request #8453 from agh1/CRM-17690-4.6
Needless civicrm_grant join causes problems
Eileen McNaughton [Fri, 27 May 2016 05:35:56 +0000 (17:35 +1200)]
Merge pull request #8462 from eileenmcnaughton/hack
CRM-18684 fix fatal error by backporting 4.7 hack
eileenmcnaugton [Fri, 27 May 2016 04:24:50 +0000 (16:24 +1200)]
CRM-18684 fix fatal error by backporting 4.7 hack
joshgowans [Thu, 26 May 2016 19:39:07 +0000 (13:39 -0600)]
Update success.tpl (#8459)
* Update success.tpl
Change in upgrade message text
jitendrapurohit [Fri, 11 Dec 2015 08:44:42 +0000 (14:14 +0530)]
CRM-17690 - Grant fields being retrieved by default when completely irrelevant
Eileen McNaughton [Wed, 25 May 2016 10:25:38 +0000 (22:25 +1200)]
Merge pull request #8326 from mollux/CRM-18510-4.6
CRM-18510 Backport 4.7 changes.
Eileen McNaughton [Wed, 25 May 2016 10:12:16 +0000 (22:12 +1200)]
Merge pull request #8448 from seamuslee001/CRM-18474-46
CRM-18474 - Port fix for excluding dodgy characters from CiviMail Body text
Mattias Michaux [Wed, 25 May 2016 07:45:31 +0000 (09:45 +0200)]
backport of 4.7.
Seamus Lee [Wed, 25 May 2016 05:58:27 +0000 (05:58 +0000)]
Port Fix for CRM-18474 to 4.6
Eileen McNaughton [Wed, 25 May 2016 00:33:28 +0000 (12:33 +1200)]
Merge pull request #8444 from eileenmcnaughton/hook
CRM-18672 CiviMail New Mailing won't load
eileen [Tue, 24 May 2016 22:41:49 +0000 (10:41 +1200)]
CRM-18672 CiviMail New Mailing won't load
Eileen McNaughton [Mon, 23 May 2016 21:52:08 +0000 (09:52 +1200)]
Merge pull request #8345 from eileenmcnaughton/api
API code sync 4.7 to 4.6
Eileen McNaughton [Mon, 23 May 2016 05:44:39 +0000 (17:44 +1200)]
Merge pull request #8339 from yashodha/CRM-18521
CRM-18521
Eileen McNaughton [Mon, 23 May 2016 05:43:12 +0000 (17:43 +1200)]
Merge pull request #8429 from civicrm/revert-7626-4.6-case-rel
Revert "CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types"
Eileen McNaughton [Mon, 23 May 2016 04:41:43 +0000 (16:41 +1200)]
Revert "CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types"
Eileen McNaughton [Mon, 23 May 2016 04:40:14 +0000 (16:40 +1200)]
Merge pull request #8401 from eileenmcnaughton/testa
Improve test error reporting & sync test with master
Eileen McNaughton [Mon, 23 May 2016 01:43:05 +0000 (13:43 +1200)]
Merge pull request #8428 from eileenmcnaughton/4.6-minor
4.6 code synchronisation
eileen [Wed, 11 May 2016 05:01:53 +0000 (17:01 +1200)]
Improve test error reporting & sync test with master
Eileen McNaughton [Mon, 23 May 2016 01:06:58 +0000 (13:06 +1200)]
Merge pull request #7824 from torrance/editable-button-fix
Ensure editable buttons don't sit underneath other page elements.
eileen [Tue, 10 May 2016 20:40:41 +0000 (08:40 +1200)]
API code sync 4.7 to 4.6
Eileen McNaughton [Sun, 22 May 2016 23:03:31 +0000 (11:03 +1200)]
Merge pull request #7626 from totten/4.6-case-rel
CRM-17342 - Case Managed Entities - Don't recreate disabled relationship types
eileenmcnaugton [Sun, 22 May 2016 22:42:17 +0000 (10:42 +1200)]
Port back default on OptionGroup
eileen [Tue, 17 May 2016 01:05:23 +0000 (13:05 +1200)]
Add tests for Ensure OptionGroup exists fn & fix optionValueExists to accept ID
The option_group_id field accepts name or id so use that.
Conflicts:
CRM/Core/BAO/OptionValue.php
p
eileenmcnaugton [Sun, 15 May 2016 22:05:53 +0000 (10:05 +1200)]
Comment fixes & formatting
eileenmcnaugton [Mon, 16 May 2016 03:51:05 +0000 (15:51 +1200)]
Preliminary tidy up on test class
Conflicts:
tests/phpunit/CRM/Contact/BAO/GroupContactCacheTest.php
Eileen McNaughton [Sun, 22 May 2016 21:19:36 +0000 (09:19 +1200)]
Merge pull request #8398 from yashodha/4.6.CRM-18046
CRM-18046: Search link in AB Testing report erroneously requires view…
Eileen McNaughton [Sun, 22 May 2016 01:00:56 +0000 (13:00 +1200)]
Merge pull request #8282 from galgeek/patch-3
Use mailing template subject in 4.6
Eileen McNaughton [Sun, 22 May 2016 01:00:32 +0000 (13:00 +1200)]
Merge pull request #8283 from galgeek/patch-4
handle more better date formats in 4.6
Eileen McNaughton [Sat, 21 May 2016 09:54:22 +0000 (21:54 +1200)]
Merge pull request #8203 from agileware/4.6-crm-18356
CRM-18356: Fix incorrect logic Activity Report has when excluding NUL…
Eileen McNaughton [Sat, 21 May 2016 09:53:01 +0000 (21:53 +1200)]
Merge pull request #8247 from eileenmcnaughton/triggerport
CRM-15078: make sure logging schema is updated on extension installation
Eileen McNaughton [Sat, 21 May 2016 06:45:50 +0000 (18:45 +1200)]
Merge pull request #8382 from eileenmcnaughton/report
CRM-18519 Add 'standard' contact report fields to contribution detail…
Eileen McNaughton [Sat, 21 May 2016 06:07:43 +0000 (18:07 +1200)]
Merge pull request #8333 from TobiasLounsbury/CRM-17888-4.6-freq-unit
CRM-17888: Updated frequency_unit to type T_STRING
Eileen McNaughton [Fri, 20 May 2016 02:35:10 +0000 (14:35 +1200)]
Merge pull request #8412 from seamuslee001/CRM-18504
CRM-18504 Fix validation error when contact subtype is disabled
Eileen Mcnaughton [Thu, 19 May 2016 21:53:27 +0000 (21:53 +0000)]
Fix validation error when contact subtype is disabled
colemanw [Thu, 19 May 2016 19:58:21 +0000 (15:58 -0400)]
Merge pull request #8411 from mollux/CRM-18589-4.6
CRM-18589 Drastically reduce memory usage during tests.
Mattias Michaux [Thu, 19 May 2016 15:26:52 +0000 (17:26 +0200)]
Drasticly reduce memory usage during tests.
Eileen McNaughton [Thu, 19 May 2016 09:29:16 +0000 (21:29 +1200)]
Merge pull request #8395 from monishdeb/CRM-18405
CRM-18405: Backport master fix
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
systopia [Wed, 18 May 2016 13:31:31 +0000 (15:31 +0200)]
proposed workaround for CRM-17235
yashodha [Wed, 18 May 2016 11:11:59 +0000 (16:41 +0530)]
CRM-18046: Search link in AB Testing report erroneously requires view all contacts permission
----------------------------------------
* CRM-18046: Search link in AB Testing report erroneously requires view all contacts permission
https://issues.civicrm.org/jira/browse/CRM-18046
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
deb.monish [Wed, 18 May 2016 07:18:03 +0000 (12:48 +0530)]
CRM-18405: Backport master fix
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.
eileen [Mon, 9 May 2016 04:34:47 +0000 (14:34 +1000)]
CRM-18519 Add 'standard' contact report fields to contribution detail report
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.
jitendrapurohit [Tue, 10 May 2016 12:32:33 +0000 (18:02 +0530)]
CRM-18239 - 4.6 fix CiviCRM: view my contact permission results in user being able to edit themselves in CiviCRM
yashodha [Tue, 10 May 2016 11:18:05 +0000 (16:48 +0530)]
CRM-18521: Search results table, 'Select all' checkbox gives 'mark_x_201 is not of the type Integer'
----------------------------------------
* CRM-18521: Search results table, "Select all" checkbox gives "mark_x_201 is not of the type Integer"
https://issues.civicrm.org/jira/browse/CRM-18521
yashodha [Tue, 10 May 2016 10:57:41 +0000 (16:27 +0530)]
CRM-18521: Search results table, 'Select all' checkbox gives 'mark_x_201 is not of the type Integer'
----------------------------------------
* CRM-18521: Search results table, "Select all" checkbox gives "mark_x_201 is not of the type Integer"
https://issues.civicrm.org/jira/browse/CRM-18521
Tobias Lounsbury [Tue, 10 May 2016 00:41:59 +0000 (17:41 -0700)]
CRM-17888: Updated frequency_unit to type T_STRING
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…
projects / civicrm-core.git / log