civicrm-core.git
9 years agoCRM-17485: Event participant role filter not working in Participant list Count Report
yashodha [Thu, 5 Nov 2015 07:12:28 +0000 (12:42 +0530)]
CRM-17485: Event participant role filter not working in Participant list Count Report

----------------------------------------
* CRM-17485: Event participant role filter not working in Participant list Count Report
  https://issues.civicrm.org/jira/browse/CRM-17485

9 years agoMerge pull request #7116 from JKingsnorth/CRM-17488
Dave Greenberg [Thu, 5 Nov 2015 00:40:24 +0000 (16:40 -0800)]
Merge pull request #7116 from JKingsnorth/CRM-17488

CRM-17488 Fix bounce status on mailing detail report

9 years agoMerge pull request #7130 from colemanw/CRM-17493
colemanw [Wed, 4 Nov 2015 22:16:03 +0000 (17:16 -0500)]
Merge pull request #7130 from colemanw/CRM-17493

CRM-17493 - Fix datatable when popup forms disabled

9 years agoCRM-17493 - Fix datatable when popup forms disabled
Coleman Watts [Wed, 4 Nov 2015 22:15:01 +0000 (17:15 -0500)]
CRM-17493 - Fix datatable when popup forms disabled

9 years agoMerge pull request #7126 from monishdeb/4.6
Dave Greenberg [Wed, 4 Nov 2015 20:00:48 +0000 (12:00 -0800)]
Merge pull request #7126 from monishdeb/4.6

CRM-17497 fix - Adding relationship with multi-valued custom field fails

9 years agoUpdate version to 4.6.11
CiviCRM [Wed, 4 Nov 2015 10:05:31 +0000 (02:05 -0800)]
Update version to 4.6.11

9 years agoCRM-17488 Correct capitalization of values
JKingsnorth [Wed, 4 Nov 2015 09:34:24 +0000 (09:34 +0000)]
CRM-17488 Correct capitalization of values

9 years agoCRM-17497 fix - Adding relationship with multi-valued custom field fails
monishdeb [Wed, 4 Nov 2015 08:07:59 +0000 (13:37 +0530)]
CRM-17497 fix - Adding relationship with multi-valued custom field fails

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

9 years agoMerge pull request #7119 from seamuslee001/CRM-17471-4.6
Dave Greenberg [Tue, 3 Nov 2015 20:17:09 +0000 (12:17 -0800)]
Merge pull request #7119 from seamuslee001/CRM-17471-4.6

Crm 17471 Fix situation where search options not updating for change in membership status

9 years agoMerge pull request #6901 from monishdeb/4.6
Monish Deb [Tue, 3 Nov 2015 05:00:27 +0000 (10:30 +0530)]
Merge pull request #6901 from monishdeb/4.6

CRM-17339 fix - Error when importing contributions matched on name an…

9 years agoMerge pull request #7041 from monishdeb/CRM-17343
Monish Deb [Tue, 3 Nov 2015 05:00:16 +0000 (10:30 +0530)]
Merge pull request #7041 from monishdeb/CRM-17343

CRM-17343 fix - Invoice email does not send out when completing payme…

9 years agoCRM - 17471 Fix Issue where updated status labels aren't displayed in search
Seamus Lee [Sat, 31 Oct 2015 23:09:12 +0000 (23:09 +0000)]
CRM - 17471 Fix Issue where updated status labels aren't displayed in search

CRM-17471 Fix issue where updated statuses aren't represented in PseudoConstant, by flushing the cache

Change membershipStatus psuedoConstant to use label column not name

Alter buildSearchForm rather than PseudoConstant to be more safe

9 years agoMerge pull request #7111 from kurund/CRM-17393
Dave Greenberg [Mon, 2 Nov 2015 18:19:15 +0000 (10:19 -0800)]
Merge pull request #7111 from kurund/CRM-17393

CRM-17393, changed the incorrect logic

