civicrm-core.git
9 years agoEnable/Disable switcher button added.
Helena [Sun, 11 Oct 2015 15:25:36 +0000 (16:25 +0100)]
Enable/Disable switcher button added.

9 years agoMerge pull request #6912 from yashodha/CRM-17351
Kurund Jalmi [Sun, 11 Oct 2015 14:04:10 +0000 (15:04 +0100)]
Merge pull request #6912 from yashodha/CRM-17351

CRM-17351: Unable to mark price set field as inactive

9 years agoMerge pull request #6895 from jake-mw/CRM-16669
Eileen McNaughton [Sun, 11 Oct 2015 01:49:16 +0000 (14:49 +1300)]
Merge pull request #6895 from jake-mw/CRM-16669

CRM-16669 - ensure financialType is loaded for cc transactions

9 years agoMerge pull request #6922 from eileenmcnaughton/CRM-17000
colemanw [Sat, 10 Oct 2015 16:47:14 +0000 (12:47 -0400)]
Merge pull request #6922 from eileenmcnaughton/CRM-17000

CRM-17000 bypass separatevalues for getfields for performance

9 years agoCRM-17000 bypass separatevalues for getfields for performance
eileen [Fri, 9 Oct 2015 23:29:22 +0000 (12:29 +1300)]
CRM-17000 bypass separatevalues for getfields for performance

9 years agoMerge pull request #6921 from kurund/CRM-16785
Kurund Jalmi [Fri, 9 Oct 2015 15:03:54 +0000 (16:03 +0100)]
Merge pull request #6921 from kurund/CRM-16785

CRM-16785, exclude code coverage

9 years agoCRM-16785, exclude code coverage
Kurund Jalmi [Fri, 9 Oct 2015 14:59:50 +0000 (15:59 +0100)]
CRM-16785, exclude code coverage

----------------------------------------
* CRM-16785: non-free file "packages/PHP/CodeCoverage/Report/HTML/Renderer/Template/highcharts.js"
  https://issues.civicrm.org/jira/browse/CRM-16785

9 years agoCRM-17351: remove whitespace
yashodha [Thu, 8 Oct 2015 13:53:28 +0000 (19:23 +0530)]
CRM-17351: remove whitespace

----------------------------------------
* CRM-17351: Unable to mark price set field as inactive
  https://issues.civicrm.org/jira/browse/CRM-17351

9 years agoMerge pull request #6911 from monishdeb/CRM-17353
Monish Deb [Thu, 8 Oct 2015 12:06:00 +0000 (17:36 +0530)]
Merge pull request #6911 from monishdeb/CRM-17353

CRM-17353 fix - Membership Dashboard has links with eg status1,2,3 wh…

9 years agoCRM-17351: more fixes for unsetting option
yashodha [Thu, 8 Oct 2015 11:06:30 +0000 (16:36 +0530)]
CRM-17351: more fixes for unsetting option

----------------------------------------
* CRM-17351: Unable to mark price set field as inactive
  https://issues.civicrm.org/jira/browse/CRM-17351

9 years agoMerge pull request #6898 from yashodha/CRM-17299
Yashodha Chaku [Thu, 8 Oct 2015 08:31:19 +0000 (14:01 +0530)]
Merge pull request #6898 from yashodha/CRM-17299

CRM-17299: Yes or No custom fields not displayed correctly in table

9 years agoCRM-17351: Unable to mark price set field as inactive
yashodha [Thu, 8 Oct 2015 06:44:18 +0000 (12:14 +0530)]
CRM-17351: Unable to mark price set field as inactive

----------------------------------------
* CRM-17351: Unable to mark price set field as inactive
  https://issues.civicrm.org/jira/browse/CRM-17351

9 years agoCRM-17353 fix - Membership Dashboard has links with eg status1,2,3 which do not cause...
monishdeb [Thu, 8 Oct 2015 04:55:08 +0000 (10:25 +0530)]
CRM-17353 fix - Membership Dashboard has links with eg status1,2,3 which do not cause filter to be applied

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

9 years agoMerge pull request #6824 from eileenmcnaughton/CRM-17293
Eileen McNaughton [Wed, 7 Oct 2015 23:02:35 +0000 (12:02 +1300)]
Merge pull request #6824 from eileenmcnaughton/CRM-17293

CRM-17293 align payment processor interface between 4.6 & 4.7

9 years agoMerge pull request #6910 from colemanw/pdf
colemanw [Wed, 7 Oct 2015 18:49:25 +0000 (14:49 -0400)]
Merge pull request #6910 from colemanw/pdf

