David Mudrak [Thu, 27 Oct 2011 06:47:29 +0000 (23:47 -0700)]
Merge pull request #17 from marinaglancy/wip-rubricrenderer-rubric
Better rendering of the rubrics, rubric display options
Marina Glancy [Wed, 26 Oct 2011 03:36:29 +0000 (11:36 +0800)]
MDL-29482, MDL-29481: better rendering, options for rubric display
Marina Glancy [Tue, 25 Oct 2011 01:49:10 +0000 (09:49 +0800)]
MDL-29794: fixed bug with description cloning
Marina Glancy [Tue, 25 Oct 2011 00:55:55 +0000 (08:55 +0800)]
MDL-29481: rubric renderer now uses tables for smoother layout
Marina Glancy [Mon, 24 Oct 2011 08:27:48 +0000 (16:27 +0800)]
MDL-29481: phpdocs in renderer, renamed the main CSS class for rubric
David Mudrak [Mon, 24 Oct 2011 20:13:01 +0000 (22:13 +0200)]
Merge remote branch 'origin/master' into rubric
Conflicts:
lib/db/upgrade.php
version.php
David Mudrak [Mon, 24 Oct 2011 19:02:56 +0000 (21:02 +0200)]
Merge remote branch 'github/rubric' into rubric
David Mudrak [Mon, 24 Oct 2011 19:02:05 +0000 (21:02 +0200)]
Simplified manage.php initialization
For now, we support activity modules only anyway.
David Mudrak [Mon, 24 Oct 2011 18:59:08 +0000 (11:59 -0700)]
Merge pull request #16 from marinaglancy/wip-MDL-29483-rubric
MDL-29483: advanced grading methods support on assignment module, grading
Marina Glancy [Mon, 24 Oct 2011 05:32:50 +0000 (13:32 +0800)]
MDL-29483: allow the grading instance to exist without itemid until submitting (submission in assignment might not yet existed)
Marina Glancy [Mon, 24 Oct 2011 03:03:48 +0000 (11:03 +0800)]
MDL-29108: support for returnurl in rubriceditor
Marina Glancy [Mon, 24 Oct 2011 02:55:03 +0000 (10:55 +0800)]
MDL-29481: added support for remarks in rubric feedback
Marina Glancy [Fri, 21 Oct 2011 05:58:52 +0000 (13:58 +0800)]
MDL-29483, MDL-29482 advanced grading in assignment, rubrics editor
- advanced grading plugins now return the grade in the specified range
- prohibited quick grading when advanced grading method is used
- fixed bug in processing description in rubric editor
- some improvements to rubric editor JS
Marina Glancy [Thu, 20 Oct 2011 04:15:51 +0000 (12:15 +0800)]
MDL-29483: advanced grading methods support on assignment module, grading form element, rubrics
- gradingform API now has not only controller class but also instance class with functions and data related to the particular grading instance
- assignment grading form and grading form element deal with elements of gradingform_instance class instead of gradingform_controller
- implemented the class gradingform_rubric_instance
- added more phpdocs
Eloy Lafuente (stronk7) [Wed, 19 Oct 2011 22:53:26 +0000 (00:53 +0200)]
emergency release 2.2dev
Eloy Lafuente (stronk7) [Wed, 19 Oct 2011 22:33:30 +0000 (00:33 +0200)]
MDL-29496 course search - emergency regression fix
Eloy Lafuente (stronk7) [Wed, 19 Oct 2011 16:44:16 +0000 (18:44 +0200)]
weekly release 2.2dev
Eloy Lafuente (stronk7) [Wed, 19 Oct 2011 16:41:14 +0000 (18:41 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
David Mudrak [Wed, 19 Oct 2011 11:25:47 +0000 (13:25 +0200)]
Form definitions can be removed now
Sam Hemelryk [Wed, 19 Oct 2011 03:50:23 +0000 (16:50 +1300)]
MDL-28945 course_reports: Fixed up pagination issue
Sam Hemelryk [Wed, 19 Oct 2011 03:26:31 +0000 (16:26 +1300)]
MDL-26953 theme_nonzero: Quick fix to incorrect left position
Eloy Lafuente (stronk7) [Tue, 18 Oct 2011 16:23:00 +0000 (18:23 +0200)]
MDL-29602 unittest - fixing other tests to work with new accesslib
David Mudrak [Tue, 18 Oct 2011 23:17:43 +0000 (01:17 +0200)]
Saving a form as a public template
There is a new API method get_definition_copy() that is expected to
return the definition structure as if the form was written from scratch
via the editor. Such a prepared structure is passed to
a controller's update_definition() method in the new target area.
The same mechanism will be used for copying definitions from a shared
area to a normal gradable area.
David Mudrak [Tue, 18 Oct 2011 14:39:54 +0000 (16:39 +0200)]
Trivial rename of the active method selector param
David Mudrak [Tue, 18 Oct 2011 14:27:22 +0000 (16:27 +0200)]
Fixed registering new form definition
David Mudrak [Tue, 18 Oct 2011 14:26:06 +0000 (16:26 +0200)]
Fixed form cancellation handling
Previously, a cancelled form was processed as if all rubric definition
was removed.
David Mudrak [Tue, 18 Oct 2011 14:25:30 +0000 (16:25 +0200)]
Improved management page's integration into the settings block (again)
David Mudrak [Tue, 18 Oct 2011 12:55:25 +0000 (14:55 +0200)]
New capability to share and publish a form as a template
Eloy Lafuente (stronk7) [Tue, 18 Oct 2011 11:15:13 +0000 (13:15 +0200)]
Merge branch 'w41_MDL-29602_m22_accesslib' of git://github.com/skodak/moodle
sam marshall [Tue, 18 Oct 2011 09:40:07 +0000 (10:40 +0100)]
MDL-29719 Category page typo fix
Eloy Lafuente (stronk7) [Tue, 18 Oct 2011 09:22:15 +0000 (11:22 +0200)]
Merge branch 'MDL-29627' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2011 09:08:15 +0000 (11:08 +0200)]
Merge branch 'MDL-28491' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 18 Oct 2011 09:00:04 +0000 (11:00 +0200)]
Merge branch 'wip-MDL-29496-master' of git://github.com/phalacee/moodle
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 11:07:28 +0000 (13:07 +0200)]
MDL-29496 unittests - verify COALESCE() cross-db compatibility
Tim Hunt [Tue, 18 Oct 2011 07:39:28 +0000 (08:39 +0100)]
MDL-28491 fix notice because $page was undefined.
Tim Hunt [Tue, 18 Oct 2011 07:22:05 +0000 (08:22 +0100)]
MDL-29627 quiz access rules: quiz edit settings was broken with no custom rules installed.
Thanks to Apu for reporting this.
Aparup Banerjee [Tue, 18 Oct 2011 03:19:43 +0000 (11:19 +0800)]
MDL-29768 Language : fixed installation undefined debugstringids notice
Sam Hemelryk [Tue, 18 Oct 2011 01:31:34 +0000 (14:31 +1300)]
Merged branch 'MDL-28491' of git://github.com/timhunt/moodle.git with conflict resolution
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 23:44:58 +0000 (01:44 +0200)]
Merge branch 'MDL-29627' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 17 Oct 2011 23:39:22 +0000 (00:39 +0100)]
MDL-29627 quiz access rules: fix two little problems found during integration.
Missing include was breaking unit tests if they were run separately.
Missing breaks in one switch.
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 23:37:09 +0000 (01:37 +0200)]
NOBUG: Minibump to get css/js pruned everywhere
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 23:35:34 +0000 (01:35 +0200)]
Merge branch 'MDL-28613' of git://github.com/timhunt/moodle
David Mudrak [Mon, 17 Oct 2011 23:05:07 +0000 (01:05 +0200)]
Initial support for the grading management screen
The user is sent to the new grade/grading/manage.php screen when an
advanced grading method is set in the activity mod form or via the
settings block.
The screen is supposed to (1) let the user change the currently active
grading method, (2) open the editor for the selected method, (3) create
new form from a template (4) display a preview of the form.
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 22:58:09 +0000 (00:58 +0200)]
Merge branch 'MDL-28614' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 17 Oct 2011 22:53:53 +0000 (23:53 +0100)]
MDL-28614 questions: remove another obsolete editing_head_contributions fn.
Sam Hemelryk [Mon, 17 Oct 2011 22:38:26 +0000 (11:38 +1300)]
Merge branch 'MDL-29501-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 17 Oct 2011 22:02:00 +0000 (11:02 +1300)]
MDL-29695 enrol-cohort: Minor code improvement
Ruslan Kabalin [Fri, 7 Oct 2011 11:35:10 +0000 (12:35 +0100)]
MDL-29695 cohorts: Add pagination and search to cohorts adminstartion page
Ruslan Kabalin [Tue, 30 Aug 2011 16:12:14 +0000 (17:12 +0100)]
MDL-29695 enrol: cohort: Add pagination and search to quickenrolment interface
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 21:09:03 +0000 (23:09 +0200)]
Merge branch 'MDL-28614' of git://github.com/timhunt/moodle
David Mudrak [Mon, 17 Oct 2011 19:42:04 +0000 (21:42 +0200)]
Initial version of a couple of big icons from Tango Desktop project
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 19:24:39 +0000 (21:24 +0200)]
Merge branch 'w41_MDL-29785_m22_tinymce' of git://github.com/skodak/moodle
Tim Hunt [Mon, 17 Oct 2011 11:06:44 +0000 (12:06 +0100)]
MDL-28491 diplay the quiz navigation on the summary page.
This makes the UI more consistent as you work through the quiz. The improvement is more noticable in some themes than others.
Tim Hunt [Mon, 17 Oct 2011 10:42:41 +0000 (11:42 +0100)]
MDL-28614 qtypes: get_editing_head_contributions not used any more. Remove from base class.
Tim Hunt [Mon, 17 Oct 2011 10:28:49 +0000 (11:28 +0100)]
MDL-28613 question CSS. Some text in the grey info box is the wrong size.
Note that according to http://www.quirksmode.org/css/contents.html, the > CSS selector works in IE 7+, so is probably now safe to use.
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 10:05:05 +0000 (12:05 +0200)]
Merge branch 'MDL-29719-master' of git://github.com/sammarshallou/moodle
David Mudrak [Mon, 17 Oct 2011 09:54:53 +0000 (02:54 -0700)]
Merge pull request #15 from marinaglancy/wip-renderer-rubric
MDL-29481: implemented rubrics renderer, improved rubrics UI
sam marshall [Mon, 10 Oct 2011 12:50:01 +0000 (13:50 +0100)]
MDL-29719 Option to display course shortname alongside fullname on course lists
Marina Glancy [Mon, 17 Oct 2011 09:03:25 +0000 (17:03 +0800)]
MDL-29481: implemented rubrics renderer, improved rubrics UI
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 08:19:59 +0000 (10:19 +0200)]
NOBUG - whitespace fixes (MDL-19488, MDL-27242, MDL-29435)
Sam Hemelryk [Mon, 17 Oct 2011 05:52:23 +0000 (18:52 +1300)]
Merge branch 'MDL-28170' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 17 Oct 2011 04:37:49 +0000 (17:37 +1300)]
Merge branch 'MDL-26953' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 17 Oct 2011 04:31:52 +0000 (17:31 +1300)]
Merge branch 'MDL-29435' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 17 Oct 2011 04:28:32 +0000 (17:28 +1300)]
Merge branch 'MDL-27242-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 17 Oct 2011 03:25:33 +0000 (16:25 +1300)]
Merge branch 'MDL-28945-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Mon, 17 Oct 2011 02:21:45 +0000 (15:21 +1300)]
Merge branch 'MDL-29781' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 17 Oct 2011 00:54:03 +0000 (13:54 +1300)]
Merge branch 'MDL-26893' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 17 Oct 2011 00:18:30 +0000 (13:18 +1300)]
Merged branch 'MDL-29277' of git://github.com/mouneyrac/moodle.git with improvements
Eloy Lafuente (stronk7) [Mon, 17 Oct 2011 00:09:46 +0000 (02:09 +0200)]
MDL-28170 environment - add new 2.2 section
nothing changes from 2.1 as far as it was agreed that this will be
the last version supporting 1.9 upgrade. See issue for details.
Sam Hemelryk [Sun, 16 Oct 2011 22:12:33 +0000 (11:12 +1300)]
MDL-19488 mod_feedback: Coding style improvement
Sam Hemelryk [Sun, 16 Oct 2011 22:07:25 +0000 (11:07 +1300)]
Merge branch 'MDL-19488_master_wip' of git://github.com/grabs/moodle
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 19:16:38 +0000 (21:16 +0200)]
Merge branch 'MDL-28219d' of git://github.com/bostelm/moodle
David Mudrak [Fri, 14 Oct 2011 13:41:08 +0000 (15:41 +0200)]
Improved integration into the settings block
David Mudrak [Fri, 14 Oct 2011 12:34:12 +0000 (14:34 +0200)]
Activity module's settings form redirects to the management screen when advanced grading method was selected to use
David Mudrak [Fri, 14 Oct 2011 11:55:54 +0000 (13:55 +0200)]
Grading manager's set_active_method() returns bool now
David Mudrak [Fri, 14 Oct 2011 11:51:43 +0000 (13:51 +0200)]
Fixing the nullability of levelid field in the gradingform_rubric_fillings table
Credit goes to Marina Glency for spotting this.
David Mudrak [Fri, 14 Oct 2011 11:47:16 +0000 (13:47 +0200)]
Adding a unique key to the gradingform_rubric_fillings table
Credit goes to Marina Glency for the suggestion.
David Mudrak [Fri, 14 Oct 2011 10:22:31 +0000 (12:22 +0200)]
Dropping the uq_rater_per_item from the table grading_instances
It was realized that we may need multiple instances per one rater/item
to be able to 1) implement a draft instance and 2) eventually keep the
history of advanced grading.
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 17:21:57 +0000 (19:21 +0200)]
Merge branch 'MDL-27351' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 17:13:00 +0000 (19:13 +0200)]
Merge branch 'MDL-28436' of git://github.com/nebgor/moodle
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 17:01:57 +0000 (19:01 +0200)]
MDL-29191 wiki - avoid one more username leak
Sun Zhigang [Wed, 31 Aug 2011 08:36:31 +0000 (16:36 +0800)]
MDL-29191 - Show creator's fullname instead of username
Stephen Bourget [Fri, 7 Oct 2011 16:17:23 +0000 (12:17 -0400)]
MDL-29698 Assignment: Fix broken logentry
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 15:51:59 +0000 (17:51 +0200)]
MDL-29768 debugstringids new help lang string now used
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 15:46:18 +0000 (17:46 +0200)]
Merge branch 'MDL-29768-master' of git://github.com/sammarshallou/moodle
Petr Skoda [Sun, 16 Oct 2011 15:37:12 +0000 (17:37 +0200)]
MDL-29785 enable TinyMCE on iOS 5 devices
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 15:30:45 +0000 (17:30 +0200)]
Merge branch 'MDL-28483-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Sun, 16 Oct 2011 15:23:35 +0000 (17:23 +0200)]
Merge branch 'MDL-29788-langpack_version' of git://github.com/mudrd8mz/moodle
Petr Skoda [Sun, 16 Oct 2011 15:12:39 +0000 (17:12 +0200)]
MDL-29785 import latest TinyMCE 3.4.6
using https://github.com/moodle/custom-tinymce/tree/MOODLE_22_3.4.6 and https://github.com/moodle/custom-tinymce_spellchecker_php/tree/MOODLE_22_2.0.6 customised branches
Petr Skoda [Fri, 14 Oct 2011 10:48:00 +0000 (12:48 +0200)]
MDL-29602 accesslib improvements
Refactoring and improvements of the accesslib.php library including prevention of access for not-logged-in users when forcelogin enabled, improved context caching, OOP refactoring of contexts, fixed context loading, deduplication of role definitions in user sessions, installation improvements, decoupling of enrolment checking from capability loading, added detection of deleted and non-existent users in has_capability(), new function accesslib test, auth and enrol upgrade notes.
More details are available in tracker subtasks.
David Mudrak [Fri, 14 Oct 2011 21:55:27 +0000 (23:55 +0200)]
MDL-29788 Fixed the version of installed language packs
Mary Evans [Fri, 14 Oct 2011 19:39:36 +0000 (20:39 +0100)]
MDL-29781 FIX for side-post-only layout
Petr Skoda [Fri, 14 Oct 2011 13:50:27 +0000 (15:50 +0200)]
MDL-29773 prevent negative unix timestamps in the files table
Petr Skoda [Fri, 14 Oct 2011 13:30:54 +0000 (15:30 +0200)]
MDL-29773 use db debuginfo when file record insertion fails
Mary Evans [Fri, 14 Oct 2011 01:28:03 +0000 (02:28 +0100)]
MDL-26953 FIX for side-post-only layout
AMOS bot [Fri, 14 Oct 2011 00:55:22 +0000 (00:55 +0000)]
Automatically generated installer lang files
David Mudrak [Thu, 13 Oct 2011 20:43:28 +0000 (22:43 +0200)]
Merge branch 'rubric' of github.com:mudrd8mz/moodle into rubric
David Mudrak [Thu, 13 Oct 2011 20:42:47 +0000 (22:42 +0200)]
Merge branch 'master' into rubric
Conflicts:
lib/db/upgrade.php
David Mudrak [Thu, 13 Oct 2011 20:24:37 +0000 (13:24 -0700)]
Merge pull request #14 from marinaglancy/wip-MDL-29481-rubric
MDL-29481: Filling rubric by teacher (first steps)
Tony Levi [Tue, 16 Aug 2011 02:30:29 +0000 (12:00 +0930)]
MDL-28945: Fix course/activity completion reports initial selection broken