eileenmcnaugton [Mon, 2 Nov 2015 18:25:33 +0000 (07:25 +1300)]
CRM-17490 fix interface error on activity import
Eileen McNaughton [Mon, 26 Oct 2015 01:41:23 +0000 (14:41 +1300)]
Merge pull request #7021 from saurabhbatra96/CRM-14756
CRM-14756 fixed some legacy code and the issue where supplying id was not enough.
Eileen McNaughton [Mon, 26 Oct 2015 01:27:48 +0000 (14:27 +1300)]
Merge pull request #7034 from eileenmcnaughton/tests
CRM-17397 fix enotices on amount_level
Coleman Watts [Sun, 25 Oct 2015 14:36:47 +0000 (10:36 -0400)]
CRM-13823 - Fix invalid markup and add animation
colemanw [Sun, 25 Oct 2015 13:14:14 +0000 (09:14 -0400)]
Merge pull request #7033 from colemanw/CRM-13823-2
System status message page fixups
Coleman Watts [Sat, 24 Oct 2015 16:56:23 +0000 (12:56 -0400)]
Whitespace cleanup
Coleman Watts [Sat, 24 Oct 2015 16:52:09 +0000 (12:52 -0400)]
CRM-13823 - Use popup menu for snooze options
Eileen McNaughton [Sat, 24 Oct 2015 11:55:15 +0000 (00:55 +1300)]
Merge pull request #7042 from monishdeb/CRM-17434
CRM-17434 fix - Free event registration with 'skip confirmation' thro…
Eileen McNaughton [Sat, 24 Oct 2015 05:19:43 +0000 (18:19 +1300)]
Merge pull request #7046 from eileenmcnaughton/master
Master
eileenmcnaugton [Fri, 23 Oct 2015 20:00:44 +0000 (09:00 +1300)]
comment fixes
Eileen McNaughton [Fri, 23 Oct 2015 19:20:33 +0000 (08:20 +1300)]
Merge pull request #7038 from eileenmcnaughton/master
Comments
eileenmcnaugton [Fri, 23 Oct 2015 19:07:49 +0000 (08:07 +1300)]
comment fixes
Coleman Watts [Fri, 23 Oct 2015 19:03:15 +0000 (15:03 -0400)]
CRM-13823 - Show icons in Angular tabs
eileenmcnaugton [Fri, 23 Oct 2015 05:09:14 +0000 (18:09 +1300)]
comment fixes
Coleman Watts [Fri, 23 Oct 2015 18:42:31 +0000 (14:42 -0400)]
CRM-13823 - Show count in Angular tabs
Eileen McNaughton [Fri, 23 Oct 2015 18:36:16 +0000 (07:36 +1300)]
Merge pull request #7043 from saurabhbatra96/comment-fixes-sms
Minor comment-fixes for CRM/SMS directory.
colemanw [Fri, 23 Oct 2015 18:31:59 +0000 (14:31 -0400)]
Merge pull request #7045 from laryn/patch-2
CRM-17440 - CSS improvement for notify UI
Laryn [Fri, 23 Oct 2015 18:20:25 +0000 (13:20 -0500)]
CRM-17440 - CSS improvement for notify UI
Saurabh Batra [Fri, 23 Oct 2015 16:33:15 +0000 (22:03 +0530)]
Minor comment-fixes for CRM/SMS directory.
Coleman Watts [Fri, 23 Oct 2015 12:43:19 +0000 (08:43 -0400)]
CRM-13823 - Snooze/hush cleanup
monishdeb [Fri, 23 Oct 2015 11:23:34 +0000 (16:53 +0530)]
CRM-17434 fix - Free event registration with 'skip confirmation' throws warning
https://issues.civicrm.org/jira/browse/CRM-17434
Monish Deb [Fri, 23 Oct 2015 05:04:17 +0000 (10:34 +0530)]
Merge pull request #7018 from monishdeb/CRM-17129
CRM-17129 fix - Checkbox custom fields for participants are not not r…
eileenmcnaugton [Fri, 23 Oct 2015 05:02:15 +0000 (18:02 +1300)]
comment fixes
Eileen McNaughton [Fri, 23 Oct 2015 04:32:56 +0000 (17:32 +1300)]
phpcs fix
Eileen McNaughton [Fri, 23 Oct 2015 04:30:30 +0000 (17:30 +1300)]
Merge pull request #7036 from eileenmcnaughton/master
Master
eileenmcnaugton [Fri, 23 Oct 2015 03:39:15 +0000 (16:39 +1300)]
comment fixes
eileenmcnaugton [Fri, 23 Oct 2015 02:16:36 +0000 (15:16 +1300)]
comment fixes
Coleman Watts [Fri, 23 Oct 2015 02:31:18 +0000 (22:31 -0400)]
CRM-13823 - Simplify data loading
eileenmcnaugton [Fri, 23 Oct 2015 01:23:01 +0000 (14:23 +1300)]
comment fixes
Eileen McNaughton [Fri, 23 Oct 2015 01:21:07 +0000 (14:21 +1300)]
Merge pull request #7031 from saurabhbatra96/comment-fixes-activity
Comment fixes and function clean-up for CRM/Activity directory.
eileenmcnaugton [Thu, 22 Oct 2015 23:07:28 +0000 (12:07 +1300)]
CRM-17397 fix enotices on amount_level
After looking at this I think the 'right' answer is to always go to the same function to find out what the amount_level
should be - rather than calculate it on the forms and / or tack it onto the function that derives the line_items
I made this change on the form that was experiencing an issue & added a test.
Elsewhere I just added comments
Eileen McNaughton [Thu, 22 Oct 2015 21:46:04 +0000 (10:46 +1300)]
Merge pull request #7030 from eileenmcnaughton/tests
Test fix - adapt tests to not use hard-coded payment_processor_type_id
Coleman Watts [Thu, 22 Oct 2015 21:18:22 +0000 (17:18 -0400)]
CRM-13823 - Remove unused api calls
Coleman Watts [Thu, 22 Oct 2015 19:33:47 +0000 (15:33 -0400)]
CRM-13823 - Switch statusPage to use tabbed interface
monishdeb [Thu, 22 Oct 2015 16:42:24 +0000 (22:12 +0530)]
format only to checkbox values
Coleman Watts [Thu, 22 Oct 2015 16:24:43 +0000 (12:24 -0400)]
CRM-13823 - Show help for system status page
Saurabh Batra [Thu, 22 Oct 2015 12:31:00 +0000 (18:01 +0530)]
Comment fixes and function clean-up for CRM/Activity directory.
Coleman Watts [Thu, 22 Oct 2015 15:42:14 +0000 (11:42 -0400)]
CRM-13823 - Cleanup and add icons to system status messages
colemanw [Thu, 22 Oct 2015 13:49:00 +0000 (09:49 -0400)]
Merge pull request #7024 from colemanw/CRM-13823
CRM-13823 - Better extension error handling
eileenmcnaugton [Thu, 22 Oct 2015 03:17:20 +0000 (16:17 +1300)]
Test fix - adapt tests to not use hard-coded payment_processor_type_id
This type id has been changed in core & the tests are now failing - but since the
affected tests were excluded from CI it wasn't picked up at the time
Eileen McNaughton [Thu, 22 Oct 2015 07:19:52 +0000 (20:19 +1300)]
Merge pull request #7028 from eileenmcnaughton/comments-2
comment fixes
Eileen McNaughton [Thu, 22 Oct 2015 03:48:26 +0000 (16:48 +1300)]
Merge pull request #7029 from eileenmcnaughton/CRM-17426-pay-later
CRM-17426 fix paylater showing when not configured to
eileenmcnaughton [Thu, 22 Oct 2015 01:51:56 +0000 (01:51 +0000)]
comment fixes
wq!
comment fixes
f
eileenmcnaugton [Thu, 22 Oct 2015 02:29:01 +0000 (15:29 +1300)]
CRM-17426 fix paylater showing when not configured to
Coleman Watts [Wed, 21 Oct 2015 22:33:36 +0000 (18:33 -0400)]
CRM-13823 - Better extension error handling
monishdeb [Wed, 21 Oct 2015 13:30:07 +0000 (19:00 +0530)]
minor fix
monishdeb [Wed, 21 Oct 2015 11:15:24 +0000 (16:45 +0530)]
CRM-17129 fix - Checkbox custom fields for participants are not not rendered properly
https://issues.civicrm.org/jira/browse/CRM-17129
Dave Greenberg [Wed, 21 Oct 2015 18:58:14 +0000 (11:58 -0700)]
Merge pull request #7022 from davecivicrm/CRM-17428
CRM-17428 - Fix test processor and editing of processor type.
colemanw [Wed, 21 Oct 2015 18:17:55 +0000 (14:17 -0400)]
Merge pull request #7023 from yurg/patch-1
check.gif not visible due to code formatting issue
yurg [Wed, 21 Oct 2015 18:10:14 +0000 (20:10 +0200)]
check.gif not visible due to code formatting issue
Carriage return should be added at #56 between closing curly bracket and start of image tag, it gives check.gif path error thus icon is not visible at civicrm/admin/labelFormats?reset=1
Dave Greenberg [Wed, 21 Oct 2015 17:40:04 +0000 (10:40 -0700)]
CRM-17428 - Fix test processor and editing of processor type.
----------------------------------------
* CRM-17428: Wrong payment processor type for 'dummy' processor AND can not change processor type when editing existing processor
https://issues.civicrm.org/jira/browse/CRM-17428
Saurabh Batra [Wed, 21 Oct 2015 16:39:43 +0000 (22:09 +0530)]
Minimized code for BAO::add function, reduced ids parameter.
Monish Deb [Wed, 21 Oct 2015 14:16:04 +0000 (19:46 +0530)]
Merge pull request #7019 from jitendrapurohit/CRM-17395
CRM-17395 - Activities report - filter by target contact
Saurabh Batra [Tue, 20 Oct 2015 17:18:31 +0000 (22:48 +0530)]
Fixed legacy code and solved the id issue.
jitendrapurohit [Wed, 21 Oct 2015 11:45:10 +0000 (17:15 +0530)]
CRM-17395 - Activities report - filter by target contact
Monish Deb [Wed, 21 Oct 2015 11:20:25 +0000 (16:50 +0530)]
Merge pull request #7017 from yashodha/CRM-16990
CRM-16990: Custom fields are NOT being saved for some component custo…
Monish Deb [Wed, 21 Oct 2015 10:43:16 +0000 (16:13 +0530)]
Merge pull request #7007 from monishdeb/CRM-17422
Crm 17422 fix
CiviCRM [Wed, 21 Oct 2015 10:32:55 +0000 (03:32 -0700)]
Update version to 4.7.beta1
yashodha [Wed, 21 Oct 2015 10:18:21 +0000 (15:48 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
https://issues.civicrm.org/jira/browse/CRM-16990
yashodha [Wed, 21 Oct 2015 09:55:38 +0000 (15:25 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
https://issues.civicrm.org/jira/browse/CRM-16990
yashodha [Wed, 21 Oct 2015 09:19:33 +0000 (14:49 +0530)]
CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
----------------------------------------
* CRM-16990: Custom fields are NOT being saved for some component custom data (activities, membership ...)
https://issues.civicrm.org/jira/browse/CRM-16990
monishdeb [Wed, 21 Oct 2015 07:57:45 +0000 (13:27 +0530)]
minor fix
monishdeb [Tue, 20 Oct 2015 08:25:12 +0000 (13:55 +0530)]
minor fix
monishdeb [Tue, 20 Oct 2015 08:23:49 +0000 (13:53 +0530)]
CRM-17422 fix - Change in custom field search behaviour impacting on performance
https://issues.civicrm.org/jira/browse/CRM-17422
Eileen McNaughton [Wed, 21 Oct 2015 06:46:29 +0000 (19:46 +1300)]
Merge pull request #7011 from saurabhbatra96/comment-fixes-financial
Comment fixes and function clean-up for CRM/Financial directory.
Kurund Jalmi [Wed, 21 Oct 2015 06:38:04 +0000 (12:08 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-21-12-07-36
Monish Deb [Wed, 21 Oct 2015 05:34:13 +0000 (11:04 +0530)]
Merge pull request #7016 from monishdeb/4.6-master-2015-10-21-10-54-28
4.6-master merge forward
Brian Shaughnessy [Mon, 19 Oct 2015 15:25:10 +0000 (11:25 -0400)]
CRM-17419 fix exception error condition
Francis Whittle [Thu, 15 Oct 2015 00:00:32 +0000 (11:00 +1100)]
CRM-17402: Defer loading Google Maps API
----------------------------------------
* CRM-17402: Google Maps API sometimes tries to call initMap callback before it is defined.
https://issues.civicrm.org/jira/browse/CRM-17402
Monish Deb [Wed, 21 Oct 2015 04:53:47 +0000 (10:23 +0530)]
Merge pull request #7009 from jitendrapurohit/CRM-11084
CRM-11084 -- Custom Membership Field not populating in membership form
colemanw [Wed, 21 Oct 2015 01:16:49 +0000 (21:16 -0400)]
Merge pull request #7015 from seamuslee001/CRM-17303-futher
CRM 17303 Fix validtion when users time is before 9am
colemanw [Wed, 21 Oct 2015 01:04:46 +0000 (21:04 -0400)]
Merge pull request #6963 from agileware/4.6-CRM-17402
CRM-17402: Defer loading Google Maps API
colemanw [Wed, 21 Oct 2015 01:04:07 +0000 (21:04 -0400)]
Merge pull request #6979 from eileenmcnaughton/master
CRM-17352 fix strict error on non-static method …
colemanw [Wed, 21 Oct 2015 01:03:36 +0000 (21:03 -0400)]
Merge pull request #6981 from eileenmcnaughton/CRM-17411
CRM-17411 fix strict warning by removing empty override function
colemanw [Wed, 21 Oct 2015 00:42:24 +0000 (20:42 -0400)]
Merge pull request #7012 from colemanw/css
Add searchForm css wherever alpha pager is used
colemanw [Wed, 21 Oct 2015 00:41:27 +0000 (20:41 -0400)]
Merge pull request #7014 from colemanw/CRM-11782
CRM-11782 - Get rid of VALUE_SEPARATOR character in saved search form values
Seamus Lee [Tue, 20 Oct 2015 22:56:01 +0000 (22:56 +0000)]
Fix validtion when users time is before 9am
Coleman Watts [Tue, 20 Oct 2015 20:21:48 +0000 (16:21 -0400)]
Add searchForm css wherever alpha pager is used
Coleman Watts [Tue, 20 Oct 2015 21:24:11 +0000 (17:24 -0400)]
CRM-11782 - Get rid of VALUE_SEPARATOR character in saved search form values
Saurabh Batra [Tue, 20 Oct 2015 17:58:07 +0000 (23:28 +0530)]
Comment fixes and function clean-up for CRM/Financial directory.
jitendrapurohit [Tue, 20 Oct 2015 13:21:35 +0000 (18:51 +0530)]
warning fixes
jitendrapurohit [Tue, 20 Oct 2015 13:16:07 +0000 (18:46 +0530)]
CRM-11084 -- Custom Membership Field not populating in membership form
Kurund Jalmi [Tue, 20 Oct 2015 10:26:03 +0000 (15:56 +0530)]
Merge pull request #7008 from jitendrapurohit/CRM-16990
CRM-16990 -- Custom fields are NOT being saved for some component cus…
Kurund Jalmi [Tue, 20 Oct 2015 10:20:34 +0000 (15:50 +0530)]
Merge pull request #6975 from herbdool/master-redis
add support for Redis as caching server
jitendrapurohit [Tue, 20 Oct 2015 09:17:08 +0000 (14:47 +0530)]
CRM-16990 -- Custom fields are NOT being saved for some component custom data (activities, membership ...)
Monish Deb [Tue, 20 Oct 2015 08:33:32 +0000 (14:03 +0530)]
Merge pull request #7005 from jitendrapurohit/CRM-17280
CRM-17280 - contribution detail report: error when sorting by custom …
Herb [Mon, 19 Oct 2015 20:17:14 +0000 (16:17 -0400)]
style fix: removed space
Eileen McNaughton [Mon, 19 Oct 2015 19:36:26 +0000 (08:36 +1300)]
Merge pull request #7006 from lcdservices/CRM-17419
CRM-17419 fix exception error condition
Kurund Jalmi [Mon, 19 Oct 2015 17:32:18 +0000 (23:02 +0530)]
Merge pull request #6986 from saurabhbatra96/CRM-17120-function-caching-test
CRM-17120 Unit test to ensure replacing deprecated function (to get labels) does not cause regressions.
Brian Shaughnessy [Mon, 19 Oct 2015 15:25:10 +0000 (11:25 -0400)]
CRM-17419 fix exception error condition
Monish Deb [Mon, 19 Oct 2015 14:55:39 +0000 (20:25 +0530)]
Merge pull request #6985 from jitendrapurohit/CRM-17361
CRM-17361 - Fix Address fields when used in Contact get api
colemanw [Mon, 19 Oct 2015 14:27:37 +0000 (10:27 -0400)]
Merge pull request #7001 from colemanw/CRM-16415
CRM-16415 - Fix crmSelect2 placeholder icons
colemanw [Mon, 19 Oct 2015 14:17:35 +0000 (10:17 -0400)]
Merge pull request #7004 from seamuslee001/CRM-17303-test
CRM-17303 Make new test more stable by deliberately moving the day a …
Kurund Jalmi [Mon, 19 Oct 2015 14:10:20 +0000 (19:40 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-19-19-40-00
Coleman Watts [Mon, 19 Oct 2015 02:22:16 +0000 (22:22 -0400)]
CRM-16415 - Fix crmSelect2 placeholder icons
Saurabh Batra [Mon, 19 Oct 2015 07:38:33 +0000 (13:08 +0530)]
Fixed indentation.
jitendrapurohit [Mon, 19 Oct 2015 11:17:07 +0000 (16:47 +0530)]
minor fix
jitendrapurohit [Mon, 19 Oct 2015 11:09:14 +0000 (16:39 +0530)]
warning fix
jitendrapurohit [Mon, 19 Oct 2015 11:08:22 +0000 (16:38 +0530)]
minor fix
jitendrapurohit [Mon, 19 Oct 2015 11:02:57 +0000 (16:32 +0530)]
CRM-17280 - contribution detail report: error when sorting by custom contrib field
projects / civicrm-core.git / log