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

19875 Commits

Author SHA1 Message Date
David Monllao
d41203c55f Merge branch 'MDL-61045' of git://github.com/timhunt/moodle 2017-12-19 06:43:17 +01:00
Simey Lameze
7a1a9ec635 MDL-57431 mod_quiz: remove unnecessary class from selector 2017-12-19 12:47:43 +08:00
Damyon Wiese
b260dec8b7 Merge branch 'MDL-59999-master' of git://github.com/mihailges/moodle 2017-12-19 10:49:36 +08:00
Jun Pataleta
3e882c418b Merge branch 'MDL-59709_master' of https://github.com/marcusfabriczy/moodle 2017-12-19 13:21:35 +13:00
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
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
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
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
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
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
Damyon Wiese
2d08e6565a Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle 2017-12-18 12:51:33 +08:00
Mihail Geshoski
a86b75608a MDL-59999 lesson: Boost grade essays page not indicating grade status 
AMOS BEGIN
    CPY [graded,assign],[graded,lesson]
    CPY [notgraded,assign],[notgraded,lesson]
AMOS END
 2017-12-18 09:14:11 +08:00
Tim Hunt
06b4ab81a8 MDL-61045 quiz settings: add back missing disabledIf 
This got broken in Moodle 2.1 by MDL-20636.
 2017-12-15 13:11:57 +00: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
Jun Pataleta
07a46481fe MDL-61040 mod_choice: Save my choice button needs some space 2017-12-15 13:06:14 +13: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
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
Simey Lameze
3bf572411a MDL-56932 theme_boost: fix quiz max mark input height 2017-12-13 10:21:17 +08:00
Simey Lameze
cadeb8d21c MDL-60061 mod_scorm: add unit tests for drag/drop 2017-12-12 15:15:09 +08:00
Simey Lameze
f808e0432a MDL-60061 mod_scorm: add support for drag/drop events 
AMOS BEGIN
	CPY [openafterclose,mod_choice],[openafterclose,mod_scorm]
AMOS END
 2017-12-12 15:15:09 +08:00
Damyon Wiese
302104af4b Merge branch 'MDL-60920-master' of https://github.com/lucaboesch/moodle 2017-12-12 11:39:20 +08:00
Jun Pataleta
9244faa3a4 Merge branch 'MDL-59766-master' of git://github.com/damyon/moodle 2017-12-12 16:26:34 +13:00
Damyon Wiese
57fe6616a8 Merge branch 'MDL-52538-master' of git://github.com/mihailges/moodle 2017-12-12 10:40:15 +08:00
Damyon Wiese
39377f8083 Merge branch 'MDL-44667-master' of https://github.com/snake/moodle 2017-12-12 10:26:08 +08:00
Mathew May
aa6b85d2b7 MDL-57431 mod_quiz: Quiz editing help icon fix 2017-12-12 09:56:05 +08:00
Zig Tan
6901981962 MDL-42676 mod_assign: Display message fix when using grade override 
Logic fix in mod_assign locallib.php to correctly set the submissionlockedstatus,
and added associated unit test in test_grade_submission_override()
 2017-12-12 09:01:35 +08:00
Mihail Geshoski
2034f57fe1 MDL-52538 lesson: Grade info displayed while ongoing score disabled 2017-12-12 08:54:51 +08:00
Simey Lameze
97f4556a94 MDL-60750 mod_quiz: only apply form css rules on clean theme 2017-12-11 16:56:06 +08:00
Damyon Wiese
67c0e18ca2 Merge branch 'MDL-60057-master' of git://github.com/lameze/moodle 2017-12-11 14:54:46 +08:00
Simey Lameze
5c1ea9aea5 MDL-60057 mod_lesson: add unit tests for callbacks 2017-12-11 14:45:04 +08:00
Simey Lameze
f077e0af7e MDL-60057 mod_lesson: add calendar drag and drop callbacks 
AMOS BEGIN
        CPY [openafterclose,mod_choice],[openafterclose,mod_lesson]
	CPY [closebeforeopen,mod_choice],[closebeforeopen,mod_database]
	CPY [openafterclose,mod_choice],[openafterclose,mod_database]
AMOS END
 2017-12-11 14:29:16 +08:00
Simey Lameze
61ac58a887 MDL-60060 mod_data: add unit tests for callbacks 2017-12-11 14:05:00 +08:00
Simey Lameze
5e401a2a51 MDL-60060 mod_data: add calendar drag and drop callbacks 2017-12-11 14:05:00 +08:00
Marcus Fabriczy
e7ec2f901b MDL-59709 mod_assign: Export to portfolio button not working 
Changed the button to a text link
 2017-12-10 13:47:47 +10:30
Luca Bösch
41d335f31a MDL-60920 quiz: removed legacy "edit questions" button 2017-12-08 14:13:05 +01:00
Andrew Nicols
e3b699eab7 Merge branch 'MDL-59159' of git://github.com/stronk7/moodle 2017-12-06 19:53:36 +13:00
Jun Pataleta
f013112752 Merge branch 'wip-MDL-34161-master' of git://github.com/marinaglancy/moodle 2017-12-06 19:53:33 +13:00
Jake Dallimore
3112c22004 MDL-44667 database: fix incorrect usages of $DB->get_field 
Some places were passing 5 params, meaning the strictness param was
lost. This fixes those usages.
 2017-12-04 16:53:51 +08:00
Damyon Wiese
713a2cbb25 Merge branch 'MDL-60219-master' of https://github.com/abias/moodle 2017-12-04 16:28:16 +08:00