moodle.git
8 years agoMerge branch 'MDL-35926_alt_c' of git://github.com/rwijaya/moodle
Sam Hemelryk [Mon, 7 Oct 2013 19:27:46 +0000 (08:27 +1300)]
Merge branch 'MDL-35926_alt_c' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-41914-weekly' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Mon, 7 Oct 2013 14:06:32 +0000 (16:06 +0200)]
Merge branch 'MDL-41914-weekly' of git://github.com/jleyva/moodle

8 years agoMDL-31830 course: Remove unused shifter built js files
Damyon Wiese [Mon, 7 Oct 2013 07:58:59 +0000 (15:58 +0800)]
MDL-31830 course: Remove unused shifter built js files

8 years agoMerge branch '31830-26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Mon, 7 Oct 2013 07:28:45 +0000 (15:28 +0800)]
Merge branch '31830-26' of git://github.com/samhemelryk/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMDL-31830 course: fixed up minor points as noted by Damyon's integration review
Sam Hemelryk [Mon, 7 Oct 2013 05:48:52 +0000 (18:48 +1300)]
MDL-31830 course: fixed up minor points as noted by Damyon's integration review

* Fixed typo breaking drag and drop of courses.
* Fixed the ' ' title for the create new button plus two other icons I found as well.
* Adding padding to items displayed in the action menu drop down. base + bootstrapbase.
* Padding adjusted to the same as on the course page. base + bootstrapbase.
* Removed hover icon from categories. base only.
* Fixed categroy typo
* Removed min-width that was being applied to coursename making its clickable area larger than normal.
* The category tree is now presented using aria attributes as per http://www.w3.org/WAI/GL/wiki/Using_ARIA_trees
* Bulk action selectors now use aria-labelledby
* Category course count now given access hidden label.
* Pagination links now have better titles.
* The course action icons now present with role=button

8 years agoMDL-35926 notification dialog: trap tab focus within dialog modal.
rwijaya [Mon, 7 Oct 2013 04:40:16 +0000 (12:40 +0800)]
MDL-35926 notification dialog: trap tab focus within dialog modal.

8 years agoMerge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Oct 2013 04:38:25 +0000 (17:38 +1300)]
Merge branch 'w41_MDL-42040_m26_shutdown' of https://github.com/skodak/moodle

8 years agoMDL-31830 course: management behat tests corrected after fixes
Sam Hemelryk [Sun, 6 Oct 2013 20:13:23 +0000 (09:13 +1300)]
MDL-31830 course: management behat tests corrected after fixes

8 years agoMerge branch 'MDL-42013_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 7 Oct 2013 03:26:37 +0000 (11:26 +0800)]
Merge branch 'MDL-42013_master' of git://github.com/dmonllao/moodle

8 years agoMerge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Oct 2013 02:51:45 +0000 (15:51 +1300)]
Merge branch 'w41_MDL-41220_m26_pluginlist' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-42072_master' of https://github.com/totara/openbadges
Sam Hemelryk [Mon, 7 Oct 2013 02:40:48 +0000 (15:40 +1300)]
Merge branch 'MDL-42072_master' of https://github.com/totara/openbadges

Conflicts:
badges/assertion.php

8 years agoMerge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 7 Oct 2013 00:43:08 +0000 (13:43 +1300)]
Merge branch 'w41_MDL-41197_m26_convnotices' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-41229-master' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Sun, 6 Oct 2013 23:50:29 +0000 (12:50 +1300)]
Merge branch 'MDL-41229-master' of git://github.com/mouneyrac/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

8 years agoMDL-31830 course: several management interface improvements
Sam Hemelryk [Thu, 3 Oct 2013 23:59:32 +0000 (12:59 +1300)]
MDL-31830 course: several management interface improvements

