moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
81178 commits 37 branches 540 tags 1.3 GiB
Commit graph

81178 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
8e13213427 Merge branch 'MDL-56436-master' of git://github.com/danpoltawski/moodle 2016-10-18 11:21:31 +02:00
David Monllao
d244cf1fd7 MDL-56277 theme_boost: Converting EOLs to unix style 2016-10-18 17:14:11 +08:00
Juan Leyva
43d8e805bb MDL-56159 webservice: Tolerate exceptions in the get_autologin_key ws 2016-10-18 09:44:10 +01:00
Juan Leyva
80e0f0b85b MDL-56159 webservice: Improve not fully setup and missing pwd checks 
Removing the check in login/token.php is secure since the
auth_forcepasswordchange is checked in require_login that is called via
validate_context.
The user must be able to get a token even if that setting is on. With
that token we’ll redirect the user to the site or we’ll change the
password when a new WS for that is available.
 2016-10-18 09:44:09 +01:00
David Monllao
b7676ef92c Merge branch 'MDL-56277-master' of git://github.com/FMCorz/moodle 2016-10-18 16:33:21 +08:00
Eloy Lafuente (stronk7)
2017a60e11 MDL-55175 course: Fix typo & parenthesis 2016-10-18 10:12:30 +02:00
Eloy Lafuente (stronk7)
1f89aba18f Merge branch 'MDL-55175-master-2' of git://github.com/andrewnicols/moodle 2016-10-18 10:12:29 +02:00
David Monllao
3ac4a74777 Merge branch 'MDL-56328-M32' of git://github.com/lazydaisy/moodle 2016-10-18 16:05:53 +08:00
Eloy Lafuente (stronk7)
5dea1f12fc Merge branch 'MDL-56345-master' of https://github.com/lucisgit/moodle 2016-10-18 09:37:47 +02:00
David Monllao
51607c7ea3 Merge branch 'MDL-56214-master' of git://github.com/FMCorz/moodle 2016-10-18 15:02:41 +08:00
Andrew Nicols
6e39d07e4d MDL-56468 theme_boost: Correct heading level of modal dialogue 2016-10-18 14:19:13 +08:00
David Monllao
36259a1cc3 Merge branch 'MDL-56411-int-fix' of github.com:ryanwyllie/moodle 2016-10-18 14:00:29 +08:00
Simey Lameze
acf17832d6 MDL-56017 filters: Update MathJax to version 2.7 2016-10-18 13:29:30 +08:00
Ryan Wyllie
f5a174f451 MDL-56411 message: dont render message area without other user 
Stop the message area header and footer from being rendered if there is
no other user being messaged, otherwise notices are generated and the
messages fail to send.
 2016-10-18 02:00:09 +00:00
Tim Lock
65b4dce6f8 MDL-56466 assign: fix database error with team submissions 
This fixes the error when viewing the Grading summary with Blind Marking and Team submission is enabled:

ERROR: Incorrect number of query parameters. Expected 32, got 31.
 2016-10-18 12:11:45 +10:30
Sam Wilson
813c0590f7 MDL-29774 core_user: Update group-membership summaries on AJAX calls 2016-10-18 09:31:36 +08:00
David Monllao
326d861978 MDL-45639 ws: Remove trailing whitespace 2016-10-18 08:40:25 +08:00
David Monllao
4455ff2cba Merge branch 'MDL-45639-master' of git://github.com/jleyva/moodle 2016-10-18 08:26:25 +08:00
Ryan Wyllie
f05c1013de MDL-55926 message: add behat tests for message ui 2016-10-18 00:26:21 +00:00
Eloy Lafuente (stronk7)
7da431d2ca Merge branch 'wip-MDL-48629-master' of https://github.com/Beedell/moodle 2016-10-18 01:58:31 +02:00
Eloy Lafuente (stronk7)
c74bbbb6d5 Merge branch 'MDL-55518-master' of git://github.com/andrewnicols/moodle 2016-10-18 01:43:52 +02:00
Eloy Lafuente (stronk7)
7b7dbac4e8 Merge branch 'wip-mdl-56369' of https://github.com/rajeshtaneja/moodle 2016-10-18 01:32:58 +02:00
Eloy Lafuente (stronk7)
b3a089e864 Merge branch 'wip-mdl-56348' of https://github.com/rajeshtaneja/moodle 2016-10-18 01:10:23 +02:00
Eloy Lafuente (stronk7)
3dd505af7d Merge branch 'MDL-56368-M32' of git://github.com/lazydaisy/moodle 2016-10-18 00:38:47 +02:00
Eloy Lafuente (stronk7)
a14edb9fbb Merge branch 'MDL-56022_m32v3' of https://github.com/sbourget/moodle 2016-10-18 00:07:17 +02:00
Eloy Lafuente (stronk7)
682074fe5b MDL-56100 mod_folder: add missing $OUTPUT for recent activity report. 2016-10-17 23:06:54 +02:00
Eloy Lafuente (stronk7)
2aa983c006 Merge branch 'MDL-56100-master' of https://github.com/mackensen/moodle 2016-10-17 22:58:11 +02:00
Stephen Bourget
1b467cb8cf MDL-56022 Assign: Make folders structure in the downloaded zip optional 
Special thanks to Matt McDermott for the contributing the Javascript
code to fix this issue.
 2016-10-17 16:19:28 -04:00
