civicrm-core.git
8 years agoMerge pull request #8793 from eileenmcnaughton/pledge
Monish Deb [Thu, 18 Aug 2016 08:46:45 +0000 (14:16 +0530)]
Merge pull request #8793 from eileenmcnaughton/pledge

CRM-18259 call pledge & pledgePayment specific functions for geting status

8 years agoMerge pull request #8903 from eileenmcnaughton/report_filters
Yashodha Chaku [Thu, 18 Aug 2016 06:13:13 +0000 (11:43 +0530)]
Merge pull request #8903 from eileenmcnaughton/report_filters

CRM-19241 Add communication filters to reports

8 years agoCRM-19241 Add communication filters to reports
eileen [Thu, 18 Aug 2016 02:40:04 +0000 (14:40 +1200)]
CRM-19241 Add communication filters to reports

8 years agoCRM_Contact_Page_AJAX - Style fix
Tim Otten [Thu, 18 Aug 2016 00:16:19 +0000 (17:16 -0700)]
CRM_Contact_Page_AJAX - Style fix

8 years agoMerge branch 'civiExit' of https://github.com/colemanw/civicrm-core into colemanw...
Tim Otten [Thu, 18 Aug 2016 00:17:43 +0000 (17:17 -0700)]
Merge branch 'civiExit' of https://github.com/colemanw/civicrm-core into colemanw-civiExit

8 years agoMerge pull request #8901 from GinkgoFJG/CRM-19068
Eileen McNaughton [Wed, 17 Aug 2016 21:29:02 +0000 (09:29 +1200)]
Merge pull request #8901 from GinkgoFJG/CRM-19068

CRM-19068: Code style change.

8 years agoCRM-18744 - Fix quotes in smarty tag
Coleman Watts [Wed, 17 Aug 2016 18:45:53 +0000 (14:45 -0400)]
CRM-18744 - Fix quotes in smarty tag

8 years agoCRM-19068: Code style change. Reduced verbosity and removed the dreaded $dc
Frank J. Gómez [Wed, 17 Aug 2016 15:29:18 +0000 (11:29 -0400)]
CRM-19068: Code style change. Reduced verbosity and removed the dreaded $dc
(or $dont_care) variable.

8 years agoMerge pull request #8895 from totten/master-bin-adm
Eileen McNaughton [Wed, 17 Aug 2016 07:35:57 +0000 (19:35 +1200)]
Merge pull request #8895 from totten/master-bin-adm

CRM-19223 - Tighter permissions for migration scripts

8 years agoCRM-19223 - bin/encryptDB.php - Completely disable by default
Tim Otten [Wed, 17 Aug 2016 02:04:42 +0000 (19:04 -0700)]
CRM-19223 - bin/encryptDB.php - Completely disable by default

Arguably, it's sufficient to check for administrative privileges...  since
an administrator can do this kind of damage anyway...  but this use-case is
so broad, dangerous, and uncommon that it really shouldn't be available
unless you take extraordinary measures.

It's tempting to remove the file entirely, but some upgrade workflows don't
properly handle deleted files, and some users may still want access to this
code so that they can run it themselves.

8 years agomigrate/(export,import)JSON.php - Syntax cleanup
Tim Otten [Wed, 17 Aug 2016 01:57:07 +0000 (18:57 -0700)]
migrate/(export,import)JSON.php - Syntax cleanup

8 years agoMerge pull request #8764 from colemanw/CRM-18744
Eileen McNaughton [Wed, 17 Aug 2016 01:10:28 +0000 (13:10 +1200)]
Merge pull request #8764 from colemanw/CRM-18744

CRM-18744 - Add prompt text when search term not found

8 years agoMerge pull request #8869 from seamuslee001/CRM-19218
Eileen McNaughton [Tue, 16 Aug 2016 22:58:42 +0000 (10:58 +1200)]
Merge pull request #8869 from seamuslee001/CRM-19218