* Tidied up course detail permissions so that user is not shown information they couldn't access elsewhere.
* category link dimming now accounts for course creation as an action as well.
* category single select when in courses view mode is now limited to courses user can action in.
* There is now a check at the start of the management page to redirect to course/index.php if the user isn't able to manage in any category.
* Tweaked navigation again, to give the limited users a navbar structure similar to the system cap'd user.
* Cancelling a category delete now takes you back to the category you were viewing.
* Fixed undefined notice
* Improved placement of course request and approval links.
* Several styling tweaks/improvements to the base theme.
* Several styling tweaks/improvements to the bootstrapbase theme.

8 years agoMDL-31830 course: improvements to JS coding style
Sam Hemelryk [Wed, 2 Oct 2013 23:15:34 +0000 (12:15 +1300)]
MDL-31830 course: improvements to JS coding style

8 years agoMDL-31830 course: fixed interface issues with limited user
Sam Hemelryk [Wed, 2 Oct 2013 21:28:58 +0000 (10:28 +1300)]
MDL-31830 course: fixed interface issues with limited user

* Navigation/settings now show best available option.
* Resorting categories works now for limited access user.
* Display of up and down arrows corrected.
* Checkboxes no longer displayed if an action can't be performed.

8 years agoMDL-31830 course: management interface fixes as noted
Sam Hemelryk [Wed, 2 Oct 2013 02:32:09 +0000 (15:32 +1300)]
MDL-31830 course: management interface fixes as noted

* Fixed the highlighing of the default category when no categories have been selected.
* Fixed the bug preventing the action menu for AJAX loaded categories from functioning.
* Repositioned course idnumber infront of course actions.
* Fixed display of moveup on first item and movedown on last item (courses and categories)
* Fixed up resort selected categories string.

8 years agoMDL-31830 course: renamed functions for consistency
Sam Hemelryk [Mon, 30 Sep 2013 20:40:29 +0000 (09:40 +1300)]
MDL-31830 course: renamed functions for consistency

* course_move_by_one => course_change_sortorder_by_one
* course_move_after_course => course_move_after_course
* helper::action_course_move_after_course  => helper::action_course_change_sortorder_after_course
* helper::action_course_moveup     => helper::action_course_change_sortorder_up_one
* helper::action_course_movedown     => helper::action_course_change_sortorder_down_one
* helper::action_course_moveup_by_record   => helper::action_course_change_sortorder_up_one_by_record
* helper::action_course_movedown_by_record => helper::action_course_change_sortorder_down_one_by_record
* helper::action_category_movedown         => helper::action_category_change_sortorder_down_one
* helper::action_category_movedown_by_id   => helper::action_category_change_sortorder_down_one_by_id
* helper::action_category_moveup     => helper::action_category_change_sortorder_up_one
* helper::action_category_moveup_by_id     => helper::action_category_change_sortorder_up_one_by_id
* coursecat::move_by_one             => coursecat::change_sortorder_by_one

8 years agoMDL-31830 course: several small code improvements
Sam Hemelryk [Mon, 30 Sep 2013 20:02:08 +0000 (09:02 +1300)]
MDL-31830 course: several small code improvements

* I can rebase this for you/the integrator before it goes in for sure no probs :)
* Fixed double phpdoc block of course_change_visibility
* Moved permission checks out of course_move_after_course and into helper function.
* Reviewed setType calls for editcategory_form.php.
* Reviewed all uses of can_resort and added more specific methods.
* Fixed method mentioned in exception for resort methods.
* Converted calls to fetch courses to call get_course.
* Exceptions now thrown when trying to move courses and problems arise.
* Fixed unnecessary namespace hinting in core_course_management_renderer.
* Abstracted common logic of can_resort_any and can_change_parent_any.
* Removed check for system level capability from has_manage_capability_on_any.
* Reviewed debugging calls I've introduced.

8 years agoMDL-31830 course: added behat test of category creation
Sam Hemelryk [Mon, 30 Sep 2013 02:31:46 +0000 (15:31 +1300)]
MDL-31830 course: added behat test of category creation