Eloy Lafuente (stronk7)
087476c711 Merge branch 'MDL-56440-master' of git://github.com/danpoltawski/moodle 2016-10-17 20:55:23 +02:00
Eloy Lafuente (stronk7)
b705cefa18 Merge branch 'MDL-56300_master' of git://github.com/reskit/moodle 2016-10-17 18:50:07 +02:00
Eloy Lafuente (stronk7)
aa46cb9503 Merge branch 'MDL-56057_master' of git://github.com/dmonllao/moodle 2016-10-17 18:42:14 +02:00
Eloy Lafuente (stronk7)
cfe55553e0 Merge branch 'MDL-56005-master' of git://github.com/FMCorz/moodle 2016-10-17 18:12:33 +02:00
Dan Poltawski
54c1da6690 Merge branch 'MDL-56208-master' of git://github.com/andrewnicols/moodle 2016-10-17 12:52:26 +01:00
Dan Poltawski
a4c7a0bd95 Merge branch 'MDL-54945-master-workshopportfolio' of git://github.com/mudrd8mz/moodle 2016-10-17 12:06:42 +01:00
Dan Poltawski
2ee939fb19 Merge branch 'MDL-56262-master' of git://github.com/FMCorz/moodle 2016-10-17 11:01:27 +01:00
Dan Poltawski
6578ffe4e0 Merge branch 'MDL-55630-master' of https://github.com/StudiUM/moodle 2016-10-17 10:23:35 +01:00
Dan Poltawski
a227cf1278 Merge branch 'MDL-31465-master' of git://github.com/lameze/moodle 2016-10-17 10:00:08 +01:00
David Monllao
c8bd606475 Merge branch 'MDL-56423-master' of git://github.com/danpoltawski/moodle 2016-10-17 15:51:51 +08:00
David Monllao
99218e916b Merge branch 'MDL-56393-master' of git://github.com/ryanwyllie/moodle 2016-10-17 15:32:33 +08:00
David Monllao
0998896e9e Merge branch 'MDL-56411-master' of git://github.com/ryanwyllie/moodle 2016-10-17 15:29:13 +08:00
David Monllao
4456e7efa6 Merge branch 'MDL-56415-master' of git://github.com/ryanwyllie/moodle 2016-10-17 15:17:16 +08:00
David Monllao
542452a97e Merge branch 'MDL-56430-master' of git://github.com/ryanwyllie/moodle 2016-10-17 15:03:51 +08:00
David Monllao
94926e5d74 Merge branch 'MDL-55510-master' of git://github.com/danpoltawski/moodle 2016-10-17 14:25:00 +08:00
Michael Aherne
0c5994269f MDL-56131 choice: Set maximum lifetime for lock 2016-10-17 13:50:42 +08:00
Andrew Nicols
608edec5ca MDL-56208 mod_forum: Move Display period below Group 2016-10-17 11:46:36 +08:00
Andrew Nicols
f0f4c1939c MDL-55175 course: Begin deprecation process for pring_log_* 2016-10-17 11:08:20 +08:00
Ryan Wyllie
fd8eab572d MDL-56415 message: style toggle contact button on user profile page 
Changed the styles in theme_bootstrapbase for the ajax toggle
button so that the loading icon is overlaid on the element
rather than replacing it to stop the interface jarring.

Also ported those same styles to theme_boost for consistency.
 2016-10-17 03:07:15 +00:00
Ryan Wyllie
54e22257c7 MDL-56338 message_popup: add behat tests for message popover 2016-10-17 01:07:59 +00:00
Adrian Greeve
f34d7af0ae MDL-55087 lib: Update to htmlpurifier lib. 2016-10-17 08:43:41 +08:00
Adrian Greeve
b36b997b7f MDL-55087 lib: Update htmlpurifier to v4.8.0. 2016-10-17 08:43:41 +08:00