civicrm-core.git
9 years agoMerge pull request #7240 from sudhabisht/WebtestFix46
Monish Deb [Wed, 18 Nov 2015 15:54:11 +0000 (21:24 +0530)]
Merge pull request #7240 from sudhabisht/WebtestFix46

Webtest Fix

9 years agoWebtest Fix
Sudha Bisht [Wed, 18 Nov 2015 10:51:43 +0000 (16:21 +0530)]
Webtest Fix

9 years agoMerge pull request #6733 from pradpnayak/CRM-16801
Yashodha Chaku [Wed, 18 Nov 2015 08:40:19 +0000 (14:10 +0530)]
Merge pull request #6733 from pradpnayak/CRM-16801

--CRM-16801, Replaced $_REQUEST with $_POST

9 years agoMerge pull request #7229 from yashodha/CRM-17564
Monish Deb [Wed, 18 Nov 2015 07:26:34 +0000 (12:56 +0530)]
Merge pull request #7229 from yashodha/CRM-17564

CRM-17564: Dedupe rule doesnt appear to be working correctly

9 years agoMerge pull request #7233 from sudhabisht/WebtestFix46
Monish Deb [Tue, 17 Nov 2015 19:00:21 +0000 (00:30 +0530)]
Merge pull request #7233 from sudhabisht/WebtestFix46

Webtest Fix

9 years agoMerge pull request #7227 from yashodha/CRM-17563
Monish Deb [Tue, 17 Nov 2015 15:03:11 +0000 (20:33 +0530)]
Merge pull request #7227 from yashodha/CRM-17563

CRM-17563

9 years agoFix
Sudha Bisht [Tue, 17 Nov 2015 13:53:47 +0000 (19:23 +0530)]
Fix

9 years agoMinor fix
Sudha Bisht [Tue, 17 Nov 2015 13:45:27 +0000 (19:15 +0530)]
Minor fix

9 years agoWebtestFix
Sudha Bisht [Tue, 17 Nov 2015 13:27:46 +0000 (18:57 +0530)]
WebtestFix

9 years agoCRM-17564: minor fix
yashodha [Tue, 17 Nov 2015 10:33:13 +0000 (16:03 +0530)]
CRM-17564: minor fix

----------------------------------------
* CRM-17564: Dedupe rule doesnt appear to be working correctly...
  https://issues.civicrm.org/jira/browse/CRM-17564

9 years agoCRM-17564: Dedupe rule doesnt appear to be working correctly
yashodha [Tue, 17 Nov 2015 09:54:03 +0000 (15:24 +0530)]
CRM-17564: Dedupe rule doesnt appear to be working correctly

----------------------------------------
* CRM-17564: Dedupe rule doesnt appear to be working correctly...
  https://issues.civicrm.org/jira/browse/CRM-17564

9 years agominor format fix
yashodha [Tue, 17 Nov 2015 07:47:59 +0000 (13:17 +0530)]
minor format fix

9 years agoCRM-17563: Dedupe rules - changes not saved when editing existing rule
yashodha [Tue, 17 Nov 2015 06:35:09 +0000 (12:05 +0530)]
CRM-17563: Dedupe rules - changes not saved when editing existing rule

----------------------------------------
* CRM-17563: Dedupe rules - changes not saved when editing existing rule
  https://issues.civicrm.org/jira/browse/CRM-17563

9 years agoMerge pull request #7221 from agh1/sort-event-date-46
Dave Greenberg [Mon, 16 Nov 2015 23:57:44 +0000 (15:57 -0800)]
Merge pull request #7221 from agh1/sort-event-date-46

CRM-17579 Reports - sort by event start date in participant report

9 years agoCRM-17579 Reports - sort by event start date in participant report
Andrew Hunt [Mon, 16 Nov 2015 19:24:51 +0000 (14:24 -0500)]
CRM-17579 Reports - sort by event start date in participant report