8 years agoMDL-31830 core_course: new course category management interface
Sam Hemelryk [Sun, 29 Sep 2013 20:08:07 +0000 (09:08 +1300)]
MDL-31830 core_course: new course category management interface

* Implemented a new course and category management page.
* Deprecated the old management interface.
* Unit tests to cover the new API and core functions.
* Behat tests to cover the new interface.

8 years agoMDL-41220 fix test_get_plugin_list_with_file
Petr Škoda [Mon, 30 Sep 2013 20:55:51 +0000 (22:55 +0200)]
MDL-41220 fix test_get_plugin_list_with_file

8 years agoMDL-41611 mod_quiz: Offer to return to course when supported
Frederic Massart [Fri, 4 Oct 2013 03:35:47 +0000 (11:35 +0800)]
MDL-41611 mod_quiz: Offer to return to course when supported

8 years agoMDL-41611 mod_forum: Display inline available when supported
Frederic Massart [Fri, 4 Oct 2013 03:19:53 +0000 (11:19 +0800)]
MDL-41611 mod_forum: Display inline available when supported

8 years agoMDL-41611 format_singleactivity: Only hide unnecessary elements
Frederic Massart [Thu, 3 Oct 2013 06:44:07 +0000 (14:44 +0800)]
MDL-41611 format_singleactivity: Only hide unnecessary elements

8 years agoMDL-41611 format_singleactivity: Ignore unsupported modules
Frederic Massart [Fri, 4 Oct 2013 02:44:48 +0000 (10:44 +0800)]
MDL-41611 format_singleactivity: Ignore unsupported modules

8 years agoMDL-41914 New webservice core_user_add_user_device
Juan Leyva [Fri, 4 Oct 2013 09:43:45 +0000 (11:43 +0200)]
MDL-41914 New webservice core_user_add_user_device

8 years agoMDL-42040 refactor core Moodle shutdown handlers logic
Petr Škoda [Fri, 27 Sep 2013 20:41:08 +0000 (22:41 +0200)]
MDL-42040 refactor core Moodle shutdown handlers logic

8 years agoMDL-41914 New table user_devices
Juan Leyva [Fri, 4 Oct 2013 09:36:04 +0000 (11:36 +0200)]
MDL-41914 New table user_devices

8 years agoMDL-41197 ignore all problems when converting texts
Petr Škoda [Fri, 4 Oct 2013 08:59:41 +0000 (10:59 +0200)]
MDL-41197 ignore all problems when converting texts

8 years agoMDL-42013 behat: Fixing related tests
David Monllao [Mon, 30 Sep 2013 07:49:26 +0000 (15:49 +0800)]
MDL-42013 behat: Fixing related tests

We had no false positives because of this
issue, but some checking have been restricted
to specific DOM parts.

8 years agoMDL-42013 behat: Fixing problem with should not see
David Monllao [Fri, 27 Sep 2013 02:51:42 +0000 (10:51 +0800)]
MDL-42013 behat: Fixing problem with should not see

Using 'should see' outputs rather than an incorrect
xpath query. Also our custom selectors are not properly
used by WebAssert so switching to find xpath.

8 years agoMDL-41229 Filepicker: ie9 css - the picker content were displayed outside the picker
Jerome Mouneyrac [Fri, 4 Oct 2013 03:01:04 +0000 (11:01 +0800)]
MDL-41229 Filepicker: ie9 css - the picker content were displayed outside the picker

8 years agoweekly release 2.6dev
Sam Hemelryk [Fri, 4 Oct 2013 02:43:58 +0000 (15:43 +1300)]
weekly release 2.6dev

8 years agoNOBUG: Fixed file access permissions
Sam Hemelryk [Fri, 4 Oct 2013 02:43:58 +0000 (15:43 +1300)]
NOBUG: Fixed file access permissions

