Eileen McNaughton [Thu, 21 Jul 2016 03:27:36 +0000 (15:27 +1200)]
Merge pull request #8721 from seamuslee001/CRM-19098-46
CRM-19098 Add in Group Settings to add new group on import
Seamus Lee [Mon, 18 Jul 2016 09:30:44 +0000 (09:30 +0000)]
Add in checking on if groupType is set
Seamus Lee [Mon, 18 Jul 2016 09:29:42 +0000 (09:29 +0000)]
Update template
Seamus Lee [Mon, 18 Jul 2016 09:27:05 +0000 (09:27 +0000)]
CRM-19098 Add in Group Settings to add new group on import
Eileen McNaughton [Sun, 17 Jul 2016 21:34:16 +0000 (09:34 +1200)]
Merge pull request #8713 from seamuslee001/sl_test_fixes_46
NFC Fix errors in Tests in 4.6
Seamus Lee [Sat, 16 Jul 2016 23:39:29 +0000 (09:39 +1000)]
Fix error in Membership Test
Seamus Lee [Sat, 16 Jul 2016 23:38:40 +0000 (09:38 +1000)]
Fix error in activity.get api
Eileen McNaughton [Fri, 15 Jul 2016 03:38:34 +0000 (15:38 +1200)]
Merge pull request #8710 from seamuslee001/sl_remove_test
NFC Remove failing test on 4.6 which isn't present in master
Seamus Lee [Fri, 15 Jul 2016 03:31:47 +0000 (03:31 +0000)]
Remove failing test on 4.6 which isn't present in master
Eileen McNaughton [Thu, 14 Jul 2016 01:55:13 +0000 (13:55 +1200)]
Merge pull request #8699 from mfb/backport/CRM-19070
CRM-19070 - CiviMail - Schedule job after recipients have been populated
mark burdett [Wed, 13 Jul 2016 04:09:07 +0000 (21:09 -0700)]
CRM-19070 - CiviMail - Schedule job after recipients have been populated
Eileen McNaughton [Tue, 12 Jul 2016 00:19:27 +0000 (12:19 +1200)]
Merge pull request #8407 from seamuslee001/CRM-18448-46
CRM-18448 Port fixes from FuzionRepo around allowing for editing of f…
Eileen McNaughton [Mon, 11 Jul 2016 10:19:42 +0000 (22:19 +1200)]
Merge pull request #8622 from konadave/CRM-19007
CRM-19007 Optionally disable USPS address validation during contact import.
Eileen McNaughton [Mon, 11 Jul 2016 10:19:01 +0000 (22:19 +1200)]
Merge pull request #8684 from seamuslee001/CRM-19038-46
CRM-19038 NFC backport safe Remove FK code to 4.6
Seamus Lee [Fri, 1 Jul 2016 02:44:56 +0000 (12:44 +1000)]
Fix up Tests and add in return statements
Seamus Lee [Fri, 1 Jul 2016 02:30:46 +0000 (12:30 +1000)]
CRM-19038 backport safe Remove FK code to 4.6
Eileen McNaughton [Fri, 8 Jul 2016 22:19:30 +0000 (10:19 +1200)]
Merge pull request #8682 from seamuslee001/CRM-19055-46
CRM-19055 remove error alert email function from eway
Seamus Lee [Fri, 8 Jul 2016 09:40:41 +0000 (09:40 +0000)]
CRM-19055 remove error alert email function from eway
Eileen McNaughton [Fri, 8 Jul 2016 07:21:50 +0000 (19:21 +1200)]
Merge pull request #8600 from eileenmcnaughton/search_fixes
CRM-18435 handling for membership type etc fields
CiviCRM [Wed, 6 Jul 2016 05:44:44 +0000 (22:44 -0700)]
Update version to 4.6.20
Eileen McNaughton [Sat, 2 Jul 2016 04:00:01 +0000 (16:00 +1200)]
Merge pull request #8542 from JMAConsulting/CRM-18804
--CRM-18804, fixed code to reset from email address
Eileen McNaughton [Fri, 1 Jul 2016 21:54:19 +0000 (09:54 +1200)]
Merge pull request #8618 from cividesk/CRM-18997-4.6
CRM-18997 DB error, incorrect truncating multibyte string
sunil [Thu, 30 Jun 2016 12:34:34 +0000 (18:04 +0530)]
upper case boolean flag
sunil [Thu, 30 Jun 2016 11:45:50 +0000 (17:15 +0530)]
added testcase to verify utf-8 string
Eileen McNaughton [Wed, 29 Jun 2016 03:22:53 +0000 (15:22 +1200)]
Merge pull request #8637 from eileenmcnaughton/CRM-19005
CRM-16642 - Compute timestamps using 24-hour clock
Eileen McNaughton [Wed, 29 Jun 2016 03:18:54 +0000 (15:18 +1200)]
Merge pull request #8610 from cividesk/CRM-18987-4.6
CRM-1897: full fix
Tim Otten [Fri, 20 May 2016 00:48:28 +0000 (17:48 -0700)]
CRM-16642 - Compute timestamps using 24-hour clock
`Ymdhis` is silly here. Use `YmdHis`. This was causing test results to
vary based on they were run.
Eileen McNaughton [Tue, 28 Jun 2016 23:14:44 +0000 (11:14 +1200)]
Merge pull request #8099 from cividesk/CRM-18362-4.6
CRM-18362 get current local for navigation menu
David Reedy Jr [Sat, 25 Jun 2016 00:40:02 +0000 (19:40 -0500)]
Fix Jenkins warning message
David Reedy Jr [Fri, 24 Jun 2016 23:54:13 +0000 (18:54 -0500)]
CRM-19007 Optionally disable USPS address...
...validation during contact import.
sunil [Thu, 23 Jun 2016 09:41:04 +0000 (15:11 +0530)]
CRM-18997 DB error, incorrect truncating multibyte string
Eileen McNaughton [Wed, 22 Jun 2016 07:55:34 +0000 (19:55 +1200)]
Merge pull request #8608 from eileenmcnaughton/missing_fn
Port missing function in 4.6. Also some minor code style syncs.
Nicolas Ganivet [Wed, 22 Jun 2016 03:51:21 +0000 (21:51 -0600)]
Convert tab to space
Nicolas Ganivet [Wed, 22 Jun 2016 03:41:03 +0000 (21:41 -0600)]
Cleaner with variable initialized.
Nicolas Ganivet [Tue, 21 Jun 2016 15:50:44 +0000 (09:50 -0600)]
Fix issue with email sent message displayed when checkbox has not been clicked in back-end membership edit screen.
eileen [Tue, 21 Jun 2016 22:40:07 +0000 (10:40 +1200)]
Port missing function in 4.6. Also some minor code style syncs.
Eileen McNaughton [Tue, 21 Jun 2016 21:55:44 +0000 (09:55 +1200)]
Merge pull request #8535 from nishant-bhorodia/CRM-18688-cancel-ipn-cancels-membership
CRM-18688: Cancel IPN cancels entire membership
root [Tue, 21 Jun 2016 14:50:35 +0000 (20:20 +0530)]
CRM-18688: whitelist Pending status
Eileen [Mon, 20 Jun 2016 06:16:21 +0000 (06:16 +0000)]
CRM-18435 handling for membership type etc fields
Conflicts:
CRM/Contact/BAO/SavedSearch.php
CRM/Member/Form/Search.php
Eileen McNaughton [Thu, 16 Jun 2016 01:12:38 +0000 (13:12 +1200)]
Merge pull request #8553 from stevekessler/patch-1
CRM-18836 Update Address.tpl
Steve Kessler [Mon, 13 Jun 2016 20:54:51 +0000 (14:54 -0600)]
Update Address.tpl
The URL for USPS is not correct any longer. Here is the new address - https://www.usps.com/business/web-tools-apis/welcome.htm
Pradeep Nayak [Fri, 10 Jun 2016 00:27:41 +0000 (05:57 +0530)]
--CRM-18804, fixed code to reset from email address
root [Wed, 8 Jun 2016 12:26:22 +0000 (17:56 +0530)]
CRM-18688: Cancel IPN cancels entire membership
Eileen McNaughton [Wed, 8 Jun 2016 05:08:10 +0000 (23:08 -0600)]
Merge pull request #8530 from seamuslee001/CRM-18772-46
CRM-18772 46 backport
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.
Seamus Lee [Mon, 6 Jun 2016 06:06:34 +0000 (16:06 +1000)]
Sync file from 4.7
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
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
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