civicrm-core.git
6 years agoMerge pull request #12188 from larssg-wildsight/master
Eileen McNaughton [Thu, 24 May 2018 00:31:24 +0000 (12:31 +1200)]
Merge pull request #12188 from larssg-wildsight/master

dev/core#43 - Update geocoding setting text to reflect need for Google API key

6 years agodev/core#135 Fix remaining non well formed numeric number problems in CRM_Batch_Form_...
Seamus Lee [Thu, 24 May 2018 00:05:59 +0000 (10:05 +1000)]
dev/core#135 Fix remaining non well formed numeric number problems in CRM_Batch_Form_EntryTest

6 years agoMerge pull request #12190 from seamuslee001/dev_ore_135_a
Seamus Lee [Thu, 24 May 2018 00:03:25 +0000 (10:03 +1000)]
Merge pull request #12190 from seamuslee001/dev_ore_135_a

dev/core#135 Fix first of 2 non numeric issues in CRM_Batch_form_entr…

6 years agoMerge pull request #12189 from seamuslee001/117_report_recur
Seamus Lee [Wed, 23 May 2018 23:53:14 +0000 (09:53 +1000)]
Merge pull request #12189 from seamuslee001/117_report_recur

Dev/Core#117 Fix use of each() function in Recur Report

6 years agodev/core#135 Fix first of 2 non numeric issues in CRM_Batch_form_entryTest
Seamus Lee [Wed, 23 May 2018 21:55:05 +0000 (07:55 +1000)]
dev/core#135 Fix first of 2 non numeric issues in CRM_Batch_form_entryTest

6 years agoDev/Core#117 Fix use of each() function in Recur Report
Seamus Lee [Wed, 23 May 2018 21:35:48 +0000 (07:35 +1000)]
Dev/Core#117 Fix use of each() function in Recur Report

6 years agoMerge pull request #12187 from colemanw/recursive
Seamus Lee [Wed, 23 May 2018 21:31:46 +0000 (07:31 +1000)]
Merge pull request #12187 from colemanw/recursive

Add utils for finding nested array items

6 years agoAdd utils for finding nested array items
Coleman Watts [Wed, 23 May 2018 19:42:59 +0000 (13:42 -0600)]
Add utils for finding nested array items

6 years agoUpdate GetFields.php
wildsight [Wed, 23 May 2018 19:39:51 +0000 (13:39 -0600)]
Update GetFields.php

6 years agoUpdate Map.setting.php
wildsight [Wed, 23 May 2018 19:34:38 +0000 (13:34 -0600)]
Update Map.setting.php

6 years agoUpdate Mapping.tpl
wildsight [Wed, 23 May 2018 19:32:45 +0000 (13:32 -0600)]
Update Mapping.tpl

6 years agoUpdate Mapping.tpl
wildsight [Wed, 23 May 2018 19:25:02 +0000 (13:25 -0600)]
Update Mapping.tpl

6 years agoadding test to ensure dependent entities are uninstalled cleanly
Michael McAndrew [Wed, 23 May 2018 09:26:50 +0000 (10:26 +0100)]
adding test to ensure dependent entities are uninstalled cleanly

6 years agoDelete entities in the reverse order that they were created
Michael McAndrew [Mon, 23 Apr 2018 11:16:57 +0000 (12:16 +0100)]
Delete entities in the reverse order that they were created

6 years agoalways remove entity from civicrm_managed if we think it should be deleted
Michael McAndrew [Mon, 23 Apr 2018 11:01:55 +0000 (12:01 +0100)]
always remove entity from civicrm_managed if we think it should be deleted

6 years agoCIVICRM-832: Removing related memberships if parent membership type is changed which...
Alok Patel [Wed, 23 May 2018 07:05:55 +0000 (12:35 +0530)]
CIVICRM-832: Removing related memberships if parent membership type is changed which does not have relation type associated.

6 years agoset default created_id value to BAO
deb.monish [Wed, 18 Apr 2018 12:03:46 +0000 (17:33 +0530)]
set default created_id value to BAO