8 years agoNOBUG: Fixed SVG browser compatibility
Sam Hemelryk [Fri, 4 Oct 2013 02:43:53 +0000 (15:43 +1300)]
NOBUG: Fixed SVG browser compatibility

8 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Sam Hemelryk [Fri, 4 Oct 2013 02:43:52 +0000 (15:43 +1300)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

8 years agoMerge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Thu, 3 Oct 2013 19:25:58 +0000 (08:25 +1300)]
Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle

8 years agoMDL-9873 question Require question text
Eric Merrill [Thu, 3 Oct 2013 12:50:39 +0000 (08:50 -0400)]
MDL-9873 question Require question text

This commit removes the code that requires the question text
for the multianswer question type, as it is a duplicate, and
throws errors.

8 years agoMerge branch 'MDL-40829_mc' of https://github.com/rwijaya/moodle
Marina Glancy [Thu, 3 Oct 2013 08:10:31 +0000 (18:10 +1000)]
Merge branch 'MDL-40829_mc' of https://github.com/rwijaya/moodle

8 years agoMDL-40829 frontpage course heading: add padding to coursename and fix info ajax
rwijaya [Thu, 3 Oct 2013 07:47:47 +0000 (15:47 +0800)]
MDL-40829 frontpage course heading: add padding to coursename and fix info ajax

8 years agoMDL-42023 Assign: Edit PDF plugin - fix unit tests
Damyon Wiese [Thu, 3 Oct 2013 06:03:44 +0000 (14:03 +0800)]
MDL-42023 Assign: Edit PDF plugin - fix unit tests

8 years agoMerge branch 'MDL-42023-master' of git://github.com/damyon/moodle
Marina Glancy [Thu, 3 Oct 2013 03:08:03 +0000 (13:08 +1000)]
Merge branch 'MDL-42023-master' of git://github.com/damyon/moodle

8 years agoMerge branch 'MDL-41241-master-fix3' of git://github.com/damyon/moodle
Sam Hemelryk [Thu, 3 Oct 2013 03:03:22 +0000 (16:03 +1300)]
Merge branch 'MDL-41241-master-fix3' of git://github.com/damyon/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

8 years agoMDL-40770 TinyMCE - Restoring border to colour selectors
Jason Fowler [Thu, 3 Oct 2013 02:26:13 +0000 (10:26 +0800)]
MDL-40770 TinyMCE - Restoring border to colour selectors

8 years agoMDL-41241 Atto: Restrict searching for anchor tags to selection.
Damyon Wiese [Wed, 2 Oct 2013 14:58:29 +0000 (22:58 +0800)]
MDL-41241 Atto: Restrict searching for anchor tags to selection.

8 years agoRevert "MDL-33569 themes: Labels create extra margin below content."
Sam Hemelryk [Thu, 3 Oct 2013 01:39:57 +0000 (14:39 +1300)]
Revert "MDL-33569 themes: Labels create extra margin below content."

This reverts commits:
336c57575bd4b72ae8d52fdc5b50faeeffe8dd56.
c528917d3f6e84a132b6eff2bb06a7ed7eb992fa.

8 years agoMDL-42023 assign: Edit PDF plugin - Damyon's contributions
Damyon Wiese [Fri, 27 Sep 2013 06:51:22 +0000 (14:51 +0800)]
MDL-42023 assign: Edit PDF plugin - Damyon's contributions

8 years agoMDL-42023 assign: Edit PDF plugin - Barbara's contributions
Barbara Ramiro [Fri, 27 Sep 2013 06:50:39 +0000 (14:50 +0800)]
MDL-42023 assign: Edit PDF plugin - Barbara's contributions

8 years agoMDL-42023 assign: Edit PDF plugin - Jerome's contributions
Jerome Mouneyrac [Fri, 27 Sep 2013 06:47:12 +0000 (14:47 +0800)]
MDL-42023 assign: Edit PDF plugin - Jerome's contributions