CRM-19218 Fix unindexed join by getting option values using api

8 years agoMerge pull request #8066 from totten/master-alter-menu-rb
Eileen McNaughton [Tue, 16 Aug 2016 21:58:52 +0000 (09:58 +1200)]
Merge pull request #8066 from totten/master-alter-menu-rb

CRM-17570 - CRM_Core_Menu - Fire `alterMenu` hook

8 years agoMerge pull request #8887 from seamuslee001/CRM-19229
Tim Otten [Tue, 16 Aug 2016 21:01:33 +0000 (14:01 -0700)]
Merge pull request #8887 from seamuslee001/CRM-19229

CRM-19229 empty the bower_components folder if it already exists when…

8 years agoMerge pull request #8787 from agh1/soap-wp-4.7
Eileen McNaughton [Tue, 16 Aug 2016 08:47:19 +0000 (20:47 +1200)]
Merge pull request #8787 from agh1/soap-wp-4.7

SOAP Authentication Fails on WP (4.7)

8 years agoMerge pull request #8882 from liedekef/patch-1
Eileen McNaughton [Tue, 16 Aug 2016 08:37:02 +0000 (20:37 +1200)]
Merge pull request #8882 from liedekef/patch-1

CRM-19224 - Correct get-call for apccache

8 years agoMerge pull request #8735 from eileenmcnaughton/address_tests
Eileen McNaughton [Tue, 16 Aug 2016 08:34:33 +0000 (20:34 +1200)]
Merge pull request #8735 from eileenmcnaughton/address_tests

CRM-19074 & CRM-19113 merge fixes & tests

8 years agoMerge pull request #8820 from eileenmcnaughton/report
Eileen McNaughton [Tue, 16 Aug 2016 05:37:40 +0000 (17:37 +1200)]
Merge pull request #8820 from eileenmcnaughton/report

Reports: CRM-19175 fix add to group, CRM-19170  performance on group filters

8 years agoMerge pull request #8890 from eileenmcnaughton/state
Eileen McNaughton [Tue, 16 Aug 2016 04:33:35 +0000 (16:33 +1200)]
Merge pull request #8890 from eileenmcnaughton/state

CRM-19081 fix mapping load function to cope with legacy state format

8 years agoCRM-19170 update sybunt to optimise group filter
eileen [Thu, 4 Aug 2016 11:01:18 +0000 (23:01 +1200)]
CRM-19170 update sybunt to optimise group filter

8 years agoCRM-19170 update Lybunt to utilse shared code now it is moved
eileen [Thu, 4 Aug 2016 09:21:31 +0000 (21:21 +1200)]
CRM-19170 update Lybunt to utilse shared code now it is moved

8 years agoCRM-19170 update Contribution Detail & Repeat reports to use optimised group filter
eileen [Thu, 4 Aug 2016 08:42:10 +0000 (20:42 +1200)]
CRM-19170 update Contribution Detail & Repeat reports to use optimised group filter

8 years agoCRM-19170 explicitly mark the reports not taking advantage of efficient group queries.
eileen [Thu, 4 Aug 2016 08:37:52 +0000 (20:37 +1200)]
CRM-19170 explicitly mark the reports not taking advantage of efficient group queries.

The process of switching them over is not hard but they need to be looked at one-be-one

8 years agoCRM-19170 optimise group filter on contribution summary report.
eileen [Thu, 4 Aug 2016 08:32:07 +0000 (20:32 +1200)]
CRM-19170 optimise group filter on contribution summary report.

This reduced the time in testing from 190+ seconds (killed at that point) to ~1 second for a
report with a small result set on a large DB

8 years agoCRM-19170 preliminary tidy up on top donor report for testability
eileen [Thu, 4 Aug 2016 08:27:17 +0000 (20:27 +1200)]
CRM-19170 preliminary tidy up on top donor report for testability

