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

18911 commits

Author SHA1 Message Date
Dan Poltawski
53b540c82a Merge branch 'MDL-54027-master' of git://github.com/FMCorz/moodle 2016-05-18 11:05:06 +01:00
Dan Poltawski
07eb3a0db7 Merge branch 'wip-mdl-53956' of https://github.com/rajeshtaneja/moodle 2016-05-18 10:45:22 +01:00
Dan Poltawski
27bdd818f6 Merge branch 'MDL-54549-master-en_fix' of git://github.com/mudrd8mz/moodle 2016-05-18 10:28:08 +01:00
David Monllao
923b230c8e Merge branch 'wip-MDL-54061-master' of git://github.com/abgreeve/moodle 2016-05-18 16:20:27 +08:00
Adrian Greeve
759f61fe1c MDL-54061 mod_assign: Added encoding and separator to upload form. 
Added the fields of encoding and separator so that the user has
more control when uploading a csv assignment grading file.
 2016-05-18 15:50:33 +08:00
David Monllao
d9e7af1d6a Merge branch 'MDL-54594-master' of git://github.com/ryanwyllie/moodle 2016-05-18 14:02:00 +08:00
Ryan Wyllie
7d7e5a4cf0 MDL-54594 mod_assign: Fix editpdf toolbar breakpoints 
Fixed the CSS media breakpoints for the editpdf toolbar after the
additional button was added.
 2016-05-18 05:53:44 +00:00
David Monllao
98c3f736bb Merge branch 'MDL-54595-master' of git://github.com/junpataleta/moodle 2016-05-18 11:30:25 +08:00
Rajesh Taneja
1ef6a5e30a MDL-53956 behat: Avoid before and after step and switch 
After pressing the button, if system is slow then
after step and before step might fail as the window
is closed by then. Execute steps one after other
 2016-05-18 10:41:01 +08:00
David Mudrák
50d083f07a MDL-54549 lang: Fix changed strings in behat scenario files 2016-05-17 18:29:30 +02:00
Helen Foster
75a22eb9fb MDL-54549 lang: Merge English strings from the en_fix language pack 2016-05-17 18:26:15 +02:00
Jake Dallimore
4741c3162e MDL-54025 mod_lti: Use activity name when creating tool from cartridge. 2016-05-17 17:54:12 +08:00
Adrian Greeve
897444d761 MDL-53923 mod_assign: Put messages into notifications. 
The unoconv test page was before just outputting text to
page. Now it is wrapped in a nice notification. One of the
warnings has been improved as well.
 2016-05-17 17:16:13 +08:00
David Monllao
2a1cfd371f Merge branch 'MDL-54108-master' of git://github.com/marinaglancy/moodle 2016-05-17 17:16:10 +08:00
Dan Poltawski
bdabf42d9a Merge branch 'wip-MDL-54129-master' of git://github.com/abgreeve/moodle 2016-05-17 17:16:09 +08:00
Dan Poltawski
5a2283cdc0 Merge branch 'wip-MDL-53923-master' of git://github.com/abgreeve/moodle 2016-05-17 17:16:08 +08:00
Jun Pataleta
2664105c87 MDL-54595 mod_assign: Remove btn-group class 2016-05-17 11:53:10 +08:00
Marina Glancy
ea4176c24f MDL-54108 mod_feedback: separate upgrade sql for mysql 2016-05-17 09:27:59 +08:00
Marina Glancy
8e70465aa8 MDL-54108 mod_feedback: add unique index on values for completed items 2016-05-17 09:27:58 +08:00
Adrian Greeve
692b53480d MDL-54129 mod_lti: Show in course checkbox works properly. 
The show in course setting for LTI would always be set to true
regardless of what was set.
 2016-05-16 14:38:13 +08:00
Adrian Greeve
0eecf87687 MDL-53923 mod_assign: Movement of functions to file_storage. 2016-05-16 14:32:54 +08:00
Simey Lameze
c4d692285f MDL-53923 mod_assign: test unoconv path 2016-05-16 14:08:09 +08:00
Andrew Nicols
98c2893cdd Merge branch 'MDL-53221_master-information' of https://github.com/dmonllao/moodle 2016-05-16 13:06:05 +08:00
David Monllao
c827acae2d MDL-53221 search: Renaming search areas 
AMOS BEGIN
 CPY [modulename,mod_folder],[search:activity,mod_folder]
 CPY [modulename,mod_label],[search:activity,mod_label]
 CPY [modulename,mod_page],[search:activity,mod_page]
 CPY [modulename,mod_resource],[search:activity,mod_resource]
 CPY [modulename,mod_url],[search:activity,mod_url]
