mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 00:12:42 +02:00
Code Issues Projects Releases Wiki Activity
80,818 Commits 36 Branches 529 Tags
Commit Graph

80818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
c8303131be Merge branch 'MDL-54682_master' of git://github.com/markn86/moodle 2016-10-11 12:53:11 +01:00
Eloy Lafuente (stronk7)
1e1dbc669f Merge branch 'MDL-56147-master' of git://github.com/FMCorz/moodle 2016-10-11 12:49:56 +02:00
Eloy Lafuente (stronk7)
77348a62db Merge branch 'MDL-55954_master' of git://github.com/dmonllao/moodle 2016-10-11 12:46:32 +02:00
Eloy Lafuente (stronk7)
44e7b8b827 Merge branch 'wip-mdl-56248' of https://github.com/rajeshtaneja/moodle 2016-10-11 12:15:05 +02:00
David Monllao
85d7a13ab0 Merge branch 'master_MDL-51401' of https://github.com/janeklb/moodle 2016-10-11 17:58:05 +08:00
Eloy Lafuente (stronk7)
537054ec27 Merge branch 'MDL-55921' of https://github.com/mr-russ/moodle 2016-10-11 11:54:23 +02:00
David Monllao
b65c33ace5 Merge branch 'MDL-52051-master' of git://github.com/andrewnicols/moodle 2016-10-11 17:11:21 +08:00
Dan Poltawski
988ff9f57f Merge branch 'MDL-36611-master' of git://github.com/junpataleta/moodle 2016-10-11 08:53:06 +01:00
Mark Nelson
d4b2c195e1 MDL-54682 core: build amd modules 2016-10-11 14:39:24 +08:00
Mark Nelson
16f91ae12a MDL-56299 core: fixed failing Behat tests 
This also involved removing legacy Behat tests.
 2016-10-11 14:39:24 +08:00
