Eloy Lafuente (stronk7)
5b52ce19c5
Merge branch 'MDL-27625_master' of git://github.com/stronk7/moodle
...
Conflicts:
mod/forum/lib.php
2011-05-25 16:37:43 +02:00
Eloy Lafuente (stronk7)
5693d56cd8
MDL-27625 rating - consider RATING_UNSET_RATING a valid rating value
2011-05-25 12:00:16 +02:00
Sam Hemelryk
2b04c41c58
MDL-27471 Adding mandatory component & ratingarea to the ratings API + other fixes
...
* Added the component and ratingarea fields and implemented it throughout
the rating API as mandatory fields
* Cleanup rating indexes
* Upgrade forum/data/glossary ratings
* Moved the logic in the render_rating method to methods of the rating object.
* Added new callback for checking ratingareas
* Cleaned comments here and there
* Mark the xxx_get_participants methods as deprecated
* Refactor rate_ajax and ratingsuser_can_view_aggregate methods
* Cleaned up rating/index.php to use html_table object and moved inline styles to CSS.
* Added missing properties of the rating object that were being set throughout the rating
API.
2011-05-23 12:35:39 +02:00
Dan Marsden
6fa51b70a5
MDL-25177 Choice - fix typo for form creation causing pop-up window - thanks to Jason Hardin for fix
2011-05-19 13:01:21 +12:00
Sam Hemelryk
f138b7c13b
MDL-27161 Improved the 2 new strings in assignment
2011-05-18 17:29:39 +08:00
Sam Hemelryk
74cf2d0015
MDL-26704 Fixed up variable typo
2011-05-18 15:32:40 +08:00
Eloy Lafuente (stronk7)
4d7e02616b
Merge branch 'MDL-27386_HEAD2' of git://github.com/rwijaya/moodle
2011-05-17 14:19:23 +02:00
Eloy Lafuente (stronk7)
94a74f549a
MDL-26704 gradebook: adding TODO comment to avoid forgetting
2011-05-17 11:58:22 +02:00
Eloy Lafuente (stronk7)
dcc26efb70
Merge branch 'MDL-26704_user_outline_report_master' of git://github.com/andyjdavis/moodle
2011-05-17 11:55:04 +02:00
Sam Hemelryk
870b8b0402
Merge branch 'MDL-27161_head' of git://github.com/rwijaya/moodle.git
2011-05-16 12:28:18 +08:00
Sam Hemelryk
731d1b89ad
Merge branch 'MDL-27387_rating_scale_validation_master2' of git://github.com/andyjdavis/moodle
2011-05-16 12:14:11 +08:00
Sam Hemelryk
c23ee732c2
Merge branch 'MDL-26075_head' of git://github.com/grabs/moodle
2011-05-16 11:51:41 +08:00
Glenn Ansley
3efd551351
MDL-27494 choice - fixing incorrectly named column in backup
2011-05-16 03:24:30 +02:00
Rossiani Wijaya
4bb7783ef1
MDL-27386: fixed mform for lesson essay grading (head)
2011-05-13 14:14:19 +08:00
Andreas Grabs
74e3f2c67e
MDL-26075 Sending Message through Feedback Component throws an error
2011-05-12 17:12:11 +02:00
Rossiani Wijaya
e512715b89
MDL-27161: fixed optional setting for 'require grading' to prevent page lock out (head)
2011-05-12 17:32:00 +08:00
Aparup Banerjee
b38f0baad4
MDL-27386 lesson fix mform->score not saving (wip)
2011-05-12 16:00:18 +08:00
Andrew Davis (andyjdavis)
6ac149dce3
MDL-27387 rating: prevent the submission of ratings outside of the range allowed by the current scale
2011-05-11 11:29:31 +08:00
Andrew Davis (andyjdavis)
4433f871f2
MDL-26704 gradebook: added some intelligence to the dates displayed on the user outline activity report
2011-05-10 11:14:16 +08:00
Andreas Grabs
439ae873af
MDL-27422 The excel export fails in some conditions.
2011-05-09 17:27:06 +08:00
Sam Hemelryk
d045b479f4
Merge branch 's9_MDL-26854_spam_comments_master_2' of git://github.com/dongsheng/moodle
2011-05-05 10:41:53 +08:00
Sam Hemelryk
2c82d0eeb0
Merge branch 'MDL-26838_ratings_bad_data_master4' of git://github.com/andyjdavis/moodle
2011-05-05 10:18:39 +08:00
Dongsheng Cai
c1951ea953
MDL-26854 COMMENT
...
1. added pluginname_comment_validate callback to comments api
2. change permission callback defaults to false
3. Tidied up serveal areas of comments and implemented callback to
ignore system permissions for view (credits to Sam Hemelryk)
AMOS BEGIN
MOV [modulerejectcomment,error],[callbackrejectcomment,error]
AMOS END
2011-05-04 17:23:46 +08:00
Eloy Lafuente (stronk7)
5f0ac7652b
Merge branch 'MDL-26788_head' of git://github.com/rwijaya/moodle
2011-05-04 11:18:22 +02:00
Andrew Davis (andyjdavis)
778361c330
MDL-26838 rating: multiple fixes after a review of rating validation code
2011-05-04 15:43:30 +08:00
Sam Hemelryk
870815faed
Merged MDL-25805 Renamed property and function to be a little more descriptive
2011-05-03 15:41:34 +08:00
Sam Hemelryk
5f1c825dfa
Merged MDL-27251 Fixed up whitespace, Fixed broken string, reworded new strings
2011-05-03 10:51:06 +08:00
Aparup Banerjee
b9bcad24db
MDL-25805 Roles propagated ugly hack for parent seeing child activities into navigation lib to display nav node.
2011-05-02 20:08:08 +08:00
Andrew Davis (andyjdavis)
2c2ff8d5fc
MDL-26838 rating: remove logged in users ability to sidestep rating validity checks
2011-05-01 18:50:13 +08:00
Rossiani Wijaya
f672e3e920
MDL-26788 - grading in lesson containing essays (head)
2011-04-29 18:20:19 +08:00
Aparup Banerjee
60b5a2fec7
MDL-27251 Files API - added timeout re-calculation as an optional argument. added setting for minimum Kbps for large files fetched from internet where the passed in timeout maybe too low.
...
allowed turning off the http HEAD request timeout calculation with zero (or negative) bitrate
This was added in to allow servers that have a problem with
HEAD requests to carry on with the given timeout without re-calculations.
See PULL-651 for the discussion.
the optional argument to force recalculation of timeout has been forced within scorm/locallib.php
timeout re-calculation only increments timeout.
2011-04-27 10:49:40 +08:00
Petr Skoda
7774aca0fb
MDL-27253 add default swf size and allow #d=100x50 URL resizing in mod/url
2011-04-21 20:35:48 +02:00
Eloy Lafuente (stronk7)
97fefd2386
Merge branch 'w16_MDL-27148_m21_stringinc' of git://github.com/skodak/moodle
2011-04-18 01:15:56 +02:00
Petr Skoda
af4378aee9
Merge branch 'master_MDL-26880_SCORM2004_tracking_fix' of git://github.com/danmarsden/moodle
2011-04-17 17:16:03 +02:00
Petr Skoda
13516b7c1f
Merge branch 'master_MDL-24734_gradefix' of git://github.com/danmarsden/moodle
2011-04-17 17:09:05 +02:00
Petr Skoda
6b7fb33661
Merge branch 'master_MDL-18392_slash_cleanup' of git://github.com/danmarsden/moodle
2011-04-17 17:02:15 +02:00
Dan Marsden
4f4a8acf3b
SCORM MDL-24734 - fix display of grade information on view.php page - also fixes some XHTML in the same function.
2011-04-16 19:34:04 +12:00
Petr Skoda
cf717dc26b
MDL-27148 use new get_in_or_equal() param prefix instead of start
2011-04-14 15:15:01 +02:00
Nadav Kavalerchik
b41fc49c26
CSS MDL-26013 Fixed several display bugs when using right to left languages
2011-04-14 15:56:10 +08:00
Matteo Scaramuccia
74ef6bd82d
PULL-498 - Fixed potential issues about UTF-8 and multilang filter by adopting pure ASCII chars, the SCO primary key
2011-04-14 10:28:36 +12:00
Matteo Scaramuccia
0ec0224b9a
MDL-26880 - Fixed missing of activity id
...
Moved errorCode as global, to allow GetLastError() to work
Applied MDL-17891 mechanism against AJAX failures, "true if true, false otherwise"
Limited what added to log when in debug, to be compliant with mdl_log.action as VARCHAR(40)
2011-04-14 10:28:31 +12:00
Dan Marsden
4f6e39db5e
Merge remote branch 'moodle/master' into master_MDL-18392_slash_cleanup
2011-04-14 09:15:48 +12:00
Dan Marsden
3825bed0e8
SCORM MDL-18392 - remove old call to stripslashes
2011-04-13 20:05:30 +12:00
Matteo Scaramuccia
454f5aeef6
SCORM MDL-18392 MDL-26282 - Fixed calls to add/strip slashes
2011-04-13 20:05:19 +12:00
Eloy Lafuente (stronk7)
9ff913b716
Merge branch 'MDL-26778-master' of git://github.com/sammarshallou/moodle
2011-04-11 17:48:29 +02:00
Petr Skoda
337d8b1489
Merge branch 'wip-MDL-26599' of git://github.com/samhemelryk/moodle
2011-04-11 14:09:15 +02:00
sam marshall
6553cda7c9
MDL-26778 Change to completion should immediately affect nav block
...
Includes change so that updating completion resets the cache, and a debugging
warning if any module calls the completion viewed thing after it's already
printed navigation (which will mean navigation obviously doesn't update right
away). All existing modules that currently update after printing navigation
were updated.
2011-04-11 12:40:13 +01:00
Sam Hemelryk
2e79cd117a
Merge branch 'MDL-25746' of git://github.com/nebgor/moodle
2011-04-11 15:35:03 +08:00
Aparup Banerjee
16265f06d1
MDL-25746 fixed db tempate page layout to prevent hidden content layers
2011-04-11 15:15:58 +08:00
Sam Hemelryk
65f2fad9a0
mod-lesson MDL-26599 Fixed echo causing incorrect nesting.
2011-04-11 10:16:35 +08:00