civicrm-core.git
9 years agoUpdate version to 4.6.3
CiviCRM [Wed, 15 Apr 2015 23:43:14 +0000 (16:43 -0700)]
Update version to 4.6.3

9 years agoMerge pull request #5640 from totten/4.6-dm-ang
Tim Otten [Wed, 15 Apr 2015 23:16:28 +0000 (16:16 -0700)]
Merge pull request #5640 from totten/4.6-dm-ang

CRM-16299 - distmaker - Include "ang" folder

9 years agoCRM-16299 - distmaker - Include "ang" folder
Tim Otten [Wed, 15 Apr 2015 23:06:14 +0000 (16:06 -0700)]
CRM-16299 - distmaker - Include "ang" folder

9 years agoMerge pull request #5626 from eileenmcnaughton/4.6
colemanw [Wed, 15 Apr 2015 22:05:53 +0000 (18:05 -0400)]
Merge pull request #5626 from eileenmcnaughton/4.6

CRM-16290 fix fatal on relationship edit

9 years agoMerge pull request #5638 from JKingsnorth/CRM-16227b
Kurund Jalmi [Wed, 15 Apr 2015 19:34:07 +0000 (12:34 -0700)]
Merge pull request #5638 from JKingsnorth/CRM-16227b

CRM-16227: Change last month filter to last 30 days

9 years agoUpdate version to 4.6.2
CiviCRM [Wed, 15 Apr 2015 18:43:25 +0000 (11:43 -0700)]
Update version to 4.6.2

9 years agoMerge pull request #5639 from JKingsnorth/CRM-16297
colemanw [Wed, 15 Apr 2015 14:14:24 +0000 (10:14 -0400)]
Merge pull request #5639 from JKingsnorth/CRM-16297

CRM-16297: Fix comment. _custom is called after db write, not before.

9 years agoCRM-16297: Fix comment. _custom is called AFTER db write, not before.
JKingsnorth [Wed, 15 Apr 2015 14:10:37 +0000 (15:10 +0100)]
CRM-16297: Fix comment. _custom is called AFTER db write, not before.

9 years agoCRM-16227: Change last month filter to last 30 days
JKingsnorth [Wed, 15 Apr 2015 09:48:23 +0000 (10:48 +0100)]
CRM-16227: Change last month filter to last 30 days

9 years agoMerge pull request #5634 from davecivicrm/CRM-16289
Kurund Jalmi [Wed, 15 Apr 2015 05:46:27 +0000 (22:46 -0700)]
Merge pull request #5634 from davecivicrm/CRM-16289

CRM-16289 - Upgrade fix for log_civicrm_case.case_type_id.

9 years agoMerge pull request #5633 from kurund/CRM-15959
Kurund Jalmi [Wed, 15 Apr 2015 00:57:41 +0000 (17:57 -0700)]
Merge pull request #5633 from kurund/CRM-15959

CRM-15959, manually applied changes that were lost in forward merge

9 years agoCRM-16289 - Upgrade fix for log_civicrm_case.case_type_id.
Dave Greenberg [Wed, 15 Apr 2015 00:14:46 +0000 (17:14 -0700)]
CRM-16289 - Upgrade fix for log_civicrm_case.case_type_id.

----------------------------------------
* CRM-16289: Remove special characters from log_civicrm_case.case_type_id data during upgrade
  https://issues.civicrm.org/jira/browse/CRM-16289

9 years agoCRM-16289 - Upgrade fix for log_civicrm_case.case_type_id.
Dave Greenberg [Wed, 15 Apr 2015 00:09:37 +0000 (17:09 -0700)]
CRM-16289 - Upgrade fix for log_civicrm_case.case_type_id.

----------------------------------------
* CRM-16289: Remove special characters from log_civicrm_case.case_type_id data during upgrade
  https://issues.civicrm.org/jira/browse/CRM-16289