----------------------------------------
* CRM-17579: Sort by event date in participant report
  https://issues.civicrm.org/jira/browse/CRM-17579

9 years agoMerge pull request #7217 from jitendrapurohit/CRM-17565
Dave Greenberg [Mon, 16 Nov 2015 19:18:01 +0000 (11:18 -0800)]
Merge pull request #7217 from jitendrapurohit/CRM-17565

CRM-17565 -- Clicking case status link on case dashboard does not ope…

9 years agoMerge pull request #7219 from sudhabisht/WebtestFix46
Monish Deb [Mon, 16 Nov 2015 17:34:42 +0000 (23:04 +0530)]
Merge pull request #7219 from sudhabisht/WebtestFix46

Webtest Fix

9 years agoWebtest Fix
Sudha Bisht [Mon, 16 Nov 2015 13:17:26 +0000 (18:47 +0530)]
Webtest Fix

9 years agoCRM-17563: Dedupe rules - changes not saved when editing existing rule
yashodha [Mon, 16 Nov 2015 12:45:05 +0000 (18:15 +0530)]
CRM-17563: Dedupe rules - changes not saved when editing existing rule

----------------------------------------
* CRM-17563: Dedupe rules - changes not saved when editing existing rule
  https://issues.civicrm.org/jira/browse/CRM-17563

9 years agoCRM-17565 -- Clicking case status link on case dashboard does not open in search...
jitendrapurohit [Mon, 16 Nov 2015 07:25:06 +0000 (12:55 +0530)]
CRM-17565 -- Clicking case status link on case dashboard does not open in search correctly

9 years agoMerge pull request #7180 from GinkgoFJG/CRM-17192
colemanw [Fri, 13 Nov 2015 22:07:53 +0000 (17:07 -0500)]
Merge pull request #7180 from GinkgoFJG/CRM-17192

CRM-17192: Fixes problem with failure to prepopulate crmEntityRefs with multiple values.

9 years agoMerge pull request #7128 from totten/4.6-casechange-hook
Tim Otten [Wed, 11 Nov 2015 21:46:06 +0000 (13:46 -0800)]
Merge pull request #7128 from totten/4.6-casechange-hook

CRM_Utils_Hook::caseChange - Fix firing

9 years agoMerge pull request #7185 from davecivicrm/CRM-17537
Dave Greenberg [Wed, 11 Nov 2015 20:02:19 +0000 (12:02 -0800)]
Merge pull request #7185 from davecivicrm/CRM-17537

CRM-17357 - Conditional label for Name / Email search fields based on…

9 years agoCRM-17357 - Conditional label for Name / Email search fields based on search setting.
Dave Greenberg [Wed, 11 Nov 2015 19:52:28 +0000 (11:52 -0800)]
CRM-17357 - Conditional label for Name / Email search fields based on search setting.

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

9 years agoMerge pull request #7166 from eileenmcnaughton/CRM-17536
Dave Greenberg [Wed, 11 Nov 2015 19:43:37 +0000 (11:43 -0800)]
Merge pull request #7166 from eileenmcnaughton/CRM-17536

CRM-17536 fix quicksearch label for when email search is disabled

9 years agoMerge pull request #7182 from totten/4.6-gencode-mem
Dave Greenberg [Wed, 11 Nov 2015 19:03:55 +0000 (11:03 -0800)]
Merge pull request #7182 from totten/4.6-gencode-mem

xml/GenCode - Expand memory limit

9 years agoxml/GenCode - Expand memory limit
Tim Otten [Wed, 11 Nov 2015 01:30:00 +0000 (17:30 -0800)]
xml/GenCode - Expand memory limit

GenCode processes translations in all locales.  Loading all locales is
memory-intensive (est ~20mb per locale based on `memory_get_usage()`).

