64100 Commits

Author SHA1 Message Date
Sam Hemelryk
8aa3aa3dfd MDL-31830 course: management behat tests corrected after fixes 2013-10-07 17:34:09 +13:00
Sam Hemelryk
484c4c6cf3 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.
2013-10-07 10:22:57 +13:00
Sam Hemelryk
c46996ea5a MDL-31830 course: improvements to JS coding style 2013-10-07 10:22:51 +13:00
Sam Hemelryk
b488058f7d 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.
2013-10-07 10:22:51 +13:00
Sam Hemelryk
f454e3247d 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.
2013-10-07 10:22:45 +13:00
Sam Hemelryk
5aff38e4d8 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
2013-10-07 10:22:36 +13:00
Sam Hemelryk
67e1f26874 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.
2013-10-07 10:22:36 +13:00
Sam Hemelryk
a3b7439ff2 MDL-31830 course: added behat test of category creation 2013-10-07 10:22:36 +13:00
Sam Hemelryk
5dc361e16e 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.
2013-10-07 10:21:41 +13:00
Sam Hemelryk
56cc9b387e weekly release 2.6dev 2013-10-04 15:43:58 +13:00
Sam Hemelryk
cf8943779e NOBUG: Fixed file access permissions 2013-10-04 15:43:58 +13:00
Sam Hemelryk
9b70e68445 NOBUG: Fixed SVG browser compatibility 2013-10-04 15:43:53 +13:00
Sam Hemelryk
577fc805a2 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-10-04 15:43:52 +13:00
Sam Hemelryk
7f62e4040a Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle 2013-10-04 08:25:58 +13:00
Eric Merrill
300eee6a45 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.
2013-10-03 08:50:39 -04:00
Marina Glancy
1b87f31348 Merge branch 'MDL-40829_mc' of https://github.com/rwijaya/moodle 2013-10-03 18:10:31 +10:00
rwijaya
983c46a8a7 MDL-40829 frontpage course heading: add padding to coursename and fix info ajax 2013-10-03 15:47:47 +08:00
Damyon Wiese
9f5193a4b8 MDL-42023 Assign: Edit PDF plugin - fix unit tests 2013-10-03 14:05:28 +08:00
Marina Glancy
32e375bdcb Merge branch 'MDL-42023-master' of git://github.com/damyon/moodle 2013-10-03 13:08:03 +10:00
Sam Hemelryk
322ca2fc66 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
2013-10-03 16:03:22 +13:00
Jason Fowler
dc48715eb7 MDL-40770 TinyMCE - Restoring border to colour selectors 2013-10-03 15:59:17 +13:00
Damyon Wiese
8c11cd2e09 MDL-41241 Atto: Restrict searching for anchor tags to selection. 2013-10-03 10:54:10 +08:00
Sam Hemelryk
18a56136e7 Revert "MDL-33569 themes: Labels create extra margin below content."
This reverts commits:
* 336c57575bd4b72ae8d52fdc5b50faeeffe8dd56.
* c528917d3f6e84a132b6eff2bb06a7ed7eb992fa.
2013-10-03 14:41:18 +13:00
Damyon Wiese
5c3864723a MDL-42023 assign: Edit PDF plugin - Damyon's contributions 2013-10-03 09:30:32 +08:00
Barbara Ramiro
95dfde5549 MDL-42023 assign: Edit PDF plugin - Barbara's contributions 2013-10-03 09:29:54 +08:00
Jerome Mouneyrac
e0cc92c650 MDL-42023 assign: Edit PDF plugin - Jerome's contributions 2013-10-03 09:29:54 +08:00
Davo Smith
1ce2ce7cb0 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.
2013-10-03 09:29:54 +08:00
Sam Hemelryk
c7387be83b Merge branch 'MDL-16464' of https://github.com/timhunt/moodle 2013-10-03 08:34:39 +13:00
Tim Hunt
dba40d4e70 MDL-16464 qtype_multichoice: fix missed question -> questionid. 2013-10-02 10:16:22 +01:00
Marina Glancy
d794391d8b Merge branch 'MDL-41241-master-fix2' of github.com:damyon/moodle 2013-10-02 17:27:03 +10:00
Damyon Wiese
30509335dd MDL-41241 Atto: Make searching for the anchor tag more reliable 2013-10-02 15:21:11 +08:00
Marina Glancy
3b06d7b22b Merge branch 'MDL-42021-master-int' of git://github.com/FMCorz/moodle 2013-10-02 17:01:12 +10:00
Marina Glancy
0880a52c9a Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle 2013-10-02 16:54:59 +10:00
Damyon Wiese
766c6401b7 MDL-41912 Atto: Min-height fix - div was too small by default. 2013-10-02 13:13:35 +08:00
Frederic Massart
26422a66ad MDL-40050 webservice: Moving new events test file to right location 2013-10-02 13:10:45 +08:00
Frederic Massart
ee2df1a8b2 MDL-40050 webservice: Remove token from events 2013-10-02 13:00:28 +08:00
Frederic Massart
4fb6600eae MDL-42021 enrol: Missing objectid in enrolment_deleted event 2013-10-02 10:45:28 +08:00
Marina Glancy
a929e5e83d Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle 2013-10-02 09:20:52 +10:00
Sam Hemelryk
0fcedc7c73 MDL-41039 mod_quiz: version bump 2013-10-02 12:10:43 +13:00
Sam Hemelryk
18f04ab625 Merge branch 'MDL-41039-master' of git://github.com/FMCorz/moodle 2013-10-02 12:10:08 +13:00
Sam Hemelryk
6579a7b791 Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle 2013-10-02 11:36:16 +13:00
Eloy Lafuente (stronk7)
9d4ff1e5f4 Merge branch 'MDL-41798' of git://github.com/rwijaya/moodle 2013-10-02 00:26:20 +02:00
Eloy Lafuente (stronk7)
3667a8ce7f Merge branch 'MDL-40047-master' of git://github.com/ankitagarwal/moodle 2013-10-01 23:59:05 +02:00
Sam Hemelryk
274399c00e MDL-40770 tinymce: fixed svg files included with moodle theme 2013-10-02 10:52:15 +13:00
Sam Hemelryk
55fcb3504f Merge branch 'MDL-40770-master' of git://github.com/phalacee/moodle 2013-10-02 10:52:03 +13:00
Eloy Lafuente (stronk7)
d1ed736f1d Merge branch 'wip-MDL-40049-master-i' of git://github.com/abgreeve/moodle 2013-10-01 23:42:00 +02:00
Sam Hemelryk
49b38d141e Merge branch 'MDL-42017_M26' of git://github.com/lazydaisy/moodle 2013-10-02 10:36:56 +13:00
Sam Hemelryk
28a6f665f4 Merge branch 'MDL-41738' of https://github.com/Lightwork-Marking/moodle 2013-10-02 10:27:54 +13:00
rwijaya
faf6010b10 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.
2013-10-02 09:46:26 +13:00
Eloy Lafuente (stronk7)
268f4cb503 Merge branch 'MDL-42021-master' of git://github.com/FMCorz/moodle 2013-10-01 21:36:13 +02:00