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
colemanw [Thu, 22 Oct 2015 13:48:01 +0000 (09:48 -0400)]
Merge pull request #7025 from davecivicrm/CRM-17395
CRM-17395 - Backporting to 4.6 branch since it is a minor fix for pai…
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
Eileen McNaughton [Thu, 22 Oct 2015 03:23:12 +0000 (16:23 +1300)]
Merge pull request #7026 from davecivicrm/CRM-17363
CRM-17363 - Conditional inclusion of Social Network bar in petitions.
eileenmcnaugton [Thu, 22 Oct 2015 02:29:01 +0000 (15:29 +1300)]
CRM-17426 fix paylater showing when not configured to
Dave Greenberg [Thu, 22 Oct 2015 00:59:16 +0000 (17:59 -0700)]
CRM-17363 - Conditional inclusion of Social Network bar in petitions.
----------------------------------------
* CRM-17363: Petition: Social Network Buttons are displayed on certain condition although switched off
https://issues.civicrm.org/jira/browse/CRM-17363
Dave Greenberg [Thu, 22 Oct 2015 00:16:01 +0000 (17:16 -0700)]
CRM-17395 - Backporting to 4.6 branch since it is a minor fix for paid issue queue.
----------------------------------------
* CRM-17395: Activities report - filter by target contact does not appear to work
https://issues.civicrm.org/jira/browse/CRM-17395
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.
Andrew Hunt [Tue, 20 Oct 2015 17:14:18 +0000 (13:14 -0400)]
CRM-17425 Batch Contrib Entry: extra column created by soft credit type
----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
https://issues.civicrm.org/jira/browse/CRM-17425
Andrew Hunt [Tue, 20 Oct 2015 16:57:25 +0000 (12:57 -0400)]
CRM-17425 Batch PCP: cleanup
----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
https://issues.civicrm.org/jira/browse/CRM-17425
Andrew Hunt [Tue, 20 Oct 2015 16:51:24 +0000 (12:51 -0400)]
CRM-17425 CiviContribute: add contrib form error if blanking out PCP
----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
https://issues.civicrm.org/jira/browse/CRM-17425
Andrew Hunt [Tue, 20 Oct 2015 16:42:59 +0000 (12:42 -0400)]
CRM-17425 Batch entry PCP working at basic level
----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
https://issues.civicrm.org/jira/browse/CRM-17425
Andrew Hunt [Tue, 20 Oct 2015 14:58:33 +0000 (10:58 -0400)]
CRM-17425 Move PCP fields to their own field
----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
https://issues.civicrm.org/jira/browse/CRM-17425
Andrew Hunt [Sat, 10 Oct 2015 00:16:46 +0000 (20:16 -0400)]
CRM-17425 initial changes for pcp in contrib batch entry
----------------------------------------
* CRM-17425: Allow PCP selection in contribution batch entry
https://issues.civicrm.org/jira/browse/CRM-17425
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
Seamus Lee [Mon, 19 Oct 2015 08:12:15 +0000 (08:12 +0000)]
CRM-17303 Make new test more stable by deliberately moving the day a whole day forward in a verfiable way
Fix another test based on new test
Fix text and increment the year also
Add another unit test to try to work out what is going on
Fix tests now working out the issue
Fix tests now working out the issue
Deliberately cause fail test to see values
Fix test by manually setting values
Monish Deb [Mon, 19 Oct 2015 09:45:55 +0000 (15:15 +0530)]
Merge pull request #7002 from monishdeb/CRM-17396
CRM-17396 fix - Editing a membership price set breaks auto-renew func…
Yashodha Chaku [Mon, 19 Oct 2015 09:34:07 +0000 (15:04 +0530)]
Merge pull request #6982 from eileenmcnaughton/CRM-17412
CRM-17412 strict notice fix
Yashodha Chaku [Mon, 19 Oct 2015 08:45:19 +0000 (14:15 +0530)]
Merge pull request #7003 from yashodha/CRM-17414
CRM-17414: Add to and from dates to the Relationship Report filter
Eileen McNaughton [Mon, 19 Oct 2015 08:12:11 +0000 (21:12 +1300)]
Merge pull request #6995 from saurabhbatra96/CRM-16842
CRM-16842 add EntityBatch API (fixed).
yashodha [Mon, 19 Oct 2015 06:41:36 +0000 (12:11 +0530)]
CRM-17414: fix comments
----------------------------------------
* CRM-17414: Add to and from dates to the Relationship Report filter
https://issues.civicrm.org/jira/browse/CRM-17414
yashodha [Mon, 19 Oct 2015 06:38:13 +0000 (12:08 +0530)]
CRM-17414: minor fixes
----------------------------------------
* CRM-17414: Add to and from dates to the Relationship Report filter
https://issues.civicrm.org/jira/browse/CRM-17414
Yashodha Chaku [Mon, 19 Oct 2015 06:28:13 +0000 (11:58 +0530)]
Merge pull request #6983 from yashodha/CRM-17354
CRM-17354: Tell a Friend email field should be trimmed
yashodha [Mon, 19 Oct 2015 06:17:18 +0000 (11:47 +0530)]
CRM-17414: Add to and from dates to the Relationship Report filter
----------------------------------------
* CRM-17414: Add to and from dates to the Relationship Report filter
https://issues.civicrm.org/jira/browse/CRM-17414
monishdeb [Mon, 19 Oct 2015 05:48:12 +0000 (11:18 +0530)]
CRM-17396 fix - Editing a membership price set breaks auto-renew functionality
https://issues.civicrm.org/jira/browse/CRM-17396
Monish Deb [Mon, 19 Oct 2015 04:49:03 +0000 (10:19 +0530)]
Merge pull request #6970 from monishdeb/CRM-17396
CRM-17396 fix - Editing a membership price set breaks auto-renew functionality
colemanw [Mon, 19 Oct 2015 02:23:35 +0000 (22:23 -0400)]
Merge pull request #6999 from colemanw/CRM-17416
CRM-17416 - Handle wysiwyg latency and add lazy-loading
colemanw [Mon, 19 Oct 2015 00:54:05 +0000 (20:54 -0400)]
Merge pull request #6992 from colemanw/icons
Icon and css updates/cleanup
Coleman Watts [Mon, 19 Oct 2015 00:06:11 +0000 (20:06 -0400)]
Make clientside CRM.config.resourceBase absolute
Coleman Watts [Mon, 19 Oct 2015 00:02:39 +0000 (20:02 -0400)]
Remove unused wysiwyg settings from angular callback
Coleman Watts [Sun, 18 Oct 2015 21:16:34 +0000 (17:16 -0400)]
Lazy-load ckeditor.js
Dave Greenberg [Sun, 18 Oct 2015 22:50:20 +0000 (15:50 -0700)]
Merge pull request #6989 from seamuslee001/CRM-17415
CRM-17415 Add in URL filtering to Click through report
Eileen McNaughton [Sun, 18 Oct 2015 22:06:13 +0000 (11:06 +1300)]
Merge pull request #6993 from eileenmcnaughton/tests
minor test classes tidy-up.
Eileen McNaughton [Sun, 18 Oct 2015 22:05:32 +0000 (11:05 +1300)]
Merge pull request #6996 from eileenmcnaughton/t
minor test class tidy-up
eileenmcnaugton [Sun, 18 Oct 2015 07:52:57 +0000 (20:52 +1300)]
minor test classes idy-up.
We have been moving from the create helper classes taking a range of parameters to them taking an array which
is merged with the defaults the functions provide in order to create the entity
eileenmcnaughton [Sun, 18 Oct 2015 20:45:13 +0000 (20:45 +0000)]
minor test class tidy-up
Coleman Watts [Sun, 18 Oct 2015 19:25:51 +0000 (15:25 -0400)]
crm.ckeditor.js code cleanup
Coleman Watts [Sun, 18 Oct 2015 19:11:54 +0000 (15:11 -0400)]
CRM-17416 - Wait for wysiwyg to be ready
projects / civicrm-core.git / log