8 years agoCRM-19170 preliminary tidy up.
eileen [Thu, 4 Aug 2016 08:21:00 +0000 (20:21 +1200)]
CRM-19170 preliminary tidy up.

Remove unused return variable, fix comments, remove duplicate key

8 years agoCRM-19175 fix add to group when viewing contribution detail without soft credits.
eileen [Thu, 4 Aug 2016 04:03:38 +0000 (16:03 +1200)]
CRM-19175 fix add to group when viewing contribution detail without soft credits.

This also includes some tidy up of the code, getting rid of the overriding of the  signature

8 years agoCRM-19081 fix mapping load function for legacy smart groups
Seamus Lee [Tue, 16 Aug 2016 03:25:19 +0000 (15:25 +1200)]
CRM-19081 fix mapping load function for legacy smart groups

8 years agoCRM-19081 Add test to demonstrate breakage
Seamus Lee [Sun, 17 Jul 2016 04:17:06 +0000 (14:17 +1000)]
CRM-19081 Add test to demonstrate breakage

8 years agoMerge pull request #8796 from eileenmcnaughton/master
Eileen McNaughton [Tue, 16 Aug 2016 01:16:51 +0000 (13:16 +1200)]
Merge pull request #8796 from eileenmcnaughton/master

CRM-19164 use exception rather than assert (for HHVM)

8 years agoMerge pull request #8881 from liedekef/master
Eileen McNaughton [Tue, 16 Aug 2016 01:06:18 +0000 (13:06 +1200)]
Merge pull request #8881 from liedekef/master

CRM-19221: Disabled role causes php notices

8 years agoMerge pull request #8883 from colemanw/CRM-19227
colemanw [Mon, 15 Aug 2016 13:41:21 +0000 (09:41 -0400)]
Merge pull request #8883 from colemanw/CRM-19227

CRM-19227 - Add entityRefFilters hook and support different widget types

8 years agoCRM-19229 empty the bower_components folder if it already exists when running distmaker
Seamus Lee [Mon, 15 Aug 2016 02:00:55 +0000 (12:00 +1000)]
CRM-19229 empty the bower_components folder if it already exists when running distmaker

8 years agoAdd specific test of the getTaxRates function
Seamus Lee [Sat, 13 Aug 2016 21:19:13 +0000 (07:19 +1000)]
Add specific test of the getTaxRates function

8 years agoAdd in fix for possible multiple option values found
Seamus Lee [Fri, 12 Aug 2016 01:52:00 +0000 (11:52 +1000)]
Add in fix for possible multiple option values found

8 years agoFix array index
Seamus Lee [Thu, 11 Aug 2016 07:05:30 +0000 (17:05 +1000)]
Fix array index

8 years agoCRM-19218 Fix unindexed join by getting option values using api
Seamus Lee [Thu, 11 Aug 2016 07:03:52 +0000 (17:03 +1000)]
CRM-19218 Fix unindexed join by getting option values using api

8 years agoMerge pull request #8864 from seamuslee001/CRM-19034
Eileen McNaughton [Sat, 13 Aug 2016 20:32:49 +0000 (08:32 +1200)]
Merge pull request #8864 from seamuslee001/CRM-19034

CRM-19034 revert the capitlisation of country names

8 years agoCRM-19227 - Add entityRefFilters hook and support different widget types
Coleman Watts [Sat, 13 Aug 2016 04:17:48 +0000 (00:17 -0400)]
CRM-19227 - Add entityRefFilters hook and support different widget types

8 years agoCRM-19034 fix tests failing due to expecting country names to be all caps
Seamus Lee [Sat, 13 Aug 2016 12:07:59 +0000 (22:07 +1000)]
CRM-19034 fix tests failing due to expecting country names to be all caps

8 years agoFix civicrm_country template file
Seamus Lee [Sat, 13 Aug 2016 11:08:32 +0000 (21:08 +1000)]
Fix civicrm_country template file

E remove unneded line