8 years agoMDL-42023 assign: Add Edit PDF plugin to core.
Davo Smith [Fri, 27 Sep 2013 06:40:10 +0000 (14:40 +0800)]
MDL-42023 assign: Add Edit PDF plugin to core.

This plugin is heavily based on the uploadpdf plugin from
Davo Smith <git@davosmith.co.uk>. This is a fantastic plugin
that provides a great benefit for teachers marking assignments.

A big thankyou to Davo for writing the plugin and helping us to
get it integrated to core.

The plugin provides a pdf editing interface in the teachers browser
that lets them add comments and annotations to a students assignment
submission. The comment and annotations are then added to a pdf version
of the students submission which is send back to the student so they can
download it, or read it online.

This plugin has been primarily worked on by Damyon Wiese, Jerome Mouneyrac
and Barbara Ramiro. We have also had great feedback and suggestions from others
including the entire frontend team, Martin and Frederic Massart.

8 years agoMerge branch 'MDL-16464' of https://github.com/timhunt/moodle
Sam Hemelryk [Wed, 2 Oct 2013 19:34:39 +0000 (08:34 +1300)]
Merge branch 'MDL-16464' of https://github.com/timhunt/moodle

8 years agoMDL-16464 qtype_multichoice: fix missed question -> questionid.
Tim Hunt [Wed, 2 Oct 2013 09:16:22 +0000 (10:16 +0100)]
MDL-16464 qtype_multichoice: fix missed question -> questionid.

8 years agoMerge branch 'MDL-41241-master-fix2' of github.com:damyon/moodle
Marina Glancy [Wed, 2 Oct 2013 07:27:03 +0000 (17:27 +1000)]
Merge branch 'MDL-41241-master-fix2' of github.com:damyon/moodle

8 years agoMDL-41241 Atto: Make searching for the anchor tag more reliable
Damyon Wiese [Wed, 2 Oct 2013 07:21:11 +0000 (15:21 +0800)]
MDL-41241 Atto: Make searching for the anchor tag more reliable

8 years agoMerge branch 'MDL-42021-master-int' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 2 Oct 2013 07:01:12 +0000 (17:01 +1000)]
Merge branch 'MDL-42021-master-int' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 2 Oct 2013 06:54:59 +0000 (16:54 +1000)]
Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle

8 years agoMDL-41912 Atto: Min-height fix - div was too small by default.
Damyon Wiese [Wed, 2 Oct 2013 05:13:35 +0000 (13:13 +0800)]
MDL-41912 Atto: Min-height fix - div was too small by default.

8 years agoMDL-40050 webservice: Moving new events test file to right location
Frederic Massart [Wed, 2 Oct 2013 05:10:45 +0000 (13:10 +0800)]
MDL-40050 webservice: Moving new events test file to right location

8 years agoMDL-40050 webservice: Remove token from events
Frederic Massart [Wed, 2 Oct 2013 05:00:28 +0000 (13:00 +0800)]
MDL-40050 webservice: Remove token from events

8 years agoMDL-42021 enrol: Missing objectid in enrolment_deleted event
Frederic Massart [Wed, 2 Oct 2013 02:45:28 +0000 (10:45 +0800)]
MDL-42021 enrol: Missing objectid in enrolment_deleted event

8 years agoMerge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle
Marina Glancy [Tue, 1 Oct 2013 23:20:52 +0000 (09:20 +1000)]
Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle

8 years agoMDL-41039 mod_quiz: version bump
Sam Hemelryk [Tue, 1 Oct 2013 23:10:43 +0000 (12:10 +1300)]
MDL-41039 mod_quiz: version bump

8 years agoMerge branch 'MDL-41039-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 1 Oct 2013 23:10:08 +0000 (12:10 +1300)]
Merge branch 'MDL-41039-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Tue, 1 Oct 2013 22:36:16 +0000 (11:36 +1300)]
Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle

