73958 Commits

Author SHA1 Message Date
Dan Poltawski
d2a0482d17 Merge branch 'wip-MDL-50649-master' of git://github.com/marinaglancy/moodle 2015-07-27 11:57:52 +01:00
Dan Poltawski
53fb02da8e Merge branch 'MDL-50645_master' of git://github.com/dmonllao/moodle 2015-07-27 10:36:55 +01:00
Dan Poltawski
b0917db5ee Merge branch 'MDL-46398-master' of git://github.com/junpataleta/moodle 2015-07-27 10:26:25 +01:00
Andrew Nicols
0c8699c8a9 Merge branch 'MDL-46232-master' of git://github.com/FMCorz/moodle 2015-07-27 15:53:59 +08:00
Frederic Massart
a180d06cb8 MDL-46232 user: Handle bulk delete of users without email addresses 2015-07-27 15:47:39 +08:00
Marina Glancy
7cd401446d MDL-50649 report: query optimisation 2015-07-24 17:38:18 +08:00
Jun Pataleta
959dd36783 MDL-46398 medialib : Change media player ranks
Change player ranks for QT and HTML5 players so that the QT player will be
the fallback player for the playback of MP4, M4V and M4A files.
2015-07-24 15:54:45 +08:00
Dan Poltawski
6a51993e9f MDL-49434 availability: more bad whitespace 2015-07-22 23:58:12 +01:00
Dan Poltawski
e870b10343 MDL-49434 availability: fix trailing whitespace 2015-07-22 23:49:52 +01:00
Dan Poltawski
d84625438e weekly release 3.0dev 2015-07-22 20:42:54 +01:00
Dan Poltawski
f2d9f75875 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-07-22 20:42:52 +01:00
Marina Glancy
57ca231ad9 MDL-49434 availability: unit test adjustments 2015-07-22 12:49:22 +08:00
Andrew Nicols
12ae35433f Merge branch 'MDL-50563' of https://github.com/NeillM/moodle 2015-07-22 09:16:32 +08:00
Andrew Nicols
bb4ecc7423 Merge branch 'MDL-50762-master' of https://github.com/luryus/moodle 2015-07-22 09:12:05 +08:00
Andrew Nicols
944455b514 Merge branch 'MDL-50699-master' of https://github.com/pauln/moodle 2015-07-22 09:05:06 +08:00
Andrew Nicols
50834fa15f Merge branch 'MDL-50525' of https://github.com/andrewhancox/moodle 2015-07-22 08:55:05 +08:00
Andrew Nicols
6597994206 Merge branch 'MDL-50523' of https://github.com/andrewhancox/moodle 2015-07-22 08:16:36 +08:00
Dan Poltawski
8930d28254 MDL-50663 blocks: minor style fixes 2015-07-21 15:42:34 +01:00
Dan Poltawski
da001d4dba Merge branch 'MDL-50663-master' of https://github.com/sk-unikent/moodle 2015-07-21 15:40:10 +01:00
Dan Poltawski
8fb4743e1e Merge branch 'MDL-50293_master' of https://github.com/Syxton/moodle 2015-07-21 12:51:46 +01:00
Dan Poltawski
3dd2be1df7 Merge branch 'MDL-50427-master' of git://github.com/jleyva/moodle 2015-07-21 09:41:09 +01:00
Dan Poltawski
ca43103134 Merge branch 'MDL-50639_mod_book_fontsize_master' of https://github.com/barrysspace/moodle 2015-07-21 09:08:15 +01:00
Andrew Nicols
83bd7fcc89 Merge branch 'MDL-49618-master' of https://github.com/marinaglancy/moodle 2015-07-21 12:14:53 +08:00
Andrew Nicols
8aa8a7465b Merge branch 'MDL-49176_marking_guide' of git://github.com/davosmith/moodle 2015-07-21 11:25:42 +08:00
Andrew Nicols
fd05c11399 Merge branch 'MDL-47230_master' of https://github.com/barrysspace/moodle 2015-07-21 11:11:52 +08:00
Andrew Nicols
31cd898ce7 Merge branch 'wip-MDL-41650-master' of https://github.com/marinaglancy/moodle 2015-07-21 09:29:11 +08:00
Andrew Nicols
7b8d4f4005 Merge branch 'MDL-49434-master' of https://github.com/sammarshallou/moodle 2015-07-21 08:13:19 +08:00
Andrew Hancox
c3f38fa686 MDL-50523 mod_assign: Conditionally disable activity setting
On activity settings form if "Students submit in groups" is set to no then
disable "Require group to make submission" setting.
2015-07-20 19:45:02 +01:00
Andrew Hancox
b11e24ba7d MDL-50525 mod_assign: Moved preventsubmissionnotingroup
Moved preventsubmissionnotingroup to between teamsubmission and
requireallteammemberssubmit to keep all settings related to
group submissions together.
2015-07-20 19:43:26 +01:00
David Monllao
592ea4b975 MDL-50645 cache: get_plugins_with_function for more than one plugintype 2015-07-20 20:22:04 +02:00
David Monllao
9effa14810 MDL-50645 cache: New plugin_functions cache
Improves memory usage as we don't need to include all files every time we want
to see if any plugin supports a callback.
2015-07-20 20:21:07 +02:00
Dan Poltawski
2e934446c8 Merge branch 'MDL-49440_master' of https://github.com/crazyserver/moodle 2015-07-20 14:02:55 +01:00
Dan Poltawski
641e3c4346 Merge branch 'wip-MDL-50678-master' of git://github.com/marinaglancy/moodle 2015-07-20 13:53:47 +01:00
Dan Poltawski
0c59bb747d Merge branch 'MDL-50673-master-workshop-submissions' of git://github.com/mudrd8mz/moodle 2015-07-20 11:20:12 +01:00
Dan Poltawski
d44ae46632 Merge branch 'wip-MDL-50612-master' of https://github.com/marinaglancy/moodle 2015-07-20 10:12:16 +01:00
Dan Poltawski
8bdb261a31 Merge branch 'MDL-49582-master' of https://github.com/lucisgit/moodle 2015-07-20 08:23:22 +01:00
Juan Leyva
0b9fc18ba1 MDL-50427 mod_scorm: Rename scorm_view_display to scorm_print_launch
In order to avoid confusion with the new scorm_view fuction
2015-07-20 09:15:44 +02:00
Juan Leyva
e9bf301145 MDL-50427 mod_scorm: New Web Service mod_scorm_view_scorm 2015-07-20 09:15:44 +02:00
Juan Leyva
ade341deb2 MDL-50427 mod_scorm: Move logging and completion to new API 2015-07-20 09:13:42 +02:00
AMOS bot
1b084d9215 Automatically generated installer lang files 2015-07-20 00:04:59 +08:00
apsdehal
aba6e0bfe9 MDL-41650 Tags: Changed css classes of errors and success notice 2015-07-19 20:21:47 +08:00
AMOS bot
118cd37ab6 Automatically generated installer lang files 2015-07-18 00:05:18 +08:00
Lauri Koskela
e225a665ff MDL-50762 tool_capability: Do not hide first capability in list 2015-07-17 15:28:37 +03:00
Neill Magill
2c9aca8a45 MDL-50563 blocks: A hidden block that is dropped should be dimmed
Before this patch when dragging and dropping a hidden block it would display as though visible when it was dropped.

