mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-08 18:03:19 +02:00
Code Issues Projects Releases Wiki Activity
81,692 Commits 36 Branches 530 Tags
Commit Graph

18583 Commits

Author SHA1 Message Date
David Monllao
fd887df697 Merge branch 'MDL-56888-master-workshop-leap2a' of git://github.com/mudrd8mz/moodle 2016-11-14 15:01:21 +08:00
Andrew Nicols
622c84f630 Merge branch 'MDL-56853-master' of git://github.com/damyon/moodle 2016-11-14 14:36:45 +08:00
David Monllao
3ecf492a75 Merge branch 'MDL-56811-master' of git://github.com/damyon/moodle 2016-11-11 12:13:30 +08:00
Andrew Nicols
a044ff57a1 Merge branch 'MDL-52216_master' of https://github.com/eugeneventer/moodle-fixes 2016-11-11 11:21:26 +08:00
Adrian Greeve
f65db49765 MDL-56363 mod_assign: Restrictions added for tutors. 
If the grader does not have the accessallgroups capability,
or groups mode is set to separate groups and the user is not
a member of the group then no participants are shown.
 2016-11-11 00:28:33 +01:00
Eugene Venter
dbd8cadb5c MDL-52216 mod_lesson: prevent invalid view modes 2016-11-11 09:19:37 +13:00
Dan Poltawski
6063f62e7d Merge branch 'MDL-56725-master' of git://github.com/damyon/moodle 2016-11-10 15:37:38 +00:00
Dan Poltawski
a3ead7172b Merge branch 'MDL-55249_m32v1' of https://github.com/sbourget/moodle 2016-11-10 15:01:41 +00:00
David Mudrák
48ea715da0 MDL-56888 workshop: Fix Leap2A export of the workshop submission 
The whole story described in the tracker. Shortly, Mahara seems to have
a bug (or undocumented feature) that it expects the Leap2A content
wrapped in a single container.
 2016-11-10 15:30:11 +01:00
Damyon Wiese
930ce60550 MDL-56725 mod_data: better field alignment 
Labels containing only accesshide text should have the accesshide class
on the label, not the content so the label does not push the content
down.
 2016-11-10 16:25:48 +08:00
Damyon Wiese
398be7c897 MDL-56725 mod_data: coding style 
Fixes from lines in the previous commit.
 2016-11-10 16:21:01 +08:00
Damyon Wiese
e85fda95c6 MDL-56725 mod_data: Style fixes for boost theme 2016-11-10 16:21:01 +08:00
Damyon Wiese
16076f1e3d MDL-56811 forum: Auto create the latest news forum 
When a course is created or updated, create a news forum if the
newsitems setting is > 0.
 2016-11-10 13:51:02 +08:00
Andrew Nicols
3302e8bfa5 Merge branch 'MDL-56820-master' of https://github.com/snake/moodle 2016-11-10 12:20:17 +08:00
Jake Dallimore
700ef87691 MDL-56820 themes: Fix user search drop down on grading page for boost 
Fixes a problem where the drop down list is cut off by overflow.
 2016-11-10 11:45:59 +08:00
David Monllao
af49935a53 Merge branch 'MDL-56753-master' of git://github.com/lameze/moodle 2016-11-10 11:38:24 +08:00
Simey Lameze
763f7b05ae MDL-56753 mod_assign: behat tests for groups and grouping counting 2016-11-10 11:09:37 +08:00
Andrew Nicols
96eba6b982 Merge branch 'MDL-55883_m32v1' of https://github.com/sbourget/moodle 2016-11-10 11:06:11 +08:00
Simey Lameze
426bb5ae0f MDL-56753 mod_assign: fix groups and submitted counting on grading summary 
This also fixes a coding error that was displayed when a group was not part of
assignment grouping.
 2016-11-10 10:58:29 +08:00
Andrew Nicols
743f9c8c42 Merge branch 'wip-mdl-56840' of https://github.com/rajeshtaneja/moodle 2016-11-10 09:38:26 +08:00
Andrew Nicols
a2567336df Merge branch 'MDL-56755-m' of https://github.com/micaherne/moodle 2016-11-09 15:42:32 +08:00
Andrew Nicols
4cc6477198 Merge branch 'MDL-56790-master' of git://github.com/damyon/moodle 2016-11-09 15:40:16 +08:00
Rajesh Taneja
d514d25e0a
MDL-56630 behat: Click on link in specificed block/region 2016-11-09 13:56:49 +08:00
Rajesh Taneja
26ca972e9e
MDL-56840 behat: Wait till pdf conversion progress is finished 2016-11-09 13:39:00 +08:00
Damyon Wiese
ba4173384d MDL-56853 mod_folder: Review styles in boost 
Remove random center-alignment and put buttons on a single line.
 2016-11-09 13:35:08 +08:00