6 years agoCRM-19948: Store the logged in contact ID as the file uploader
Davi Alexandre [Tue, 31 Jan 2017 20:30:30 +0000 (18:30 -0200)]
CRM-19948: Store the logged in contact ID as the file uploader

6 years agoCRM-19948: Add The created_id field to File
Davi Alexandre [Wed, 8 Mar 2017 20:40:04 +0000 (17:40 -0300)]
CRM-19948: Add The created_id field to File

6 years agoMerge pull request #12137 from eileenmcnaughton/year_fiscal
Eileen McNaughton [Tue, 22 May 2018 19:30:09 +0000 (07:30 +1200)]
Merge pull request #12137 from eileenmcnaughton/year_fiscal

Extend fiscal year relative options to better match other periods

6 years agoMerge pull request #12182 from michaelmcandrew/dev/mail#10
Monish Deb [Tue, 22 May 2018 18:01:15 +0000 (23:31 +0530)]
Merge pull request #12182 from michaelmcandrew/dev/mail#10

only add a closing quote if it is not already present

6 years agoonly add a closing quote if it is not already present
Michael McAndrew [Tue, 22 May 2018 15:28:19 +0000 (16:28 +0100)]
only add a closing quote if it is not already present

6 years agoMerge pull request #12169 from seamuslee001/mime_mail_upgrade
Monish Deb [Tue, 22 May 2018 13:13:02 +0000 (18:43 +0530)]
Merge pull request #12169 from seamuslee001/mime_mail_upgrade

Update variable name as per upgraded Mime_mail package to support PHP7.2

6 years ago[NFC] stop passing around variables that are cached anyway.
eileen [Tue, 22 May 2018 11:11:02 +0000 (23:11 +1200)]
[NFC] stop passing around variables that are cached anyway.

6 years ago[NFC] minor variable renaming.
eileen [Tue, 22 May 2018 10:44:25 +0000 (22:44 +1200)]
[NFC] minor variable renaming.

I am working through https://github.com/civicrm/civicrm-core/pull/11870/files &
this is one very minor change that makes sense to commit in isolation

6 years agominor fix
deb.monish [Tue, 22 May 2018 10:24:21 +0000 (15:54 +0530)]
minor fix

6 years agoUpdate variable name as per upgraded Mime_mail package to support PHP7.2
Seamus Lee [Sat, 19 May 2018 21:55:26 +0000 (07:55 +1000)]
Update variable name as per upgraded Mime_mail package to support PHP7.2

6 years agoMerge pull request #12170 from seamuslee001/php72_pledge_foreach
Monish Deb [Tue, 22 May 2018 09:06:51 +0000 (14:36 +0530)]
Merge pull request #12170 from seamuslee001/php72_pledge_foreach

dev/core#117 Fix use of each in CRM/Pledge

6 years agoAdd unit test
Jitendra Purohit [Tue, 22 May 2018 05:48:07 +0000 (11:18 +0530)]
Add unit test

6 years agomembership/issues/2 - Add membership start date and registration start/end date to...
Jitendra Purohit [Fri, 11 May 2018 10:58:30 +0000 (16:28 +0530)]
membership/issues/2 - Add membership start date and registration start/end date to schedule reminder

6 years agoMerge pull request #11732 from twomice/CRM-21811_optimize_search_reciprocal_relations...
Seamus Lee [Tue, 22 May 2018 04:01:26 +0000 (14:01 +1000)]
Merge pull request #11732 from twomice/CRM-21811_optimize_search_reciprocal_relationship_group

CRM-21811: Optimize advanced search by relationship with target g…

6 years agoMerge pull request #12175 from eileenmcnaughton/jamie
Eileen McNaughton [Mon, 21 May 2018 20:06:06 +0000 (08:06 +1200)]
Merge pull request #12175 from eileenmcnaughton/jamie

dev/core#35 Avoid variable leakage on recurring contribution receipts.

