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

80937 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
David Monllao
36259a1cc3 Merge branch 'MDL-56411-int-fix' of github.com:ryanwyllie/moodle 2016-10-18 14:00:29 +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
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
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
Andrew Nicols
608edec5ca MDL-56208 mod_forum: Move Display period below Group 2016-10-17 11:46:36 +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
Ryan Wyllie
cdff0944b6 MDL-56430 message: fix php7 incompatibility in processor form 2016-10-17 00:27:56 +00:00
John Beedell
fa677bc9df MDL-48629 Quiz: Change separator for matching correct answer feedback 2016-10-14 16:41:49 +01:00
lazydaisy
7cfb9175ac MDL-56368 theme_bootstrapbase: Settings for Restrict Access not inline. 2016-10-14 15:34:39 +01:00
Jean-Philippe Gaudreau
6399ecd743 MDL-55630 mod_assign: Exclude users courses from user details 
Exclude users' enrolled courses for performance reason.
A new 'includeenrolments' parameter was added
to mod_assign::list_particpants.
 2016-10-14 09:28:18 -04:00
Charles Fulton
1de06aa19b MDL-56100 mod_folder: add support for recent activity 2016-10-14 08:57:56 -04:00
Juan Leyva
961c95499e MDL-45639 tool_mobile: Support auto-login from the app to the site 
We din't call it SSO because:
- SSO usually requires a 3rd party for authentication
- SSO term is already used in tool_mobile when supporting using auth methods like CAS or Shibboleth
 2016-10-14 12:32:37 +01:00
Juan Leyva
69cbe35943 MDL-45639 webservice: Support private tokens 
Private tokens are generated at the same time that the token.
They must be stored safely by the ws client, and they must be transmitted only via  https.
 2016-10-14 12:32:30 +01:00
Dan Poltawski
0a51a20928 MDL-55510 upgrade: remove repository_alfresco config 
This was missing from MDL-49533 and caused a complaint about alfresco
on every upgrade.
 2016-10-14 09:41:31 +01:00
Ryan Wyllie
8387932ddd MDL-56393 themes: unread notification style in popover 2016-10-14 07:52:04 +00:00
Dan Poltawski
e816b872ad MDL-56440 theme_boost: fix logic errors in templates 2016-10-14 08:43:22 +01:00
Marc Català
260713fc8e MDL-56300 mod_assign: Filtering students throws a javascript error 2016-10-14 09:28:20 +02:00
Ryan Wyllie
703ab16475 MDL-56411 message: new message to user renders message area 
When messaging a user for the first time from the message button on
their profile page the message area should still be rendered.
 2016-10-14 07:13:58 +00:00
acorbier
1b372a77a5
MDL-56369 behat: Updated comment for i_look_for_exceptions 
After upgrade to Behat 3.x, i_look_for_exception is called from
Moodle\BehatExtension\EventDispatcher\Tester\ChainedStepTester
 2016-10-14 13:22:04 +08:00
Andrew Nicols
8ad2afd316 MDL-55518 travis: Enable redis tests 2016-10-14 12:16:36 +08:00
Simey Lameze
8490014955 MDL-31465 core_user: Suspended field must be boolean 2016-10-14 10:44:08 +08:00
Andrew Solomon
511db62153 MDL-31465 core_user: Incorporate user suspension into webservices 2016-10-14 10:13:49 +08:00
Ryan Wyllie
658dbdf7dd MDL-56337 message_popup: add behat tests for notification popover 2016-10-14 01:32:29 +00:00