Kurund Jalmi [Tue, 28 Apr 2015 23:52:23 +0000 (17:52 -0600)]
Update version.xml
Kurund Jalmi [Mon, 27 Apr 2015 15:53:48 +0000 (09:53 -0600)]
Merge pull request #5707 from jitendrapurohit/CRM-15716
CRM-15716, fix for issues found during QA
jitendrapurohit [Mon, 27 Apr 2015 13:34:40 +0000 (19:04 +0530)]
api test fixes
jitendrapurohit [Mon, 27 Apr 2015 13:30:45 +0000 (19:00 +0530)]
api test fix
Monish Deb [Mon, 27 Apr 2015 10:30:22 +0000 (16:00 +0530)]
Merge pull request #5671 from jitendrapurohit/CRM-15357
CRM-15357 fix Event 'delete participant' batch operation can show incorr...
Monish Deb [Mon, 27 Apr 2015 10:28:30 +0000 (15:58 +0530)]
Merge pull request #5663 from kenwest/CRM-16324-1
CRM-16324 Scheduled jobs won't accept zero-valued parameters
jitendrapurohit [Mon, 27 Apr 2015 07:11:57 +0000 (12:41 +0530)]
warning fixes
jitendrapurohit [Mon, 27 Apr 2015 06:11:54 +0000 (11:41 +0530)]
QA fixes
magnolia61 [Mon, 9 Mar 2015 10:06:29 +0000 (11:06 +0100)]
fields added to contact, contribute and event forms
Middle name, birth date, gender, contact (sub)type added to fields,
sorting and filters
kurund [Sun, 26 Apr 2015 15:47:36 +0000 (09:47 -0600)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-04-26-09-47-18
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:41:29 +0000 (22:41 -0600)]
Merge pull request #5694 from eileenmcnaughton/testy
CRM-16357 - refactor postProcess into a submit function for testability
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)
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:57:02 +0000 (15:57 -0600)]
missing space
Eileen McNaughton [Sat, 25 Apr 2015 21:52:27 +0000 (15:52 -0600)]
CRM-16357 - refactor postProcess into a submit function for testability
Eileen McNaughton [Sat, 25 Apr 2015 21:31:49 +0000 (15:31 -0600)]
CRM-16357 - Add test wrapper
Eileen McNaughton [Sat, 25 Apr 2015 21:30:13 +0000 (15:30 -0600)]
CRM-16357 - Add for backoffice contribution form through phpunit
Eileen McNaughton [Sat, 25 Apr 2015 21:29:48 +0000 (15:29 -0600)]
minor comment fix
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
colemanw [Sat, 25 Apr 2015 17:05:17 +0000 (11:05 -0600)]
Merge pull request #5686 from josephlacey/bower-adds
CRM-16353/CRM-16354 - Adding DataTables and CKEditor to bower.json for i...
Joseph Lacey [Sat, 25 Apr 2015 16:57:23 +0000 (10:57 -0600)]
CRM-16353/CRM-16354 - Adding DataTables and CKEditor to bower.json for improved package management.
----------------------------------------
* CRM-16353: Upgrade datatables integration to use v2 api
https://issues.civicrm.org/jira/browse/CRM-16353
* CRM-16354: Upgrade CKeditor
https://issues.civicrm.org/jira/browse/CRM-16354
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
colemanw [Fri, 24 Apr 2015 14:16:30 +0000 (08:16 -0600)]
Merge pull request #5681 from elinw/oldcoderemoval
Remove code supporting no longer supported Joomla passwords (from Joomla...
Elin Waring [Fri, 24 Apr 2015 12:11:02 +0000 (08:11 -0400)]
Fix code style
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 [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: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
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
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
jitendrapurohit [Wed, 22 Apr 2015 13:10:52 +0000 (18:40 +0530)]
optimised changes
Web Access [Wed, 22 Apr 2015 10:03:54 +0000 (15:33 +0530)]
Fix for CRM-16296
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
jitendrapurohit [Wed, 22 Apr 2015 07:15:56 +0000 (12:45 +0530)]
CRM-15357 fix Event 'delete participant' batch operation can show incorrect count
Tim Mallezie [Wed, 22 Apr 2015 07:12:43 +0000 (09:12 +0200)]
remove name_id property
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
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
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
JKingsnorth [Tue, 21 Apr 2015 13:50:13 +0000 (14:50 +0100)]
CRM-16328: Add pre and post classes for help text
pratikshad [Tue, 21 Apr 2015 10:32:00 +0000 (16:02 +0530)]
Fixed webtest for civicrm4.6
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
Ken West [Mon, 20 Apr 2015 23:59:32 +0000 (09:59 +1000)]
CRM-16324 used FALSE
Ken West [Mon, 20 Apr 2015 23:10:31 +0000 (09:10 +1000)]
CRM-16324 Scheduled jobs won't accept zero-valued parameters
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
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
projects / civicrm-core.git / log