6 years agoMerge pull request #11944 from JMAConsulting/access-3-1
Monish Deb [Mon, 21 May 2018 20:02:22 +0000 (01:32 +0530)]
Merge pull request #11944 from JMAConsulting/access-3-1

(accessibility/misc-core-fixes/issues/3) Remove CMS specific print header templates that share same code

6 years agofixed civilint error
Michael McAndrew [Mon, 21 May 2018 19:50:33 +0000 (20:50 +0100)]
fixed civilint error

6 years agoadding system check for address parsing
Michael McAndrew [Mon, 21 May 2018 19:46:56 +0000 (20:46 +0100)]
adding system check for address parsing

6 years agorefactor post process - remove unecessary foreach
Michael McAndrew [Mon, 21 May 2018 19:46:32 +0000 (20:46 +0100)]
refactor post process - remove unecessary foreach

6 years agoMerge pull request #12128 from eileenmcnaughton/cust_extract
colemanw [Mon, 21 May 2018 12:07:09 +0000 (08:07 -0400)]
Merge pull request #12128 from eileenmcnaughton/cust_extract

Permit UI editing of custom data on other entities (here relationship_type) when enabled in an extension

6 years agoMerge pull request #12155 from seamuslee001/php7_2_each_membership
colemanw [Mon, 21 May 2018 12:03:48 +0000 (08:03 -0400)]
Merge pull request #12155 from seamuslee001/php7_2_each_membership

dev/core#117 Replace use of Deprecated function each in CRM/Member/BA…

6 years agoMerge pull request #12172 from eileenmcnaughton/report_id_filter
colemanw [Mon, 21 May 2018 12:01:13 +0000 (08:01 -0400)]
Merge pull request #12172 from eileenmcnaughton/report_id_filter

dev/core#126 Add support for contact id as a basic report filter.

6 years agoMerge pull request #12153 from JMAConsulting/dev_core_116
Eileen McNaughton [Mon, 21 May 2018 11:33:33 +0000 (23:33 +1200)]
Merge pull request #12153 from JMAConsulting/dev_core_116

dev/core#116 Search builder searches on primary addresses are producing unexpected results

6 years agodev/core#35 Avoid variable leakage on recurring contribution receipts.
Jamie McClelland [Wed, 28 Mar 2018 18:55:50 +0000 (14:55 -0400)]
dev/core#35 Avoid variable leakage on recurring contribution receipts.

This covers pcpParams (which are tested & sets up the data set to extend to honor
params).

See https://lab.civicrm.org/dev/core/issues/35

6 years ago(accessibility/misc-core-fixes/issues/3) Remove CMS specific print header templates...
deb.monish [Fri, 6 Apr 2018 13:25:01 +0000 (18:55 +0530)]
(accessibility/misc-core-fixes/issues/3) Remove CMS specific print header templates that share same code

6 years agoMerge pull request #11737 from aydun/CRM-21816-relative-dates-in-search
Eileen McNaughton [Mon, 21 May 2018 03:28:20 +0000 (15:28 +1200)]
Merge pull request #11737 from aydun/CRM-21816-relative-dates-in-search

CRM-21816 Fix Relative dates in search bug

6 years agoMerge pull request #12036 from mattwire/mail_unsetcc
Eileen McNaughton [Mon, 21 May 2018 02:21:59 +0000 (14:21 +1200)]
Merge pull request #12036 from mattwire/mail_unsetcc

dev/core#85 On some servers mail() fails when 'Cc' or 'Bcc' headers are defined but empty

6 years agoMerge pull request #12171 from eileenmcnaughton/paypal_ex
Eileen McNaughton [Mon, 21 May 2018 01:43:03 +0000 (13:43 +1200)]
Merge pull request #12171 from eileenmcnaughton/paypal_ex

Towards dev/financial/#16 Paypal unreliable getting payment processor type

6 years agoAdd support for contact id as a basic report filter.
eileen [Mon, 21 May 2018 01:04:03 +0000 (13:04 +1200)]
Add support for contact id as a basic report filter.