8 years agoCRM-19034 further country fixes
Seamus Lee [Sat, 13 Aug 2016 10:15:17 +0000 (20:15 +1000)]
CRM-19034 further country fixes

8 years agoCRM-19034 revert the capitlisation of country names
Seamus Lee [Thu, 11 Aug 2016 21:43:12 +0000 (21:43 +0000)]
CRM-19034 revert the capitlisation of country names

8 years agoCRM-17663 - fullscreen_url should be optional
Coleman Watts [Fri, 12 Aug 2016 17:46:25 +0000 (13:46 -0400)]
CRM-17663 - fullscreen_url should be optional

8 years agoFix get-call for apccache
Franky Van Liedekerke [Fri, 12 Aug 2016 11:39:02 +0000 (13:39 +0200)]
Fix get-call for apccache

Otherwise a php notice pops up (Notice: Only variable references should be returned by reference) and civicrm doesn't even load then ...

8 years agoMerge pull request #8860 from rocxa/CRM-19200_Merging_prefix_suffix_only_fix
Monish Deb [Fri, 12 Aug 2016 10:53:47 +0000 (16:23 +0530)]
Merge pull request #8860 from rocxa/CRM-19200_Merging_prefix_suffix_only_fix

CRM-19200 Merging just the title (prefix) field doesn't update properly

8 years agoMerge pull request #8878 from jitendrapurohit/CRM-19202
Monish Deb [Fri, 12 Aug 2016 10:00:26 +0000 (15:30 +0530)]
Merge pull request #8878 from jitendrapurohit/CRM-19202

CRM-19202 - Exporting an OR search exports with selected fields

8 years agoMerge pull request #8879 from monishdeb/CRM-19220
Monish Deb [Fri, 12 Aug 2016 08:41:19 +0000 (14:11 +0530)]
Merge pull request #8879 from monishdeb/CRM-19220

CRM-19220: iAmAnIntentionalENoticeThatWarnsOfAProblemYouShouldReport in Find Participants

8 years agoDisabled role causes php notices
Franky Van Liedekerke [Fri, 12 Aug 2016 08:00:51 +0000 (10:00 +0200)]
Disabled role causes php notices

8 years agoCRM-19220: iAmAnIntentionalENoticeThatWarnsOfAProblemYouShouldReport in Find Participants
deb.monish [Fri, 12 Aug 2016 07:26:22 +0000 (12:56 +0530)]
CRM-19220: iAmAnIntentionalENoticeThatWarnsOfAProblemYouShouldReport in Find Participants

8 years agoCRM-19202 - Exporting an OR search exports with selected fields
jitendrapurohit [Fri, 12 Aug 2016 06:00:52 +0000 (11:30 +0530)]
CRM-19202 - Exporting an OR search exports with selected fields

8 years agoMerge pull request #8851 from colemanw/dashboard
colemanw [Fri, 12 Aug 2016 04:31:59 +0000 (00:31 -0400)]
Merge pull request #8851 from colemanw/dashboard

CRM-17663 - Major dashboard improvements

8 years agoCRM-17663 - Fix missing dashboard names
Coleman Watts [Fri, 12 Aug 2016 03:55:40 +0000 (23:55 -0400)]
CRM-17663 - Fix missing dashboard names

8 years agoCRM-17663 - More tolerant url parsing
Coleman Watts [Fri, 12 Aug 2016 03:29:03 +0000 (23:29 -0400)]
CRM-17663 - More tolerant url parsing

8 years agoRemove unnecessary scrollbars from dashboard graphs
Coleman Watts [Wed, 10 Aug 2016 16:00:22 +0000 (12:00 -0400)]
Remove unnecessary scrollbars from dashboard graphs

8 years agoCRM-17663 - Fix race condition when loading OFC charts on dashboard
Coleman Watts [Wed, 10 Aug 2016 15:55:18 +0000 (11:55 -0400)]
CRM-17663 - Fix race condition when loading OFC charts on dashboard