Fix template checkboxes in Print PDF form

9 years agoFix template checkboxes in Print PDF form
Coleman Watts [Wed, 7 Oct 2015 18:41:55 +0000 (14:41 -0400)]
Fix template checkboxes in Print PDF form

9 years agoUpdate version to 4.6.10
CiviCRM [Wed, 7 Oct 2015 12:58:14 +0000 (05:58 -0700)]
Update version to 4.6.10

9 years agomake sure it works for non-boolean options as well
yashodha [Wed, 7 Oct 2015 06:48:01 +0000 (12:18 +0530)]
make sure it works for non-boolean options as well

9 years agoMerge pull request #6549 from pradpnayak/CRM-16620
colemanw [Wed, 7 Oct 2015 01:35:29 +0000 (21:35 -0400)]
Merge pull request #6549 from pradpnayak/CRM-16620

--CRM-16620, replaced 'nothing' to NULL

9 years agoMerge pull request #6897 from jitendrapurohit/CRMtestfixes
colemanw [Wed, 7 Oct 2015 00:36:34 +0000 (20:36 -0400)]
Merge pull request #6897 from jitendrapurohit/CRMtestfixes

4.6 - CRM Test Fixes

9 years agoMerge pull request #6899 from colemanw/crmDatepicker
colemanw [Wed, 7 Oct 2015 00:35:11 +0000 (20:35 -0400)]
Merge pull request #6899 from colemanw/crmDatepicker

crmDatepicker fixes and documentation

9 years agoMerge pull request #6875 from colemanw/CRM-17323
colemanw [Wed, 7 Oct 2015 00:05:16 +0000 (20:05 -0400)]
Merge pull request #6875 from colemanw/CRM-17323

CRM-17323 - Add sid token to registration/membership links

9 years agoMerge pull request #6853 from eileenmcnaughton/CRM-17256-46
colemanw [Tue, 6 Oct 2015 21:26:46 +0000 (17:26 -0400)]
Merge pull request #6853 from eileenmcnaughton/CRM-17256-46

CRM-17256 populate created_id on report creation

9 years agoMerge pull request #6904 from davecivicrm/CRM-17344
Dave Greenberg [Tue, 6 Oct 2015 19:15:19 +0000 (12:15 -0700)]
Merge pull request #6904 from davecivicrm/CRM-17344

CRM-17344 - Fix footer button markup in Manage Reports Template.

9 years agoCRM-17344 - Fix footer button markup in Manage Reports Template.
Dave Greenberg [Tue, 6 Oct 2015 19:14:14 +0000 (12:14 -0700)]
CRM-17344 - Fix footer button markup in Manage Reports Template.

----------------------------------------
* CRM-17344: buttons without text on Manage Reports page
  https://issues.civicrm.org/jira/browse/CRM-17344

9 years agoMerge pull request #6903 from colemanw/CRM-14748
colemanw [Tue, 6 Oct 2015 18:55:40 +0000 (14:55 -0400)]
Merge pull request #6903 from colemanw/CRM-14748

CRM-14748 - Clarify rest url in api explorer

9 years agoCRM-14748 - Clarify rest url in api explorer
Coleman Watts [Tue, 6 Oct 2015 18:46:07 +0000 (14:46 -0400)]
CRM-14748 - Clarify rest url in api explorer

9 years agoMerge pull request #6883 from eileenmcnaughton/CRM-17355
colemanw [Tue, 6 Oct 2015 18:34:12 +0000 (14:34 -0400)]
Merge pull request #6883 from eileenmcnaughton/CRM-17355

CRM-17335 toward eliminating use of leaky static

9 years agoUpdate civicrm.org links to use https
Coleman Watts [Tue, 6 Oct 2015 16:42:00 +0000 (12:42 -0400)]
Update civicrm.org links to use https

9 years agoCRM-16907 - Preserve other links in the help menu
Coleman Watts [Tue, 6 Oct 2015 13:44:45 +0000 (09:44 -0400)]
CRM-16907 - Preserve other links in the help menu

9 years agocrmDatepicker fixes and documentation
Coleman Watts [Tue, 6 Oct 2015 13:40:53 +0000 (09:40 -0400)]
crmDatepicker fixes and documentation

9 years agoCRM-17299: Yes or No custom fields not displayed correctly in table
yashodha [Tue, 6 Oct 2015 13:29:46 +0000 (18:59 +0530)]
CRM-17299: Yes or No custom fields not displayed correctly in table