This is to address a declared regression https://lab.civicrm.org/dev/core/issues/126 (in 4.7.30) and also to improve flexibility

6 years agoTowards dev/financial/#16 Paypal unreliable getting payment processor type
eileen [Sun, 20 May 2018 23:16:20 +0000 (11:16 +1200)]
Towards dev/financial/#16 Paypal unreliable getting payment processor type

This is a partial reviewer's commit on the work Matt did in
https://github.com/civicrm/civicrm-core/pull/12007#event-1631874773

It adds the new function & new construct but I spotted an error in
the usage of the function & so want to add the usage changes more slowly
& carefully

6 years agoMerge pull request #11679 from jitendrapurohit/CRM-21776
Eileen McNaughton [Sun, 20 May 2018 22:51:10 +0000 (10:51 +1200)]
Merge pull request #11679 from jitendrapurohit/CRM-21776

CRM-21776: Ensure from clause adds custom table when search query is …

6 years agoMerge pull request #12159 from tschuettler/123-core-particpiant-import-custom-fields
Eileen McNaughton [Sun, 20 May 2018 21:57:17 +0000 (09:57 +1200)]
Merge pull request #12159 from tschuettler/123-core-particpiant-import-custom-fields

dev/core#123 Retrieve existing participant custom fields for import

6 years agoMerge pull request #12156 from seamuslee001/non_numeric_membership_test
Monish Deb [Sun, 20 May 2018 13:07:42 +0000 (18:37 +0530)]
Merge pull request #12156 from seamuslee001/non_numeric_membership_test

Fix issue where non numeric number was encounted in running unit test…

6 years agoFix issue where non numeric number was encounted in running unit tests on php7.2
Seamus Lee [Thu, 17 May 2018 21:51:42 +0000 (07:51 +1000)]
Fix issue where non numeric number was encounted in running unit tests on php7.2

Unit Test in api_v3_MembershipTest was throwing an error on the non numeric value of tax_amount, tax_amount was a NULL string.

6 years agodev/core#117 Fix Pledge each use in CRM/Pledge
Seamus Lee [Sun, 20 May 2018 02:29:42 +0000 (12:29 +1000)]
dev/core#117 Fix Pledge each use in CRM/Pledge

6 years agodev/core#117 Replace use of Deprecated function each in CRM/Member/BAO/Membership...
Seamus Lee [Thu, 17 May 2018 21:51:33 +0000 (07:51 +1000)]
dev/core#117 Replace use of Deprecated function each in CRM/Member/BAO/Membership.php to assit in supporting php7.2

Rename Variable to be more accurate

6 years agoMerge pull request #12162 from seamuslee001/group_query_count
Monish Deb [Sat, 19 May 2018 18:27:16 +0000 (23:57 +0530)]
Merge pull request #12162 from seamuslee001/group_query_count

dev/core#118 Fix issue using count on non array in Group query builder

6 years agoMerge pull request #12157 from seamuslee001/pass_by_reference_mailing
colemanw [Sat, 19 May 2018 18:26:05 +0000 (14:26 -0400)]
Merge pull request #12157 from seamuslee001/pass_by_reference_mailing

Remove pass by reference for some mailing functions

6 years agoMerge pull request #12166 from seamuslee001/token_each
Monish Deb [Sat, 19 May 2018 18:25:32 +0000 (23:55 +0530)]
Merge pull request #12166 from seamuslee001/token_each

dev/core#117 Replace deprecated each with foreach in CRM/Utils/Token.php

6 years agoMerge pull request #12167 from seamuslee001/import_each
colemanw [Sat, 19 May 2018 18:23:08 +0000 (14:23 -0400)]
Merge pull request #12167 from seamuslee001/import_each

dev/core#117 Replace deprecated each with foreach in CRM/Utils/Migrat…

6 years agoMerge pull request #12168 from seamuslee001/dev_core_131
Mathieu Lu [Sat, 19 May 2018 15:32:17 +0000 (11:32 -0400)]
Merge pull request #12168 from seamuslee001/dev_core_131

