Elin Waring [Fri, 24 Apr 2015 11:53:00 +0000 (07:53 -0400)]
Fix code style
Elin Waring [Fri, 24 Apr 2015 11:24:44 +0000 (07:24 -0400)]
Remove code supporting no longer supported Joomla passwords (from Joomla 1.0) and fixing a Joomla 1.5 style query that won't work in 1.6+.
Monish Deb [Wed, 22 Apr 2015 14:10:20 +0000 (19:40 +0530)]
Merge pull request #5674 from rohankatkar/CRM-16296
Enable Multiselect option in "Find Contribution" for Financial Type & Contribution page element
colemanw [Wed, 22 Apr 2015 13:19:03 +0000 (07:19 -0600)]
Merge pull request #5649 from mallezie/use-addfield-dedupeRuleForm-16178
Convert dedupeRuleForm to use addField method
Web Access [Wed, 22 Apr 2015 10:03:54 +0000 (15:33 +0530)]
Fix for CRM-16296
Tim Mallezie [Wed, 22 Apr 2015 07:12:43 +0000 (09:12 +0200)]
remove name_id property
colemanw [Tue, 21 Apr 2015 16:47:44 +0000 (10:47 -0600)]
Merge pull request #5667 from JKingsnorth/CRM-16328
CRM-16328: Add pre and post classes for help text
JKingsnorth [Tue, 21 Apr 2015 13:50:13 +0000 (14:50 +0100)]
CRM-16328: Add pre and post classes for help text
Tim Mallezie [Tue, 21 Apr 2015 06:09:13 +0000 (08:09 +0200)]
dont add select2 class and placeholder to all select elements
kurund [Tue, 21 Apr 2015 05:30:02 +0000 (23:30 -0600)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-20-23-29-59
Kurund Jalmi [Tue, 21 Apr 2015 05:28:48 +0000 (23:28 -0600)]
Merge pull request #5656 from kurund/CRM-16312
allow contribution widget to include pending status if &includePending=1...
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
kurund [Tue, 21 Apr 2015 00:23:44 +0000 (18:23 -0600)]
fixed warning
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
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
Tim Mallezie [Mon, 20 Apr 2015 06:24:25 +0000 (08:24 +0200)]
add allowClear attribute
Tim Mallezie [Mon, 20 Apr 2015 06:24:13 +0000 (08:24 +0200)]
get type from schema
Tim Mallezie [Mon, 20 Apr 2015 06:23:57 +0000 (08:23 +0200)]
remove unused variable
kurund [Sun, 19 Apr 2015 20:54:00 +0000 (14:54 -0600)]
allow contribution widget to include pending status if &includePending=1 is passed.
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
Tim Mallezie [Fri, 17 Apr 2015 12:47:19 +0000 (14:47 +0200)]
Convert dedupeRuleForm to use addField method
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
Kurund Jalmi [Tue, 14 Apr 2015 18:11:09 +0000 (11:11 -0700)]
Merge pull request #5630 from rohankatkar/4.6--webtest
webtest fix
colemanw [Tue, 14 Apr 2015 17:41:12 +0000 (13:41 -0400)]
Merge pull request #5627 from torrance/master
Don't call into Drupal from Civicrm to build navigation menu. See CRM-15132
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
Eileen McNaughton [Tue, 14 Apr 2015 07:12:19 +0000 (19:12 +1200)]
Merge pull request #5629 from torrance/drupal8
Changes needed to CRM_Utils_System_Drupal8
Torrance [Tue, 14 Apr 2015 05:55:26 +0000 (17:55 +1200)]
Change CSS and JS output in preparation to be added via head_link.
Torrance [Tue, 14 Apr 2015 05:53:58 +0000 (17:53 +1200)]
Allow for url's that are not Drupal routes; handle 'path?query' special case.
pratikshad [Tue, 14 Apr 2015 05:07:42 +0000 (10:37 +0530)]
Fixed webtest for civi-4.6
Torrance [Tue, 14 Apr 2015 02:32:11 +0000 (14:32 +1200)]
Don't call into Drupal from Civicrm to build navigation menu. See CRM-15132.
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:09:09 +0000 (16:09 -0700)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-13-16-09-07
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
colemanw [Sat, 11 Apr 2015 12:50:29 +0000 (08:50 -0400)]
Merge pull request #5513 from mallezie/contact-select-file-16178
CRM_Contact_Form_Contact to use addField CRM-16178
Tim Mallezie [Sat, 11 Apr 2015 09:10:13 +0000 (11:10 +0200)]
Remove add to addElement changes
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
projects / civicrm-core.git / log