8 years agoCRM-17663 - Regenerate SQL & DAOs
Coleman Watts [Tue, 9 Aug 2016 23:07:35 +0000 (19:07 -0400)]
CRM-17663 - Regenerate SQL & DAOs

8 years agoCRM-17663 - Configurable cache time per dashlet & auto-refresh
Coleman Watts [Tue, 9 Aug 2016 22:42:56 +0000 (18:42 -0400)]
CRM-17663 - Configurable cache time per dashlet & auto-refresh

8 years agoCRM-17663 - Add tests
Coleman Watts [Tue, 9 Aug 2016 02:35:18 +0000 (22:35 -0400)]
CRM-17663 - Add tests

8 years agoCRM-17663 - Cruft removal
Coleman Watts [Mon, 8 Aug 2016 18:36:55 +0000 (14:36 -0400)]
CRM-17663 - Cruft removal

Remove functions and db columns no longer needed by the streamlined dashboard.

8 years agoCRM-17663 - Implement localStorage cache
Coleman Watts [Sat, 6 Aug 2016 05:30:49 +0000 (01:30 -0400)]
CRM-17663 - Implement localStorage cache

8 years agoCRM-17663 - Load dashlets directly
Coleman Watts [Fri, 5 Aug 2016 07:06:46 +0000 (03:06 -0400)]
CRM-17663 - Load dashlets directly

8 years agoCRM-17663 - Refactor contact dashlet retrieval
Coleman Watts [Thu, 4 Aug 2016 19:52:58 +0000 (15:52 -0400)]
CRM-17663 - Refactor contact dashlet retrieval

8 years agoCRM-17663 - Add unique index to civicrm_dashboard_contact
Coleman Watts [Thu, 4 Aug 2016 19:03:55 +0000 (15:03 -0400)]
CRM-17663 - Add unique index to civicrm_dashboard_contact

8 years agoCRM-17663 - Dashboard cleanup
Coleman Watts [Thu, 4 Aug 2016 02:40:46 +0000 (22:40 -0400)]
CRM-17663 - Dashboard cleanup

8 years agoBlog dashlet improvements
Coleman Watts [Wed, 3 Aug 2016 19:07:01 +0000 (15:07 -0400)]
Blog dashlet improvements

8 years agoCRM-17663 - Dashboard style improvements
Coleman Watts [Tue, 2 Aug 2016 21:24:54 +0000 (17:24 -0400)]
CRM-17663 - Dashboard style improvements

8 years agoLoad home dashboard faster
Coleman Watts [Tue, 2 Aug 2016 17:34:25 +0000 (13:34 -0400)]
Load home dashboard faster

Eliminate unnecessary ajax call should speed up load times significantly.

8 years agoCRM-19223 - migrate/move.php - Require "administer CiviCRM"
Tim Otten [Thu, 11 Aug 2016 23:53:54 +0000 (16:53 -0700)]
CRM-19223 - migrate/move.php - Require "administer CiviCRM"

8 years agoCRM-19223 - migrate/(export|import)JSON.php - Require "administer CiviCRM"
Tim Otten [Thu, 11 Aug 2016 23:51:55 +0000 (16:51 -0700)]
CRM-19223 - migrate/(export|import)JSON.php - Require "administer CiviCRM"

8 years agoCRM-19223 - migrate/(export|import).php - Require "administer CiviCRM"
Tim Otten [Thu, 11 Aug 2016 23:51:23 +0000 (16:51 -0700)]
CRM-19223 - migrate/(export|import).php - Require "administer CiviCRM"

8 years agoCRM-19223 - bin/encryptDB.php - Require permission "administer CiviCRM"
Tim Otten [Thu, 11 Aug 2016 23:51:03 +0000 (16:51 -0700)]
CRM-19223 - bin/encryptDB.php - Require permission "administer CiviCRM"

