10416 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
b9c6ce2d19 Merge branch 'm20_MDL-26905_AICC_API_missing_currentorg_init' of git://github.com/scara/moodle 2011-03-21 21:38:23 +01:00
Eloy Lafuente (stronk7)
be5eb0013e Merge branch 'MDL-26863_wrong_appendtolog_statement' of git://github.com/scara/moodle 2011-03-21 21:15:54 +01:00
Eloy Lafuente (stronk7)
63187a6887 Merge branch 'm20_MDL-26894_SCORM13_PHP_notice_undefined_prop_id' of git://github.com/scara/moodle 2011-03-21 21:03:15 +01:00
Eloy Lafuente (stronk7)
1595b8120f Merge branch 'MDL-26861' of git://github.com/timhunt/moodle 2011-03-21 20:59:32 +01:00
Petr Skoda
dca072aedc Merge branch 'MDL-26571_lesson_scale' of git://github.com/andyjdavis/moodle 2011-03-21 14:52:11 +01:00
Petr Skoda
e5be555c27 Merge branch 'MDL-26768_0_grade' of git://github.com/andyjdavis/moodle 2011-03-21 14:49:18 +01:00
Matteo Scaramuccia
c6e46d37bc MDL-26905 - Fixed missing of currentorg initialization in AICC API 2011-03-20 23:54:39 +01:00
Matteo Scaramuccia
36c0108a2f MDL-26894: merged from SCORM 1.2 (scorm_12lib.php) after an XDebug audit session 2011-03-19 11:15:10 +01:00
Tim Hunt
8c448e1c83 MDL-26861 quiz view align Summary of your previous attempts table consistenty
Fix thanks to Joseph Rézeau.
2011-03-19 09:31:27 +00:00
Matteo Scaramuccia
77e889a0ef MDL-26863: fixed regression by an appropriate Merging From Branch using 1.9 2011-03-17 18:15:42 +01:00
Petr Skoda
72650054f4 MDL-26833 send forum notifications to active enrolled users only 2011-03-16 23:26:00 +01:00
Andrew Davis (andyjdavis)
f51cda3d09 lesson MDL-26571 made lesson accept a custom scale 2011-03-16 17:27:59 +08:00
Andrew Davis (andyjdavis)
76027a9f65 lesson MDL-26768 lesson was inserting a grade of 0 when a user id and a null raw grade were supplied 2011-03-16 10:26:12 +08:00
Eloy Lafuente (stronk7)
e5e64a4886 Merge branch 'w11_MDL-26697_20_media' of git://github.com/skodak/moodle
Conflicts:
	theme/formal_white/config.php
2011-03-15 15:21:02 +01:00
Petr Skoda
b0b4ab1aff Merge branch 'MDL-26464_m20_v2' of github.com:skodak/moodle 2011-03-14 20:55:04 +01:00
Petr Skoda
0393a8b706 MDL-26464 improve coding style and fix phpdocs 2011-03-14 20:54:00 +01:00
Eloy Lafuente (stronk7)
6326817e0f Merge branch 'MDL-26767' of git://github.com/timhunt/moodle 2011-03-14 12:07:41 +01:00
Eloy Lafuente (stronk7)
9f091bcd45 Merge branch 's7_MDL-9376_qaforum' of git://github.com/dongsheng/moodle 2011-03-14 01:22:10 +01:00
Eloy Lafuente (stronk7)
b5686d021b Merge branch 'MDL-26735' of git://github.com/timhunt/moodle 2011-03-13 23:41:48 +01:00
Petr Skoda
fcd2cbaf1f MDL-26697 multiple media filtering fixes and improvements
Bug fixes:
    * fixed broken flash resizing via URL
    * upgraded Flowplayer
    * fixed invalid context in format_text()
    * all media related CSS moved from themes to filter and resources
    * fixed automatic pdf resizing in resources

Changes:
    * reworked filter_mediaplugin system settings - grouped by player type instead of individual extensions, added more information
    * improved regex url matching
    * removed old unused players, Eolas fix and UFO embedding
    * image embedding moved to filter_urltolink
    * new Flowplayer embedding API
    * accessibility and compatibility tweaks in Flowplayer
    * SWF embedding now works only in trusted texts, it is now enabled by default (works everywhere if "Allow EMBED and OBJECT tags" enabled)
    * new default video width and height

New features:
    * automatic Flash video resizing using information from video metadata
    * Flash HD video support (*.f4v)
    * Flash video embedding with HTML5 fallback - compatible with iOS and other mobile devices
    * Vimeo embedding
    * no-cookie YouTube site supported
    * HTML 5 audio and video with multiple source URLs and QuickTime fallback
    * more video and audio extensions in filelib.php
    * MP3 player colours customisable via CSS in themes
    * nomediaplugin class in a tag prevents media embedding
