mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
81,048 Commits 36 Branches 523 Tags
Commit Graph

81048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
be1ff9a1ee MDL-43230 badges: new cap version bump 2016-10-18 22:58:27 +02:00
Eloy Lafuente (stronk7)
8c88830a43 Merge branch 'MDL-43230-master' of git://github.com/ryanwyllie/moodle 2016-10-18 22:35:53 +02:00
Eloy Lafuente (stronk7)
ffe9505d2b Merge branch 'MDL-56295-master' of git://github.com/andrewnicols/moodle 2016-10-18 20:02:22 +02:00
Eloy Lafuente (stronk7)
e74c54ec4d Merge branch 'MDL-56270-master' of git://github.com/andrewnicols/moodle 2016-10-18 19:11:51 +02:00
Eloy Lafuente (stronk7)
05e588a056 Merge branch 'MDL-56293-master' of git://github.com/andrewnicols/moodle 2016-10-18 19:08:08 +02:00
Eloy Lafuente (stronk7)
881e611c33 Merge branch 'MDL-53752-master' of git://github.com/andrewnicols/moodle 2016-10-18 19:06:26 +02:00
Eloy Lafuente (stronk7)
3fdbba0e27 Merge branch 'MDL-29774-master-by-sam-wilson' of git://github.com/junpataleta/moodle 2016-10-18 18:26:50 +02:00
Dan Poltawski
876fc28255 MDL-56082 auth: minor tweak to login block idp links 
No longer set the return url to $SESSION->wantsurl, it doens't make
sense in this context, as the user is probably on the page they want.

Also add a note about this functionality to auth/ugrade.txt
 2016-10-18 17:19:03 +01:00
Dan Poltawski
a477b761be Merge branch 'master' of https://github.com/rimas-kudelis/moodle 2016-10-18 17:03:21 +01:00
Dan Poltawski
ad2eba780a Merge branch 'MDL-55926-master-3' of git://github.com/ryanwyllie/moodle 2016-10-18 16:31:42 +01:00
Eloy Lafuente (stronk7)
0e51800e5f Merge branch 'MDL-55858-master' of git://github.com/andrewnicols/moodle 2016-10-18 17:00:21 +02:00
Dan Poltawski
55c7a86632 Merge branch 'wip-MDL-55833-master' of git://github.com/marinaglancy/moodle 2016-10-18 15:26:31 +01:00
Dan Poltawski
0022812b71 Merge branch 'MDL-55736-master' of git://github.com/FMCorz/moodle 2016-10-18 13:48:46 +01:00
Dan Poltawski
cfa69ad260 Merge branch 'MDL-56131-master' of git://github.com/andrewnicols/moodle 2016-10-18 13:44:33 +01:00
Dan Poltawski
c0b1f18930 MDL-55924 behat: fix misleading comment 2016-10-18 13:24:08 +01:00
Dan Poltawski
01bc6a35bc Merge branch 'wip-mdl-55924' of https://github.com/rajeshtaneja/moodle 2016-10-18 13:22:56 +01:00
Dan Poltawski
846baba950 Merge branch 'wip-mdl-55746' of https://github.com/rajeshtaneja/moodle 2016-10-18 12:37:32 +01:00
Dan Poltawski
551c7e6c38 Merge branch 'wip-MDL-55087-master' of git://github.com/abgreeve/moodle 2016-10-18 12:32:08 +01:00
Dan Poltawski
d98ab2a585 Merge branch 'MDL-56062-master' of https://github.com/lucisgit/moodle 2016-10-18 12:06:27 +01:00
Dan Poltawski
1bcaff71d8 Merge branch 'MDL-56159_master-phpunit-fix' of git://github.com/dmonllao/moodle 2016-10-18 11:26:18 +01:00
David Monllao
8d92dbd1fc MDL-56159 user: Fix unit test 
The exception that is being thrown changed to moodle_exception
with usernotfullysetup error code.
 2016-10-18 18:24:47 +08:00
Dan Poltawski
c70b9e8451 Merge branch 'MDL-56081-master' of git://github.com/andrewnicols/moodle 2016-10-18 11:24:36 +01:00
Eloy Lafuente (stronk7)
772c7b4733 Merge branch 'MDL-56275-master' of git://github.com/danpoltawski/moodle 2016-10-18 12:16:28 +02:00
Dan Poltawski
9def79f79a MDL-56275 blog: do not display the 'choose a link' button 
When registereing an external blog the choose a link button is
misleading, we don't have any repos which restrict to RSS feeds, so the
majority of results you get from the repo picker will be wrong.
 2016-10-18 11:07:54 +01:00
David Monllao
5f02fd5072 Merge branch 'MDL-56159-master' of git://github.com/jleyva/moodle 2016-10-18 17:27:48 +08:00
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
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
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