Commit graph

79531 commits

Author SHA1 Message Date
David Monllao
379ca98642 MDL-55287 search: Check that an engine has been selected 2016-07-21 18:40:29 +02:00
Eloy Lafuente (stronk7)
90a8bdbfc0 weekly release 3.2dev 2016-07-21 11:44:48 +02:00
Eloy Lafuente (stronk7)
3343737171 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-07-21 11:44:42 +02:00
Stephen Bourget
94c7e9f1de MDL-45753 Events: Add view and reset events for the dashboard 2016-07-20 22:50:55 -04:00
Damyon Wiese
771f8df153 MDL-55284 assign: Add missing webservice param 'onlyids'
Mod assign list_participants webservice is supposed to accept a param to limit the
returned data to only show user ids and not the full user details. It is missing
and so the full user records are fetched every time. This has a major impact on the
performance of the new assignment grading interface.
2016-07-20 15:18:01 +08:00
Andrew Nicols
78c09b9a60 Merge branch 'wip-mdl-51758' of https://github.com/rajeshtaneja/moodle 2016-07-20 13:06:22 +08:00
Rajesh Taneja
01082b50f0 MDL-51758 libraries: Reworded password.php not required 2016-07-20 12:55:09 +08:00
Andrew Nicols
b2c2d18b28 MDL-55283 javascript: Check dir is readable before traversing them 2016-07-20 12:16:13 +08:00
Andrew Nicols
4cb32b2b52 Merge branch 'MDL-50937-fixes' of git://github.com/andrewnicols/moodle 2016-07-20 11:20:08 +08:00
Andrew Nicols
eb3839dffd MDL-50937 tag: Stop using deprecated context
$.context has been deprecated for a long time - since before this code was
written. Unfortunately jQuery does not emit anything for deprecated code so
this was not picked up sooner.
2016-07-20 11:19:29 +08:00
Andrew Nicols
3c4778f5d2 MDL-50937 theme: langmenu should not have a href value 2016-07-20 11:19:23 +08:00
AMOS bot
bde229738d Automatically generated installer lang files 2016-07-20 00:05:02 +08:00
Dan Poltawski
ff0039689b Merge branch 'MDL-31356_master' of https://github.com/StudiUM/moodle 2016-07-19 13:01:34 +01:00
Eloy Lafuente (stronk7)
4feed61702 Merge branch 'MDL-55220-master' of git://github.com/jleyva/moodle 2016-07-19 13:21:36 +02:00
Eloy Lafuente (stronk7)
a900c680ba Merge branch 'wip-mdl-55258-m' of https://github.com/rajeshtaneja/moodle 2016-07-19 12:13:00 +02:00
Dan Poltawski
29dcec6803 Merge branch 'MDL-55206-master' of git://github.com/junpataleta/moodle 2016-07-19 10:52:13 +01:00
Dan Poltawski
6851244452 MDL-50937 jquery: remove instances of migrate plugin 2016-07-19 10:34:17 +01:00
Dan Poltawski
11caf2e2e1 Merge branch 'MDL-50937-master' of git://github.com/damyon/moodle 2016-07-19 10:27:10 +01:00
Dan Poltawski
2c85472688 Merge branch 'MDL-54915-master' of http://github.com/damyon/moodle 2016-07-19 09:38:23 +01:00
Dan Poltawski
738430b863 Revert "Merge branch 'MDL-54915-master' of git://github.com/andrewnicols/moodle"
This reverts commit fa57043eb6, reversing
changes made to 36a19ecc26.
2016-07-19 09:37:01 +01:00
David Monllao
7bd5ce57d8 Merge branch 'MDL-51758-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/upgrade.txt
2016-07-19 09:29:41 +02:00
David Monllao
8942afa981 Merge branch 'MDL-55141' of https://github.com/creator23/moodle 2016-07-19 08:58:09 +02:00
David Monllao
3e2b1e179f Merge branch 'MDL-49599-master' of git://github.com/andrewnicols/moodle 2016-07-19 08:53:28 +02:00
Andrew Nicols
b34ed08a12 MDL-49599 core: Fully deprecate the boxclient class 2016-07-19 14:44:51 +08:00
David Monllao
fa8f88095c Merge branch 'MDL-55157_m32v6' of https://github.com/sbourget/moodle 2016-07-19 08:41:29 +02:00
Damyon Wiese
8d00afb12c MDL-54915 templates: Fix async rendering of js blocks
Mustache JS helper can overwrite JS blocks when using nested templates.