David Monllao
6e986b2919 Merge branch 'mdl-54852-master' of https://github.com/Dagefoerde/moodle 2016-11-09 13:07:26 +08:00
Andrew Nicols
16f9660cfe Merge branch 'MDL-56196-master' of git://github.com/damyon/moodle 2016-11-09 11:59:02 +08:00
Damyon Wiese
50302c404a MDL-56790 boost: Styling fixes for mod_feedback 
Also fixed are problems with frozen select from elements showing raw
HTML. I checked the other form templates for similar problems and fixed
them all.
 2016-11-09 11:29:58 +08:00
Rajesh Taneja
e4c98de168
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 18:06:09 +08:00
Michael Aherne
db8514bcff MDL-56755 assign: Improve documentation of assign::get_grade_item() 2016-11-08 08:58:31 +00:00
David Monllao
d72c9774ae Merge branch 'wip-mdl-56630' of git://github.com/rajeshtaneja/moodle 2016-11-08 14:47:25 +08:00
Rajesh Taneja
dc90838aaa
MDL-56630 behat: Click on link in specificed block/region 2016-11-08 14:45:43 +08:00
Damyon Wiese
9280f62e38 MDL-56196 mod_lti: Fix popups and secret form in boost 2016-11-08 14:27:26 +08:00
Rajesh Taneja
eaefd5bc57
MDL-55215 behat: autocomplete field requires javascript 2016-11-08 14:21:52 +08:00
Frédéric Massart
3d979f9676 MDL-56196 mod_lti: Adapt templates for both Boost and Clean 2016-11-08 14:11:14 +08:00
Ilya Tregubov
f67f5f0245 MDL-29795 assign: add missing sortorder column for overrides when backing up a course 2016-11-08 13:23:22 +11:00
Jan Dageförde
f928c24dcc MDL-54852 assignment: Suppress "leave page" warning after save 
If the user navigates away from the grading page immediately
after saving the grading form, the browser warning can be
safely omitted, as there are no unsaved changes. This is achieved
by calling `reset_form_dirty_state()` of the core_formchangechecker
YUI module, which is responsible for the warning.
 2016-11-07 10:35:06 +01:00
Andrew Nicols
f1b018f511 Merge branch 'MDL-55215-master-fix2' of http://github.com/damyon/moodle 2016-11-07 15:01:46 +08:00
Damyon Wiese
737b54fe9e MDL-55215 lesson: JS is required for some lesson behats 
Lesson is using the searchselector which only supports JS - so some
tests need javascript tags.

Also fixed support for filling a passwordunmask field with JS enabled by
id.
 2016-11-07 14:23:46 +08:00
David Monllao
2a9275601a Merge branch 'master_MDL-54575' of git://github.com/danmarsden/moodle 2016-11-07 13:58:04 +08:00
Marina Glancy
2a63c0b1c2 MDL-38158 media: missing require and videojs fallback 
Problems picked up by behat tests
 2016-11-07 09:22:32 +08:00
David Monllao
b667a67c47 MDL-29795 mod_assign: Remove empty line 2016-11-07 09:22:02 +08:00
David Monllao
cf4019cf40 Merge branch 'MDL-29795_master' of https://github.com/dmonllao/moodle 2016-11-07 09:20:59 +08:00
David Monllao
325ac748b2 MDL-29795 behat: Narrow Edit link scope 2016-11-07 09:19:41 +08:00
Andrew Nicols
0e5db67d8e Merge branch 'MDL-55215-master' of git://github.com/damyon/moodle 2016-11-07 09:04:34 +08:00
Eloy Lafuente (stronk7)
6e29346609 Merge branch 'wip-MDL-38158-master' of https://github.com/marinaglancy/moodle 2016-11-06 02:11:19 +01:00
Dan Poltawski
1e1e4ff8e5 Merge branch 'MDL-56535-master' of git://github.com/jleyva/moodle 2016-11-04 14:10:48 +00:00
Marina Glancy
fab11235d8 MDL-38158 core_media: Convert media players to new plugin type 
AMOS BEGIN
  MOV [siteyoutube,core_media],[pluginname,media_youtube]
  MOV [siteyoutube_desc,core_media],[pluginname_help,media_youtube]
  MOV [sitevimeo,core_media],[pluginname,media_vimeo]
  MOV [sitevimeo_desc,core_media],[pluginname_help,media_vimeo]
  MOV [html5audio,core_media],[pluginname,media_html5audio]
  MOV [html5audio_desc,core_media],[pluginname_help,media_html5audio]
  MOV [html5video,core_media],[pluginname,media_html5video]
  MOV [html5video_desc,core_media],[pluginname_help,media_html5video]
  MOV [flashanimation,core_media],[pluginname,media_swf]
  MOV [flashanimation_desc,core_media],[pluginname_help,media_swf]
AMOS END
 2016-11-04 17:30:40 +08:00
Jun Pataleta
17f63d18a5 MDL-46903 mod_scorm: Apply alias to compare text column 2016-11-04 13:32:24 +08:00
David Monllao
e1074d6ffd Merge branch 'master_MDL-46903' of https://github.com/danmarsden/moodle 2016-11-04 08:24:43 +08:00