mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 07:30:01 +01:00
Code Issues Projects Releases Wiki Activity
87,403 Commits 36 Branches 527 Tags
Commit Graph

87403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
e20a041100 Merge branch 'MDL-59200-master' of git://github.com/damyon/moodle 2017-12-19 01:08:15 +01:00
Eloy Lafuente (stronk7)
cb5fb8aea5 Merge branch 'MDL-58888-master' of git://github.com/junpataleta/moodle 2017-12-19 01:04:54 +01:00
Eloy Lafuente (stronk7)
dc3f4ac929 Merge branch 'MDL-60750-master' of git://github.com/lameze/moodle 2017-12-19 00:56:14 +01:00
Eloy Lafuente (stronk7)
2b7fda50d9 Merge branch 'wip-MDL-60594-master' of git://github.com/marinaglancy/moodle 2017-12-19 00:36:28 +01:00
Eloy Lafuente (stronk7)
a1036e90f8 Merge branch 'MDL-60036-fix-string-online_user_block' of https://github.com/DSI-Universite-Rennes2/moodle 2017-12-19 00:26:31 +01:00
Jun Pataleta
b3a36eb80d Merge branch 'm35_MDL-60793_Mod_Chat_Reserved_Words_In_MySQL8p0p3_And_Above' of https://github.com/scara/moodle 2017-12-19 12:23:18 +13:00
Eloy Lafuente (stronk7)
fc0c84c04b MDL-43466 mod_assign: fix corresponding behat tests 2017-12-19 00:11:54 +01:00
Eloy Lafuente (stronk7)
22c6affdef Merge branch 'MDL-43466_master' of git://github.com/markn86/moodle 2017-12-19 00:11:52 +01:00
David Monllao
73aa231f83 Merge branch 'MDL-60653-master' of git://github.com/rezaies/moodle 2017-12-18 17:59:32 +01:00
David Monllao
4ea34b6d65 Merge branch 'MDL-61042-master' of git://github.com/junpataleta/moodle 2017-12-18 17:26:48 +01:00
David Monllao
7bce505885 Merge branch 'MDL-61040-master' of git://github.com/junpataleta/moodle 2017-12-18 17:24:52 +01:00
Eloy Lafuente (stronk7)
6663f615ed Merge branch 'wip-MDL-60161-master-test' of git://github.com/abgreeve/moodle 2017-12-18 16:09:51 +01:00
Matteo Scaramuccia
307dce6cf3 MDL-60793 mod_chat: Renamed 'system' into 'issystem' 
'system' is now a reserved word in MySQL 8.0.3+.
 2017-12-18 15:23:11 +01:00
David Monllao
f71a4993c7 Merge branch 'MDL-31521-master' of https://github.com/lucaboesch/moodle 2017-12-18 13:14:22 +01:00
Eloy Lafuente (stronk7)
10d22cceb5 Merge branch 'MDL-56932-master' of git://github.com/lameze/moodle 2017-12-18 11:40:17 +01:00
David Monllao
3bcf2d2895 Merge branch 'MDL-60858-master' of git://github.com/ryanwyllie/moodle 2017-12-18 11:34:47 +01:00
David Monllao
f41e1773e9 Merge branch 'MDL-61022-master' of git://github.com/damyon/moodle 2017-12-18 10:21:26 +01:00
David Monllao
ee35376e28 Merge branch 'wip-MDL-52100-master' of git://github.com/abgreeve/moodle 2017-12-18 10:07:46 +01:00
Andrew Nicols
b91696eeac Merge branch 'MDL-42676-master' of git://github.com/zig-moodle/moodle 2017-12-18 15:08:37 +08:00
Andrew Nicols
6cb535f081 Merge branch 'MDL-60061-master' of git://github.com/lameze/moodle 2017-12-18 14:03:47 +08:00
Adrian Greeve
c86189ae02 MDL-52100 filelib: Update to unit tests for maxbytes. 2017-12-18 13:12:22 +08:00
Adrian Greeve
48a9856da8 MDL-52100 filelib: Files that are oversized are checked with user. 
Files that are oversized could have been uploaded by a user who
can ignore the file size limits. These files should not be deleted
in these situations.
 2017-12-18 13:12:22 +08:00
