civicrm-core.git
9 years agoCRM-17069: Search for Contribution with campaign causes fatal error
yashodha [Tue, 25 Aug 2015 05:58:47 +0000 (11:28 +0530)]
CRM-17069: Search for Contribution with campaign causes fatal error

----------------------------------------
* CRM-17069: Search for Contribution with campaign  causes fatal error
  https://issues.civicrm.org/jira/browse/CRM-17069

9 years agoMerge pull request #6583 from eileenmcnaughton/comment-cleanup
Eileen McNaughton [Tue, 25 Aug 2015 02:08:24 +0000 (14:08 +1200)]
Merge pull request #6583 from eileenmcnaughton/comment-cleanup

Comment cleanup

9 years agoMerge pull request #6581 from eileenmcnaughton/CRM-17076
Eileen McNaughton [Mon, 24 Aug 2015 23:29:22 +0000 (11:29 +1200)]
Merge pull request #6581 from eileenmcnaughton/CRM-17076

CRM-17076 future start date not showing for authorize.net

9 years agoComment fixes in report class
eileenmcnaugton [Mon, 24 Aug 2015 23:26:39 +0000 (11:26 +1200)]
Comment fixes in report class

9 years agofix up comment blocks & remove empty overrides on contribution summary form
eileenmcnaugton [Mon, 24 Aug 2015 22:56:28 +0000 (10:56 +1200)]
fix up comment blocks & remove empty overrides on contribution summary form

9 years agoCRM-17076 future start date not showing for authorize.net
Eileen [Mon, 24 Aug 2015 21:24:29 +0000 (17:24 -0400)]
CRM-17076 future start date not showing for authorize.net

9 years agoMerge pull request #6577 from eileenmcnaughton/CRM-17071
colemanw [Mon, 24 Aug 2015 12:58:14 +0000 (08:58 -0400)]
Merge pull request #6577 from eileenmcnaughton/CRM-17071

CRM-17071 add required marker to payment form

9 years agoMerge pull request #6562 from monishdeb/4.6
Monish Deb [Mon, 24 Aug 2015 09:15:48 +0000 (14:45 +0530)]
Merge pull request #6562 from monishdeb/4.6

CRM-17057 fix - Advanced Search does not respect the selected Case St…

9 years agoCRM-17071 add required marker to payment form
eileenmcnaugton [Mon, 24 Aug 2015 02:07:05 +0000 (14:07 +1200)]
CRM-17071 add required marker to payment form

This commit adds the red asterisk to required payment fields, although they
are not set on the form layer as required as we don't want to alter existing validation

9 years agoMerge pull request #6566 from colemanw/CRM-17066
colemanw [Sat, 22 Aug 2015 15:24:26 +0000 (11:24 -0400)]
Merge pull request #6566 from colemanw/CRM-17066

CRM-17066 - Specify api permissions for messageTemplates

9 years agoMerge pull request #6569 from seamuslee001/CRM-17066
colemanw [Sat, 22 Aug 2015 15:23:38 +0000 (11:23 -0400)]
Merge pull request #6569 from seamuslee001/CRM-17066

CRM-17066 Limit the Save template icon display to only those who have…

9 years agoMerge pull request #6568 from eileenmcnaughton/CRM-17068
Eileen McNaughton [Sat, 22 Aug 2015 08:47:47 +0000 (20:47 +1200)]
Merge pull request #6568 from eileenmcnaughton/CRM-17068

CRM-17068 fix static warning

9 years agoCRM-17066 Limit the Save template icon display to only those who have permission...
Seamus Lee [Sat, 22 Aug 2015 05:30:22 +0000 (05:30 +0000)]
CRM-17066 Limit the Save template icon display to only those who have permission to edit mailing templates

9 years agoCRM-17068 fix static warning
eileenmcnaughton [Sat, 22 Aug 2015 04:15:42 +0000 (04:15 +0000)]
CRM-17068 fix static warning

9 years agoCRM-17066 - Specify api permissions for messageTemplates
Coleman Watts [Fri, 21 Aug 2015 20:34:02 +0000 (16:34 -0400)]
CRM-17066 - Specify api permissions for messageTemplates

9 years agoMerge pull request #6492 from eileenmcnaughton/CRM-17020
colemanw [Fri, 21 Aug 2015 20:06:50 +0000 (16:06 -0400)]
Merge pull request #6492 from eileenmcnaughton/CRM-17020

CRM-17020 remove unindexed join from activity report

