Andrew Nicols
38036e73c2
Merge branch 'MDL-53808-master' of git://github.com/cescobedo/moodle
2018-07-17 11:34:59 +08:00
Andrew Nicols
4a91bd6f62
Merge branch 'MDL-62849-master' of git://github.com/abgreeve/moodle
2018-07-17 10:31:29 +08:00
Adrian Greeve
f38766e166
MDL-62849 files lib: Add method to return all files.
...
Added a function which returns all the files from all directories
in the draftarea.
2018-07-17 10:25:11 +08:00
David Monllao
c6f64c217d
Merge branch 'MDL-52953-master' of git://github.com/abgreeve/moodle
2018-07-16 14:17:56 +02:00
David Monllao
aa59fb2ea2
Merge branch 'MDL-49025' of https://github.com/NeillM/moodle
2018-07-16 13:34:57 +02:00
David Monllao
011c1a4291
Merge branch 'MDL-61019-master' of https://github.com/lucaboesch/moodle
2018-07-16 13:25:06 +02:00
Andrew Nicols
bfeef10af0
Merge branch 'MDL-45851' of git://github.com/timhunt/moodle
2018-07-16 13:10:24 +08:00
Jake Dallimore
c6150f1104
Merge branch 'MDL-45389-master' of https://github.com/lucaboesch/moodle
2018-07-16 10:11:40 +08:00
Neill Magill
650779d609
MDL-49025 assign: Submissions of an empty directory should not save
...
Before this change if only a folder was submitted the submission_is_empty
check would return true. This meant that the draft area would be saved.
The is_empty check would then be called which would return false. This
caused the submission form to indicate to the user that the submission
had failed.
Now is_empty and submission_is_empty should both return false if only
folders are submitted.
2018-07-13 14:03:42 +01:00
Neill Magill
3ebfab9810
MDL-49025 assign: Test than an empty directory will not submit
2018-07-13 14:03:41 +01:00
Luca Bösch
9004441b7b
MDL-61019 Theme boost: lesson display issues with buttons/progress bar.
2018-07-13 09:27:06 +02:00
Luca Bösch
5cb24d2299
MDL-45389 theme_bootstrapbase: Forum index page alignment in clean.
2018-07-13 09:26:47 +02:00
Jake Dallimore
8c51626841
weekly release 3.6dev
2018-07-13 12:26:07 +08:00
Jake Dallimore
856602d992
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2018-07-13 12:26:05 +08:00
David Monllao
2a021ac3a0
Merge branch 'MDL-62618-master' of git://github.com/mickhawkins/moodle
2018-07-11 18:47:57 +02:00
David Monllao
c2164bff0d
Merge branch 'MDL-47899-master' of https://github.com/lucaboesch/moodle
2018-07-11 12:29:23 +02:00
David Monllao
fd2b5d5c63
MDL-59599 navigation: Respect previous activity-level navigation
...
The original patch was overwriting grading methods navigation.
All credit goes to Andrew Nicols.
2018-07-11 12:01:08 +02:00
Luca Bösch
aab977e0ce
MDL-47899 forms: course search form info list bullet points alignment.
...
AMOS BEGIN
MOV [searchhelp,moodle],[coursesearch_help,moodle]
AMOS END
2018-07-11 11:58:14 +02:00
cescobedo
437ffc9f46
MDL-53808 external_api: Remove external_function_info
2018-07-11 11:11:33 +02:00
Adrian Greeve
28d0d12f5f
MDL-52953 tool_log: Deprecation of the legacy log store.
2018-07-11 09:45:52 +08:00
Jake Dallimore
98a09721d7
Merge branch 'MDL-62712-master' of https://github.com/HuongNV13/moodle
2018-07-11 09:02:15 +08:00
Andrew Nicols
034e9ce5cd
Merge branch 'MDL-52318-master' of https://github.com/snake/moodle
2018-07-11 08:33:13 +08:00
Andrew Nicols
124cd929fb
Merge branch 'MDL-62026-master' of git://github.com/junpataleta/moodle
2018-07-11 08:13:11 +08:00
David Monllao
76dbb5884d
Merge branch 'MDL-62262-master' of https://github.com/lucaboesch/moodle
2018-07-10 13:30:17 +02:00
David Monllao
e7941ae3e9
Merge branch 'MDL-62823' of https://github.com/NeillM/moodle
2018-07-10 11:43:37 +02:00
David Monllao
58b987282e
Merge branch 'MDL-42818-master' of git://github.com/zig-moodle/moodle
2018-07-10 11:31:24 +02:00
Andrew Nicols
5a0a8686e3
Merge branch 'MDL-61578-master' of git://github.com/mickhawkins/moodle
2018-07-10 16:45:55 +08:00
Huong Nguyen
0b245bf390
MDL-62712 Filepicker: Improve upload process
...
Lost the uploading file when user press Submit before upload process has done
2018-07-10 15:18:45 +07:00
David Monllao
147b4f3dee
Merge branch 'MDL-61110_master' of https://github.com/nadavkav/moodle
2018-07-10 09:59:06 +02:00
David Monllao
debbed03ed
Merge branch 'MDL-62814-master' of https://github.com/HuongNV13/moodle
2018-07-10 07:50:45 +02:00
David Monllao
cbc67cba73
Merge branch 'MDL-62533-master' of git://github.com/zig-moodle/moodle
2018-07-10 07:37:19 +02:00
Jun Pataleta
0433707f7b
MDL-62026 tool_dataprivacy: Behat tests for contacting PO
2018-07-10 12:31:08 +08:00
Jun Pataleta
ef7f7cfdf8
MDL-62026 tool_dataprivacy: Allow manual completion of general enquiries
2018-07-10 12:30:56 +08:00
Andrew Hancox
820f28c61b
MDL-61578 backup: Added unit test for is_course_modified check.
2018-07-10 10:50:30 +08:00
Michael Hawkins
4b9c2928d4
MDL-61578 backup: Prevent backup logging triggering fresh backups.
...
Thanks to Renaat Debleu for their contribution to this solution.
2018-07-10 10:50:30 +08:00
Andrew Nicols
39650bc12f
Merge branch 'MDL-62746-master' of git://github.com/junpataleta/moodle
2018-07-10 09:33:05 +08:00
Jake Dallimore
793fe5fc4c
Merge branch 'MDL-62772-master_always_show_disclosure' of https://github.com/jmcgettrick/moodle
2018-07-10 08:59:34 +08:00
David Monllao
1ef11d5182
Merge branch 'MDL-62753' of https://github.com/OdyX/moodle
2018-07-09 15:15:40 +02:00
David Monllao
6ce50554ee
Merge branch 'MDL-56881-master' of https://github.com/snake/moodle
2018-07-09 14:38:19 +02:00
David Monllao
5edfece170
Merge branch 'MDL-62037-master' of https://github.com/lethevinh/moodle
2018-07-09 13:48:47 +02:00
David Monllao
381bb72153
Merge branch 'MDL-62831-master' of git://github.com/damyon/moodle
2018-07-09 13:36:05 +02:00
David Monllao
6af4e08333
MDL-59599 navigation: Strict zero-position comparision
2018-07-09 12:27:25 +02:00
David Monllao
727592291b
Merge branch 'MDL-59599-master' of https://github.com/Kathrin84/moodle
2018-07-09 11:58:53 +02:00
John McGettrick
9481cc0e06
MDL-62772 mod_assign: Show disclosure for all submitters
2018-07-09 09:26:38 +01:00
Jake Dallimore
3143160204
Merge branch 'MDL-62180-master' of https://github.com/lucaboesch/moodle
2018-07-09 15:46:25 +08:00
Andrew Nicols
8dfafebc13
Merge branch 'MDL-33509-master' of git://github.com/mihailges/moodle
2018-07-09 13:52:31 +08:00
Andrew Nicols
a31b3cf30b
Merge branch 'MDL-62808_master' of git://github.com/markn86/moodle
2018-07-09 13:29:29 +08:00
Andrew Nicols
2f6f156a8f
MDL-56093 auth_db: Remove issue no. from comment
2018-07-09 12:14:17 +08:00
Andrew Nicols
33d2796f0a
Merge branch 'MDL_56093' of https://github.com/eledia/moodle
2018-07-09 12:13:58 +08:00
Jake Dallimore
545a1382aa
Merge branch 'MDL-61359-master' of git://github.com/mickhawkins/moodle
2018-07-09 12:10:33 +08:00