9 years agoCRM-16289 - Upgrade fix for log_civicrm_case.case_type_id.
Dave Greenberg [Tue, 14 Apr 2015 23:51:20 +0000 (16:51 -0700)]
CRM-16289 - Upgrade fix for log_civicrm_case.case_type_id.

----------------------------------------
* CRM-16289: Remove special characters from log_civicrm_case.case_type_id data during upgrade
  https://issues.civicrm.org/jira/browse/CRM-16289

9 years agoCRM-15959, manually applied changes that were lost in forward merge
kurund [Tue, 14 Apr 2015 23:39:49 +0000 (16:39 -0700)]
CRM-15959, manually applied changes that were lost in forward merge

----------------------------------------
* CRM-15959: Leakage in payment processor selection
  https://issues.civicrm.org/jira/browse/CRM-15959

9 years agoMerge pull request #5604 from mallezie/crm-16265-fix-drush-install-4.6
Kurund Jalmi [Tue, 14 Apr 2015 23:02:55 +0000 (16:02 -0700)]
Merge pull request #5604 from mallezie/crm-16265-fix-drush-install-4.6

fix drush installation of civicrm 4.6

9 years agoMerge pull request #5628 from pratikshad/webtest
Kurund Jalmi [Tue, 14 Apr 2015 18:11:21 +0000 (11:11 -0700)]
Merge pull request #5628 from pratikshad/webtest

Fixed webtest for civi-4.6

9 years agoMerge pull request #5630 from rohankatkar/4.6--webtest
Kurund Jalmi [Tue, 14 Apr 2015 18:11:09 +0000 (11:11 -0700)]
Merge pull request #5630 from rohankatkar/4.6--webtest

webtest fix

9 years agowebtest fix
Web Access [Tue, 14 Apr 2015 13:06:36 +0000 (18:36 +0530)]
webtest fix

9 years agowhitespace fix
Eileen McNaughton [Tue, 14 Apr 2015 07:15:56 +0000 (19:15 +1200)]
whitespace fix

9 years agoFixed webtest for civi-4.6
pratikshad [Tue, 14 Apr 2015 05:07:42 +0000 (10:37 +0530)]
Fixed webtest for civi-4.6

9 years agoCRM-16290 fix fatal on relationship edit
Eileen McNaughton [Tue, 14 Apr 2015 01:45:24 +0000 (13:45 +1200)]
CRM-16290 fix fatal on relationship edit

9 years agoMerge pull request #5625 from rohankatkar/webtest--4.6
Kurund Jalmi [Mon, 13 Apr 2015 23:46:16 +0000 (16:46 -0700)]
Merge pull request #5625 from rohankatkar/webtest--4.6

Webtest Fixes (4.6)

