mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity
82,400 Commits 36 Branches 519 Tags
Commit Graph

82400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
3b8cf77689 Merge branch 'wip-mdl-56614' of https://github.com/rajeshtaneja/moodle 2016-12-07 09:42:20 +08:00
Marina Glancy
1491f21554 MDL-56642 dataformat: set temp dir 
Thanks to Chien Wen-Chang for proposing a patch
 2016-12-07 09:30:14 +08:00
Andrew Nicols
00f6e2cc52 Merge branch 'wip-mdl-57137' of https://github.com/rajeshtaneja/moodle 2016-12-07 09:00:22 +08:00
Rajesh Taneja
63be664507
MDL-57137 behat: Subcategory has black space before name 2016-12-07 08:49:04 +08:00
Rajesh Taneja
9bad658aaf
MDL-56614 behat: Fixed steps to use new definition 2016-12-07 07:10:35 +08:00
AMOS bot
c545551a0a Automatically generated installer lang files 2016-12-07 00:04:51 +08:00
Dan Poltawski
be1b12490e Merge branch 'MDL-45873' of https://github.com/bostelm/moodle 2016-12-06 15:56:23 +00:00
Dan Poltawski
b864c7fa1d Merge branch 'MDL-57284-master' of git://github.com/ankitagarwal/moodle 2016-12-06 15:50:36 +00:00
Dan Poltawski
c4d9fd1afe Merge branch 'MDL-53677-master' of git://github.com/ankitagarwal/moodle 2016-12-06 12:48:09 +00:00
Dan Poltawski
dee51f01d6 Merge branch 'MDL-56836-master' of https://github.com/snake/moodle 2016-12-06 12:46:19 +00:00
Dan Poltawski
369382f7bf Merge branch 'MDL-56233-32-mocksubmit' of https://github.com/roperto/moodle 2016-12-06 12:42:00 +00:00
Dan Poltawski
8a08d016ff MDL-56778 enrol: add note about legacy css 2016-12-06 12:31:57 +00:00
Dan Poltawski
94d950601c Merge branch 'MDL-56778_master' of https://github.com/nadavkav/moodle 2016-12-06 12:30:28 +00:00
Dan Poltawski
e2838e0e5d Merge branch 'MDL-57199' of git://github.com/timhunt/moodle 2016-12-06 12:25:36 +00:00
Dan Poltawski
7cdc6974d4 Merge branch 'MDL-56971-m' of https://github.com/micaherne/moodle 2016-12-06 11:08:08 +00:00
SSRF
7829997343 MDL-53677 tool_spamcleaner: CSRF Fix 
Resolves minor CSRF within Moodle spamcleaner.
 2016-12-06 12:25:14 +05:30
Andrew Nicols
3bb4ad7521 Merge branch 'MDL-57137_question_category_with_parent_category' of https://github.com/melihovv/moodle 2016-12-06 14:52:32 +08:00
Andrew Nicols
afecb4dfd5 Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle 2016-12-06 14:34:06 +08:00
Ankit Agarwal
59def6f397 MDL-57284 boost: Fix booktool_print icons 2016-12-06 11:51:02 +05:30
Mark Nelson
07af06df96 MDL-57283 core: fixed function call on null 2016-12-06 14:12:42 +08:00
Andrew Nicols
7586a36022 Merge branch 'MDL-56301-master' of https://github.com/snake/moodle 2016-12-06 14:10:40 +08:00
Andrew Nicols
5b67c9ecd1 Merge branch 'wip-MDL-56614-master-2' of https://github.com/marinaglancy/moodle 2016-12-06 13:37:33 +08:00
Andrew Nicols
f3666a1a56 Merge branch 'MDL-57161-master' of git://github.com/lameze/moodle 2016-12-06 13:06:39 +08:00
Marina Glancy
7a12a02dc7 MDL-56614 behat: add navigation block when required 
Most of these hacks have links to corresponding MDL issues
 2016-12-06 11:49:14 +08:00