9 years agoMerge pull request #6552 from pradpnayak/CRM-16571
Dave Greenberg [Fri, 21 Aug 2015 20:05:30 +0000 (13:05 -0700)]
Merge pull request #6552 from pradpnayak/CRM-16571

CRM-16571, fixed notice error when contribution is deleted

9 years agoMerge pull request #6551 from eileenmcnaughton/CRM-17060
Monish Deb [Fri, 21 Aug 2015 14:37:46 +0000 (20:07 +0530)]
Merge pull request #6551 from eileenmcnaughton/CRM-17060

CRM-17060 fix for post code groups with IN not working

9 years agoCRM-17057 fix - Advanced Search does not respect the selected Case Status filter
monishdeb [Fri, 21 Aug 2015 14:28:30 +0000 (19:58 +0530)]
CRM-17057 fix - Advanced Search does not respect the selected Case Status filter

https://issues.civicrm.org/jira/browse/CRM-17057

9 years agoCRM-16571, fixed notice error when contribution is deleted
Pradeep Nayak [Fri, 21 Aug 2015 05:59:44 +0000 (11:29 +0530)]
CRM-16571, fixed notice error when contribution is deleted

----------------------------------------
* CRM-16571: undefined indexes when deleting a contribution
  https://issues.civicrm.org/jira/browse/CRM-16571

9 years agoCRM-17060 fix for post code groups with IN not working
eileenmcnaugton [Fri, 21 Aug 2015 05:55:26 +0000 (17:55 +1200)]
CRM-17060 fix for post code groups with IN not working

9 years agoMerge pull request #6546 from colemanw/CRM-17059
colemanw [Fri, 21 Aug 2015 00:14:30 +0000 (20:14 -0400)]
Merge pull request #6546 from colemanw/CRM-17059

CRM-17059 - Fix faulty relationship count in datatable

9 years agoCRM-17059 - Fix faulty relationship count in datatable
Coleman Watts [Thu, 20 Aug 2015 22:19:06 +0000 (18:19 -0400)]
CRM-17059 - Fix faulty relationship count in datatable

9 years agoMerge pull request #6540 from LevityNL/upstream-relationships-4.6
Dave Greenberg [Thu, 20 Aug 2015 16:58:26 +0000 (09:58 -0700)]
Merge pull request #6540 from LevityNL/upstream-relationships-4.6

Fix relationships permissions (CRM-17045) for 4.6 branch

9 years agoMerge pull request #6544 from yashodha/CRM-17048
Monish Deb [Thu, 20 Aug 2015 16:53:54 +0000 (22:23 +0530)]
Merge pull request #6544 from yashodha/CRM-17048

CRM-17048: Only one Invoice is available and attached to all the acti…

9 years agoCRM-17048: Only one Invoice is available and attached to all the activities
yashodha [Thu, 20 Aug 2015 10:33:35 +0000 (16:03 +0530)]
CRM-17048: Only one Invoice is available and attached to all the activities

----------------------------------------
* CRM-17048: Only one Invoice is available and attached to all the activities
  https://issues.civicrm.org/jira/browse/CRM-17048

9 years agoUpdate version to 4.6.8
CiviCRM [Thu, 20 Aug 2015 01:59:14 +0000 (18:59 -0700)]
Update version to 4.6.8

9 years agoFix relationships permissions (CRM-17045) for 4.6 branch
Kevin Levie [Thu, 20 Aug 2015 01:12:07 +0000 (03:12 +0200)]
Fix relationships permissions (CRM-17045) for 4.6 branch

9 years agoMerge pull request #6536 from monishdeb/4.6
Kurund Jalmi [Wed, 19 Aug 2015 15:06:38 +0000 (20:36 +0530)]
Merge pull request #6536 from monishdeb/4.6

Test case fix for Custom Value using '!=' operator

9 years agoTest case fix for Custom Value using !=
monishdeb [Wed, 19 Aug 2015 09:28:04 +0000 (14:58 +0530)]
Test case fix for Custom Value using !=

9 years agoMerge pull request #6526 from totten/4.6-regen
Tim Otten [Tue, 18 Aug 2015 19:30:30 +0000 (12:30 -0700)]
Merge pull request #6526 from totten/4.6-regen

CRM-16205 - regen.sh - Exclude cache, extension, dir/path settings, and third-party tables.