Each call to render should have it's own scope.
2016-07-19 12:55:50 +08:00
Stephen Bourget
05fbbb7731 MDL-55157 mod_feedback: Deprecate unused strings 2016-07-18 22:08:47 -04:00
Stephen Bourget
b28753f5bf MDL-55157 mod_feedback: Course reset should update dates 2016-07-18 22:08:00 -04:00
Eloy Lafuente (stronk7)
5281e6a082 MDL-52544 oracle: small tweaks
This commit just:

- Moves the null => '' to better place, restricting it to PHP >= 7.0
  (bug https://bugs.php.net/bug.php?id=72524)
- Adds a couple of notes here and there.
- Changes some small details to keep the file using the same coding.
2016-07-19 04:04:32 +02:00
Eloy Lafuente (stronk7)
74ec2dd63d Merge branch 'MDL-52544-master' of git://github.com/damyon/moodle 2016-07-19 04:04:18 +02:00
Damyon Wiese
d863344ad7 MDL-50937 jquery: Upgrade to 3.1, remove migrate plugins 2016-07-19 09:27:40 +08:00
Rajesh Taneja
ddf36bf5aa MDL-55258 behat: Set focus on button before clicking it
Set the focus on button to ensure it is in
viewport before clicking on it.
2016-07-19 09:23:44 +08:00
Eloy Lafuente (stronk7)
9e91ff52c9 Merge branch 'MDL-51410_m32v2' of https://github.com/sbourget/moodle 2016-07-19 02:31:24 +02:00
Eloy Lafuente (stronk7)
f91d6783aa Merge branch 'MDL-55207-configiplist-errors' of https://github.com/brendanheywood/moodle 2016-07-19 02:26:58 +02:00
Eloy Lafuente (stronk7)
b697ad409b Merge branch 'wip-mdl-55111' of https://github.com/rajeshtaneja/moodle 2016-07-19 02:09:17 +02:00
David Monllao
db26654b70 Merge branch 'MDL-55173-master' of git://github.com/andrewnicols/moodle 2016-07-19 01:48:28 +02:00
David Monllao
b3b1833097 Merge branch 'MDL-54943-master' of git://github.com/jleyva/moodle
Conflicts:
	version.php
2016-07-19 01:19:13 +02:00
David Monllao
2f8da1e814 Merge branch 'MDL-55158_m32v3' of https://github.com/sbourget/moodle 2016-07-19 00:50:41 +02:00
Stephen Bourget
87d6e85a9a MDL-55158 mod_data: Add calendar events for database activities 2016-07-18 18:35:37 -04:00
David Monllao
c08a7eebb6 Merge branch 'wip-MDL-55126-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/upgrade.txt
2016-07-18 20:50:47 +02:00
David Monllao
8c00f1cbc7 Merge branch 'MDL-55200_master' 2016-07-18 20:41:07 +02:00
Steffen Pegenau
51ed23519a MDL-55200 question type ddmarker: Display coordinates on image
To make the creation of dropzones easier, the mouse coordinates are shown.
2016-07-18 20:40:49 +02:00
David Monllao
f60a16ad9d Merge branch 'MDL-55162-master' of git://github.com/jleyva/moodle
Conflicts:
	mod/assign/externallib.php
2016-07-18 20:35:50 +02:00
David Monllao
d66e54b021 Merge branch 'MDL-55161-m' of https://github.com/micaherne/moodle 2016-07-18 20:00:18 +02:00
David Monllao
90f3675d9c Merge branch 'MDL-55163-master' of git://github.com/jleyva/moodle 2016-07-18 19:42:46 +02:00
Dan Poltawski
ae76b9ed17 Merge branch 'MDL-14448_m32v1' of https://github.com/sbourget/moodle 2016-07-18 15:06:22 +01:00
Dan Poltawski
3ed88885e5 Merge branch 'wip-mdl-55174' of https://github.com/rajeshtaneja/moodle 2016-07-18 14:49:48 +01:00
Dan Poltawski
bbb826f48f Merge branch 'MDL-55190-master' of git://github.com/merrill-oakland/moodle 2016-07-18 14:21:03 +01:00
Dan Poltawski
151aaa2654 Merge branch 'MDL-55012-master' of git://github.com/damyon/moodle 2016-07-18 13:55:50 +01:00
Dan Poltawski
2dbaaa9bdc Merge branch 'MDL-54963_master' of git://github.com/dmonllao/moodle 2016-07-18 13:38:36 +01:00