8 years agoMerge pull request #8769 from totten/master-gencode-test
Tim Otten [Thu, 11 Aug 2016 21:25:21 +0000 (14:25 -0700)]
Merge pull request #8769 from totten/master-gencode-test

CRM-14885 - Commit DAO's. Add freshness test.

8 years agoFix caching bug in DAO commit PR
eileen [Thu, 11 Aug 2016 05:07:00 +0000 (17:07 +1200)]
Fix caching bug in DAO commit PR

8 years agoCRM-19130 - Add test for regression in CRM_Core_BAO_Cache
Tim Otten [Thu, 11 Aug 2016 20:20:56 +0000 (13:20 -0700)]
CRM-19130 - Add test for regression in CRM_Core_BAO_Cache

The earlier patch for CRM-19130 broke support for reading individual items
from the SQL cache.  Although the test-suite hits the cache layer a lot
(e.g.  CRM_Utils_Cache_SqlGroupTest), the bug wasn't exposed by other tests
because (a) caches are replicated in-memory and in SQL (b) caches are often
read in batch mode.

This explicitly flushes the in-memory cache and reads the SQL cache.

8 years agoMerge pull request #8873 from francescbassas/patch-5
Monish Deb [Thu, 11 Aug 2016 14:08:34 +0000 (19:38 +0530)]
Merge pull request #8873 from francescbassas/patch-5

CRM-19219 Parent child groups arrow mis-aligned

8 years agoMerge pull request #8871 from yashodha/CRM-18508
Yashodha Chaku [Thu, 11 Aug 2016 13:35:45 +0000 (19:05 +0530)]
Merge pull request #8871 from yashodha/CRM-18508

CRM-18508: Display State/Province in event address in registration em…

8 years agoMerge pull request #8874 from tschuettler/patch-3
Monish Deb [Thu, 11 Aug 2016 12:38:33 +0000 (18:08 +0530)]
Merge pull request #8874 from tschuettler/patch-3

CRM-19207: Update description to require views

8 years agoCRM-19207: Update description
tschuettler [Thu, 11 Aug 2016 11:25:26 +0000 (13:25 +0200)]
CRM-19207: Update description

8 years agoMerge pull request #8854 from tschuettler/patch-2
Monish Deb [Thu, 11 Aug 2016 10:56:57 +0000 (16:26 +0530)]
Merge pull request #8854 from tschuettler/patch-2

CRM-19207

8 years agoCRM-19219 Parent child groups arrow mis-aligned
francescbassas [Thu, 11 Aug 2016 10:19:12 +0000 (12:19 +0200)]
CRM-19219 Parent child groups arrow mis-aligned

Replicating changes made in this PR https://github.com/civicrm/civicrm-core/pull/8716/files