9 years agoMerge pull request #7101 from colemanw/footer
Dave Greenberg [Mon, 2 Nov 2015 18:17:04 +0000 (10:17 -0800)]
Merge pull request #7101 from colemanw/footer

Footer tpl cleanup

9 years agoCRM-17488 Fix bounce status on mailing detail report
JKingsnorth [Mon, 2 Nov 2015 15:43:17 +0000 (15:43 +0000)]
CRM-17488 Fix bounce status on mailing detail report

9 years agoCRM-17393, changed the incorrect logic
Kurund Jalmi [Mon, 2 Nov 2015 12:01:49 +0000 (17:31 +0530)]
CRM-17393, changed the incorrect logic

9 years agoFooter tpl cleanup
Coleman Watts [Sun, 1 Nov 2015 13:38:18 +0000 (08:38 -0500)]
Footer tpl cleanup

9 years agoMerge pull request #7076 from totten/4.6-weight-sgn
Kurund Jalmi [Sun, 1 Nov 2015 11:20:59 +0000 (16:50 +0530)]
Merge pull request #7076 from totten/4.6-weight-sgn

CRM-17466 - Refine error message

9 years agoMerge pull request #7072 from monishdeb/CRM-17457
Dave Greenberg [Fri, 30 Oct 2015 18:56:53 +0000 (11:56 -0700)]
Merge pull request #7072 from monishdeb/CRM-17457

CRM-17457 fix - Enotices when skip participant is used

9 years agoadditional notices on enabling tax invoice
monishdeb [Fri, 30 Oct 2015 14:18:42 +0000 (19:48 +0530)]
additional notices on enabling tax invoice

9 years agoCRM-17466 - Refine error message
Tim Otten [Thu, 29 Oct 2015 21:08:24 +0000 (14:08 -0700)]
CRM-17466 - Refine error message

9 years agoCRM-17457 fix - Enotices when skip participant is used
monishdeb [Thu, 29 Oct 2015 06:19:27 +0000 (11:49 +0530)]
CRM-17457 fix - Enotices when skip participant is used

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

9 years agoMerge pull request #7037 from seamuslee001/CRM-17436
Dave Greenberg [Tue, 27 Oct 2015 23:15:00 +0000 (16:15 -0700)]
Merge pull request #7037 from seamuslee001/CRM-17436

CRM-17436 Make the Date and time filter on ContributionAggregate sear…

9 years agoremove unecessary validation rule
monishdeb [Mon, 26 Oct 2015 11:47:09 +0000 (17:17 +0530)]
remove unecessary validation rule

9 years agoCRM-17339 fix - Error when importing contributions matched on name and email
monishdeb [Tue, 6 Oct 2015 15:22:36 +0000 (20:52 +0530)]
CRM-17339 fix - Error when importing contributions matched on name and email

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

9 years agoFix $endTime variable as was missing _ for formValues
seamuslee001 [Fri, 23 Oct 2015 21:24:31 +0000 (08:24 +1100)]
Fix $endTime variable as was missing _ for formValues

9 years agoCRM-17343 fix - Invoice email does not send out when completing payment using Paypal
monishdeb [Fri, 23 Oct 2015 10:42:54 +0000 (16:12 +0530)]
CRM-17343 fix - Invoice email does not send out when completing payment using Paypal

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

9 years agoPHPCS fix
Seamus Lee [Fri, 23 Oct 2015 03:35:34 +0000 (03:35 +0000)]
PHPCS fix

9 years agoCRM-17436 Make the Date and time filter on ContributionAggregate search aware of...
Seamus Lee [Fri, 23 Oct 2015 03:31:14 +0000 (03:31 +0000)]
CRM-17436 Make the Date and time filter on ContributionAggregate search aware of time filtering

9 years agoMerge pull request #7025 from davecivicrm/CRM-17395
colemanw [Thu, 22 Oct 2015 13:48:01 +0000 (09:48 -0400)]
Merge pull request #7025 from davecivicrm/CRM-17395

