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
81,530 Commits 36 Branches 527 Tags
Commit Graph

18545 Commits

Author SHA1 Message Date
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
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
Andrew Nicols
bc378b50ec Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle 2016-11-03 14:08:21 +08:00
Dan Poltawski
56f763b1f9 Merge branch 'MDL-55841-master' of https://github.com/xow/moodle 2016-11-02 15:24:33 +00:00
Andrew Nicols
0c6fa2e9a8 Merge branch 'MDL-56698-master' of git://github.com/damyon/moodle 2016-11-02 15:34:06 +08:00
Damyon Wiese
a5d4b54890 MDL-56698 mod_feedback: Make it look ok in boost 2016-11-02 15:25:18 +08:00
Simey Lameze
1d9356d7e9 MDL-56671 mod_scorm: fix styling issues on scorm module 2016-11-02 14:57:13 +08:00
David Monllao
93dfcf3274 Merge branch 'MDL-56670-master' of git://github.com/lameze/moodle 2016-11-02 13:29:46 +08:00
Simey Lameze
6e4b3752f2 MDL-56670 mod_lesson: adds padding to end of lesson links 2016-11-02 13:12:32 +08:00
David Monllao
e14f5db6a0 Merge branch 'wip-MDL-55930-master' of https://github.com/Beedell/moodle 2016-11-02 12:49:46 +08:00
David Monllao
a5f53db190 Merge branch 'MDL-43796_master_blindmarking' of https://github.com/SWiT/moodle 2016-11-02 12:28:43 +08:00
David Monllao
f5d9072e51 Merge branch 'MDL-56462-master' of git://github.com/damyon/moodle 2016-11-02 09:14:09 +08:00
Dan Poltawski
b7959d831d Merge branch 'MDL-54112-master' of https://github.com/hcpss-banderson/moodle 2016-11-01 21:31:04 +00:00
Dan Poltawski
777760b6ae Merge branch 'master_MDL-47500' of git://github.com/danmarsden/moodle 2016-11-01 21:29:32 +00:00
Juan Leyva
30861fbdaa MDL-56535 forum: Do not return user information in single discussion 
This patch fixes the forum external functions
 2016-11-01 20:52:58 +00:00
John Beedell
7983265241 MDL-55930 Quiz: "Next page button" showing in sequential mode 2016-11-01 11:22:39 +00:00
Adrian Greeve
839b391f74 MDL-56489 Lib: force_settings_menu added to pagelib. 
This introduces a flag to force the settings menu
to be displayed on the page if the theme uses a settings
menu. This is for use by activities and resources.
 2016-11-01 10:00:12 +08:00
Dan Marsden
3dc868478b MDL-54575 scorm: fix typo in data_preprocessing function 
thanks to Mike Finch for the patch/report.
 2016-11-01 12:11:54 +13:00
Dan Marsden
a2096721c7 MDL-46903 scorm: Fix db error in objectives report for oracle. 
also improve 2004 report handling to help with testing.
 2016-11-01 12:05:35 +13:00
Eloy Lafuente (stronk7)
a1f6a27c80 Merge branch 'MDL-47162' of git://github.com/merrill-oakland/moodle 2016-10-31 22:45:37 +01:00
Eric Merrill
880fc15bf0 MDL-47162 core_message: Updating all uses of messaging to add courseid 2016-10-31 14:13:13 -04:00
Dan Poltawski
f2263f7c06 Merge branch 'MDL-56542-master-enfix' of git://github.com/mudrd8mz/moodle 2016-10-31 15:15:09 +00:00
Andrew Nicols
711e2ab184 Merge branch 'MDL-56583-master' of git://github.com/crazyserver/moodle 2016-10-31 13:42:46 +08:00
Pau Ferrer Ocaña
1f84c2c5ea MDL-56638 assign: Don't check sesskey using submit_grading_form from WS 2016-10-28 13:44:19 +02:00
Adrian Greeve
9715f61a26 MDL-44467 lib: Fix return path to noreply. 
Added code to show emails from users on controlled domains.
Moved admin settings from message_email to admin.
 2016-10-28 13:27:00 +08:00
Damyon Wiese
f7ed5cee30 MDL-56171 javascript: Make searchableselector wrap autocomplete 
One less yui module.

Conflicts:
	lib/upgrade.txt
 2016-10-28 13:13:22 +08:00
Simey Lameze
253ae23058 MDL-44467 core: always send email from noreplyaddress 2016-10-28 13:04:09 +08:00
Damyon Wiese
58488d0ff0 MDL-56462 boost: Fix assign grading options form 
Classes attribute was not being honoured by all form element templates.
Formchangechecker was only looking for the ignoredirty class on the element,
in boost it is on the container.
Assign had specific styles to hide the submit buttons that were not matching in boost.
 2016-10-28 12:24:50 +08:00
Brian Barnes
ea6763e421 MDL-47500 scorm: improved height calculation 2016-10-28 13:41:18 +13:00
Eric Merrill
9d0e8a4f6d MDL-47162 core_message: Remove changes to small messages 2016-10-27 18:12:43 +02:00
Eric Merrill
0e8b51607b MDL-47162 core_message: Cleanup of messaging course ids code 2016-10-27 18:12:42 +02:00
Amanda Doughty
cc350fd9c8 MDL-47162 core_message: Add course id to message eventdata 2016-10-27 18:11:27 +02:00
Brendan Anderson
c28c76450b MDL-54112 mod_assign: Add scale null grade filter 2016-10-27 09:58:56 -04:00
Pau Ferrer Ocaña
59111fa937 MDL-56583 assign: Add info about the user submission capability 2016-10-27 15:40:03 +02:00
John Okely
3a5e14a5d0 MDL-55841 mod_lti: Improve interface usability & consistency 
* Always say "Tool URL"
* Add help strings to cartridge interface
 2016-10-27 17:13:22 +08:00
Kenneth Hendricks
e47c002c75 MDL-29795 assign: Tweak user-info section in grader view 
- also mirror due date removal in boost template
 2016-10-27 17:09:58 +11:00
Kenneth Hendricks
84a303b5d2 MDL-29795 assign: Fix mustache template 2016-10-27 15:52:28 +11:00
Kenneth Hendricks
eeaefbb850 MDL-29795 assign: Add 'Duplicate override' breadcrumb 2016-10-27 14:10:43 +11:00