9 years agoCRM-16205 - regen.sh - Exclude cache, extension, dir/path settings, and third-party...
Tim Otten [Fri, 14 Aug 2015 05:59:39 +0000 (22:59 -0700)]
CRM-16205 - regen.sh - Exclude cache, extension, dir/path settings, and third-party tables.

9 years agoMerge pull request #6510 from monishdeb/4.6
Monish Deb [Mon, 17 Aug 2015 20:31:54 +0000 (02:01 +0530)]
Merge pull request #6510 from monishdeb/4.6

Test fixes for All kind of Custom Values

9 years agoMerge pull request #6516 from eileenmcnaughton/CRM-16737
Eileen McNaughton [Sun, 16 Aug 2015 20:46:24 +0000 (08:46 +1200)]
Merge pull request #6516 from eileenmcnaughton/CRM-16737

CRM-16737 adjustment, (do not merge to master) referred to wrong param

9 years agoMerge pull request #6508 from lsmithgo/patch-2
Kurund Jalmi [Sun, 16 Aug 2015 18:33:55 +0000 (00:03 +0530)]
Merge pull request #6508 from lsmithgo/patch-2

CRM-17030 Fix to Event Confirmation template to improve deliverability

9 years agoFormatting fixes 2
monishdeb [Sun, 16 Aug 2015 15:54:52 +0000 (21:24 +0530)]
Formatting fixes 2

9 years agocontact reference fix and minor improvments
monishdeb [Sun, 16 Aug 2015 15:34:39 +0000 (21:04 +0530)]
contact reference fix and minor improvments

9 years agoCRM-16737 adjustment, (do not merge to master) referred to wrong param
eileenmcnaughton [Sun, 16 Aug 2015 13:44:52 +0000 (13:44 +0000)]
CRM-16737 adjustment, (do not merge to master) referred to wrong param

9 years agoformatting fixes 1
monishdeb [Sat, 15 Aug 2015 21:11:59 +0000 (02:41 +0530)]
formatting fixes 1

9 years agoformatting fixes
monishdeb [Sat, 15 Aug 2015 21:02:38 +0000 (02:32 +0530)]
formatting fixes

9 years agoTest fixes for All kind of Custom Values
monishdeb [Sat, 15 Aug 2015 20:45:28 +0000 (02:15 +0530)]
Test fixes for All kind of Custom Values

9 years agoCRM-17030 Fix to Event Confirmation template to improve email deliverability
lsmithgo [Sat, 15 Aug 2015 15:28:32 +0000 (16:28 +0100)]
CRM-17030 Fix to Event Confirmation template to improve email deliverability

The Google API is only required by the webpages, not the emails.  So the fix is simply to move the <script> reference into an IF statement that only applies if SocialNetworks is being used on a webpage.

9 years agoMerge pull request #6503 from totten/4.6-random
Tim Otten [Sat, 15 Aug 2015 12:56:47 +0000 (05:56 -0700)]
Merge pull request #6503 from totten/4.6-random

Utils - SQL, Array, Resolver, DAO - Random improvements

9 years agoCivi\Core\Resolver - Add "global://" support
Tim Otten [Sat, 25 Jul 2015 03:40:14 +0000 (20:40 -0700)]
Civi\Core\Resolver - Add "global://" support

9 years agoCRM_Utils_SQL_*
Tim Otten [Thu, 30 Jul 2015 04:21:55 +0000 (21:21 -0700)]
CRM_Utils_SQL_*

9 years agoCRM_Utils_AutoClean
Tim Otten [Sat, 25 Jul 2015 03:43:08 +0000 (20:43 -0700)]
CRM_Utils_AutoClean

9 years agoCRM_Utils_Array - Add pathGet() and pathSet()
Tim Otten [Sat, 25 Jul 2015 03:38:06 +0000 (20:38 -0700)]
CRM_Utils_Array - Add pathGet() and pathSet()

9 years agoCRM_Utils_Array::extend()
Tim Otten [Thu, 23 Jul 2015 10:22:35 +0000 (03:22 -0700)]
CRM_Utils_Array::extend()

9 years agoCRM_Core_DAO::fetchAll
Tim Otten [Thu, 30 Jul 2015 04:21:23 +0000 (21:21 -0700)]
CRM_Core_DAO::fetchAll

9 years agoMerge pull request #6498 from monishdeb/4.6
Monish Deb [Fri, 14 Aug 2015 13:08:48 +0000 (18:38 +0530)]
Merge pull request #6498 from monishdeb/4.6

CRM-17022 fix - Bug introduced in 4.6.6 breaks Grant Search

