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

80584 commits

This branch
This branch
All branches
Author SHA1 Message Date
Damyon Wiese
644fcbb629 MDL-55837 themes: base and canvas themes removed 
Look for them in the plugins DB if you still need them.
 2016-09-19 13:35:13 +08:00
Marina Glancy
e7ba25f1b1 MDL-29332 question: calculated variables may differ in case only 2016-09-19 10:37:43 +08:00
Andrew Nicols
96872ab271 Merge branch 'MDL-55932-master' of https://github.com/eberhardt/moodle 2016-09-19 08:32:54 +08:00
Henning Bostelmann
4151ed984a MDL-51361 backup: Adding default settings for course import 
Also adding "calendar events" and "competencies" default setting for other backup modes.
 2016-09-18 23:39:57 +01:00
spvickers
d8f9109a12 MDL-49609 mod_lti: Add Content-Item message 
Added option for tools to support Content-Item message and redirect
to/from tool provider when creating an instance.
 2016-09-18 22:16:10 +08:00
AMOS bot
e2625817a1 Automatically generated installer lang files 2016-09-17 00:04:27 +08:00
David Mudrák
d676f6bd19 MDL-55987 gradebook: Claim extra memory when updating final grades 
As we experienced in a bigger moodle.org course (7500 users, 70 grade
items), the standard memory limit 256M may not be enough here. We were
not able to find any obvious memory leak in the processing. Requiring
extra memory helped in this particular case and it seems reasonable to
have it in the core.
 2016-09-16 12:39:47 +02:00
Juan Leyva
08d7965e63 MDL-55928 gradereport_user: New WS for retrieve grade items 
It includes a refactor of the complete externallib.
Previously it was not possible to filter the report by groups.
 2016-09-16 09:55:14 +01:00