dev/core#131 Add in missing UK state Monmouthshire

6 years agoMerge pull request #12163 from seamuslee001/count_peldge_tests
Monish Deb [Sat, 19 May 2018 14:23:10 +0000 (19:53 +0530)]
Merge pull request #12163 from seamuslee001/count_peldge_tests

dev/core#118 Fix Count issues with PledgePayment and Pledge BAO tests

6 years agoMerge pull request #12164 from seamuslee001/region_create_function
Monish Deb [Sat, 19 May 2018 12:56:26 +0000 (18:26 +0530)]
Merge pull request #12164 from seamuslee001/region_create_function

dev/core#130 Remove deprecated create_function from RegionTest in fav…

6 years agodev/core#117 Replace deprecated each with foreach in CRM/Utils/Token.php
Seamus Lee [Sat, 19 May 2018 04:15:10 +0000 (14:15 +1000)]
dev/core#117 Replace deprecated each with foreach in CRM/Utils/Token.php

6 years agoMerge pull request #12165 from seamuslee001/activity_query_each
Monish Deb [Sat, 19 May 2018 09:50:31 +0000 (15:20 +0530)]
Merge pull request #12165 from seamuslee001/activity_query_each

dev/core#117 Replace deprecated each with foreach in CRM/Activity/BAO…

6 years agodev/core#131 Add in missing UK state Monmouthshire
applicado [Tue, 15 May 2018 15:01:40 +0000 (16:01 +0100)]
dev/core#131 Add in missing UK state Monmouthshire

Monmouthshire is in Wales

dev/core#131 Add in upgrade step to add in missing UK state province

6 years agodev/core#117 Replace deprecated each with foreach in CRM/Activity/BAO/Query.php
Seamus Lee [Sat, 19 May 2018 04:15:27 +0000 (14:15 +1000)]
dev/core#117 Replace deprecated each with foreach in CRM/Activity/BAO/Query.php

6 years agodev/core#117 Replace deprecated each with foreach in CRM/Utils/Migrate/Import.php
Seamus Lee [Sat, 19 May 2018 04:15:19 +0000 (14:15 +1000)]
dev/core#117 Replace deprecated each with foreach in CRM/Utils/Migrate/Import.php

6 years agodev/core#118 Fix Count issues with PledgePayment and Pledge BAO tests
Seamus Lee [Sat, 19 May 2018 03:29:50 +0000 (13:29 +1000)]
dev/core#118 Fix Count issues with PledgePayment and Pledge BAO tests

6 years agodev/core#130 Remove deprecated create_function from RegionTest in favor of an annoymo...
Seamus Lee [Sat, 19 May 2018 04:04:25 +0000 (14:04 +1000)]
dev/core#130 Remove deprecated create_function from RegionTest in favor of an annoymous function

6 years agodev/core#118 Fix issue using count on non array in Group query builder
Seamus Lee [Sat, 19 May 2018 03:30:09 +0000 (13:30 +1000)]
dev/core#118 Fix issue using count on non array in Group query builder

6 years agodev/core#123 Retrieve existing participant custom fields for import
Thomas [Fri, 18 May 2018 15:31:29 +0000 (17:31 +0200)]
dev/core#123 Retrieve existing participant custom fields for import

6 years agoTry removing some more passing by reference
Seamus Lee [Fri, 18 May 2018 09:18:16 +0000 (19:18 +1000)]
Try removing some more passing by reference

6 years agoAttempt to remove pass by reference in some mailing functions
Seamus Lee [Thu, 17 May 2018 22:34:16 +0000 (08:34 +1000)]
Attempt to remove pass by reference in some mailing functions

6 years agoMerge pull request #12154 from compucorp/122-fix-bug-with-action-links
colemanw [Thu, 17 May 2018 13:53:58 +0000 (09:53 -0400)]
Merge pull request #12154 from compucorp/122-fix-bug-with-action-links