9 years agoMerge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-04-13-16-08-08
kurund [Mon, 13 Apr 2015 23:08:14 +0000 (16:08 -0700)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-04-13-16-08-08

9 years agoMerge pull request #5472 from monishdeb/CRM-15908
Kurund Jalmi [Mon, 13 Apr 2015 22:54:03 +0000 (15:54 -0700)]
Merge pull request #5472 from monishdeb/CRM-15908

CRM-15908 additional fix

9 years agoMerge pull request #5623 from eileenmcnaughton/CRM-16280
Dave Greenberg [Mon, 13 Apr 2015 16:57:31 +0000 (09:57 -0700)]
Merge pull request #5623 from eileenmcnaughton/CRM-16280

CRM-16280 remove NOT NULL from upgrade sql to reflect schema & resolve u...

9 years agoWebtest Fixes
Web Access [Mon, 13 Apr 2015 12:52:48 +0000 (18:22 +0530)]
Webtest Fixes

9 years agoMerge pull request #5622 from colemanw/docs
colemanw [Mon, 13 Apr 2015 12:25:52 +0000 (08:25 -0400)]
Merge pull request #5622 from colemanw/docs

Update doc links

9 years agoMerge pull request #5613 from rohankatkar/CRM-16264
Monish Deb [Mon, 13 Apr 2015 11:33:15 +0000 (17:03 +0530)]
Merge pull request #5613 from rohankatkar/CRM-16264

Descriptions not displayed in Profile

9 years agoMerge pull request #5611 from atif-shaikh/CRM-16257
Monish Deb [Mon, 13 Apr 2015 07:27:19 +0000 (12:57 +0530)]
Merge pull request #5611 from atif-shaikh/CRM-16257

CRM-16257 - "Sorry an error occurred and your information was not saved"...

9 years agoMerge pull request #5612 from pratikshad/CRM-16222
Monish Deb [Mon, 13 Apr 2015 07:22:40 +0000 (12:52 +0530)]
Merge pull request #5612 from pratikshad/CRM-16222

CRM-16222 Fix-Forms with 'Other amount' field should display a currency ...

9 years agoMerge pull request #5600 from atif-shaikh/CRM-16254
Monish Deb [Mon, 13 Apr 2015 07:22:09 +0000 (12:52 +0530)]
Merge pull request #5600 from atif-shaikh/CRM-16254

CRM-16254 - Cannot create a custom Search

9 years agoMerge pull request #5610 from jitendrapurohit/CRM-16250
Monish Deb [Mon, 13 Apr 2015 05:45:17 +0000 (11:15 +0530)]
Merge pull request #5610 from jitendrapurohit/CRM-16250

CRM-16250 - Tax Invoice CIVIevent Registration Not working for Multiple ...

9 years agotypo Fix
pratikshad [Mon, 13 Apr 2015 05:39:23 +0000 (11:09 +0530)]
typo Fix

9 years agoCRM-16280 remove NOT NULL from upgrade sql to reflect schema & resolve upgrade failure
Eileen McNaughton [Mon, 13 Apr 2015 02:38:28 +0000 (14:38 +1200)]
CRM-16280 remove NOT NULL from upgrade sql to reflect schema & resolve upgrade failure

9 years agoUpdate doc links
Coleman Watts [Sun, 12 Apr 2015 23:01:53 +0000 (19:01 -0400)]
Update doc links

9 years agoMerge pull request #5608 from totten/4.6-ckeditor-upload
Tim Otten [Sat, 11 Apr 2015 04:23:32 +0000 (21:23 -0700)]
Merge pull request #5608 from totten/4.6-ckeditor-upload

CRM-16253 - crmUiRichtext - Enable file uploads

9 years agoMerge pull request #5616 from colemanw/CRM-16267
colemanw [Sat, 11 Apr 2015 00:33:29 +0000 (20:33 -0400)]
Merge pull request #5616 from colemanw/CRM-16267

CRM-16267 - Fix copying date fields in profile batch update

9 years agoCRM-16267 Fix setting dates in membership batch
Coleman Watts [Fri, 10 Apr 2015 22:00:33 +0000 (18:00 -0400)]
CRM-16267 Fix setting dates in membership batch

9 years agoMerge pull request #5615 from colemanw/CRM-16271
colemanw [Fri, 10 Apr 2015 21:31:38 +0000 (17:31 -0400)]
Merge pull request #5615 from colemanw/CRM-16271

CRM-16271 - Fix formatting of custom fields on name badges

9 years agoBatch js cleanup
Coleman Watts [Fri, 10 Apr 2015 21:31:19 +0000 (17:31 -0400)]
Batch js cleanup

9 years agoMerge pull request #5617 from colemanw/CRM-15916
colemanw [Fri, 10 Apr 2015 21:30:35 +0000 (17:30 -0400)]
Merge pull request #5617 from colemanw/CRM-15916

CRM-15916 - Revert bad merge

9 years agoCRM-15916 - Revert bad merge
Coleman Watts [Fri, 10 Apr 2015 21:27:30 +0000 (17:27 -0400)]
CRM-15916 - Revert bad merge

9 years agoCRM-16267 - Fix copying date fields in profile batch update
Coleman Watts [Fri, 10 Apr 2015 21:01:42 +0000 (17:01 -0400)]
CRM-16267 - Fix copying date fields in profile batch update

9 years agoCRM-16271 - Fix formatting of custom fields on name badges
Coleman Watts [Fri, 10 Apr 2015 20:20:34 +0000 (16:20 -0400)]
CRM-16271 - Fix formatting of custom fields on name badges

9 years agoUse classloader to add packages
Tim Mallezie [Fri, 10 Apr 2015 17:13:11 +0000 (19:13 +0200)]
Use classloader to add packages

9 years agoMerge pull request #5609 from PalanteJon/CRM-16196-46
Dave Greenberg [Fri, 10 Apr 2015 16:46:13 +0000 (09:46 -0700)]
Merge pull request #5609 from PalanteJon/CRM-16196-46

CRM-16196 - CiviCRM Core - CRM_Utils_System_Drupal::getLoginURL should a...

9 years agoMerge pull request #5597 from pratikshad/CRM-16008
Monish Deb [Fri, 10 Apr 2015 14:36:42 +0000 (20:06 +0530)]
Merge pull request #5597 from pratikshad/CRM-16008

CRM-16008 Fix-Import contacts: notes are imported twice

9 years agoCRM-16222-PR improvement
pratikshad [Fri, 10 Apr 2015 14:10:37 +0000 (19:40 +0530)]
CRM-16222-PR improvement

9 years agoCRM-16257 resolved regression caused by previous commit for issue CRM-16157
atif-shaikh [Fri, 10 Apr 2015 14:05:40 +0000 (19:35 +0530)]
CRM-16257 resolved regression caused by previous commit for issue CRM-16157

----------------------------------------
* CRM-16257: "Sorry an error occurred and your information was not saved" if email contains an image or a table
  https://issues.civicrm.org/jira/browse/CRM-16257
* CRM-16157: Option Group - Paper Size Options lost edit ability
  https://issues.civicrm.org/jira/browse/CRM-16157

9 years agoCRM-16254 - Cannot create a custom Search
atif-shaikh [Thu, 9 Apr 2015 12:24:28 +0000 (17:54 +0530)]
CRM-16254 - Cannot create a custom Search

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

9 years agoFix for CRM-16264
Web Access [Fri, 10 Apr 2015 13:26:36 +0000 (18:56 +0530)]
Fix for CRM-16264

9 years agoCRM-16257 - "Sorry an error occurred and your information was not saved" if email...
atif-shaikh [Fri, 10 Apr 2015 12:16:18 +0000 (17:46 +0530)]
CRM-16257 - "Sorry an error occurred and your information was not saved" if email contains an image or a table

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

9 years agoCRM-16222 Fix-Forms with 'Other amount' field should display a currency symbol with...
pratikshad [Fri, 10 Apr 2015 11:52:42 +0000 (17:22 +0530)]
CRM-16222 Fix-Forms with 'Other amount' field should display a currency symbol with the field

----------------------------------------
* CRM-16222: Forms with "Other amount" field should display a currency symbol with the field
  https://issues.civicrm.org/jira/browse/CRM-16222

9 years agoMerge pull request #5602 from rohankatkar/4.6-webtest
Kurund Jalmi [Fri, 10 Apr 2015 10:49:58 +0000 (16:19 +0530)]
Merge pull request #5602 from rohankatkar/4.6-webtest

Webtest Fix

9 years agowarning fix
jitendrapurohit [Fri, 10 Apr 2015 10:49:14 +0000 (16:19 +0530)]
warning fix

9 years agoMerge pull request #5598 from atif-shaikh/CRM-16258
Kurund Jalmi [Fri, 10 Apr 2015 10:32:33 +0000 (16:02 +0530)]
Merge pull request #5598 from atif-shaikh/CRM-16258

CRM-16258 - CiviCRM 4.6.0 membership list multiple member entries based ...

9 years agoMerge pull request #5580 from eileenmcnaughton/CRM-16247
Kurund Jalmi [Fri, 10 Apr 2015 10:20:57 +0000 (15:50 +0530)]
Merge pull request #5580 from eileenmcnaughton/CRM-16247

CRM-16247 Move activity creation until after transaction is committed

9 years agoMerge pull request #5589 from monishdeb/CRM-15403
Monish Deb [Fri, 10 Apr 2015 07:37:32 +0000 (13:07 +0530)]
Merge pull request #5589 from monishdeb/CRM-15403

CRM-15403 fix - Large Batch Data Entry allows multiple submits causing d...

9 years agoCRM-16250 - Tax Invoice CIVIevent Registration Not working for Multiple Registration
jitendrapurohit [Fri, 10 Apr 2015 07:30:55 +0000 (13:00 +0530)]
CRM-16250 - Tax Invoice CIVIevent Registration Not working for Multiple Registration

9 years agoMerge pull request #5571 from jitendrapurohit/CRM-16229
Kurund Jalmi [Fri, 10 Apr 2015 06:52:27 +0000 (12:22 +0530)]
Merge pull request #5571 from jitendrapurohit/CRM-16229

CRM-16229 - Cannot add participants to event from search

9 years agoCRM-16196 - CiviCRM Core - CRM_Utils_System_Drupal::getLoginURL should always generat...
Jon goldberg [Thu, 9 Apr 2015 23:48:44 +0000 (19:48 -0400)]
CRM-16196 - CiviCRM Core - CRM_Utils_System_Drupal::getLoginURL should always generate absolute paths

9 years agoCRM-16253 - crmUiRichtext - Enable file uploads
Tim Otten [Fri, 10 Apr 2015 00:29:36 +0000 (17:29 -0700)]
CRM-16253 - crmUiRichtext - Enable file uploads

9 years agoCRM-16253 - Angular - Declare settings in $angularModules. Add setting for callback...
Tim Otten [Fri, 10 Apr 2015 00:19:09 +0000 (17:19 -0700)]
CRM-16253 - Angular - Declare settings in $angularModules. Add setting for callback URL.

9 years agoCRM-16145 - Civi\Angular\ManagerText - Fix regression
Tim Otten [Fri, 10 Apr 2015 00:20:36 +0000 (17:20 -0700)]
CRM-16145 - Civi\Angular\ManagerText - Fix regression

9 years agoMerge pull request #5606 from totten/4.6-ngroute
Tim Otten [Fri, 10 Apr 2015 00:34:30 +0000 (17:34 -0700)]
Merge pull request #5606 from totten/4.6-ngroute

CRM-16246 - Load ngRoute through Civi\Angular\Manager

9 years agoCRM-16246 - Load ngRoute through Civi\Angular\Manager
Tim Otten [Thu, 9 Apr 2015 23:31:00 +0000 (16:31 -0700)]
CRM-16246 - Load ngRoute through Civi\Angular\Manager

This should resolve one of Chrome's warnings about min.map.

9 years agoimprovement and format fixes
monishdeb [Thu, 9 Apr 2015 16:32:14 +0000 (22:02 +0530)]
improvement and format fixes

9 years agoimprovement and format fixes
monishdeb [Thu, 9 Apr 2015 16:22:29 +0000 (21:52 +0530)]
improvement and format fixes

9 years agofix drush installation of civicrm 4.6
Tim Mallezie [Thu, 9 Apr 2015 16:08:39 +0000 (18:08 +0200)]
fix drush installation of civicrm 4.6

9 years agoCRM-15403 fix - Large Batch Data Entry allows multiple submits causing duplicate...
monishdeb [Wed, 8 Apr 2015 07:22:41 +0000 (12:52 +0530)]
CRM-15403 fix - Large Batch Data Entry allows multiple submits causing duplicate transactions

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

9 years agoWebtest Fix
Web Access [Thu, 9 Apr 2015 14:50:44 +0000 (20:20 +0530)]
Webtest Fix

9 years agoMerge pull request #5592 from JKingsnorth/CRM-16256
colemanw [Thu, 9 Apr 2015 14:37:09 +0000 (10:37 -0400)]
Merge pull request #5592 from JKingsnorth/CRM-16256

CRM-16256: Skip empty fields on dedupe

9 years agoMerge pull request #5596 from pratikshad/webtest2
Kurund Jalmi [Thu, 9 Apr 2015 13:32:04 +0000 (19:02 +0530)]
Merge pull request #5596 from pratikshad/webtest2

Fixed webtest for civi-4.6

9 years agoMerge pull request #5599 from jitendrapurohit/CRM-15735webtest
Kurund Jalmi [Thu, 9 Apr 2015 13:30:46 +0000 (19:00 +0530)]
Merge pull request #5599 from jitendrapurohit/CRM-15735webtest

webtest to verify membership dates as per the contribution receive_date

9 years agoadded doc
jitendrapurohit [Thu, 9 Apr 2015 11:39:22 +0000 (17:09 +0530)]
added doc

9 years agowebtest to verify membership dates as per the contribution receive_date
jitendrapurohit [Thu, 9 Apr 2015 11:19:03 +0000 (16:49 +0530)]
webtest to verify membership dates as per the contribution receive_date

9 years agoCRM-16258 - CiviCRM 4.6.0 membership list multiple member entries based on number...
atif-shaikh [Thu, 9 Apr 2015 10:52:56 +0000 (16:22 +0530)]
CRM-16258 - CiviCRM 4.6.0 membership list multiple member entries based on number of contributions.

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

9 years agoFatal error fix
jitendrapurohit [Thu, 9 Apr 2015 10:10:32 +0000 (15:40 +0530)]
Fatal error fix

9 years agoCRM-16008 Fix-Import contacts: notes are imported twice
pratikshad [Thu, 9 Apr 2015 10:09:38 +0000 (15:39 +0530)]
CRM-16008 Fix-Import contacts: notes are imported twice

----------------------------------------
* CRM-16008: Import contacts: notes are imported twice
  https://issues.civicrm.org/jira/browse/CRM-16008

9 years agoFix for Cannot add participants to event from search
jitendrapurohit [Mon, 6 Apr 2015 13:11:01 +0000 (18:41 +0530)]
Fix for Cannot add participants to event from search

9 years agoFixed webtest for civi-4.6
pratikshad [Thu, 9 Apr 2015 09:32:54 +0000 (15:02 +0530)]
Fixed webtest for civi-4.6

9 years agoMerge pull request #5591 from jitendrapurohit/CRM-15735
Kurund Jalmi [Thu, 9 Apr 2015 09:29:46 +0000 (14:59 +0530)]
Merge pull request #5591 from jitendrapurohit/CRM-15735

update the membership dates as per contribution receive_date

9 years agoMerge pull request #5595 from totten/4.6-agg-fixes
Tim Otten [Thu, 9 Apr 2015 06:37:23 +0000 (23:37 -0700)]
Merge pull request #5595 from totten/4.6-agg-fixes

CRM-16145 - Angular aggregation fixes

9 years agoMerge pull request #5547 from pratikshad/webtest1
Monish Deb [Thu, 9 Apr 2015 06:01:19 +0000 (11:31 +0530)]
Merge pull request #5547 from pratikshad/webtest1

Fixed webtest for civi-4.6

9 years agoCRM-16246, CRM-16145 - When aggregating JS, strip full-line "//" comments.
Tim Otten [Thu, 9 Apr 2015 05:28:53 +0000 (22:28 -0700)]
CRM-16246, CRM-16145 - When aggregating JS, strip full-line "//" comments.

In discussion of CRM-16246, we found that aggregation led to errors in
processing "//# sourceMappingURL=" comments in Chrome.  We can't fix that
for all aggregators, but we can do something about the internal aggregator.

9 years agoCRM-16145 - When aggregating JS, dedupe adjacent closures.
Tim Otten [Thu, 9 Apr 2015 04:20:04 +0000 (21:20 -0700)]
CRM-16145 - When aggregating JS, dedupe adjacent closures.

The reorganized Angular files have added ~50 identical closures, and there
are still other big modules which remain to split.  Ideally, the raw JS
files wouldn't bother with these closures, but we'd have to rework the debug
use-case and karma use-case if we removed the closures from the original
file (and that most likely means a change to developer workflow).  This
patch accomplishes the goal without changing developer workflow.

9 years agoCRM-16145 - Angular - Don't aggregate CSS files
Tim Otten [Thu, 9 Apr 2015 02:33:31 +0000 (19:33 -0700)]
CRM-16145 - Angular - Don't aggregate CSS files

The main pain-point is decomposing and then aggregating JS files. CSS files
are a smaller issue, and they have harsher requirements because CSS files
may include file-path-expressions (which need to be filtered during
aggregation).

9 years agoMerge pull request #5587 from totten/4.6-agg-cleanup
Tim Otten [Thu, 9 Apr 2015 04:43:12 +0000 (21:43 -0700)]
Merge pull request #5587 from totten/4.6-agg-cleanup

CRM-16145 - Cleanup Angular file structure

9 years agoMerge pull request #5594 from colemanw/CRM-16260
colemanw [Thu, 9 Apr 2015 00:23:43 +0000 (20:23 -0400)]
Merge pull request #5594 from colemanw/CRM-16260

CRM-16260 - Fix use of ts() within templates

9 years agoMerge pull request #5588 from jitendrapurohit/CRM-16175
Dave Greenberg [Wed, 8 Apr 2015 21:33:35 +0000 (14:33 -0700)]
Merge pull request #5588 from jitendrapurohit/CRM-16175

CRM-16175 - net amount sometimes incorrect for events involving partial payments.

9 years agoCRM-16260 - Fix use of ts() within templates
Coleman Watts [Wed, 8 Apr 2015 21:29:53 +0000 (17:29 -0400)]
CRM-16260 - Fix use of ts() within templates

9 years agoCRM-16256: Skip empty fields on dedupe
JKingsnorth [Wed, 8 Apr 2015 13:57:10 +0000 (14:57 +0100)]
CRM-16256: Skip empty fields on dedupe

9 years agoupdate the membership dates as per contribution receive_date
jitendrapurohit [Wed, 8 Apr 2015 13:01:06 +0000 (18:31 +0530)]
update the membership dates as per contribution receive_date

9 years agominor fixes
jitendrapurohit [Wed, 8 Apr 2015 12:53:03 +0000 (18:23 +0530)]
minor fixes

9 years agonet amount sometimes incorrect for events involving partial payments.
jitendrapurohit [Wed, 8 Apr 2015 06:37:11 +0000 (12:07 +0530)]
net amount sometimes incorrect for events involving partial payments.

9 years agoMerge pull request #5584 from rohankatkar/CRM-16228
Monish Deb [Wed, 8 Apr 2015 12:51:56 +0000 (18:21 +0530)]
Merge pull request #5584 from rohankatkar/CRM-16228

Tax INVOICE PDF randomly changes Tax Rate

9 years agoRevert assert value due to typo
pratikshad [Wed, 8 Apr 2015 12:44:24 +0000 (18:14 +0530)]
Revert assert value due to typo

9 years agoFixed webtest for civi-4.6
pratikshad [Thu, 2 Apr 2015 11:17:43 +0000 (16:47 +0530)]
Fixed webtest for civi-4.6

9 years agoCRM-16145 - crmMailing - Match .js and .html files for dialogs
Tim Otten [Wed, 8 Apr 2015 06:46:47 +0000 (23:46 -0700)]
CRM-16145 - crmMailing - Match .js and .html files for dialogs