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

80639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Juan Leyva
91bbfdfeca MDL-54854 grade: Refactor gradereport_overview code 2016-10-10 11:16:01 +01:00
Dan Poltawski
49e12de63f Merge branch 'MDL-56285-master' of git://github.com/StudiUM/moodle 2016-10-10 11:14:22 +01:00
Frédéric Massart
5d2f105e50 MDL-56178 theme_boost: Display drop zones labels 
The markup has changed so we now need to target .sr-only rather
than just .accesshide. I did keep the latter in case it's still used
somewhere, in a custom form field for instance.

The ideal solution was to tell QuickForm to display the labels of
those elements in the group. That works for Boost, but that did not
work for Clean. The rendering mechanics of QuickForm decides to not
print the label, unless it's set as hidden... the CSS hack remains.
 2016-10-10 11:32:08 +02:00
Dan Poltawski
80156d01c4 Merge branch 'MDL-56095-master-2nd' of git://github.com/FMCorz/moodle 2016-10-10 10:09:46 +01:00
David Monllao
e8cd446ecd Merge branch 'MDL-45388-master' of git://github.com/danpoltawski/moodle 2016-10-10 16:59:06 +08:00
David Monllao
47e863bb73 Merge branch 'MDL-56162-master' of git://github.com/FMCorz/moodle 2016-10-10 16:48:07 +08:00
David Monllao
e84c33d694 Merge branch 'MDL-56232-master' of git://github.com/junpataleta/moodle 2016-10-10 13:27:50 +08:00
Jun Pataleta
2d3130532c MDL-56232 mod_lti: Fix logic for disabling mod_form fields 
* Disable tool "Select content" button if selected preconfigured tool
  does not support Content-Item, and if the selected option is set to
  "Automatic, based on launch URL".
* Disable tool configuration form fields if selected preconfigured tool
  does not support Content-Item, but enable these fields if the selected
  option is set to "Automatic, based on launch URL".
* Behat tests also updated to check disabling/enabling of launch url field.
 2016-10-10 13:16:25 +08:00
David Monllao
96d2a6fd5f Merge branch 'MDL-56254-master' of git://github.com/FMCorz/moodle 2016-10-10 13:01:40 +08:00
David Monllao
fae446b9cb Merge branch 'MDL-56097' of git://github.com/stronk7/moodle 2016-10-10 12:57:27 +08:00
David Monllao
cf489b75ef Merge branch 'MDL-56216-master' of git://github.com/danpoltawski/moodle 2016-10-10 12:49:07 +08:00
Russell Smith
82905c097c MDL-51584 gradebook: use direct $CFG access for freeze. 
get_config() is called a lot of times on freeze and is expensive,
using $CFG is much lower overhead.
 2016-10-10 15:42:04 +11:00
lazydaisy
42bbb05f44 MDL-51633 theme_bootstrapbase: Restyled ADD BLOCK to remove max-width. 2016-10-07 18:50:46 +01:00
Frédéric Massart
82b945dbbe MDL-56095 output: Make the progress bar templatable 
The order of inclusion of weblib and outputlib had to change
as the progress_bar (weblib) uses interfaces defined in outputlib.
 2016-10-07 16:40:38 +02:00
Frédéric Massart
d13880db8b MDL-55597 tool_templatelibrary: Re-inforce logic to skip theme templates 2016-10-07 10:24:50 +02:00
Andrew Nicols
070015004e MDL-56316 tests: Ensure consistent assertion count 2016-10-07 14:45:36 +08:00
Russell Smith
eca7dd65ad MDL-56308 cache: Fix APC ready rules for CLI scripts 
When APCu is enabled, but the CLI is not it's possible for
calls to enable APCu to fail because it's not configured on the
command line.
 2016-10-07 12:02:37 +11:00
Eloy Lafuente (stronk7)
85ef6fe2d9 MDL-56097 install: update the list of stale files for 3.2 2016-10-07 00:41:11 +02:00
Eloy Lafuente (stronk7)
d9520bc04e weekly release 3.2dev 2016-10-06 22:31:27 +02:00
Eloy Lafuente (stronk7)
badaed3224 Merge branch 'MDL-56306-master' of git://github.com/danpoltawski/moodle 2016-10-06 22:25:46 +02:00
Dan Poltawski
41a9a9219a MDL-56303 quiz: lack of quiz filtering 
Also, correctly feed completiongradeitemnumber with grade item numbers
and not with grade item ids.
 2016-10-06 22:24:57 +02:00
Dan Poltawski
636ec5010f MDL-56306 tests: make upgrade_util_test compatible with travis 2016-10-06 18:01:43 +01:00
Issam Taboubi
fd8043b2de MDL-56285 competency: fix move competencies capabilities 
In learning plan templates, cannot move competencies
around even if capability templatemanage is given
to the role because of bad context check
 2016-10-06 10:33:32 -04:00
Dan Poltawski
586cf92909 MDL-45388 admin: warn of themedesignermode in /admin/ and perf footer 
This is:
a) To help avoid devs going on a wild goose chase to find a perf issue
when it's caused by css building
b) To make it clearer that this should never be enabled on production
sites (we already have a warning in the performance report, but who
looks at that)

Now that boost is the default theme and builds css itself, it's more
critical.
 2016-10-06 11:49:17 +01:00
Eloy Lafuente (stronk7)
f73f938469 weekly release 3.2dev 2016-10-06 11:51:28 +02:00
Eloy Lafuente (stronk7)
b79069d233 NOBUG: Fixed file access permissions 2016-10-06 11:51:28 +02:00
Eloy Lafuente (stronk7)
a2884f8b6c Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-10-06 11:51:24 +02:00