moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 10:26:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67179 commits 37 branches 544 tags 1.3 GiB
Commit graph

67179 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
2f0fa43133 MDL-43312 TinyMCE: Version bump to 3.5.10. Remove all the hacks. 
I retested the old bugs that required custom hacks to tinymce and could not reproduce them,
so I have not reimplemented the hacks.
 2014-05-07 12:53:35 +08:00
Damyon Wiese
f977d376c9 MDL-44606 Assign: Some grading functions are missing sesskey protection 2014-05-07 12:37:08 +08:00
Dan Poltawski
c1d62ed25d Merge branch 'wip-MDL-45414-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-05-07 12:05:43 +08:00
Dan Poltawski
34d75ff115 Merge branch 'wip-MDL-45429-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-05-07 11:50:13 +08:00
Jetha Chan
5b80099806 MDL-45387 core_form: erroneous escaping on reference list 
Fixed erroneous escaping in JS.
 2014-05-07 10:56:55 +08:00
Helen Foster
2966be7e01 MDL-45410 Merge English strings from the en_fix language pack 2014-05-07 00:21:56 +02:00
Marina Glancy
a9b8d52d84 MDL-45429 block_glossary_random: check capability before suggesting to edit 2014-05-06 17:24:00 +08:00
Jetha Chan
a0cb023389 MDL-45290 rubrics: overflow, delete button alignment 
Adjusted delete button alignment, restored overflow rule, amended button alignment, minor RTL fixes.
 2014-05-06 16:42:30 +08:00
Damyon Wiese
b37c9cf233 MDL-45412 Cache: Look for the newer classname first (mongo store) 2014-05-06 12:02:51 +08:00
Damyon Wiese
5684f787ee Merge branch '45412-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE 2014-05-06 12:02:33 +08:00
Marina Glancy
ca0f287dad MDL-45414 wiki: fix broken image 2014-05-06 11:33:20 +08:00
Damyon Wiese
53a28c9528 Merge branch 'MDL-45290-26-fix' of http://github.com/jethac/moodle into MOODLE_26_STABLE 2014-05-06 11:25:10 +08:00
Dan Poltawski
e8d36cbc1a Merge branch 'MDL-45376-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-05-06 11:16:40 +08:00
Jetha Chan
502deae544 MDL-45290 rubric: IE8 and minor fixes, RTL 
Added a fallback style for IE8, adjusted some minor styles, added RTL capability.
 2014-05-06 10:47:05 +08:00
Dan Poltawski
9ea9d487af Merge branch 'MDL-42956-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE 2014-05-06 10:18:44 +08:00
Sam Hemelryk
f627c8b770 MDL-45412 cachestore_mongodb: fixed use of deprecated Mongo class 2014-05-06 09:31:01 +12:00
Marina Glancy
74d62545da Merge branch 'MDL-34904-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE 2014-05-05 17:44:02 +08:00
Damyon Wiese
5a0e3521b9 Merge branch 'MDL-45359-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-05-05 17:25:05 +08:00
Marina Glancy
d1f5077f84 Merge branch 'MDL-43319-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-05-05 17:19:51 +08:00
Marina Glancy
8dfd2e2407 Merge branch 'MDL-45342-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE 2014-05-05 17:19:39 +08:00
Marina Glancy
09bf74f265 Merge branch 'MDL-44174-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-05-05 17:19:29 +08:00
Ankit Agarwal
78995d63a3 MDL-45201 recent_activity: Fix set type notice in recent activity form 2014-05-05 13:31:20 +08:00
Damyon Wiese
76e28ec58a Merge branch 'MDL-45290-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 2014-05-05 10:53:18 +08:00
Marina Glancy
a0a7521e5b Merge branch 'wip-MDL-45127-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE 2014-05-05 10:18:25 +08:00
Dan Poltawski
af41a7ef13 weekly release 2.6.2+ 2014-05-02 17:45:44 +08:00
Dan Poltawski
30453f2bc8 Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE 2014-05-02 17:45:41 +08:00
Adrian Greeve
cb6a69a1b6 MDL-45127 mod_lesson: Behat test for reviewing a lesson. 2014-05-02 16:12:30 +08:00
Adrian Greeve
6dd0e57020 MDL-45127 mod_lesson: Fixed reviewing lesson answers changing the lesson grade. 2014-05-02 16:12:30 +08:00
Adrian Greeve
745f876b3e MDL-45127 mod_lesson: Updated question edit screen with more help text. 
Unless the custom scores is selected in the lesson settings the score section
in the question settings will be disabled. A help link has been added with
a description similar to this one.
 2014-05-02 16:12:30 +08:00