----------------------------------------
* CRM-17299: "Yes or No" custom fields not displayed correctly in table
  https://issues.civicrm.org/jira/browse/CRM-17299

9 years agominor changes
jitendrapurohit [Tue, 6 Oct 2015 10:19:41 +0000 (15:49 +0530)]
minor changes

9 years ago4.6 - CRM Test Fixes
jitendrapurohit [Tue, 6 Oct 2015 10:08:51 +0000 (15:38 +0530)]
4.6 - CRM Test Fixes

9 years agoCRM-16669 - ensure financialType is loaded for credit card transactions so is_deducti...
Jake Martin White [Tue, 6 Oct 2015 03:49:05 +0000 (03:49 +0000)]
CRM-16669 - ensure financialType is loaded for credit card transactions so is_deductible can be checked to determine non_deductible amount

9 years agoMerge pull request #6870 from eileenmcnaughton/CRM-17234
Eileen McNaughton [Mon, 5 Oct 2015 22:56:21 +0000 (11:56 +1300)]
Merge pull request #6870 from eileenmcnaughton/CRM-17234

CRM-17324 Log upgrade steps

9 years agoMerge pull request #6781 from monishdeb/CRM-17067
Dave Greenberg [Mon, 5 Oct 2015 18:10:45 +0000 (11:10 -0700)]
Merge pull request #6781 from monishdeb/CRM-17067

CRM-17067 fix

9 years agoMerge pull request #6871 from eileenmcnaughton/CRM-17326
Dave Greenberg [Mon, 5 Oct 2015 18:05:27 +0000 (11:05 -0700)]
Merge pull request #6871 from eileenmcnaughton/CRM-17326

CRM-17326 add isset check to timezone retrieval

9 years agoMerge pull request #6843 from guanhuan/creditnote-id-sequence
Dave Greenberg [Mon, 5 Oct 2015 17:21:01 +0000 (10:21 -0700)]
Merge pull request #6843 from guanhuan/creditnote-id-sequence

Fix credit note sequence issue

9 years agoCRM-17335 toward eliminating use of leaky static
eileenmcnaugton [Mon, 5 Oct 2015 04:55:40 +0000 (17:55 +1300)]
CRM-17335 toward eliminating use of leaky static

