mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
82,320 Commits 36 Branches 519 Tags
Commit Graph

82320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
afecb4dfd5 Merge branch 'MDL-56346-master' of https://github.com/lucisgit/moodle 2016-12-06 14:34:06 +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
Dan Poltawski
e1ac178892 Merge branch 'MDL-56459-master' of git://github.com/FMCorz/moodle 2016-12-05 15:48:27 +00: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
Eloy Lafuente (stronk7)
73ddcea6e9 MDL-57265 backup: Bump release to 3.3 2016-12-05 01:30:17 +01:00
Eloy Lafuente (stronk7)
e6cb76dfbb weekly back-to-dev release 3.3dev 2016-12-03 17:46:27 +01: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
Eloy Lafuente (stronk7)
9c46f5c6fb NOBUG: Change travis.yml to MOODLE_32_STABLE 2016-12-03 14:26:15 +01:00
Dan Poltawski
1b00e27281 Moodle release 3.2rc5 v3.2.0-rc5 2016-12-02 15:19:10 +00:00
Dan Poltawski
6a6b1bd782 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-12-02 15:19:09 +00:00
Dan Poltawski
65cc788bb1 Merge branch 'wip-mdl-57232' of https://github.com/rajeshtaneja/moodle 2016-12-02 15:00:48 +00:00
Rajesh Taneja
54348ea6d7
MDL-57232 behat: Add blocks in boost theme 
Currently behat in boost depend on blocks
so make sure we have them.
 2016-12-02 22:48:13 +08:00
Eloy Lafuente (stronk7)
72edf2ef13 Merge branch 'wip-mdl-57245' of https://github.com/rajeshtaneja/moodle 2016-12-02 14:15:27 +01:00
David Mudrák
17a23673a9 MDL-57256 course: Fix display of the Legacy course files link 
The patch fixes the classical operator precedence bug.
 2016-12-02 14:10:06 +01:00
Juan Leyva
f104a58fe0 MDL-57255 gradereport_user: Fix default value for graderaw 
graderaw is a PARAM_FLOAT, the default to empty string was incorrect
 2016-12-02 12:29:51 +00:00
Rajesh Taneja
43b3cf0f25
MDL-57245 behat: Use correct @_file_upload tag 2016-12-02 19:04:32 +08:00
Eloy Lafuente (stronk7)
dadbe55c81 Merge branch 'MDL-57193-master-notest' of git://github.com/FMCorz/moodle 2016-12-02 11:41:02 +01:00
Dan Poltawski
1acd568793 MDL-56553 usertours: fix apostrophe use 2016-12-02 09:22:42 +00:00
Frederic Massart
7fc7486f49
MDL-57193 auth_db: Flip the array outside the loop for better perf 
Also as the recent changes where affecting the whitespaces quite
a lot, I took the liberty of aligning a few lines which weren't.
 2016-12-02 16:29:47 +08:00
John Okely
ec3e79134f
MDL-57193 auth_db: Use a recordset and array_key_exists 2016-12-02 16:29:47 +08:00
Josh Willcock
34949c1a55
MDL-57193 auth_db: Fixed bug suspends all users if external DB has > 10k 2016-12-02 16:29:47 +08:00
David Monllao
b9278260c7 MDL-56553 usertours: Removing trailing ^M 2016-12-02 16:23:03 +08:00
Ryan Wyllie
1459415f93 MDL-56553 tool_usertours: change add a block step to position right 2016-12-02 07:53:07 +00:00
David Monllao
76e337ab96 Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle 2016-12-02 14:20:17 +08:00
David Monllao
80ee8a3eb0 Merge branch 'MDL-57209-master' of git://github.com/crmpicco/moodle 2016-12-02 13:26:56 +08:00
Damyon Wiese
9d1402abd8 MDL-57232 blocks: Split undeletableblocktypes 
There are 2 kinds of blocks that are undeletable. Those required by the
theme and those protected via the admin page ui. We only want the theme
ones to be auto created site wide if they don't exist - so we need to
rename the theme ones and split the logic.
 2016-12-02 12:32:03 +08:00
Andrew Nicols
666b9fcb6a MDL-57243 search: Correct todo doc 2016-12-02 10:53:52 +08:00
Andrew Nicols
ddcb68b284 Merge branch 'MDL-57243_master' of git://github.com/dmonllao/moodle 2016-12-02 10:49:34 +08:00
David Monllao
5f654ea2c0 MDL-57243 search: Note about search area base classes relocation 2016-12-02 09:51:05 +08:00
Andrew Nicols
d8326d8364 MDL-57101 media_videojs: Load legacy events before use 2016-12-02 08:58:19 +08:00
Eloy Lafuente (stronk7)
f200f74552 Merge branch 'wip-MDL-57234-master' of https://github.com/Beedell/moodle 2016-12-01 17:58:51 +01:00