The locales are tracked in `CRM_Core_I18n::singleton()`.  The behavior is
actually good for typical usage (1-2 locales per page-view), but it breaks
down when one request needs to work with all locales.  If it mattered more,
we'd probably implement some cache-management to deallocate older/unused
locales.  But for GenCode, it's OK to bump up memory requirements as high as
1gb.

9 years agoMerge pull request #7163 from mollux/4.6-CRM-17533
Dave Greenberg [Wed, 11 Nov 2015 00:15:38 +0000 (16:15 -0800)]
Merge pull request #7163 from mollux/4.6-CRM-17533

CRM-17533 - Added is_view check to prevent editing read only custom fields.

9 years agoCRM-17192: Fixes problem with failure to prepopulate crmEntityRefs with multiple...
Frank J. Gómez [Tue, 10 Nov 2015 21:25:20 +0000 (16:25 -0500)]
CRM-17192: Fixes problem with failure to prepopulate crmEntityRefs with multiple values.

9 years agoCRM-17536 fix quicksearch label for when email search is disabled
eileen [Mon, 9 Nov 2015 17:57:33 +0000 (09:57 -0800)]
CRM-17536 fix quicksearch label for when email search is disabled

Bug: T118036

9 years agoMerge pull request #7135 from yashodha/CRM-17485
Monish Deb [Tue, 10 Nov 2015 12:38:32 +0000 (18:08 +0530)]
Merge pull request #7135 from yashodha/CRM-17485

CRM-17485: Event participant role filter not working in Participant l…

9 years agoCRM-17485: Event participant role filter not working in Participant list Count Report
yashodha [Tue, 10 Nov 2015 08:29:38 +0000 (13:59 +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 agoReworked patch to be smaller and error proof.
Mattias Michaux [Mon, 9 Nov 2015 19:37:56 +0000 (20:37 +0100)]
Reworked patch to be smaller and error proof.

9 years agoAdded is_view check to prevent editing read only custom fields.
Mattias Michaux [Mon, 9 Nov 2015 11:14:49 +0000 (12:14 +0100)]
Added is_view check to prevent editing read only custom fields.

9 years agoMerge pull request #7151 from colemanw/CRM-17323
colemanw [Sat, 7 Nov 2015 00:35:04 +0000 (19:35 -0500)]
Merge pull request #7151 from colemanw/CRM-17323

CRM-17323 - Fix site registration links

9 years agoMerge pull request #7141 from agh1/report-print-header
Dave Greenberg [Fri, 6 Nov 2015 21:37:48 +0000 (13:37 -0800)]
Merge pull request #7141 from agh1/report-print-header

Issues with printing reports

9 years agoCRM-17323 - Fix site registration links
Coleman Watts [Fri, 6 Nov 2015 19:17:04 +0000 (14:17 -0500)]
CRM-17323 - Fix site registration links

9 years agoCRM-17485: Event participant role filter not working in Participant list Count Report
yashodha [Fri, 6 Nov 2015 11:30:40 +0000 (17:00 +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 agoCRM-13682 Reports - make div the page break rather than table
Andrew Hunt [Thu, 5 Nov 2015 21:14:16 +0000 (16:14 -0500)]
CRM-13682 Reports - make div the page break rather than table

Table page break confuses dompdf

9 years agoCRM-13682 Reports - break up table on page break section
Andrew Hunt [Thu, 5 Nov 2015 21:05:48 +0000 (16:05 -0500)]
CRM-13682 Reports - break up table on page break section

9 years agoCRM-17511 Reports - default header getting emptied
Andrew Hunt [Thu, 5 Nov 2015 19:54:37 +0000 (14:54 -0500)]
CRM-17511 Reports - default header getting emptied

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 agoCRM_Utils_Hook::caseChange - Fix firing
Tim Otten [Wed, 4 Nov 2015 18:24:49 +0000 (10:24 -0800)]
CRM_Utils_Hook::caseChange - Fix firing

The event fired correctly with the Symfony dispatcher, but the hooks did not
fire correctly.  Fix the hooks.

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