8 years agoMerge branch 'MDL-41798' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 22:26:20 +0000 (00:26 +0200)]
Merge branch 'MDL-41798' of git://github.com/rwijaya/moodle

8 years agoMerge branch 'MDL-40047-master' of git://github.com/ankitagarwal/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 21:59:05 +0000 (23:59 +0200)]
Merge branch 'MDL-40047-master' of git://github.com/ankitagarwal/moodle

8 years agoMDL-40770 tinymce: fixed svg files included with moodle theme
Sam Hemelryk [Tue, 1 Oct 2013 21:51:06 +0000 (10:51 +1300)]
MDL-40770 tinymce: fixed svg files included with moodle theme

8 years agoMerge branch 'MDL-40770-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 1 Oct 2013 21:52:03 +0000 (10:52 +1300)]
Merge branch 'MDL-40770-master' of git://github.com/phalacee/moodle

8 years agoMerge branch 'wip-MDL-40049-master-i' of git://github.com/abgreeve/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 21:42:00 +0000 (23:42 +0200)]
Merge branch 'wip-MDL-40049-master-i' of git://github.com/abgreeve/moodle

8 years agoMerge branch 'MDL-42017_M26' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 1 Oct 2013 21:36:56 +0000 (10:36 +1300)]
Merge branch 'MDL-42017_M26' of git://github.com/lazydaisy/moodle

8 years agoMerge branch 'MDL-41738' of https://github.com/Lightwork-Marking/moodle
Sam Hemelryk [Tue, 1 Oct 2013 21:27:54 +0000 (10:27 +1300)]
Merge branch 'MDL-41738' of https://github.com/Lightwork-Marking/moodle

8 years agoMDL-40829: courses heading: remove headerblock class from header and fix heading...
rwijaya [Tue, 1 Oct 2013 08:42:04 +0000 (16:42 +0800)]
MDL-40829: courses heading: remove headerblock class from header and fix heading levels.

    Also, changing h3 classname from name to categoryname.
    Added note to theme/upgrade.txt to describe the heading level changes.

8 years agoMerge branch 'MDL-42021-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 18:08:25 +0000 (20:08 +0200)]
Merge branch 'MDL-42021-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 1 Oct 2013 19:14:36 +0000 (08:14 +1300)]
Merge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle

8 years agoMerge branch 'mdl41996-master' of https://github.com/tlock/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 18:01:33 +0000 (20:01 +0200)]
Merge branch 'mdl41996-master' of https://github.com/tlock/moodle

8 years agoMerge branch 'wip-MDL-41921-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:55:30 +0000 (19:55 +0200)]
Merge branch 'wip-MDL-41921-master' of git://github.com/marinaglancy/moodle

8 years agoMerge branch '41997-26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:50:19 +0000 (19:50 +0200)]
Merge branch '41997-26' of git://github.com/samhemelryk/moodle

8 years agoMerge branch 'MDL-42004-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:43:42 +0000 (19:43 +0200)]
Merge branch 'MDL-42004-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-42001-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:41:10 +0000 (19:41 +0200)]
Merge branch 'MDL-42001-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-42003-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:36:37 +0000 (19:36 +0200)]
Merge branch 'MDL-42003-master' of git://github.com/FMCorz/moodle

8 years agoMerge branch 'MDL-41752-master' of git://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:18:36 +0000 (19:18 +0200)]
Merge branch 'MDL-41752-master' of git://github.com/jamiepratt/moodle

8 years agoMerge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 13:59:06 +0000 (15:59 +0200)]
Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle

8 years agoMerge branch 'MDL-32592-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Tue, 1 Oct 2013 10:49:03 +0000 (20:49 +1000)]
Merge branch 'MDL-32592-master' of git://github.com/danpoltawski/moodle