This is only a display issue, as a page refresh caused it to be dimmed in its new position.
2015-07-17 09:25:38 +01:00
Barry Oosthuizen
545e415802 MDL-50639 mod_book: Remove 0.8em font sizes 2015-07-17 08:47:07 +01:00
David Mudrák
a81b4cab22 MDL-50673 workshop: Fix some coding style violations 2015-07-16 19:44:06 +02:00
David Mudrák
65ba4cdad2 MDL-50673 workshop: Fix the way how submissions are counted
The count_submissions() method does not take the actual enrolment into
account. It is part of the API that looks on all existing data
regardless the actual status of their owner. The author of the
submission may be unenrolled or suspended, in which case they are not
displayed in the report and we would get wrong figures.
2015-07-16 19:41:16 +02:00
M Kassaei
bfde810a8b MDL-50673 workshop: Display all participants during submission phase
This patch adds a new report to be displayed during the submission
phase. The report displays all participants who are supposed to submit
their work into the workshop and the status of their submission.
2015-07-16 19:21:37 +02:00
AMOS bot
29c05319e5 Automatically generated installer lang files 2015-07-17 00:04:58 +08:00
Syxton
483fb4ec44 MDL-50293 navigation: File name not wrapping
A long File name doesn't always wrap correctly in the Navigation block.
2015-07-16 10:26:19 -04:00