dev/core#122 Wrong Action Links Shown for Reserved and Locked Option Groups

6 years agodev/core#122 Add check for DELETE flag before unsetting it
Michael Devery [Thu, 17 May 2018 11:01:17 +0000 (12:01 +0100)]
dev/core#122 Add check for DELETE flag before unsetting it

6 years ago(dev/core/116) Search builder searches on primary addresses are producing unexpected...
deb.monish [Thu, 17 May 2018 09:48:53 +0000 (15:18 +0530)]
(dev/core/116) Search builder searches on primary addresses are producing unexpected results

6 years agoMerge pull request #12150 from eileenmcnaughton/memdetail52
Eileen McNaughton [Wed, 16 May 2018 23:15:06 +0000 (11:15 +1200)]
Merge pull request #12150 from eileenmcnaughton/memdetail52

Fix Fatal error on membership detail report (with ACLs enabled) dev/core/#100

6 years agoFix Fatal error on membership detail report (with ACLs enabled) dev/core/#100
eileen [Tue, 8 May 2018 00:30:03 +0000 (12:30 +1200)]
Fix Fatal error on membership detail report (with ACLs enabled) dev/core/#100

6 years agoMerge pull request #11629 from JMAConsulting/CRM-21675
colemanw [Wed, 16 May 2018 19:45:48 +0000 (15:45 -0400)]
Merge pull request #11629 from JMAConsulting/CRM-21675

CRM-21675: scheduled reminders: limit to group doesn't support parent groups

6 years agoMerge pull request #11772 from michaelmcandrew/CRM-21821-respect-nav-item-weight
colemanw [Wed, 16 May 2018 15:41:49 +0000 (11:41 -0400)]
Merge pull request #11772 from michaelmcandrew/CRM-21821-respect-nav-item-weight

CRM-21821 respect nav item weight

6 years agoMerge pull request #12146 from seamuslee001/contribute_import_parser_count
Monish Deb [Wed, 16 May 2018 13:09:22 +0000 (18:39 +0530)]
Merge pull request #12146 from seamuslee001/contribute_import_parser_count

(NFC) Fix cannot use count() on object that doesn't implement countab…

6 years agoMerge pull request #12000 from compucorp/timeline-name-edit-inplace
Eileen McNaughton [Wed, 16 May 2018 09:57:41 +0000 (21:57 +1200)]
Merge pull request #12000 from compucorp/timeline-name-edit-inplace

Add inplace edit for timeline name

6 years ago(NFC) Fix cannot use count() on object that doesn't implement countable in tests...
Seamus Lee [Wed, 16 May 2018 09:46:37 +0000 (19:46 +1000)]
(NFC) Fix cannot use count() on object that doesn't implement countable in tests/phpunit/CRM/Contribute/Import/Parser/ContributionTest.php

6 years agoMerge pull request #12003 from vinuvarshith/dev/core/69-fix-state-province-name-token...
Eileen McNaughton [Wed, 16 May 2018 09:18:20 +0000 (21:18 +1200)]
Merge pull request #12003 from vinuvarshith/dev/core/69-fix-state-province-name-token-issue

code/dev/69: Change Approach For Setting state_province_name

6 years agoMerge pull request #12011 from lcdservices/dev-financial-12
Eileen McNaughton [Wed, 16 May 2018 07:51:46 +0000 (19:51 +1200)]
Merge pull request #12011 from lcdservices/dev-financial-12

dev/financial#12 move soft credit item count to object property

6 years agoMerge pull request #12145 from civicrm/5.2
Eileen McNaughton [Wed, 16 May 2018 07:49:03 +0000 (19:49 +1200)]
Merge pull request #12145 from civicrm/5.2

5.2 merge to master

6 years agoMerge pull request #12143 from seamuslee001/5.2
Eileen McNaughton [Wed, 16 May 2018 07:48:24 +0000 (19:48 +1200)]
Merge pull request #12143 from seamuslee001/5.2

(NFC) Add in 5.1.0 and 5.1.1 mysql upgrade files

