colemanw [Sun, 26 Apr 2015 22:12:59 +0000 (16:12 -0600)]
Merge pull request #5698 from colemanw/sigfig
Move CRM.sigfig into CRM.utils
colemanw [Sun, 26 Apr 2015 19:19:20 +0000 (13:19 -0600)]
Merge pull request #5702 from colemanw/activity_type
CRM-16360 - Don't show id field when creating/editing activity types
Coleman Watts [Sun, 26 Apr 2015 17:19:32 +0000 (11:19 -0600)]
CRM-16360 - Don't show id field when creating/editing activity types
Eileen McNaughton [Sun, 26 Apr 2015 15:44:45 +0000 (09:44 -0600)]
Merge pull request #5697 from lolas-freeform/CRM-16044-fix
Crm 16044 fix - Use return status from the processor if available
Eileen McNaughton [Sun, 26 Apr 2015 04:40:41 +0000 (22:40 -0600)]
Merge pull request #5685 from eileenmcnaughton/4.6
Additional relationship test (plus minor code tidy up)
Coleman Watts [Sun, 26 Apr 2015 03:30:11 +0000 (21:30 -0600)]
Move CRM.sigfig into CRM.utils
colemanw [Sat, 25 Apr 2015 23:32:20 +0000 (17:32 -0600)]
Merge pull request #5683 from monishdeb/15619regression
CRM-15619 regreesion fix on Event's id
colemanw [Sat, 25 Apr 2015 23:29:36 +0000 (17:29 -0600)]
Merge pull request #5690 from katesneed/patch-2
Update AddRecurringActivityTest.php
colemanw [Sat, 25 Apr 2015 23:29:16 +0000 (17:29 -0600)]
Merge pull request #5691 from katesneed/patch-3
Update AddRecurringEventTest.php
colemanw [Sat, 25 Apr 2015 23:29:02 +0000 (17:29 -0600)]
Merge pull request #5689 from katesneed/patch-1
Update RecurringEntityPreview.tpl
Lola Slade [Sat, 25 Apr 2015 23:19:37 +0000 (17:19 -0600)]
CRM-16044 - Back out JS changes after much discussion.
Lola Slade [Wed, 1 Apr 2015 16:15:55 +0000 (12:15 -0400)]
CRM-16044 - Fix two code style errors.
Lola Slade [Wed, 1 Apr 2015 15:31:09 +0000 (11:31 -0400)]
CRM-16044 - Use the return status from the processor if available to set the membership status and send receipt.
Eileen McNaughton [Sat, 25 Apr 2015 21:18:33 +0000 (15:18 -0600)]
phpcs fix
Eileen McNaughton [Sat, 25 Apr 2015 21:16:07 +0000 (15:16 -0600)]
Merge pull request #5668 from eileenmcnaughton/CRM-16331
CRM-16331 don't set amount to null value
Kate Sneed [Sat, 25 Apr 2015 19:56:02 +0000 (13:56 -0600)]
Update AddRecurringEventTest.php
replace reccuring with repeating
Kate Sneed [Sat, 25 Apr 2015 19:54:50 +0000 (13:54 -0600)]
Update AddRecurringActivityTest.php
change recurring to repeating
Kate Sneed [Sat, 25 Apr 2015 19:48:33 +0000 (13:48 -0600)]
Update RecurringEntityPreview.tpl
Replace reoccur with repeate
colemanw [Sat, 25 Apr 2015 18:26:48 +0000 (12:26 -0600)]
Merge pull request #5688 from colemanw/repeat
Use term repeating not recurring
Coleman Watts [Sat, 25 Apr 2015 18:25:50 +0000 (12:25 -0600)]
Use term repeating not recurring
colemanw [Sat, 25 Apr 2015 18:17:43 +0000 (12:17 -0600)]
Merge pull request #5660 from colemanw/repeat
Show count and position of repeating entities
Coleman Watts [Sat, 25 Apr 2015 18:16:28 +0000 (12:16 -0600)]
CRM-16275 - Workaround for race conditions
Dave Greenberg [Sat, 25 Apr 2015 15:57:46 +0000 (09:57 -0600)]
Update CONTRIBUTORS.txt
Add Pledge Payment Batch Entry sponsor.
Eileen McNaughton [Tue, 21 Apr 2015 23:17:17 +0000 (16:17 -0700)]
extension to test
Eileen McNaughton [Tue, 21 Apr 2015 22:53:49 +0000 (15:53 -0700)]
Add test to check related membership is created
Eileen McNaughton [Tue, 21 Apr 2015 22:25:33 +0000 (15:25 -0700)]
preliminary tidy up
Dave Greenberg [Sat, 25 Apr 2015 05:20:03 +0000 (23:20 -0600)]
Merge pull request #5682 from monishdeb/CRM-16315
CRM-16315 fix - Campaign Menu Items Automatically Enables without civiCa...
monishdeb [Fri, 24 Apr 2015 21:36:52 +0000 (03:06 +0530)]
CRM-15619 regreesion fix on Event's id
----------------------------------------
* CRM-15619: Api breaks
https://issues.civicrm.org/jira/browse/CRM-15619
monishdeb [Fri, 24 Apr 2015 21:29:09 +0000 (02:59 +0530)]
CRM-16315 fix - Campaign Menu Items Automatically Enables without civiCampaign Module enabled.
https://issues.civicrm.org/jira/browse/CRM-16315
Monish Deb [Thu, 23 Apr 2015 07:28:59 +0000 (12:58 +0530)]
Merge pull request #5672 from monishdeb/CRM-16327
CRM-16327 fix - GroupContact/delete call failed: "edit groups" permissio...
Monish Deb [Wed, 22 Apr 2015 14:08:38 +0000 (19:38 +0530)]
Merge pull request #5670 from monishdeb/CRM-16322
CRM-16322 fix - Notice error on training demo
monishdeb [Wed, 22 Apr 2015 08:09:15 +0000 (13:39 +0530)]
CRM-16327 fix - GroupContact/delete call failed: "edit groups" permission required
https://issues.civicrm.org/jira/browse/CRM-16327
monishdeb [Wed, 22 Apr 2015 06:47:38 +0000 (12:17 +0530)]
CRM-16322 fix - Notice error on training demo
https://issues.civicrm.org/jira/browse/CRM-16322
Kurund Jalmi [Wed, 22 Apr 2015 01:07:31 +0000 (19:07 -0600)]
Merge pull request #5669 from totten/4.6-case-syntax
case_sample.tpl - Fix syntax for older MySQL
Tim Otten [Tue, 21 Apr 2015 20:01:32 +0000 (14:01 -0600)]
case_sample.tpl - Fix syntax for older MySQL
Coleman Watts [Tue, 21 Apr 2015 19:25:11 +0000 (13:25 -0600)]
CRM-16323 - Show repeating info in entityRef fields
colemanw [Tue, 21 Apr 2015 17:29:15 +0000 (11:29 -0600)]
Merge pull request #5659 from colemanw/CRM-16305
CRM-16305 - Fix autofill of onBehalf profile fields
Eileen McNaughton [Tue, 21 Apr 2015 17:18:15 +0000 (10:18 -0700)]
enotice fix
Eileen McNaughton [Tue, 21 Apr 2015 17:16:28 +0000 (10:16 -0700)]
enotice on previous
Eileen McNaughton [Tue, 21 Apr 2015 17:11:39 +0000 (10:11 -0700)]
CRM-16331 don't set amount to null value
Kurund Jalmi [Tue, 21 Apr 2015 14:11:29 +0000 (08:11 -0600)]
Merge pull request #5664 from pratikshad/webtest1
Fixed webtest for civicrm4.6
pratikshad [Tue, 21 Apr 2015 10:32:00 +0000 (16:02 +0530)]
Fixed webtest for civicrm4.6
Monish Deb [Tue, 21 Apr 2015 05:16:12 +0000 (10:46 +0530)]
Merge pull request #5657 from jagrutiP/CRM-16317
Receive date is missing when contribution with pay later
Coleman Watts [Mon, 20 Apr 2015 00:56:57 +0000 (20:56 -0400)]
CRM-16323 Show count and position of repeating entities
Coleman Watts [Mon, 20 Apr 2015 00:43:34 +0000 (20:43 -0400)]
Fix typo
colemanw [Mon, 20 Apr 2015 17:44:53 +0000 (11:44 -0600)]
Merge pull request #5662 from colemanw/CRM-16275
CRM-16275 - Fix repeating events checkbox hiding
colemanw [Mon, 20 Apr 2015 17:20:47 +0000 (11:20 -0600)]
Merge pull request #5661 from colemanw/youCanAddAnotherProfileField
Get rid of unnecessary popup message when saving profile fields
Coleman Watts [Mon, 20 Apr 2015 02:13:41 +0000 (22:13 -0400)]
CRM-16305 - Fix autofill of onBehalf profile fields
jagrutiP [Mon, 20 Apr 2015 10:07:45 +0000 (15:37 +0530)]
Receive date is missing when contribution with pay later.CRM-16317
----------------------------------------
* CRM-16317: Receive date is missing when contribution with pay later
https://issues.civicrm.org/jira/browse/CRM-16317
Monish Deb [Mon, 20 Apr 2015 07:17:17 +0000 (12:47 +0530)]
Merge pull request #5648 from jitendrapurohit/CRM-16302
CRM-16302 Free memberships are broken fix
Monish Deb [Mon, 20 Apr 2015 06:58:19 +0000 (12:28 +0530)]
Merge pull request #5650 from atif-shaikh/CRM-16300
CRM-16300 - Inherited membership is deleted when relationship is updated
Coleman Watts [Mon, 20 Apr 2015 01:45:10 +0000 (21:45 -0400)]
Get rid of unnecessary popup message when saving profile fields
Coleman Watts [Mon, 20 Apr 2015 01:22:22 +0000 (21:22 -0400)]
CRM-16275 - Fix repeating events checkbox hiding
Dave Greenberg [Fri, 17 Apr 2015 19:14:55 +0000 (12:14 -0700)]
Merge pull request #5636 from JKingsnorth/CRM-16284
CRM-16284: Add missing phone location condition
Dave Greenberg [Fri, 17 Apr 2015 19:03:03 +0000 (12:03 -0700)]
Merge pull request #5651 from rohankatkar/CRM-16301
'The Contact Sub Type does not match the Contact type for this record' when saving a new contact
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
Web Access [Fri, 17 Apr 2015 14:14:21 +0000 (19:44 +0530)]
Fix for CRM-16301
atif-shaikh [Fri, 17 Apr 2015 13:09:44 +0000 (18:39 +0530)]
CRM-16300 - Inherited membership is deleted when relationship is updated
https://issues.civicrm.org/jira/browse/CRM-16300
jitendrapurohit [Fri, 17 Apr 2015 12:31:48 +0000 (18:01 +0530)]
remove blank line after function comment
jitendrapurohit [Fri, 17 Apr 2015 11:57:16 +0000 (17:27 +0530)]
minor fix
jitendrapurohit [Fri, 17 Apr 2015 11:42:39 +0000 (17:12 +0530)]
warning fix
jitendrapurohit [Fri, 17 Apr 2015 11:38:35 +0000 (17:08 +0530)]
added doc
jitendrapurohit [Fri, 17 Apr 2015 11:31:37 +0000 (17:01 +0530)]
CRM-16302 Free memberships are broken fix
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
JKingsnorth [Wed, 15 Apr 2015 09:01:28 +0000 (10:01 +0100)]
CRM-16284: Add missing phone location condition
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
projects / civicrm-core.git / log