CRM-17395 - Backporting to 4.6 branch since it is a minor fix for pai…

9 years agoMerge pull request #7026 from davecivicrm/CRM-17363
Eileen McNaughton [Thu, 22 Oct 2015 03:23:12 +0000 (16:23 +1300)]
Merge pull request #7026 from davecivicrm/CRM-17363

CRM-17363 - Conditional inclusion of Social Network bar in petitions.

9 years agoCRM-17363 - Conditional inclusion of Social Network bar in petitions.
Dave Greenberg [Thu, 22 Oct 2015 00:59:16 +0000 (17:59 -0700)]
CRM-17363 - Conditional inclusion of Social Network bar in petitions.

----------------------------------------
* CRM-17363: Petition: Social Network Buttons are displayed on certain condition although switched off
  https://issues.civicrm.org/jira/browse/CRM-17363

9 years agoCRM-17395 - Backporting to 4.6 branch since it is a minor fix for paid issue queue.
Dave Greenberg [Thu, 22 Oct 2015 00:16:01 +0000 (17:16 -0700)]
CRM-17395 - Backporting to 4.6 branch since it is a minor fix for paid issue queue.

----------------------------------------
* CRM-17395: Activities report - filter by target contact does not appear to work
  https://issues.civicrm.org/jira/browse/CRM-17395

9 years agoMerge pull request #6963 from agileware/4.6-CRM-17402
colemanw [Wed, 21 Oct 2015 01:04:46 +0000 (21:04 -0400)]
Merge pull request #6963 from agileware/4.6-CRM-17402

CRM-17402: Defer loading Google Maps API

9 years agoMerge pull request #7006 from lcdservices/CRM-17419
Eileen McNaughton [Mon, 19 Oct 2015 19:36:26 +0000 (08:36 +1300)]
Merge pull request #7006 from lcdservices/CRM-17419

CRM-17419 fix exception error condition

9 years agoCRM-17419 fix exception error condition
Brian Shaughnessy [Mon, 19 Oct 2015 15:25:10 +0000 (11:25 -0400)]
CRM-17419 fix exception error condition

9 years agoMerge pull request #6980 from colemanw/entityRef
colemanw [Fri, 16 Oct 2015 17:14:15 +0000 (13:14 -0400)]
Merge pull request #6980 from colemanw/entityRef

entityRef - Use deep-merge to combine data-params and options

9 years agoMerge pull request #6961 from colemanw/BorislavZlatanov-CRM-17357
Yashodha Chaku [Fri, 16 Oct 2015 09:07:05 +0000 (14:37 +0530)]
Merge pull request #6961 from colemanw/BorislavZlatanov-CRM-17357

CRM-17357 - Fix error on receipt PDF creation (rebased)

9 years agoentityRef - Use deep-merge to combine data-params and options
Coleman Watts [Fri, 16 Oct 2015 02:48:10 +0000 (22:48 -0400)]
entityRef - Use deep-merge to combine data-params and options

9 years agoCRM-17402: Defer loading Google Maps API
Francis Whittle [Thu, 15 Oct 2015 00:00:32 +0000 (11:00 +1100)]
CRM-17402: Defer loading Google Maps API

----------------------------------------
* CRM-17402: Google Maps API sometimes tries to call initMap callback before it is defined.
  https://issues.civicrm.org/jira/browse/CRM-17402

9 years agoCRM-17357 Fix php fatal error on receipt PDF creation
Borislav Zlatanov [Tue, 13 Oct 2015 17:34:59 +0000 (20:34 +0300)]
CRM-17357 Fix php fatal error on receipt PDF creation

----------------------------------------
* CRM-17357: PHP fatal error during creation of receipt PDF
  https://issues.civicrm.org/jira/browse/CRM-17357

9 years agoMerge pull request #6939 from futurefirst/4.6-list-single-json
Tim Otten [Wed, 14 Oct 2015 16:21:55 +0000 (17:21 +0100)]
Merge pull request #6939 from futurefirst/4.6-list-single-json