6 years agoMerge pull request #11962 from compucorp/55-hide-adding-option-value-for-locked-groups
Eileen McNaughton [Wed, 16 May 2018 06:58:59 +0000 (18:58 +1200)]
Merge pull request #11962 from compucorp/55-hide-adding-option-value-for-locked-groups

Hide Adding Option Value for Locked Groups

6 years agoFix unit tests
Debarshi Bhaumik [Wed, 16 May 2018 06:51:44 +0000 (12:21 +0530)]
Fix unit tests

6 years agoAdd in 5.1.0 and 5.1.1 mysql upgrade files
Seamus Lee [Wed, 16 May 2018 03:14:53 +0000 (13:14 +1000)]
Add in 5.1.0 and 5.1.1 mysql upgrade files

6 years agoMerge pull request #12135 from eileenmcnaughton/fgb_up
Eileen McNaughton [Wed, 16 May 2018 00:56:45 +0000 (12:56 +1200)]
Merge pull request #12135 from eileenmcnaughton/fgb_up

added unit test

6 years agoMerge pull request #12140 from seamuslee001/civicrm-version-filemode
Eileen McNaughton [Wed, 16 May 2018 00:45:46 +0000 (12:45 +1200)]
Merge pull request #12140 from seamuslee001/civicrm-version-filemode

(NFC) fix file permissions on civicrm-version.php

6 years agoMerge pull request #12141 from seamuslee001/file_perms_fix
Eileen McNaughton [Wed, 16 May 2018 00:44:15 +0000 (12:44 +1200)]
Merge pull request #12141 from seamuslee001/file_perms_fix

Fix file perms on files back to 664

6 years agoAdd release notes for 5.1.1
Tim Otten [Wed, 16 May 2018 00:29:24 +0000 (17:29 -0700)]
Add release notes for 5.1.1

6 years agoFix file perms on files back to 664
Seamus Lee [Tue, 15 May 2018 23:28:13 +0000 (09:28 +1000)]
Fix file perms on files back to 664

6 years ago(NFC) fix file permissions on civicrm-version.php
Seamus Lee [Tue, 15 May 2018 23:23:55 +0000 (09:23 +1000)]
(NFC) fix file permissions on civicrm-version.php

6 years agoMerge pull request #12139 from JMAConsulting/dev-drupal-17
Mathieu Lu [Tue, 15 May 2018 23:11:32 +0000 (19:11 -0400)]
Merge pull request #12139 from JMAConsulting/dev-drupal-17

(dev/drupal/17) Add Drupal8 support for getUFLocale()

6 years agoMerge pull request #12103 from seamuslee001/issue_footer
Eileen McNaughton [Tue, 15 May 2018 23:05:48 +0000 (11:05 +1200)]
Merge pull request #12103 from seamuslee001/issue_footer

(NFC) Update view issues and report bugs link in footer to point to the lab

6 years agoMerge pull request #12024 from yashodha/price_custom_search
Eileen McNaughton [Tue, 15 May 2018 23:00:36 +0000 (11:00 +1200)]
Merge pull request #12024 from yashodha/price_custom_search

core/issues/74 - 'Price Set Details for Event Participants' gives DB …

6 years agoMerge pull request #12130 from seamuslee001/karma_upgrade_2
Tim Otten [Tue, 15 May 2018 22:52:06 +0000 (15:52 -0700)]
Merge pull request #12130 from seamuslee001/karma_upgrade_2

(NFC) Update to latest versions of karma and jasmine used only in tes…

6 years agoExtend fiscal year relative options to better match other periods
eileen [Tue, 15 May 2018 11:19:39 +0000 (23:19 +1200)]
Extend fiscal year relative options to better match other periods

6 years agoMerge pull request #12106 from eileenmcnaughton/activity
Seamus Lee [Tue, 15 May 2018 21:57:25 +0000 (07:57 +1000)]
Merge pull request #12106 from eileenmcnaughton/activity

[NFC] Cleanup on ActivityTest class.