Juan Leyva
345330d172 MDL-55928 gradereport_user: Return grade items data among the table data 2016-09-16 09:55:13 +01:00
AMOS bot
fdf5335d70 Automatically generated installer lang files 2016-09-16 00:04:42 +08:00
Eloy Lafuente (stronk7)
03d27c303d MDL-29332 tests: Cover the new sql_equal() function 
- For CS, CI and AS
- Not for AI (it's not cross-db)
- equal (=) and not equal (<>)
- delete old test_sql_binary_equal() now with cross-db solution.
 2016-09-15 16:33:08 +02:00
Eloy Lafuente (stronk7)
9d5c12bee4 MDL-29332 dml: new sql_equal() to force cs/ci behavior on varchar matching 2016-09-15 16:33:00 +02:00
Dan Poltawski
d2c7175a34 MDL-55856 grunt: fail gracefully when node version too old 
Unfortunately the engine requirement in packages.json is not a fatal
error, so you can get unhelpful errors with grunt if using an
unsupported version.
 2016-09-15 15:32:32 +01:00
Dan Poltawski
054da30ba9 MDL-48766 moodlelib: introduce ip_is_public() 
For determining if an IP is publicly addressable
 2016-09-15 14:53:14 +01:00
Jan Eberhardt
2c99429375 MDL-55932 block_rss_client: Namespace fixes 2016-09-15 13:24:36 +00:00
Dan Poltawski
1f2744851f weekly release 3.2dev 2016-09-15 11:14:54 +01:00
Dan Poltawski
a8cf3454ce Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-09-15 11:14:52 +01:00
David Monllao
37a8e5223d Merge branch 'MDL-55945-master' of https://github.com/snake/moodle 2016-09-15 12:38:43 +08:00
David Monllao
e71061a22b MDL-55191 search: Generate an search result viewed event 2016-09-15 09:36:49 +08:00
Jake Dallimore
db8c2cf6d4 MDL-55945 login: fix https support for forgot_password.php 2016-09-15 09:19:39 +08:00
Andrew Nicols
4e2e54eed0 MDL-55866 mod_data: Remember editor enabled state for templates 
Some templates can legitimately contain invalid HTML (e.g. mismatched tags)
because the templates operate in pairs.

In these instances we should not use an editor because the nature of the
editor (content editable) means that the browser automatically corrects all
HTML supplied to it, thus breaking the template entirely.

Therefore we need to disable HTML editors for some templates, and do so in
a way tied to the instance of the activity, rather than to a specific user.

This patch adds a new 'config' field, with matching setters and getters, to
allow such per-instance values to be stored.
 2016-09-15 08:38:10 +08:00
David Mudrák
161131f057 MDL-55957 workshop: Add behat tests for embedded images 
This tests basic functionality of the images embedded into the
instructions and conclusion fields.
 2016-09-14 14:25:41 +02:00
David Mudrák
e46aec4c45 MDL-55957 workshop: Fix the embedded files serving 
There was a bug with serving the files from the areas instructauthors,
instructreviewers and conclusion. These three areas should not use the
itemid in the plugininfo URLs. But they did use 0 as the itemid which
broke the file previews when browsing via server files repository.

The first part of the patch fixes all relevant calls to
file_rewrite_pluginfile_urls() so that null is now properly used instead
of zero.

The second part of the fix is that we no longer delete the first $args
element in the workshop_pluginfile() function - the itemid is not
supposed to appear there now.

The last part of the patch is that instead of repeating the same code
block copy&pasted for each file area in workshop_pluginfile(), we now
have a single block covering them all.
 2016-09-14 12:14:56 +02:00
Rajesh Taneja
a396321e44
MDL-55117 behat: Re-initialise to ensure modified config is not used 
As behat cli process is 1 run for features
Any modification in  will be reflected
in later runs on cli. In this case
- disabling enablebadges in block_badges.feature
- reflected while running cron in award_badges.feature
 2016-09-14 10:46:19 +08:00
Andrew Nicols
8bdd97a35a MDL-54872 mod_assign: Allocate Unique IDs before tests 2016-09-14 09:20:33 +08:00
Russell Smith
74ee9d29d2 MDL-55944 testing: Reduce sleep usage. 
Remove sleep() and replace with waiting for a second to roll over,
this results in a simpler call the guarantee time() has moved forward
 2016-09-14 09:49:30 +10:00
Eloy Lafuente (stronk7)
b5830334e7 Merge branch 'wip-mdl-55466' of https://github.com/rajeshtaneja/moodle 2016-09-14 01:38:51 +02:00
Rajesh Taneja
234e1449a1
MDL-55466 lib: Create clean alternateloginurl 2016-09-14 07:37:08 +08:00
Stephen Bourget
768e3613a9 MDL-45752 Course: Add additional events 2016-09-13 19:23:59 -04:00
Dan Poltawski
5d602e314b Merge branch 'wip-MDL-55864-master' of git://github.com/marinaglancy/moodle 2016-09-13 14:56:27 +01:00
Pau Ferrer Ocaña
9201a00a5d MDL-55951 output: Add errorcode to fatal_error when available 2016-09-13 15:30:01 +02:00
Dan Poltawski
eb81115f20 Merge commit '2bcef5594a' 2016-09-13 10:05:57 +01:00
Dan Poltawski
3ec4a8085c Merge branch 'MDL-55791_master' of https://github.com/Syxton/moodle 2016-09-13 09:40:33 +01:00
Ryan Wyllie
2bcef5594a MDL-55727 javascript: Add modal module 2016-09-13 02:44:30 +00:00
David Monllao
c46432ad6c Merge branch 'MDL-54872-master' of git://github.com/andrewnicols/moodle 2016-09-13 10:05:26 +08:00
Marina Glancy
9e21f12dbd MDL-55864 general: fix PHP7.1 strict warnings 2016-09-13 09:39:26 +08:00
Eloy Lafuente (stronk7)
ed55d47d03 Merge branch 'wip-MDL-55123-master' of git://github.com/marinaglancy/moodle 2016-09-12 19:37:40 +02:00
Eloy Lafuente (stronk7)
9579b52372 Merge branch 'wip-MDL-55505-master' of git://github.com/abgreeve/moodle 2016-09-12 19:19:45 +02:00
Eloy Lafuente (stronk7)
4e25d5e5ea Merge branch 'wip-MDL-55654-master' of git://github.com/marinaglancy/moodle 2016-09-12 19:14:00 +02:00
Eloy Lafuente (stronk7)
61b246fd0e Merge branch 'MDL-55632-master' of git://github.com/andrewnicols/moodle 2016-09-12 19:12:26 +02:00
Eloy Lafuente (stronk7)
9d821b6faf Merge branch 'MDL-55874-master' of git://github.com/danpoltawski/moodle 2016-09-12 18:29:42 +02:00
AMOS bot
415fb6ca10 Automatically generated installer lang files 2016-09-13 00:04:35 +08:00
Eloy Lafuente (stronk7)
fa7c2bd050 Merge branch 'MDL-55725-master' of git://github.com/merrill-oakland/moodle 2016-09-12 17:54:59 +02:00
Eloy Lafuente (stronk7)
b8c5fc8620 Merge branch 'MDL-55755_master' of git://github.com/dmonllao/moodle 2016-09-12 17:34:21 +02:00
Matt Davidson
59c66f926f MDL-55791 admin: maintenance mode access capability 
Add capability to allow certain non-admin users through maintenance
mode.
 2016-09-12 10:37:25 -04:00
Dan Poltawski
2a786e7bad Merge branch 'MDL-52798_m32v2' of https://github.com/sbourget/moodle 2016-09-12 12:17:40 +01:00
Dan Poltawski
0fcbfb63a5 Merge branch 'wip-mdl-55353' of https://github.com/rajeshtaneja/moodle 2016-09-12 11:49:33 +01:00
Dan Poltawski
3e6ac53831 Merge branch 'wip-mdl-55759' of https://github.com/rajeshtaneja/moodle 2016-09-12 11:36:18 +01:00
Dan Poltawski
4bbe995c89 Merge branch 'wip-mdl-55610' of https://github.com/rajeshtaneja/moodle 2016-09-12 10:18:18 +01:00
David Monllao
a8a75c865f Merge branch 'MDL-55122-master' of git://github.com/lameze/moodle 2016-09-12 12:49:27 +08:00