9 years agoMerge pull request #6497 from jitendrapurohit/CRM-17016
Monish Deb [Fri, 14 Aug 2015 11:49:51 +0000 (17:19 +0530)]
Merge pull request #6497 from jitendrapurohit/CRM-17016

CRM-17016 -- State list for Fiji incomplete

9 years agoCRM-17022 fix - Bug introduced in 4.6.6 breaks Grant Search
monishdeb [Fri, 14 Aug 2015 07:17:39 +0000 (12:47 +0530)]
CRM-17022 fix - Bug introduced in 4.6.6 breaks Grant Search

https://issues.civicrm.org/jira/browse/CRM-17022

9 years agoCRM-17016 -- State list for Fiji incomplete
jitendrapurohit [Fri, 14 Aug 2015 06:00:33 +0000 (11:30 +0530)]
CRM-17016 -- State list for Fiji incomplete

9 years agoMerge pull request #6490 from sudhabisht/CRM-9066
Monish Deb [Fri, 14 Aug 2015 05:31:43 +0000 (11:01 +0530)]
Merge pull request #6490 from sudhabisht/CRM-9066

Fix for duplicate entry in bookkeeping transaction report

9 years agoMerge pull request #6484 from monishdeb/4.6
Monish Deb [Fri, 14 Aug 2015 05:16:13 +0000 (10:46 +0530)]
Merge pull request #6484 from monishdeb/4.6

CRM-17011 fix

9 years agoFormatting fixes
eileenmcnaugton [Fri, 14 Aug 2015 02:18:49 +0000 (14:18 +1200)]
Formatting fixes

9 years agoCRM-17020 remove unindexed join from activity report
eileenmcnaugton [Fri, 14 Aug 2015 01:27:15 +0000 (13:27 +1200)]
CRM-17020 remove unindexed join from activity report
:

9 years agoMerge pull request #6335 from totten/4.6-header-cleanup
Tim Otten [Thu, 13 Aug 2015 21:41:50 +0000 (14:41 -0700)]
Merge pull request #6335 from totten/4.6-header-cleanup

ScheduledReminder, Extensions, Cxn - Fix copy-pasted header

9 years agoMerge pull request #6489 from totten/4.6-comp-ext
Tim Otten [Thu, 13 Aug 2015 21:40:33 +0000 (14:40 -0700)]
Merge pull request #6489 from totten/4.6-comp-ext

CRM_Core_BAO_ConfigSetting - Support components from extensions

9 years agoMerge pull request #6476 from monishdeb/CRM-16950
Monish Deb [Thu, 13 Aug 2015 20:01:31 +0000 (01:31 +0530)]
Merge pull request #6476 from monishdeb/CRM-16950

Crm 16950 ix

9 years agoMerge pull request #6491 from monishdeb/46-upgrade-fix
Monish Deb [Thu, 13 Aug 2015 16:59:16 +0000 (22:29 +0530)]
Merge pull request #6491 from monishdeb/46-upgrade-fix

Upgrade script failure on Jenkin fix

9 years agoUpgrade script failure on Jenkin fix
monishdeb [Thu, 13 Aug 2015 15:03:06 +0000 (20:33 +0530)]
Upgrade script failure on Jenkin fix

9 years agoFix for duplicate entry in bookkeeping transaction
Sudha Bisht [Thu, 13 Aug 2015 10:11:40 +0000 (15:41 +0530)]
Fix for duplicate entry in bookkeeping transaction

9 years agoMerge pull request #6487 from jitendrapurohit/CRM-17009
Monish Deb [Thu, 13 Aug 2015 07:29:14 +0000 (12:59 +0530)]
Merge pull request #6487 from jitendrapurohit/CRM-17009

CRM-17009 -- event registration doesn't respect reg end date

9 years agoMerge pull request #6486 from jitendrapurohit/CRM-15935
Monish Deb [Thu, 13 Aug 2015 05:00:41 +0000 (10:30 +0530)]
Merge pull request #6486 from jitendrapurohit/CRM-15935

CRM-15935 -- Lybunt report includes people who made no contributions

9 years agoCRM_Core_BAO_ConfigSetting - Support components from extensions
Tim Otten [Wed, 12 Aug 2015 07:48:04 +0000 (00:48 -0700)]
CRM_Core_BAO_ConfigSetting - Support components from extensions

9 years agoCRM-17009 -- event registration doesn't respect reg end date
jitendrapurohit [Wed, 12 Aug 2015 13:11:15 +0000 (18:41 +0530)]
CRM-17009 -- event registration doesn't respect reg end date