(note this is an ongoing thing - I'm not pro-actively tackling these ATM)

9 years agoRelationship count fix
monishdeb [Mon, 5 Oct 2015 04:54:41 +0000 (10:24 +0530)]
Relationship count fix

9 years agoCRM-17323 - Store site id in settings
Coleman Watts [Sat, 3 Oct 2015 17:53:22 +0000 (13:53 -0400)]
CRM-17323 - Store site id in settings

9 years agoFix html escaping of external menu links
Coleman Watts [Sat, 3 Oct 2015 02:03:19 +0000 (22:03 -0400)]
Fix html escaping of external menu links

9 years agoCRM-17323 - Add sid token to registration/membership links
Coleman Watts [Sat, 3 Oct 2015 01:29:27 +0000 (21:29 -0400)]
CRM-17323 - Add sid token to registration/membership links

9 years agoRevert CRM-17067 fix
monishdeb [Mon, 21 Sep 2015 14:39:14 +0000 (20:09 +0530)]
Revert CRM-17067 fix

----------------------------------------
* CRM-17067: New relationship permission enforcement has result to related membership not created via public pages
  https://issues.civicrm.org/jira/browse/CRM-17067

9 years agominor change
monishdeb [Mon, 21 Sep 2015 14:17:36 +0000 (19:47 +0530)]
minor change

9 years agoRevert "revert CRM-16711 fix "
monishdeb [Mon, 21 Sep 2015 13:49:45 +0000 (19:19 +0530)]
Revert "revert CRM-16711 fix "

This reverts commit 1ca927cc816b21e779ebc0e9e5e2dd3bd275debd.

9 years agoformat fixes
monishdeb [Wed, 26 Aug 2015 06:00:20 +0000 (11:30 +0530)]
format fixes

9 years agoCRM-17067 fix - New relationship permission enforcement has result to related members...
monishdeb [Wed, 26 Aug 2015 05:28:02 +0000 (10:58 +0530)]
CRM-17067 fix - New relationship permission enforcement has result to related membership not created via public pages

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

9 years agoCRM-16907 - Fix navigation upgrade script
Coleman Watts [Fri, 2 Oct 2015 20:04:15 +0000 (16:04 -0400)]
CRM-16907 - Fix navigation upgrade script

9 years agoCondense credit note number query
Guanhuan Chen [Fri, 2 Oct 2015 15:35:14 +0000 (16:35 +0100)]
Condense credit note number query

9 years agoCRM-17326 add isset check to timezone retrieval
eileen [Thu, 1 Oct 2015 23:56:47 +0000 (12:56 +1300)]
CRM-17326 add isset check to timezone retrieval

This addresses an e-notice

Change-Id: I82d3314bc2e28cca64ec9f4ed4d64477c50b7303

9 years agoMerge pull request #6868 from eileenmcnaughton/CRM-17322
colemanw [Thu, 1 Oct 2015 23:35:17 +0000 (19:35 -0400)]
Merge pull request #6868 from eileenmcnaughton/CRM-17322

CRM-17322 output upgrade as text

9 years agoLog upgrade steps
Adam Roses Wight [Thu, 1 Oct 2015 08:10:25 +0000 (01:10 -0700)]
Log upgrade steps

This puts the meter back into thermometer watching.  Prints a granular
log line for each upgrade migration patch.

TODO:
* The Drush harness should install a logging callback that captures Civi
output and displays it on the console.

Bug: T99842
Change-Id: I8977b6b06b4eac9cd7e5ac5768c783d8560abfe3

9 years agoCRM-17322 output upgrade as text
Adam Roses Wight [Thu, 1 Oct 2015 08:50:24 +0000 (01:50 -0700)]
CRM-17322 output upgrade as text

This adds the 'text' array to the output params. There is a patch in drush to
print this rather than the html. wp-cli could do with such a patch too but out-of-scope here

Change-Id: Ib8ea9a2e056e225904cb96b2d0de815148ad3f8b

9 years agoAdd unit test for createCreditNoteId
Guanhuan Chen [Thu, 1 Oct 2015 12:18:15 +0000 (13:18 +0100)]
Add unit test for createCreditNoteId

9 years agoAdd credit note id if a contribution is created with cancelled/refunded status
Guanhuan Chen [Thu, 1 Oct 2015 12:17:39 +0000 (13:17 +0100)]
Add credit note id if a contribution is created with cancelled/refunded status

9 years agoRefactor redundant code with reusable function
Guanhuan Chen [Thu, 1 Oct 2015 11:46:28 +0000 (12:46 +0100)]
Refactor redundant code with reusable function

9 years agoGenerate a sequential credit note id when a contribution is cancelled or refunded
Guanhuan Chen [Tue, 29 Sep 2015 16:54:27 +0000 (17:54 +0100)]
Generate a sequential credit note id when a contribution is cancelled or refunded

9 years agoFix credit note sequence issue
Guanhuan Chen [Tue, 29 Sep 2015 15:59:41 +0000 (16:59 +0100)]
Fix credit note sequence issue

9 years agoMerge pull request #6859 from eileenmcnaughton/CRM-17311-46
Kurund Jalmi [Wed, 30 Sep 2015 13:22:37 +0000 (18:52 +0530)]
Merge pull request #6859 from eileenmcnaughton/CRM-17311-46

CRM-17311 wrap call to watchdog in function_exists

9 years agoCRM-17311 wrap call to watchdog in function_exists
eileenmcnaugton [Wed, 30 Sep 2015 10:19:50 +0000 (23:19 +1300)]
CRM-17311 wrap call to watchdog in function_exists

9 years agoMerge pull request #6856 from monishdeb/46-upgrade-fix
Monish Deb [Wed, 30 Sep 2015 09:50:36 +0000 (15:20 +0530)]
Merge pull request #6856 from monishdeb/46-upgrade-fix

4.6.5 upgrade failure fix

9 years ago4.6.5 upgrade failure
monishdeb [Wed, 30 Sep 2015 07:30:20 +0000 (13:00 +0530)]
4.6.5 upgrade failure

9 years agoCRM-17256 populate created_id on report creation
eileenmcnaugton [Wed, 30 Sep 2015 04:19:08 +0000 (17:19 +1300)]
CRM-17256 populate created_id on report creation

9 years agoMerge pull request #6797 from eileenmcnaughton/CRM-17278
colemanw [Tue, 29 Sep 2015 21:51:45 +0000 (17:51 -0400)]
Merge pull request #6797 from eileenmcnaughton/CRM-17278

CRM-17278 autorenew not checked in some circumstances

9 years agoMerge pull request #6795 from jitendrapurohit/CRM-17251
Eileen McNaughton [Tue, 29 Sep 2015 21:33:20 +0000 (10:33 +1300)]
Merge pull request #6795 from jitendrapurohit/CRM-17251

CRM-17251 - Book-keeping report displays rows inaccurately when contr…

9 years agoMerge pull request #6740 from eileenmcnaughton/CRM-17215
colemanw [Tue, 29 Sep 2015 21:24:30 +0000 (17:24 -0400)]
Merge pull request #6740 from eileenmcnaughton/CRM-17215

CRM-17215 fix auto-renew not showing on radio options

9 years agoMerge pull request #6763 from eileenmcnaughton/CRM-17242
Eileen McNaughton [Tue, 29 Sep 2015 06:11:01 +0000 (19:11 +1300)]
Merge pull request #6763 from eileenmcnaughton/CRM-17242

CRM-17242 notice fix

9 years agoMerge pull request #6817 from colemanw/positive
colemanw [Tue, 29 Sep 2015 02:41:48 +0000 (22:41 -0400)]
Merge pull request #6817 from colemanw/positive

Fixes for CRM_Utils_Type

9 years agoFix test failures
Coleman Watts [Tue, 29 Sep 2015 00:22:33 +0000 (20:22 -0400)]
Fix test failures

9 years agoMerge pull request #6794 from eileenmcnaughton/CRM-17275
Dave Greenberg [Mon, 28 Sep 2015 22:26:12 +0000 (18:26 -0400)]
Merge pull request #6794 from eileenmcnaughton/CRM-17275

CRM-17275 Importing contact with external ID match null

9 years agoMerge pull request #6822 from colemanw/editGroup
colemanw [Mon, 28 Sep 2015 16:03:08 +0000 (12:03 -0400)]
Merge pull request #6822 from colemanw/editGroup

Only allow group inline edit when appropriate

9 years agoCRM-17293 align payment processor interface between 4.6 & 4.7
eileenmcnaugton [Mon, 28 Sep 2015 04:38:44 +0000 (17:38 +1300)]
CRM-17293 align payment processor interface between 4.6 & 4.7

9 years agoOnly allow group inline edit when appropriate
Coleman Watts [Mon, 28 Sep 2015 02:38:50 +0000 (22:38 -0400)]
Only allow group inline edit when appropriate

9 years agoAdd unit tests for CRM_Utils_Type
Coleman Watts [Sun, 27 Sep 2015 18:28:14 +0000 (14:28 -0400)]
Add unit tests for CRM_Utils_Type

9 years agoFixes for CRM_Utils_Type
Coleman Watts [Sun, 27 Sep 2015 15:24:25 +0000 (11:24 -0400)]
Fixes for CRM_Utils_Type

9 years agoMerge pull request #6805 from colemanw/case
colemanw [Sat, 26 Sep 2015 15:53:31 +0000 (11:53 -0400)]
Merge pull request #6805 from colemanw/case

Fix submitting multiple addRole popups on caseView

9 years agoFix submitting multiple addRole popups on caseView
Coleman Watts [Sat, 26 Sep 2015 15:53:05 +0000 (11:53 -0400)]
Fix submitting multiple addRole popups on caseView

9 years agoMerge pull request #6796 from monishdeb/CRM-17270
Monish Deb [Fri, 25 Sep 2015 07:18:55 +0000 (12:48 +0530)]
Merge pull request #6796 from monishdeb/CRM-17270

CRM-17270 fix - Custom country multi-select fields used in a Drupal V…

9 years agoCRM-17278 autorenew not checked in some circumstances
eileenmcnaugton [Thu, 24 Sep 2015 15:15:45 +0000 (03:15 +1200)]
CRM-17278 autorenew not checked in some circumstances

9 years agoCRM-17270 fix - Custom country multi-select fields used in a Drupal View display...
monishdeb [Thu, 24 Sep 2015 13:18:18 +0000 (18:48 +0530)]
CRM-17270 fix - Custom country multi-select fields used in a Drupal View display the four digit ID number instead of the name of the country

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

9 years agoCRM-17275 Contact.duplicate api test
eileenmcnaugton [Thu, 24 Sep 2015 12:17:48 +0000 (00:17 +1200)]
CRM-17275 Contact.duplicate api test

9 years agoCRM-17275 Import - allow contact WITH external identifier to match one without
eileenmcnaugton [Thu, 24 Sep 2015 12:08:10 +0000 (00:08 +1200)]
CRM-17275 Import - allow contact WITH external identifier to match one without

9 years agoCRM-17275 Import parser: add test for what IS workding
eileenmcnaugton [Thu, 24 Sep 2015 09:34:53 +0000 (21:34 +1200)]
CRM-17275 Import parser: add test for what IS workding

9 years agoCRM-17251 - Book-keeping report displays rows inaccurately when contribution amount...
jitendrapurohit [Thu, 24 Sep 2015 11:06:50 +0000 (16:36 +0530)]
CRM-17251 - Book-keeping report displays rows inaccurately when contribution amount has been edited

9 years agoMerge pull request #6777 from yashodha/CRM-17237
Yashodha Chaku [Thu, 24 Sep 2015 07:52:35 +0000 (13:22 +0530)]
Merge pull request #6777 from yashodha/CRM-17237

CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERV…

9 years agoMerge pull request #6520 from mlutfy/4.6-crm17034
Dave Greenberg [Tue, 22 Sep 2015 23:05:01 +0000 (16:05 -0700)]
Merge pull request #6520 from mlutfy/4.6-crm17034

CRM-17034 : PriceField tax_amount should not be rounded

9 years agoMerge pull request #6783 from eileenmcnaughton/CRM-17258
Eileen McNaughton [Tue, 22 Sep 2015 22:37:35 +0000 (10:37 +1200)]
Merge pull request #6783 from eileenmcnaughton/CRM-17258

CRM-17258 add created_id, owner_id to report_instances

9 years agoMerge pull request #6778 from eileenmcnaughton/CRM-17255
Dave Greenberg [Tue, 22 Sep 2015 18:27:35 +0000 (11:27 -0700)]
Merge pull request #6778 from eileenmcnaughton/CRM-17255

CRM-17255 group.api ACLS : do not exclude hidden groups for ACL users

9 years agoMerge pull request #6786 from monishdeb/CRM-17247
Monish Deb [Tue, 22 Sep 2015 14:36:45 +0000 (20:06 +0530)]
Merge pull request #6786 from monishdeb/CRM-17247

CRM-17247 fix - Vaildation fails silently on required fields (Drupal …

9 years agoCRM-17247 fix - Vaildation fails silently on required fields (Drupal user editing)
monishdeb [Tue, 22 Sep 2015 09:46:20 +0000 (15:16 +0530)]
CRM-17247 fix - Vaildation fails silently on required fields (Drupal user editing)

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

9 years agonotice fix
yashodha [Tue, 22 Sep 2015 05:35:23 +0000 (11:05 +0530)]
notice fix

9 years agoCRM-17258 add created_id, owner_id to report_instances
eileen [Mon, 21 Sep 2015 22:51:15 +0000 (10:51 +1200)]
CRM-17258 add created_id, owner_id to report_instances

9 years agoMerge pull request #6767 from colemanw/CRM-17131
Monish Deb [Mon, 21 Sep 2015 14:19:34 +0000 (19:49 +0530)]
Merge pull request #6767 from colemanw/CRM-17131

CRM-17131 - Fix where clause

9 years agominor fixes
yashodha [Mon, 21 Sep 2015 13:31:28 +0000 (19:01 +0530)]
minor fixes

9 years agoCRM-17237: more fixes
yashodha [Mon, 21 Sep 2015 11:38:19 +0000 (17:08 +0530)]
CRM-17237: more fixes

----------------------------------------
* CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
  https://issues.civicrm.org/jira/browse/CRM-17237

9 years agoCRM-17255 group.api ACLS : do not exclude hidden groups for ACL users
eileenmcnaugton [Mon, 21 Sep 2015 08:25:37 +0000 (20:25 +1200)]
CRM-17255 group.api ACLS : do not exclude hidden groups for ACL users

This commit prevents hidden groups from being filtered out of api results by the check
permission function. The api permission check is fairly new so this only hones the check

9 years agoCRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
yashodha [Mon, 21 Sep 2015 08:05:09 +0000 (13:35 +0530)]
CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule

----------------------------------------
* CRM-17237: Add Dedupe Rule allows user to save invalid (empty) RESERVED rule
  https://issues.civicrm.org/jira/browse/CRM-17237

9 years agoMerge pull request #6769 from monishdeb/CRM-17191
Monish Deb [Fri, 18 Sep 2015 22:22:29 +0000 (03:52 +0530)]
Merge pull request #6769 from monishdeb/CRM-17191

CRM-17246 fix - Contact name showing in Contribution summary report