Damyon Wiese
dcb623be71 Merge branch 'MDL-34389-subcategories-for-category-changer' of https://github.com/lucaboesch/moodle 2017-12-18 12:56:58 +08:00
Damyon Wiese
2d08e6565a Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle 2017-12-18 12:51:33 +08:00
Damyon Wiese
e95db3416c Merge branch 'MDL-54967-master' of git://github.com/zig-moodle/moodle 2017-12-18 12:43:50 +08:00
Damyon Wiese
8c2a7f9c38 Merge branch 'wip-MDL-49995-master' of git://github.com/marinaglancy/moodle 2017-12-18 11:35:29 +08:00
Andrew Nicols
560ae357a0 Merge branch 'MDL-57564-master-courseorder' of git://github.com/mudrd8mz/moodle 2017-12-18 11:04:20 +08:00
Julien Boulen
6c519fe4d7 MDL-60036 block_online_users: complete string about online users 
- add 3 varations of "x online users" string
- change string format from "x minutes: x online users" to "x online users (x minutes)"
- factorize some duplicated code
 2017-12-15 09:36:04 +01:00
Jun Pataleta
409da21320 MDL-61042 mod_lesson: Initialise pageid variable 2017-12-15 17:36:16 +13:00
Jun Pataleta
d766bbc5b9 MDL-58888 mod_choice: Sort choice_get_my_response() results by optionid 2017-12-15 15:55:48 +13:00
Jun Pataleta
3af40cc62e MDL-58888 mod_choice: Verify sorting when testing multiple selections 
* Improve test_choice_get_my_response() to verify the sorting of the
  responses returned by choice_get_my_response().
* Fix correct usage of choice_get_my_response().
 2017-12-15 15:53:11 +13:00
Zig Tan
e0d0f411cf MDL-54967 backup: Fix IMS CC import URL decoding for XML format 
HTML encoding special characters to avoid XML compatibility issues during
Course backup restoration and avoid double encoding.
 2017-12-15 09:19:31 +08:00
Jun Pataleta
07a46481fe MDL-61040 mod_choice: Save my choice button needs some space 2017-12-15 13:06:14 +13:00
Matteo Scaramuccia
e8be9e7646 MDL-60793 core_ddl: Added the new MySQL 8 reserved words 2017-12-14 22:46:48 +01:00
Luca Bösch
e00e36fa4f MDL-31521 questions: Allow more than one unit with multiplier equal to 1 2017-12-14 22:34:19 +01:00
Luca Bösch
f987df174f MDL-34389 course: switch to subcategory w/ course:changecategory perms 2017-12-14 22:32:23 +01:00
Eloy Lafuente (stronk7)
95b7be7f05 weekly release 3.5dev 2017-12-14 14:47:29 +01:00
Eloy Lafuente (stronk7)
10e52ed009 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-12-14 14:47:27 +01:00
AMOS bot
ebb250fefb Automatically generated installer lang files 2017-12-14 00:06:01 +00:00
Mark Nelson
464ddd07d5 MDL-43466 mod_assign: improve submission help text 
Thanks go to Rajneel Totaram for the report.
 2017-12-13 15:38:45 +08:00
Marina Glancy
10c71d8a2f MDL-31436 registration: do not send false in update request 2017-12-13 13:51:25 +08:00
Damyon Wiese
ff3e43eeb0 MDL-61022 recyclebin: Verify groups are restored 2017-12-13 13:34:07 +08:00
Ryan Wyllie
e236dc1446 MDL-60858 feedback: update behat tests for lang string change 2017-12-13 05:07:19 +00:00
Ryan Wyllie
85ce9b535b MDL-60858 feedback: remove ellipsis from form lang strings 
Remove the trailing ellipsis from the complete_the_form and
continue_the_form lang strings.
 2017-12-13 03:37:00 +00:00
Mitsuhiro Yoshida
97627d2783 MDL-60858 feedback: add button style for "Answer the questions" link. 2017-12-13 03:36:04 +00:00
Damyon Wiese
23611c3757 Merge branch 'MDL-60964-master' of git://github.com/ryanwyllie/moodle 2017-12-13 11:30:46 +08:00
Ryan Wyllie
08a7915551 MDL-60964 calendar: lazy load context for calendar_event 
Stop loading the context in the constructor if it hasn't been provided.
There is no need to load it by default. We should lazily load it when it
is required.
 2017-12-13 03:20:00 +00:00
Adrian Greeve
01957f1a69 MDL-60161 filelib: Unit test for duplicate curl headers. 2017-12-13 11:07:58 +08:00
Carson Tam
7d4a3d1d07 MDL-60161 class curl in filelib: Cleaned up doc block. 2017-12-13 11:07:58 +08:00
Carson Tam
a2b66c7833 MDL-60161 class curl in filelib: Avoid duplicate params in http header 2017-12-13 11:07:58 +08:00