9 years agoCRM-15935 -- Lybunt report includes people who made no contributions
jitendrapurohit [Wed, 12 Aug 2015 11:51:01 +0000 (17:21 +0530)]
CRM-15935 -- Lybunt report includes people who made no contributions

9 years agoCRM-17011 fix - Broken smart group regression - membership type, membership status
monishdeb [Wed, 12 Aug 2015 11:15:44 +0000 (16:45 +0530)]
CRM-17011 fix - Broken smart group regression - membership type, membership status

https://issues.civicrm.org/jira/browse/CRM-17011

9 years agoCRM-17011 fix for smart group regression
eileenmcnaugton [Wed, 12 Aug 2015 00:12:56 +0000 (12:12 +1200)]
CRM-17011 fix for smart group regression

9 years agoMerge pull request #6350 from PalanteJon/CRM-16939-4.6
Yashodha Chaku [Wed, 12 Aug 2015 08:25:33 +0000 (13:55 +0530)]
Merge pull request #6350 from PalanteJon/CRM-16939-4.6

CRM-16939 - Allow exporting current employers > 64 characters

9 years agoMerge pull request #6470 from monishdeb/CRM-17006
Monish Deb [Wed, 12 Aug 2015 07:32:58 +0000 (13:02 +0530)]
Merge pull request #6470 from monishdeb/CRM-17006

CRM-17006 fix - Advanced search on radio custom fields broken

9 years agoMerge pull request #6427 from eileenmcnaughton/CRM-16975
Monish Deb [Wed, 12 Aug 2015 06:49:30 +0000 (12:19 +0530)]
Merge pull request #6427 from eileenmcnaughton/CRM-16975

CRM-16975 fix for membership price set config - backport 4.7 code tha…

9 years agoMerge pull request #6481 from yashodha/CRM-16985
Monish Deb [Wed, 12 Aug 2015 06:27:32 +0000 (11:57 +0530)]
Merge pull request #6481 from yashodha/CRM-16985

CRM-16985: Inline edit LABEL on Option Value selector updates NAME in…

9 years agoMerge pull request #6441 from monishdeb/4.6
Kurund Jalmi [Wed, 12 Aug 2015 04:40:24 +0000 (10:10 +0530)]
Merge pull request #6441 from monishdeb/4.6

CRM-14536 fix - Free Membership still submits to payment processor

9 years agoMerge pull request #6475 from colemanw/CRM-16806
colemanw [Wed, 12 Aug 2015 01:38:23 +0000 (21:38 -0400)]
Merge pull request #6475 from colemanw/CRM-16806

CRM-16806 - Additional cleanup

9 years agoMerge pull request #6436 from seamuslee001/msgtemplate_dynamic_load
colemanw [Wed, 12 Aug 2015 01:37:53 +0000 (21:37 -0400)]
Merge pull request #6436 from seamuslee001/msgtemplate_dynamic_load

CRM-16983 Dynamically load the content of Message templates in CiviMail when se…

9 years agoMerge pull request #6468 from eileenmcnaughton/CRM-17010
Eileen McNaughton [Tue, 11 Aug 2015 21:42:04 +0000 (09:42 +1200)]
Merge pull request #6468 from eileenmcnaughton/CRM-17010

CRM-17010 add data info to price-set-class

9 years agoMove to getsingle api and associated changes
Seamus Lee [Tue, 11 Aug 2015 21:11:56 +0000 (21:11 +0000)]
Move to getsingle api and associated changes

9 years agoreverted extra code
monishdeb [Tue, 11 Aug 2015 19:56:21 +0000 (01:26 +0530)]
reverted extra code

9 years agoformat fix
monishdeb [Tue, 11 Aug 2015 19:31:37 +0000 (01:01 +0530)]
format fix

9 years agoQA changes
monishdeb [Tue, 11 Aug 2015 19:22:33 +0000 (00:52 +0530)]
QA changes

9 years agoCRM-16806 - Additional cleanup
Coleman Watts [Tue, 11 Aug 2015 19:12:30 +0000 (15:12 -0400)]
CRM-16806 - Additional cleanup

9 years agoMerge pull request #6177 from xurizaemon/CRM-16806
colemanw [Tue, 11 Aug 2015 19:03:16 +0000 (15:03 -0400)]
Merge pull request #6177 from xurizaemon/CRM-16806