Marina Glancy
44f460c32a MDL-56614 behat: rename step for navigating in the gradebook 2016-12-06 11:49:14 +08:00
Marina Glancy
e5287f9b3b MDL-56614 behat: navigate without navigation and admin blocks 2016-12-06 11:49:14 +08:00
Marina Glancy
50bd633d44 MDL-56614 block_navigation: Add block in behat tests 2016-12-06 11:49:14 +08:00
Marina Glancy
ebcff7e256 MDL-56614 behat: new steps for navigation without blocks 2016-12-06 11:49:11 +08:00
Donald Barrett
4fc74fe587 MDL-56301 course: Use value for intro field if set in a mods function 
Respects a module that has set a value for the db field intro in it's lib function modulename_add_instance.
 2016-12-06 10:34:38 +08:00
Andrew Nicols
80a35e6d1f Merge branch 'MDL-57255-master' of git://github.com/jleyva/moodle 2016-12-06 10:16:38 +08:00
David Monllao
c720384758 MDL-57161 search: Set the correct HTTP header 
All credit goes to Test Valley School
 2016-12-06 09:52:30 +08:00
Andrew Nicols
2e0e081b60 Merge branch 'MDL-56759-master' of git://github.com/lameze/moodle 2016-12-06 08:56:27 +08:00
Eloy Lafuente (stronk7)
75c57a08fb MDL-57266 upgrade: add 3.2.0 separation line to all upgrade scripts 2016-12-05 17:10:20 +01:00
Dan Poltawski
e1ac178892 Merge branch 'MDL-56459-master' of git://github.com/FMCorz/moodle 2016-12-05 15:48:27 +00:00
Eloy Lafuente (stronk7)
e7a1eed154 MDL-56240 upgrade: delete incorrect lines, manually added 
Note that, with MDL-57266, we are changine the comment to be:

// Automatically generated Moodle v3.2.0 release upgrade line

in order to make to make to make it clearer that it's an
automatic (part of the release process) comment and should not
be added manually ever.
 2016-12-05 16:47:33 +01:00
Dan Poltawski
d68562bdb9 Merge branch 'MDL-57256-master-legacylink' of git://github.com/mudrd8mz/moodle 2016-12-05 15:45:31 +00:00
Simey Lameze
3eefa8a59f MDL-56759 themes: fix badge list alignment issues 2016-12-05 15:19:18 +08:00
Andrew Nicols
8e9cb9b1dd Merge branch 'MDL-54921-master' of https://github.com/xow/moodle 2016-12-05 15:13:47 +08:00
Andrew Nicols
405666d371 Merge branch 'MDL-52840_master' of https://github.com/rezaies/moodle 2016-12-05 13:01:31 +08:00
Andrew Nicols
0dcbbbaa7e Merge branch 'MDL-57084_master' of git://github.com/markn86/moodle 2016-12-05 12:26:20 +08:00
Mark Nelson
57b3433604 MDL-57084 core_message: prevent duplication of day separator 2016-12-05 12:12:14 +08:00
Andrew Nicols
feda939e2f Merge branch 'MDL-56893-MOODLE_master-edit-grade-item-bug' of https://github.com/mspall/moodle 2016-12-05 12:04:43 +08:00
Andrew Nicols
8c71e91cdb Merge branch 'MDL-57265' of git://github.com/stronk7/moodle 2016-12-05 08:51:21 +08:00
Bram Tassyns
b0c362047e MDL-56836 SCORM: player doesn't remember display mode when not logged in 2016-12-05 08:36:13 +08:00
Eloy Lafuente (stronk7)
73ddcea6e9 MDL-57265 backup: Bump release to 3.3 2016-12-05 01:30:17 +01:00
Daniel Thee Roperto
518eb19337 MDL-56233 forms library: Fixed form identifier when mocking a form. 
If the plugin is using namespaces instead of frankenstyle class name,
get_called_class() will return 'type\name' instead of 'type_name'.

Added code to replace backslashes to underscores and fix that issue.
 2016-12-05 11:27:05 +11:00
Eloy Lafuente (stronk7)
e6cb76dfbb weekly back-to-dev release 3.3dev 2016-12-03 17:46:27 +01:00
Henning Bostelmann
f4a752a2f1 MDL-45873 mode_data: Allow "0" entries in menu field 2016-12-03 15:30:12 +00:00
Eloy Lafuente (stronk7)
e0ace6db8c NOBUG: Change travis.yml back to master 2016-12-03 14:26:16 +01:00
Eloy Lafuente (stronk7)
b182239f21 Moodle release 3.2 v3.2.0 2016-12-03 14:26:15 +01:00