2011-03-12 17:42:52 +01:00
Tim Hunt
c159b07046 MDL-26767 responses report has the same unsigned subtract issue as overview (MDL-26416) 2011-03-11 07:37:29 +00:00
Dongsheng Cai
67fc4f0025 MDL-9376, disallow student to see the other users posts in max editing time, credits to Vlas Voloshin and Charles Fulton 2011-03-11 11:22:13 +08:00
Rossiani Wijaya
e4e9611570 MDL-26464: remove 'add entry' link on setting block when it reachs the max number of records. Link removal does not apply to user who has data:manageentries capability (eg: teacher). 2011-03-11 10:03:14 +08:00
Tim Hunt
f11672d84a MDL-26735 Questions file links broken when quiz_attempts.id and .uniqueid differ. 2011-03-09 15:46:59 +00:00
Tim Hunt
5f36713765 MDL-26734 fatal error on the quiz review page when reviews are not allowed.
Sorry silly error by me, merging code from my 2.1 work.
2011-03-09 15:22:15 +00:00
Petr Skoda
23c799459d Revert "MDL-26392, nwiki and creole format wiki pages should support file attachments"
This reverts commit 0c5e812ba7c43856b5193f03b75a3f7a3d51d686  because UI is going to be reimplemented.
2011-03-08 10:11:07 +01:00
Petr Skoda
8eade3d773 Merge branch 'MDL-26392_wiki_images' of git://github.com/dongsheng/moodle 2011-03-07 12:40:04 +01:00
Eloy Lafuente (stronk7)
51ecc3255b Merge branch 'm20_MDL-26672_aiccfix' of git://github.com/danmarsden/moodle 2011-03-07 02:37:28 +01:00
Eloy Lafuente (stronk7)
500422e6d0 Merge branch 'workshop-submissions-anonymity-and-availability' of git://github.com/mudrd8mz/moodle 2011-03-07 01:56:28 +01:00
Eloy Lafuente (stronk7)
5ff33ba14b Merge branch 'MDL-26324' of git://github.com/timhunt/moodle 2011-03-07 01:22:43 +01:00
Eloy Lafuente (stronk7)
7d754148c4 Merge branch 'MDL-26685' of git://github.com/timhunt/moodle 2011-03-07 01:06:51 +01:00
David Mudrak
d67c20b873 MDL-26535 workshop: fixed availability of published and assessed submissions
While working on the new capability to view authors of published
submissions, I realized that published submissions are correctly listed
(implemented in 00bc77ee) but they can't be viewed by submission.php.
This patch fixes submission.php so that it allows to view published
submissions.

Also, I noticed that when the workshop is closed, the submissions that
were assessed by the user are not listed (as they were in the previous
phases) but submission.php provides access to them correctly. So I added
a code that lists assessed submissions in the closed phase.
2011-03-06 23:49:49 +01:00
Dan Marsden
69c3d39a9c AICC MDL-26672 fix for handling of value = 0 2011-03-07 09:54:33 +13:00
Tim Hunt
4a6f461830 MDL-26685 each attempt builds on last did not work when quiz_attemts.id and question_attempts.id were not equal. 2011-03-05 19:27:32 +00:00
Tim Hunt
b302591de8 MDL-26636 fix typo in language string.
Thanks to Luis de Vasconcelos.
2011-03-05 15:19:49 +00:00
Tim Hunt
0357171e68 MDL-26324 overall feedback problem when quiz changed to being graded out of 0 2011-03-04 17:20:12 +00:00
David Mudrak
e13d02f544 MDL-26535 workshop: new capability to control the anonymity of published submissions
Re-using 'mod/workshop:viewauthornames' would not be a happy option here
because teacher would have to change local overrides every time when
they were closing or re-opening the workshop (if they wanted anonymous
assessment but non-anonymous hall of fame).
2011-03-04 14:08:00 +01:00
David Mudrak
757bade1f6 MDL-26684 workshop: fixed missing href attribute in the link to the own submission
This was caused by incorrect construction of workshop_submission_summary.
Instead of direct initiation, the helper method should be used. The
helper adds a property 'url' needed to render 'href' later.
2011-03-04 14:07:50 +01:00
David Mudrak
de6aaa7295 MDL-26683 workshop: fixed typos in code comments 2011-03-04 13:03:49 +01:00
Dongsheng Cai
0c5e812ba7 MDL-26392, nwiki and creole format wiki pages should support file attachments 2011-03-04 15:44:20 +08:00
Petr Skoda
431ac39634 MDL-26623 fix file permissions
The permissions are now going to be verified as part of the weekly release process.
2011-03-01 12:26:49 +01:00
Eloy Lafuente (stronk7)
847753d497 Merge branch 'w09_MDL-26616_20_resourcelinks' of git://github.com/skodak/moodle 2011-02-28 18:41:03 +01:00
Petr Skoda
70e6628ea3 Merge branch 'MDL-26576' of git://github.com/timhunt/moodle 2011-02-28 10:06:03 +01:00
Petr Skoda
16fd74a3a5 Merge branch 'm20_MDL-26545_userpicfix' of git://github.com/danmarsden/moodle 2011-02-28 09:48:38 +01:00
David Mudrak
29cbe43189 MDL-13481 Strings fullname and shortname are now deprecated
This is a final cleanup commit of fullname and shortname issue. All
places where these strings were detected yet have been replaced with
proper fullnamecourse or fullnameuser or some other context specific
string.

AMOS BEGIN
 CPY [fullname,core],[outcomefullname,core_grades]
 CPY [shortname,core],[outcomeshortname,core_grades]
 CPY [name,core],[rolefullname,core_role]
 CPY [shortname,core],[roleshortname,core_role]
AMOS END
2011-02-28 09:42:50 +01:00
Dan Marsden
629f5021b3 SCORM MDL-26545 - fix user object passed to user_picture renderer 2011-02-28 12:33:29 +13:00
Petr Skoda
3d8f1d3abc MDL-26616 fix broken resource modinfo caused by invalid sortorder upgrade 2011-02-27 22:54:41 +01:00
Tim Hunt
92c4354ff9 MDL-26576 avoid notices one quizzes with no overall feedback. 2011-02-23 11:42:37 +00:00
Eloy Lafuente (stronk7)
fa188aa0a2 Merge branch 'MDL-26546-workshop-restore' of git://github.com/mudrd8mz/moodle 2011-02-22 23:00:46 +01:00
David Mudrak
1dade8b185 MDL-26546 Workshop: fixed embedded images in Number of errors grading form
Because of this typo, embedded images were not loaded when the
assessment form was re-edited. Thanks Helen Foster for spotting this.
2011-02-22 22:19:16 +01:00