CRM-16806: Validate supplied entity type.

9 years agoMerge pull request #6462 from eileenmcnaughton/4.6
colemanw [Tue, 11 Aug 2015 17:16:13 +0000 (13:16 -0400)]
Merge pull request #6462 from eileenmcnaughton/4.6

CRM-16993 actual fix on not crashing when recurring is paid …

9 years agoCRM-16950 display tax rate on renewal form
Brian Shaughnessy [Wed, 5 Aug 2015 00:59:43 +0000 (20:59 -0400)]
CRM-16950 display tax rate on renewal form

9 years agoCRM-16950 apply tax during membership renewal
Brian Shaughnessy [Sat, 1 Aug 2015 17:53:44 +0000 (13:53 -0400)]
CRM-16950 apply tax during membership renewal

9 years agoCRM-16985: Inline edit LABEL on Option Value selector updates NAME instead
yashodha [Tue, 11 Aug 2015 13:09:35 +0000 (18:39 +0530)]
CRM-16985: Inline edit LABEL on Option Value selector updates NAME instead

----------------------------------------
* CRM-16985: Inline edit LABEL on Option Value selector updates NAME instead
  https://issues.civicrm.org/jira/browse/CRM-16985

9 years agoFormat fix
monishdeb [Tue, 11 Aug 2015 12:54:50 +0000 (18:24 +0530)]
Format fix

9 years agoCRM-17006 fix - Advanced search on radio custom fields broken
monishdeb [Tue, 11 Aug 2015 11:27:22 +0000 (16:57 +0530)]
CRM-17006 fix - Advanced search on radio custom fields broken

https://issues.civicrm.org/jira/browse/CRM-17006

9 years agoCRM-17010 add data info to price-set-class
eileenmcnaugton [Tue, 11 Aug 2015 05:46:37 +0000 (17:46 +1200)]
CRM-17010 add data info to price-set-class

9 years agoMerge pull request #6466 from seamuslee001/permisssion_fixup_4.6
colemanw [Tue, 11 Aug 2015 01:52:16 +0000 (21:52 -0400)]
Merge pull request #6466 from seamuslee001/permisssion_fixup_4.6

CRM-17003 Output Administer Multiple Organisation permission as an ar…

9 years agoMerge pull request #6339 from cividesk/Fortify_Fixes
Tim Otten [Tue, 11 Aug 2015 01:24:01 +0000 (18:24 -0700)]
Merge pull request #6339 from cividesk/Fortify_Fixes

Fortify fixes

9 years agoCRM-17003 Output Administer Multiple Organisation permission as an array not as string
Seamus Lee [Mon, 10 Aug 2015 21:38:47 +0000 (21:38 +0000)]
CRM-17003 Output Administer Multiple Organisation permission as an array not as string

9 years agoCRM-16993 avoid fatal when line items are created & then altered to completed
eileenmcnaugton [Mon, 10 Aug 2015 04:17:01 +0000 (16:17 +1200)]
CRM-16993 avoid fatal when line items are created & then altered to completed

9 years agoWebtests and improvisations
monishdeb [Mon, 10 Aug 2015 10:31:22 +0000 (16:01 +0530)]
Webtests and improvisations

9 years agoCRM-14536 fix - Free Membership still submits to payment processor
monishdeb [Fri, 7 Aug 2015 17:43:07 +0000 (23:13 +0530)]
CRM-14536 fix - Free Membership still submits to payment processor

https://issues.civicrm.org/jira/browse/CRM-14536

9 years agoMerge pull request #6458 from totten/4.6-toxic-list
Tim Otten [Mon, 10 Aug 2015 07:08:17 +0000 (00:08 -0700)]
Merge pull request #6458 from totten/4.6-toxic-list

INFRA-142 - Add .toxic.json

9 years agoINFRA-142 - distmaker - (Precaution) Exclude .toxic.json
Tim Otten [Mon, 10 Aug 2015 06:27:38 +0000 (23:27 -0700)]
INFRA-142 - distmaker - (Precaution) Exclude .toxic.json

This file shouldn't show up in the root (since dm_install_core uses a
whitelist), but if we add it to other repos, it could show there.

9 years agoMerge pull request #6037 from colemanw/CRM-16512
Monish Deb [Mon, 10 Aug 2015 05:36:18 +0000 (11:06 +0530)]
Merge pull request #6037 from colemanw/CRM-16512

CRM-16512 - Hide dashboard related contact table for users without 'view my contact'