Jetha Chan
15081f54a4 MDL-45290 rubric: visual fixups 
Fixed up visual issues with rubric editor on Clean.
 2014-05-02 14:21:14 +08:00
Ankit Agarwal
9cca987e0a MDL-34904 lti: Fix notice while using lti in frontpage 2014-05-02 14:07:55 +08:00
Ankit Agarwal
e322d80a06 MDL-45342 book: Automate MDLQA-2423 - A teacher can create book chapters and subchapters 2014-05-02 13:27:21 +08:00
Frederic Massart
38bbd78ebe MDL-44174 theme_clean: Updating information in readme file 2014-05-02 12:56:32 +08:00
AMOS bot
a201d4b6a8 Automatically generated installer lang files 2014-05-02 00:39:11 +00:00
sam marshall
62e02e583f MDL-45376 Completion: Form locking is still not working right 
On submit of the form, it called 'freeze' on the completion-related
fields (even though they shouldn't have been frozen because you
already clicked the unlock button).
 2014-05-01 18:16:14 +01:00
Tim Hunt
66bf3fb986 MDL-45273 quiz fixup settings initialisation. 2014-05-01 21:18:27 +08:00
Jetha Chan
e2ab510709 MDL-36836 filepicker: alfresco select box fix 
Adjusted position of alfresco select box; amended border/background application in base.
 2014-05-01 17:14:45 +08:00
Dan Poltawski
8cc974000b Merge branch 'MDL-45365-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-05-01 14:52:06 +08:00
Dan Poltawski
3959ea18ca MDL-43570 uprade: fix indentation 2014-05-01 14:45:29 +08:00
Dan Poltawski
47cdef3d70 Merge branch 'MDL-43570-M26' of https://github.com/KristerV/moodle into MOODLE_26_STABLE 2014-05-01 14:36:06 +08:00
Marina Glancy
3e1b758044 Merge branch 'MDL-44398-26' of git://github.com/ankitagarwal/moodle into MOODLE_26_STABLE 2014-05-01 14:21:59 +08:00
Damyon Wiese
cd999ba175 MDL-45365 Courselib unit tests: cmid -> instanceid confusion 
Yet again an instanceid is being passed instead of a cmid.
 2014-05-01 14:03:25 +08:00
Andrew Nicols
d59b21dcf1 MDL-45359 JS: Only change mask zIndex on modal dialogues 
When dealing with a non-modal dialogue within a modal dialogue, we should
not update the z-index of the underyling maskNode as it does not belong to
this dialogue.
 2014-05-01 14:01:29 +08:00
Dan Poltawski
84529fcf60 MDL-43319 phpdoc: fix too much ham consumption by developers 2014-05-01 13:35:33 +08:00
Dan Poltawski
278d605714 Merge branch 'MDL-45165_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-05-01 12:36:00 +08:00
Marina Glancy
62b945b70a MDL-45273 quiz: whitespace fix 2014-05-01 12:21:02 +08:00
Marina Glancy
10d96f0e37 Merge branch 'MDL-45273_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-05-01 12:20:07 +08:00
Marina Glancy
3d7b978247 Merge branch 'MDL-45292-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 2014-05-01 11:48:47 +08:00
Dan Poltawski
62fa6fc6d5 Merge branch 'MDL-45283-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-05-01 10:40:58 +08:00
Krister Viirsaar
aba7899302 MDL-43570 filetypes: Added new filetypes - ddoc, bdoc, cdoc 2014-04-30 13:08:26 +03:00