Kurund Jalmi [Fri, 17 Apr 2015 17:12:43 +0000 (10:12 -0700)]
Merge pull request #5645 from kurund/CRM-16234
CRM-16234, don't create ufmatch entries if already exists
Dave Greenberg [Fri, 17 Apr 2015 16:23:05 +0000 (09:23 -0700)]
Merge pull request #5646 from davecivicrm/CRM-16277
CRM-16277 - Sort groups and mailings alphabetically in the recipients dr...
Dave Greenberg [Fri, 17 Apr 2015 16:22:56 +0000 (09:22 -0700)]
Merge pull request #5644 from totten/4.6-mail-estimates2
CRM-16277 - crmMailing - Fix slow recipient count
Monish Deb [Fri, 17 Apr 2015 05:16:20 +0000 (10:46 +0530)]
Merge pull request #5641 from atif-shaikh/CRM-16193
CRM-16193 - Do not log civicrm_mailing_recipients table - Dave Jenkins
Dave Greenberg [Fri, 17 Apr 2015 00:53:45 +0000 (17:53 -0700)]
CRM-16277 - Sort groups and mailings alphabetically in the recipients drop-downs.
----------------------------------------
* CRM-16277: "DB Error: unknown error" in CiviMail upon adding recipient group
https://issues.civicrm.org/jira/browse/CRM-16277
Tim Otten [Fri, 17 Apr 2015 00:47:40 +0000 (17:47 -0700)]
EditRecipCtrl - Don't round recipient count
Tim Otten [Thu, 16 Apr 2015 23:21:40 +0000 (16:21 -0700)]
crmMailingPreviewMgr.preview - Match style
All other uses of crmStatus in crmMailing incude "..." in the start message.
Tim Otten [Thu, 16 Apr 2015 23:13:55 +0000 (16:13 -0700)]
CRM-16277 - EditRecipCtrl - Separate AJAX calls for preview by count and by name
Tim Otten [Thu, 16 Apr 2015 22:19:56 +0000 (15:19 -0700)]
Add CRM.sigfig utility
Tim Otten [Thu, 16 Apr 2015 22:01:58 +0000 (15:01 -0700)]
CRM-16277 - crmMailingMgr.previewRecipientCount
Tim Otten [Thu, 16 Apr 2015 21:59:55 +0000 (14:59 -0700)]
CRM-16277 - crmMailingMgr - Strictly serialize write operations
Tim Otten [Thu, 16 Apr 2015 03:47:24 +0000 (20:47 -0700)]
crmUtil - Add crmQueue() helper for serializing crmApi() calls
kurund [Thu, 16 Apr 2015 23:33:47 +0000 (16:33 -0700)]
CRM-16234, don't create ufmatch entries if already exists
----------------------------------------
* CRM-16234: User Creation via profile fails with DB Error
https://issues.civicrm.org/jira/browse/CRM-16234
Tim Otten [Wed, 15 Apr 2015 08:32:53 +0000 (01:32 -0700)]
ViewRecipCtrl - Fix advisory name on function
Tim Otten [Wed, 15 Apr 2015 00:52:13 +0000 (17:52 -0700)]
CRM_Mailing_Info - Don't output unused variable
Kurund Jalmi [Thu, 16 Apr 2015 18:25:02 +0000 (11:25 -0700)]
Merge pull request #5643 from rohankatkar/CRM-16291
PHP Notice: Undefined offset
Kurund Jalmi [Thu, 16 Apr 2015 16:16:27 +0000 (09:16 -0700)]
Merge pull request #5642 from pratikshad/webtest2
Fixed Webtest for civi-4.6
Web Access [Thu, 16 Apr 2015 14:08:26 +0000 (19:38 +0530)]
Fix for CRM-16291
pratikshad [Thu, 16 Apr 2015 12:33:06 +0000 (18:03 +0530)]
Fixed Webtest for civi-4.6
atif-shaikh [Thu, 16 Apr 2015 11:16:43 +0000 (16:46 +0530)]
CRM-16193 - Do not log civicrm_mailing_recipients table
https://issues.civicrm.org/jira/browse/CRM-16193
CiviCRM [Wed, 15 Apr 2015 23:43:14 +0000 (16:43 -0700)]
Update version to 4.6.3
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
Tim Otten [Wed, 15 Apr 2015 23:06:14 +0000 (16:06 -0700)]
CRM-16299 - distmaker - Include "ang" folder
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
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
CiviCRM [Wed, 15 Apr 2015 18:43:25 +0000 (11:43 -0700)]
Update version to 4.6.2
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.
JKingsnorth [Wed, 15 Apr 2015 14:10:37 +0000 (15:10 +0100)]
CRM-16297: Fix comment. _custom is called AFTER db write, not before.
JKingsnorth [Wed, 15 Apr 2015 09:48:23 +0000 (10:48 +0100)]
CRM-16227: Change last month filter to last 30 days
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.
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
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
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
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
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
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
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
Kurund Jalmi [Tue, 14 Apr 2015 18:11:09 +0000 (11:11 -0700)]
Merge pull request #5630 from rohankatkar/4.6--webtest
webtest fix
Web Access [Tue, 14 Apr 2015 13:06:36 +0000 (18:36 +0530)]
webtest fix
Eileen McNaughton [Tue, 14 Apr 2015 07:15:56 +0000 (19:15 +1200)]
whitespace fix
pratikshad [Tue, 14 Apr 2015 05:07:42 +0000 (10:37 +0530)]
Fixed webtest for civi-4.6
Eileen McNaughton [Tue, 14 Apr 2015 01:45:24 +0000 (13:45 +1200)]
CRM-16290 fix fatal on relationship edit
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)
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
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
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...
Web Access [Mon, 13 Apr 2015 12:52:48 +0000 (18:22 +0530)]
Webtest Fixes
colemanw [Mon, 13 Apr 2015 12:25:52 +0000 (08:25 -0400)]
Merge pull request #5622 from colemanw/docs
Update doc links
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
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"...
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 ...
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
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 ...
pratikshad [Mon, 13 Apr 2015 05:39:23 +0000 (11:09 +0530)]
typo Fix
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
Coleman Watts [Sun, 12 Apr 2015 23:01:53 +0000 (19:01 -0400)]
Update doc links
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
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
Coleman Watts [Fri, 10 Apr 2015 22:00:33 +0000 (18:00 -0400)]
CRM-16267 Fix setting dates in membership batch
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
Coleman Watts [Fri, 10 Apr 2015 21:31:19 +0000 (17:31 -0400)]
Batch js cleanup
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
Coleman Watts [Fri, 10 Apr 2015 21:27:30 +0000 (17:27 -0400)]
CRM-15916 - Revert bad merge
Coleman Watts [Fri, 10 Apr 2015 21:01:42 +0000 (17:01 -0400)]
CRM-16267 - Fix copying date fields in profile batch update
Coleman Watts [Fri, 10 Apr 2015 20:20:34 +0000 (16:20 -0400)]
CRM-16271 - Fix formatting of custom fields on name badges
Tim Mallezie [Fri, 10 Apr 2015 17:13:11 +0000 (19:13 +0200)]
Use classloader to add packages
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...
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
pratikshad [Fri, 10 Apr 2015 14:10:37 +0000 (19:40 +0530)]
CRM-16222-PR improvement
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
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
Web Access [Fri, 10 Apr 2015 13:26:36 +0000 (18:56 +0530)]
Fix for CRM-16264
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
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
Kurund Jalmi [Fri, 10 Apr 2015 10:49:58 +0000 (16:19 +0530)]
Merge pull request #5602 from rohankatkar/4.6-webtest
Webtest Fix
jitendrapurohit [Fri, 10 Apr 2015 10:49:14 +0000 (16:19 +0530)]
warning fix
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 ...
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
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...
jitendrapurohit [Fri, 10 Apr 2015 07:30:55 +0000 (13:00 +0530)]
CRM-16250 - Tax Invoice CIVIevent Registration Not working for Multiple Registration
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
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
Tim Otten [Fri, 10 Apr 2015 00:29:36 +0000 (17:29 -0700)]
CRM-16253 - crmUiRichtext - Enable file uploads
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.
Tim Otten [Fri, 10 Apr 2015 00:20:36 +0000 (17:20 -0700)]
CRM-16145 - Civi\Angular\ManagerText - Fix regression
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
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.
monishdeb [Thu, 9 Apr 2015 16:32:14 +0000 (22:02 +0530)]
improvement and format fixes
monishdeb [Thu, 9 Apr 2015 16:22:29 +0000 (21:52 +0530)]
improvement and format fixes
Tim Mallezie [Thu, 9 Apr 2015 16:08:39 +0000 (18:08 +0200)]
fix drush installation of civicrm 4.6
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
Web Access [Thu, 9 Apr 2015 14:50:44 +0000 (20:20 +0530)]
Webtest Fix
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
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
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
jitendrapurohit [Thu, 9 Apr 2015 11:39:22 +0000 (17:09 +0530)]
added doc
jitendrapurohit [Thu, 9 Apr 2015 11:19:03 +0000 (16:49 +0530)]
webtest to verify membership dates as per the contribution receive_date
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
jitendrapurohit [Thu, 9 Apr 2015 10:10:32 +0000 (15:40 +0530)]
Fatal error fix
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
projects / civicrm-core.git / log