AMOS END
 2016-05-16 13:02:02 +08:00
Andrew Nicols
dcd3dea137 Merge branch 'wip-mdl-54588' of https://github.com/rajeshtaneja/moodle 2016-05-16 12:05:34 +08:00
Jake Dallimore
f418d89957 MDL-54128 mod_lti: Add help for custom LTI tools in activity picker 2016-05-16 10:07:29 +08:00
Rajesh Taneja
528278f78f MDL-54588 behat: Button has been replaced with link 
Adding a scale has been modified to use link
on outcome page
 2016-05-16 09:13:29 +08:00
David Monllao
60152a2828 NOBUG: Fixed SVG browser compatibility 2016-05-13 18:33:22 +08:00
Andrew Nicols
d58854d3bf Merge branch 'wip-mdl-54561' of https://github.com/rajeshtaneja/moodle 2016-05-13 18:12:32 +08:00
Barbara Ramiro
378733a4c3 MDL-53822 editpdf: Much nicer icons for new drag-to-scroll feature 2016-05-13 18:11:28 +08:00
David Monllao
8ae171ed1c Merge branch 'MDL-53822-master' of git://github.com/damyon/moodle 2016-05-13 18:11:27 +08:00
David Monllao
ec7b75087c Merge branch 'MDL-54098-master' of git://github.com/FMCorz/moodle 2016-05-13 18:11:27 +08:00
Frederic Massart
2140cca1db MDL-54027 mod_forum: Display sub-header on user posts/discussions page 2016-05-13 17:17:28 +08:00
Rajesh Taneja
790bf3ace0 MDL-54561 phpunit: only search with first 3 chars 
Windows uses only the first three characters of prefix in
tempnam(), so only use first 3 chars to find if error
is logged
 2016-05-13 13:33:52 +08:00
Damyon Wiese
ab4d78ea82 MDL-53822 editpdf: Show different cursors for select and move 2016-05-11 14:54:38 +08:00
Andrew Nicols
e51176e598 Merge branch 'MDL-54125_master' of git://github.com/markn86/moodle 2016-05-11 14:11:07 +08:00
Mark Nelson
2c216a6c39 MDL-54125 mod_data: fixed PHP notice 
Also removed unused variables.
 2016-05-11 13:01:24 +08:00
Andrew Nicols
128beb3d39 Merge branch 'MDL-53976-master' of git://github.com/jleyva/moodle 2016-05-11 12:05:43 +08:00
Cameron Ball
5e84acc2f3 MDL-53916 mod_assign: Point update grade link to new interface 2016-05-10 15:42:05 +01:00
David Monllao
283b1d32bd Merge branch 'MDL-54009-master' of git://github.com/ryanwyllie/moodle 2016-05-10 21:58:41 +08:00
David Monllao
677e6345c2 Merge branch 'MDL-52133-master' of git://github.com/ryanwyllie/moodle 2016-05-10 21:41:15 +08:00
Andrew Nicols
0301e11bae Merge branch 'MDL-53821-master' of git://github.com/ryanwyllie/moodle 2016-05-10 18:36:15 +08:00
Andrew Nicols
715c3f5fef Merge branch 'MDL-52506-master' of git://github.com/ryanwyllie/moodle 2016-05-10 18:36:14 +08:00
Ryan Wyllie
1b2f9dc60c MDL-53821 mod_assign: Hide full name when blind marking 
Hide the student's full name in the new grading intferface when blind
marking is on.
 2016-05-10 02:07:02 +00:00
Ryan Wyllie
e6858c084a MDL-52506 mod_assign: Fix return links for atto auto save 2016-05-10 01:22:48 +00:00
Frederic Massart
67ee10307f MDL-54098 external: Remove usage of require_login and $PAGE->set_context 2016-05-09 19:42:37 +08:00
Ryan Wyllie
9c8ef1397f MDL-54009 mod_lti: Style LTI tool iframe border 2016-05-09 07:07:27 +00:00
Andrew Nicols
197adc93d5 Merge branch 'MDL-53914-master' of git://github.com/FMCorz/moodle 2016-05-09 14:16:56 +08:00
Damyon Wiese
55907a738a MDL-53822 editpdf: Add a new tool for scrolling 
I added a new tool to the toolbar to allow click and drag scrolling (especially useful for touchscreens).
 2016-05-06 16:33:31 +08:00
Frederic Massart
f058c74eba MDL-53914 mod_wiki: Do not format_text during search index 2016-05-06 16:25:26 +08:00