Ryan Wyllie
6b5d0e976a MDL-56087 message: change conversations to messages 2016-10-11 14:39:24 +08:00
Ryan Wyllie
f54a16fc73 MDL-56274 message: unlock tabs and search after delete all 2016-10-11 14:39:24 +08:00
Mark Nelson
fd9a64a302 MDL-56336 core_message: fix WS exception when 'forcepasswordchange' set 2016-10-11 14:39:24 +08:00
Ryan Wyllie
963ba88970 MDL-56234 message: fix messaging UI in theme boost 2016-10-11 14:39:24 +08:00
Ryan Wyllie
641b36e2ab MDL-56292 message: move notifications page into popup plugin 2016-10-11 14:39:23 +08:00
Ryan Wyllie
9f7b7b7c88 MDL-56292 message: fix style for notification popover and page 2016-10-11 14:39:23 +08:00
Ryan Wyllie
14617a566b MDL-56292 message: mustache template docs 2016-10-11 14:39:23 +08:00
Ryan Wyllie
8b99e16358 MDL-56292 core: add note to upgrade.txt for context_header change 2016-10-11 14:39:23 +08:00
Ryan Wyllie
7d69958e6b MDL-56292 message: move popover code into output plugin 2016-10-11 14:39:23 +08:00
Ryan Wyllie
f8e4145feb MDL-56292 core: change size of 'component' DB column 2016-10-11 14:39:22 +08:00
Andrew Nicols
066963cd18 MDL-52051 repository_dropbox: Migrate to v2 API 2016-10-11 11:17:09 +08:00
Kirill Astashov
f3ced08622 MDL-36611 outcome: Set page context when editing outcome 2016-10-11 10:01:01 +08:00
Eloy Lafuente (stronk7)
db43b23848 Merge branch 'wip-MDL-27072-master' of https://github.com/Beedell/moodle 2016-10-11 02:42:02 +02:00
Eloy Lafuente (stronk7)
dcd5c7cd1b Merge branch 'MDL-56228-master' of https://github.com/snake/moodle 2016-10-11 02:02:23 +02:00
Eloy Lafuente (stronk7)
6bf8e9b021 Merge branch 'MDL-55835-master' of git://github.com/danpoltawski/moodle 2016-10-11 01:21:14 +02:00
Eloy Lafuente (stronk7)
209d36cc78 Merge branch 'MDL-56220-m' of https://github.com/micaherne/moodle 2016-10-11 01:17:33 +02:00
Eloy Lafuente (stronk7)
049a4f9a20 Merge branch 'MDL-56331-master' of git://github.com/danpoltawski/moodle 2016-10-11 01:12:00 +02:00
Eloy Lafuente (stronk7)
73c5f7b7a9 Merge branch 'MDL-56261-master-taglist' of git://github.com/mudrd8mz/moodle 2016-10-11 00:32:21 +02:00
Eloy Lafuente (stronk7)
76d521e14c Merge branch 'MDL-56308' of https://github.com/mr-russ/moodle 2016-10-10 19:05:22 +02:00
Eloy Lafuente (stronk7)
45dd1dc052 Merge branch 'MDL-53695-master' of git://github.com/danpoltawski/moodle 2016-10-10 18:25:18 +02:00
Eloy Lafuente (stronk7)
f0077d4c42 Merge branch 'MDL-56316-master' of git://github.com/andrewnicols/moodle 2016-10-10 18:11:56 +02:00
Eloy Lafuente (stronk7)
6a8f40c394 Merge branch 'MDL-51633_master' of git://github.com/lazydaisy/moodle 2016-10-10 17:40:34 +02:00
Dan Poltawski
518ba4906d Merge branch 'MDL-56192-master' of git://github.com/FMCorz/moodle 2016-10-10 16:16:17 +01:00
David Monllao
97f1af7575 Merge branch 'MDL-56050-master' of git://github.com/lameze/moodle 2016-10-10 23:14:43 +08:00
David Monllao
3e1dd8791b Merge branch 'MDL-54854-master' of git://github.com/jleyva/moodle 2016-10-10 23:00:31 +08:00
David Monllao
886207f70e Merge branch 'MDL-55923-master' of git://github.com/jleyva/moodle 2016-10-10 22:57:34 +08:00
David Monllao
576ce0af0c Merge branch 'MDL-30179-master' of git://github.com/merrill-oakland/moodle 2016-10-10 22:38:29 +08:00
Dan Poltawski
bd296fc280 Merge branch 'MDL-56209-master' of git://github.com/FMCorz/moodle 2016-10-10 15:18:24 +01:00
Dan Poltawski
e210a4b2d8 Merge branch 'MDL-56052-master' of git://github.com/damyon/moodle 2016-10-10 14:18:33 +01:00
Eric Merrill
ca2cb90fed MDL-30179 gradereport_user: Add ability to view report as other user 2016-10-10 09:03:11 -04:00
Dan Poltawski
5f85134187 Merge branch 'MDL-55999-master' of git://github.com/lameze/moodle 2016-10-10 13:40:16 +01:00
Dan Poltawski
0b7aef7b20 Merge branch 'MDL-51584' of https://github.com/mr-russ/moodle 2016-10-10 13:23:59 +01:00
Dan Poltawski
1573c3031b MDL-53695 lib/javascript.php: ensure full env for core_minify 
This applies the same approach to generating minified js as is already
used in theme/javascript.php and other scripts. When we need to do the
minification, we load the full Moodle environment, so we can use the
libraries.

The reason this was required was because now the minifier uses
autoloaded classes, which are not autoloaded when doing
ABORT_AFTER_CONFIG.

Fred persuaded me that it's probably safer to keep it that way, rather
than alllow ABORT_AFTER_CONFIG scripts from autoloading the world and
their dog (especially for resource serving scripts, they are intended to
be lightweight when serving from cache).
 2016-10-10 13:17:04 +01:00
Dan Poltawski
4cb24aa9d7 MDL-53695 minify: switch to MatthiasMullie\Minify 
The previously used minification libraries were:
a) Unmaintained
b) Had some silly licensing issues (MDL-36457)

The new library is smaller, maintained, active and GPL-compatible.
 2016-10-10 13:17:04 +01:00
Dan Poltawski
ef3e4d6cc4 Merge branch 'MDL-56095-master-fixup' of https://github.com/FMCorz/moodle 2016-10-10 13:13:08 +01:00
Frédéric Massart
fc72f49da3 MDL-56095 output: Moving progress_bar from weblib to outputcomponents 
And revert the change in the order of the require_once in setup.php.
 2016-10-10 13:25:37 +02:00
Dan Poltawski
e99efa171c Merge branch 'MDL-55597-master' of git://github.com/FMCorz/moodle 2016-10-10 11:33:12 +01:00
Dan Poltawski
6a694f9a95 Merge branch 'MDL-56178-master' of git://github.com/FMCorz/moodle 2016-10-10 11:22:16 +01:00
Juan Leyva
78310c30d0 MDL-54854 grade: New WS gradereport_overview_view_grade_report 2016-10-10 11:16:02 +01:00
Juan Leyva
7cd19312f5 MDL-54854 grade: New WS gradereport_overview_get_course_grades 2016-10-10 11:16:01 +01:00