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

79822 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jun Pataleta
3046ee9f0d MDL-50051 core: Update todo tag comment for get_referer 2016-07-19 13:40:09 +08:00
Jun Pataleta
2a72354167 MDL-50051 core: Add deprecated tags to deprecated methods 2016-07-19 13:39:39 +08: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
Dan Poltawski
eab9f3d32e Merge branch 'wip-mdl-54977' of https://github.com/rajeshtaneja/moodle 2016-07-18 13:27:48 +01:00
Dan Poltawski
5e60c1d436 Merge branch 'MDL-55240-master' of git://github.com/junpataleta/moodle 2016-07-18 10:51:06 +01:00
Dan Poltawski
fa57043eb6 Merge branch 'MDL-54915-master' of git://github.com/andrewnicols/moodle 2016-07-18 09:17:53 +01:00
Dani Palou
9ac99220c5 MDL-55046 assign: Return submissionstatement in get_assignments 2016-07-18 09:22:12 +02:00
Rajesh Taneja
ce78e33a84 MDL-55174 core_tests: Use proper itemid while creating file 2016-07-18 10:29:23 +08:00
Andrew Nicols
21e8b48d13 MDL-51758 libraries: Remove password_compat library from core 2016-07-18 10:06:57 +08:00
Andrew Nicols
d16185fd4f MDL-55173 mod_forum: Perform final deprecations 2016-07-18 08:42:33 +08:00
Andrew Nicols
9a60d5f98f MDL-54915 core: JS Blocks must not used shared variables 
The JS blocks in a template must _not_ use a shared variable as they can be
executed asynchronously and complete in any order.

Instead it is stored in the only local variable available - the current
context.

Since the context can be passed in from elsewhere, we namespace it to
reduce the chance of collission.
 2016-07-18 08:29:52 +08:00
Stephen Bourget
0f256bc05e MDL-55251 mod_chat: Add view permissions 2016-07-15 16:13:06 -04:00
AMOS bot
05ce84fbc1 Automatically generated installer lang files 2016-07-16 00:05:30 +08:00
Jun Pataleta
49ccaee5a9 MDL-55206 admin: Some code cleanup 
* Removed unnecessary TODOs.
* Changed message prompt case to sentence case.
 2016-07-15 14:44:35 +08:00
Jun Pataleta
36b88f2486 MDL-55206 admin: Remove div tags in password policy error message 2016-07-15 14:40:54 +08:00
Brendan Heywood
685e5b002c MDL-55207 adminlib: Improve help and validation errors for configiplist 2016-07-15 16:38:54 +10:00
Rajesh Taneja
fc2e137750 MDL-55174 core_testing: Use proper directory separator 
While searching for existing files if directory
separator is not correct then original files
and directories will be deleted. So use DIRECTORY_SEPARATOR.
 2016-07-15 13:51:41 +08:00