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

19854 Commits

Author SHA1 Message Date
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)
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
Jun Pataleta
07a46481fe MDL-61040 mod_choice: Save my choice button needs some space 2017-12-15 13:06:14 +13: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
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
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
Marina Glancy
05cd2ff627 MDL-34161 mod_lti: backup and restore of submissions 2017-12-04 15:05:00 +08:00
Marina Glancy
6489a3d455 MDL-34161 mod_lti: backup/restore of lti types 
Only course tools are backed up, site tools and registrations
can be matched by id if they are restored to the same site only.

For predefined course tools the secret is backed up encrypted
and can be restored on the same site only.
 2017-12-04 15:04:56 +08:00
Tim Lock
edbcee25c1 MDL-34161 mod_lti: Added Behat tests 2017-12-04 15:03:44 +08:00
Gregory Faller
387a3a208a MDL-34161 mod_lti: Add support for restoring site tool 2017-12-04 15:03:44 +08:00
Eloy Lafuente (stronk7)
7ec475e2d7 MDL-59159 upgrade: remove unused functions/settings from upgradelib 
All these functions were used only by deleted upgrade steps
so it's safe to proceed with straight deletion, considering
them internal. Deletion has been documented in corresponding
upgrade.txt files:

- mod_feedback_upgrade_delete_duplicate_values()
- mod_feedback_upgrade_courseid()

These have been kept because they continue being used:

- @ install: make_competence_scale()
- @ restore: upgrade_course_letter_boundary()
 2017-12-04 01:42:01 +01:00
Eloy Lafuente (stronk7)
e4eba4c346 MDL-59159 upgrade: clean < 3.1.0 upgrade steps 
LTS (3.5) requires previous LTS (3.1)

This just deletes all the upgrade steps previous to 3.1.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.

Also includes an upgrade step to prevent upgrading from any
version < 2016052300 (v3.1.0) as anti-cheating measure.

Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
 2017-12-04 01:18:57 +01:00
Jun Pataleta
c1cd2924ec Merge branch 'MDL-60914_master' of git://github.com/markn86/moodle 2017-12-04 12:50:06 +13:00
Alexander Bias
ee73ec3d3c MDL-60219 lti: Replace pagelayout frametop with incourse 2017-11-29 09:54:42 +01:00
Jun Pataleta
a0de91e9a0 Merge branch 'MDL-50861-master' of git://github.com/junpataleta/moodle 2017-11-29 10:51:22 +13:00
Amy Groshek
e1eb4fb6d9 MDL-50861 mod_scorm: Add bootstrap btn classes to exit link 2017-11-29 10:44:13 +13:00
Eloy Lafuente (stronk7)
7445483873 Merge branch 'wip-MDL-60591-master' of git://github.com/marinaglancy/moodle 2017-11-28 22:35:58 +01:00
Eloy Lafuente (stronk7)
8c9eecdea7 Merge branch 'MDL-60682' of git://github.com/timhunt/moodle 2017-11-28 20:37:59 +01:00
Jun Pataleta
012398a8c2 Merge branch 'MDL-54693-quiz-override-help-icon' of https://github.com/lucaboesch/moodle 2017-11-28 20:10:08 +13:00
Damyon Wiese
d87a31d878 Merge branch 'MDL-53004-master' of https://github.com/lucaboesch/moodle 
Conflicts:
	mod/assign/styles.css
 2017-11-28 13:18:03 +08:00
Damyon Wiese
081ac91526 Merge branch 'MDL-24678-master-chat_get_latest_message' of https://github.com/bozoh/moodle 2017-11-28 12:14:08 +08:00
Damyon Wiese
2c3d8a06c8 Merge branch 'MDL-60669-master' of git://github.com/tobiasreischmann/moodle 2017-11-28 12:05:21 +08:00
Damyon Wiese
bdb157653b Merge branch 'MDL-60174-master' of https://github.com/sammarshallou/moodle 2017-11-28 11:38:40 +08:00
Mark Nelson
2a56a82c9b MDL-60914 mod_lti: ensure grade_update() is defined during upgrade 2017-11-28 11:37:00 +08:00
Jun Pataleta
49cbe666a4 Merge branch 'wip-MDL-60478-m35' of git://github.com/amygroshek/moodle 2017-11-28 13:25:51 +13:00
Eloy Lafuente (stronk7)
9d51d8e81f Merge branch 'MDL-60441_master' of git://github.com/juancs/moodle 2017-11-28 00:55:23 +01:00