CRM-17385 - Client side of "single JSON file" extensions directory download

9 years agoMerge pull request #6948 from colemanw/CRM-17384
colemanw [Wed, 14 Oct 2015 14:59:03 +0000 (10:59 -0400)]
Merge pull request #6948 from colemanw/CRM-17384

CRM-17384 - Remove duplicate support menu

9 years agoMerge pull request #6954 from kurund/CRM-17393
Kurund Jalmi [Wed, 14 Oct 2015 09:25:32 +0000 (10:25 +0100)]
Merge pull request #6954 from kurund/CRM-17393

worked on CRM-17393

9 years agoMerge pull request #6950 from totten/4.6-report-dashlet
Kurund Jalmi [Wed, 14 Oct 2015 09:25:09 +0000 (10:25 +0100)]
Merge pull request #6950 from totten/4.6-report-dashlet

CRM-17328 - Fix dashlet/report ID mappings

9 years agoworked on CRM-17393
Kurund Jalmi [Wed, 14 Oct 2015 00:22:34 +0000 (01:22 +0100)]
worked on CRM-17393

9 years agoCRM-17328 - Fix dashlet/report ID mappings
Tim Otten [Tue, 13 Oct 2015 21:47:06 +0000 (22:47 +0100)]
CRM-17328 - Fix dashlet/report ID mappings

civibuild has been failing to configure the dashboard because some ID's are
invalid, and some ID's are no longer pointing to the originally prescribed
reports.

9 years agoCRM-17384 - Remove duplicate support menu
Coleman Watts [Tue, 13 Oct 2015 20:12:12 +0000 (16:12 -0400)]
CRM-17384 - Remove duplicate support menu

9 years agoMerge pull request #6900 from chanunc/4.6
Yashodha Chaku [Tue, 13 Oct 2015 07:14:10 +0000 (12:44 +0530)]
Merge pull request #6900 from chanunc/4.6

Fix invoice email doesnot sent out when completed payment using Paypal

9 years agoMerge pull request #2 from totten/futurefirst-4.6-list-single-json
David Knoll [Mon, 12 Oct 2015 22:48:43 +0000 (23:48 +0100)]
Merge pull request #2 from totten/futurefirst-4.6-list-single-json

CRM-17385 - CRM_Extension_BrowserTest

9 years agoMerge pull request #6803 from eileenmcnaughton/CRM-11338-paypal-fee
Dave Greenberg [Mon, 12 Oct 2015 21:02:33 +0000 (14:02 -0700)]
Merge pull request #6803 from eileenmcnaughton/CRM-11338-paypal-fee

CRM-11338 retrieve fee_amount from paypal

9 years agoMerge pull request #6851 from eileenmcnaughton/CRM-17176-location-46
Dave Greenberg [Mon, 12 Oct 2015 20:54:27 +0000 (13:54 -0700)]
Merge pull request #6851 from eileenmcnaughton/CRM-17176-location-46

CRM-17306 fix location update action

9 years agoCRM-17385 - CRM_Extension_BrowserTest
Tim Otten [Mon, 12 Oct 2015 20:35:20 +0000 (21:35 +0100)]
CRM-17385 - CRM_Extension_BrowserTest

9 years agoClient side of "single JSON file" extensions directory download
David Knoll [Mon, 12 Oct 2015 17:40:31 +0000 (18:40 +0100)]
Client side of "single JSON file" extensions directory download

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 agoCRM-11338 further fix on fee amount
Eileen McNaughton [Fri, 9 Oct 2015 20:46:04 +0000 (09:46 +1300)]
CRM-11338 further fix on fee amount

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 agoFix invoice email doesnot sent out when completed payment using Paypal
Chanunc [Tue, 6 Oct 2015 14:48:52 +0000 (15:48 +0100)]
Fix invoice email doesnot sent out when completed payment using Paypal

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