8 years agoMerge branch 'MDL-39653-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Tue, 1 Oct 2013 10:42:37 +0000 (20:42 +1000)]
Merge branch 'MDL-39653-master' of git://github.com/danpoltawski/moodle

8 years agoMDL-41999 fix setting of USER in chat
Petr Škoda [Tue, 1 Oct 2013 07:23:42 +0000 (09:23 +0200)]
MDL-41999 fix setting of USER in chat

8 years agoMDL-41264 Themes: Right align Tabs on Wiki page, when in RTL mode (theme/clean)
Nadav Kavalerchik [Sun, 18 Aug 2013 19:35:44 +0000 (22:35 +0300)]
MDL-41264 Themes: Right align Tabs on Wiki page, when in RTL mode (theme/clean)

8 years agoMerge branch 'MDL-41989-master' of git://github.com/phalacee/moodle
Marina Glancy [Tue, 1 Oct 2013 04:45:14 +0000 (14:45 +1000)]
Merge branch 'MDL-41989-master' of git://github.com/phalacee/moodle

8 years agoMDL-41398 bootstrap: added a maintenance layout
Sam Hemelryk [Tue, 1 Oct 2013 04:06:16 +0000 (17:06 +1300)]
MDL-41398 bootstrap: added a maintenance layout

8 years agoMerge branch 'MDL-41912-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Oct 2013 04:21:50 +0000 (14:21 +1000)]
Merge branch 'MDL-41912-master' of git://github.com/FMCorz/moodle

8 years agoMDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button)
Damyon Wiese [Tue, 1 Oct 2013 03:58:15 +0000 (11:58 +0800)]
MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button)

8 years agoMDL-42072 badges: Fix output and headers in badges ajax scripts
Yuliya Bozhko [Tue, 1 Oct 2013 03:04:56 +0000 (16:04 +1300)]
MDL-42072 badges: Fix output and headers in badges ajax scripts

8 years agoMDL-41828 mod: fixed navbar when adding modules to a course
Sam Hemelryk [Tue, 17 Sep 2013 20:21:32 +0000 (08:21 +1200)]
MDL-41828 mod: fixed navbar when adding modules to a course

8 years agoMDL-41900 events: avoid new debug call within unit tests
Sam Hemelryk [Tue, 1 Oct 2013 03:20:57 +0000 (16:20 +1300)]
MDL-41900 events: avoid new debug call within unit tests

8 years agoMDL-41878 JavaScript: Add an alias for Moodle in the YUI loader
Andrew Nicols [Wed, 18 Sep 2013 23:19:46 +0000 (00:19 +0100)]
MDL-41878 JavaScript: Add an alias for Moodle in the YUI loader

8 years agoMDL-40049 mod_choice: Replaced old add_to_log calls with event triggers.
Adrian Greeve [Thu, 19 Sep 2013 05:39:44 +0000 (13:39 +0800)]
MDL-40049 mod_choice: Replaced old add_to_log calls with event triggers.

Also added a generator for unit tests.

8 years agoMDL-40047 chat: Fix classname typo in generator tests
Ankit Agarwal [Tue, 1 Oct 2013 02:13:20 +0000 (10:13 +0800)]
MDL-40047 chat: Fix classname typo in generator tests

8 years agoMDL-40047 events: Replace add_to_logs with new events in feedback
Ankit Agarwal [Fri, 20 Sep 2013 05:58:22 +0000 (13:58 +0800)]
MDL-40047 events: Replace add_to_logs with new events in feedback

8 years agoMDL-40047 events: Add unit tests for feedback events
Ankit Agarwal [Tue, 24 Sep 2013 09:47:31 +0000 (17:47 +0800)]
MDL-40047 events: Add unit tests for feedback events

8 years agoMDL-40047 feedback: Add a test generator for feedback
Ankit Agarwal [Tue, 24 Sep 2013 07:57:07 +0000 (15:57 +0800)]
MDL-40047 feedback: Add a test generator for feedback