8 years agoCRM-18508: Display State/Province in event address in registration emails (handled...
yashodha [Thu, 11 Aug 2016 09:27:22 +0000 (14:57 +0530)]
CRM-18508: Display State/Province in event address in registration emails (handled upgrade as well)

----------------------------------------
* CRM-18508: State/Province not shown in Event Confirmation Emails
  https://issues.civicrm.org/jira/browse/CRM-18508

8 years agoMerge pull request #8607 from twomice/CRM-18508
Yashodha Chaku [Thu, 11 Aug 2016 08:31:26 +0000 (14:01 +0530)]
Merge pull request #8607 from twomice/CRM-18508

CRM-18508: Display State/Province in event address in registration emails

8 years agoMerge pull request #8868 from jitendrapurohit/CRM-19214
Monish Deb [Thu, 11 Aug 2016 07:44:28 +0000 (13:14 +0530)]
Merge pull request #8868 from jitendrapurohit/CRM-19214

CRM-19214 - Loop on parent row instead of first td element

8 years agoMerge pull request #8866 from seamuslee001/CRM-19217
Eileen McNaughton [Thu, 11 Aug 2016 07:07:57 +0000 (19:07 +1200)]
Merge pull request #8866 from seamuslee001/CRM-19217

CRM-19217 Ensure that is_active is set to 1 by default when creating …

8 years agoCRM-19214 - Loop on parent row instead of first td element
jitendrapurohit [Thu, 11 Aug 2016 06:16:57 +0000 (11:46 +0530)]
CRM-19214 - Loop on parent row instead of first td element

8 years agoremove version param as unneded as callAPISucess doesn't need it
Seamus Lee [Thu, 11 Aug 2016 04:58:57 +0000 (14:58 +1000)]
remove version param as unneded as callAPISucess doesn't need it

8 years agoCRM-19217 Ensure that is_active is set to 1 by default when creating dashboards via api
Seamus Lee [Thu, 11 Aug 2016 04:50:32 +0000 (14:50 +1000)]
CRM-19217 Ensure that is_active is set to 1 by default when creating dashboards via api

8 years agoMerge pull request #7990 from fuzionnz/CRM-16900
Eileen McNaughton [Thu, 11 Aug 2016 02:32:52 +0000 (14:32 +1200)]
Merge pull request #7990 from fuzionnz/CRM-16900

CRM-16900. Set secure flag to restrict cookies to SSL where appropriate.

8 years agoMerge pull request #8664 from eileenmcnaughton/country_names
Eileen McNaughton [Thu, 11 Aug 2016 00:21:13 +0000 (12:21 +1200)]
Merge pull request #8664 from eileenmcnaughton/country_names

CRM-19034 Remove line that makes all countries upper case

8 years agoMerge pull request #8859 from jitendrapurohit/CRM-19209
Eileen McNaughton [Wed, 10 Aug 2016 20:42:54 +0000 (08:42 +1200)]
Merge pull request #8859 from jitendrapurohit/CRM-19209

CRM-19209 - Fix create group without selecting parent

8 years agoCRM-19200 Merging just the title (prefix) field doesn't update the record properly
RocXa [Wed, 10 Aug 2016 15:55:23 +0000 (16:55 +0100)]
CRM-19200 Merging just the title (prefix) field doesn't update the record properly

8 years agoCRM-19209 - Fix create group without selecting parent
jitendrapurohit [Wed, 10 Aug 2016 13:19:24 +0000 (18:49 +0530)]
CRM-19209 - Fix create group without selecting parent

8 years agoMerge pull request #8856 from jitendrapurohit/CRM-19205
Monish Deb [Wed, 10 Aug 2016 11:49:33 +0000 (17:19 +0530)]
Merge pull request #8856 from jitendrapurohit/CRM-19205

CRM-19205 - Fix delete report task

8 years agoCRM-19205 - Fix delete report task
jitendrapurohit [Wed, 10 Aug 2016 11:12:39 +0000 (16:42 +0530)]
CRM-19205 - Fix delete report task

8 years agoMerge pull request #8846 from yashodha/CRM-18972
Yashodha Chaku [Wed, 10 Aug 2016 11:05:01 +0000 (16:35 +0530)]
Merge pull request #8846 from yashodha/CRM-18972

CRM-18972: List of strings that cannot be localized cause the absence…

8 years agoMerge pull request #8855 from yashodha/CRM-18472.fix
Monish Deb [Wed, 10 Aug 2016 10:44:24 +0000 (16:14 +0530)]
Merge pull request #8855 from yashodha/CRM-18472.fix

CRM-18472: Notice fixes

8 years agoMerge pull request #8853 from monishdeb/CRM-19204
Monish Deb [Wed, 10 Aug 2016 10:23:35 +0000 (15:53 +0530)]
Merge pull request #8853 from monishdeb/CRM-19204

CRM-19204: Contact-to-contact email attachments not working

8 years agoclean up
yashodha [Wed, 10 Aug 2016 10:11:16 +0000 (15:41 +0530)]
clean up