moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72887 commits 37 branches 540 tags 1.3 GiB
Commit graph

72887 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
62d94d17d0 Revert "Merge branch 'MDL-37864' of https://github.com/serega1394/moodle" 
This reverts commit 19ffcbe273, reversing
changes made to 2112dd44e8.
 2015-04-02 11:05:45 +02:00
David Monllao
ee366cf907 Merge branch 'MDL-49587' of git://github.com/mike-grant/moodle 2015-04-02 11:05:43 +02:00
David Monllao
72457d7a72 Merge branch 'MDL-49481' of git://github.com/aolley/moodle 2015-04-02 11:05:42 +02:00
Dave Cooper
3004a92332 MDL-49534 libraries: Removed pear/HTTP/WebDav 2015-04-02 11:05:42 +02:00
Eloy Lafuente (stronk7)
b485fb20dd Merge branch 'MDL-49693-master' of git://github.com/merrill-oakland/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2015-04-02 11:05:32 +02:00
David Monllao
7c5dbf0396 Merge branch 'MDL-49453-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
 2015-04-01 11:59:33 +08:00
David Monllao
a647e1f053 Merge branch 'MDL-49502-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
 2015-04-01 11:49:31 +08:00
David Monllao
0005ce8e4b Merge branch 'MDL-49520-master' of git://github.com/gurgus/moodle 2015-04-01 11:13:28 +08:00
Andrew Nicols
2b53b13ff7 MDL-49627 core: Update uses of generate_image_thumbnail 
This removes the need to write tempfiles in these locations.
 2015-04-01 11:05:19 +08:00
Andrew Nicols
b7067f065e MDL-49627 core: Improve thumbnail generation 
We now abstract the actual file generation to a new function.
We are then able to call this function from the other image generation
sources. This allows us to generate thumbnails in a more efficient manner.

* Stored files stay as stored files and are not temporarily re-written to
  disk;
* Strings containing an image remain as a variable and are not temporarily
  written to disk; and
* Arbitrary files are not captured to string.
 2015-04-01 11:05:19 +08:00
David Monllao
47d333857d Merge branch 'MDL-23296-master' of git://github.com/FMCorz/moodle 2015-04-01 10:41:41 +08:00
David Monllao
4d9dda2389 Merge branch 'MDL-40992' of git://github.com/timhunt/moodle 2015-04-01 08:00:43 +08:00
Eloy Lafuente (stronk7)
e025f20995 Merge branch 'wip-mdl-48605' of https://github.com/rajeshtaneja/moodle 2015-04-01 01:09:25 +02:00
Dan Poltawski
f31c4f27f3 Merge branch 'MDL-49617-master' of git://github.com/jleyva/moodle 2015-03-31 20:10:27 +01:00
Dan Poltawski
2c92e06106 Merge branch 'MDL-49518-master' of git://github.com/gurgus/moodle 2015-03-31 20:04:54 +01:00
Dan Poltawski
19ffcbe273 Merge branch 'MDL-37864' of https://github.com/serega1394/moodle 2015-03-31 19:53:46 +01:00
Damyon Wiese
2112dd44e8 MDL-49578 TinyMCE: Update to 3.5.11 2015-03-31 19:38:53 +01:00
Dan Poltawski
3d8b835aec Merge branch 'MDL-49564-master' of git://github.com/merrill-oakland/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2015-03-31 19:25:10 +01:00
Dan Poltawski
f5c493f75e Merge branch 'MDL-49666' of git://github.com/timhunt/moodle 2015-03-31 19:18:14 +01:00
Tim Hunt
063cbe93e3 MDL-49666 questions: coding style fixes 2015-03-31 15:23:20 +01:00
Tim Hunt
ed98894326 MDL-49666 qbehaviour_informationitem: respect $options->readonly 2015-03-31 15:22:16 +01:00
Dan Poltawski
f0fb1ed518 Merge branch 'MDL-49671-master' of git://github.com/merrill-oakland/moodle 2015-03-31 15:05:37 +01:00
Dan Poltawski
a9feb0c48f Merge branch 'MDL-49595' of https://github.com/rlorenzo/moodle 2015-03-31 14:51:43 +01:00
Rajesh Taneja
d83a1c11a2 MDL-48605 unit_test: Only touch real file/dir 2015-03-31 21:45:23 +08:00
Dan Poltawski
c157a42a7b Merge branch 'MDL-49547' of git://github.com/timhunt/moodle 2015-03-31 14:43:48 +01:00
Dan Poltawski
22a520231d Merge branch 'MDL-49661-master-pluginfotodo' of git://github.com/mudrd8mz/moodle 2015-03-31 14:37:44 +01:00
Dan Poltawski
a80ff5baa2 Merge branch 'MDL-49643-master-local-nav' of git://github.com/mudrd8mz/moodle 2015-03-31 14:28:08 +01:00
Dan Poltawski
6cb65683d1 Merge branch 'MDL-49598-master' of git://github.com/andrewnicols/moodle 2015-03-31 14:21:37 +01:00
Tim Hunt
5e63b335fe MDL-40992 quiz: option to let students redo questions within an attempt 
This feature is designed for use on pracice or formative quizzes.
It is available for quizzes that use Interactive or Immediate feedback
behaviour.

If the teacher turns this on in the quiz settings, then once a student
has finished a question, they get a 'Redo question' button beside the
question. If they click it, then the question they finished is replaced
by a new one so they can try again to practise that particul skill or
bit of knowledge a bit more.

When randomisation is involved, the studnets will be given a question or
variant that they have not seen before if possible.
 2015-03-31 14:12:48 +01:00
Dan Poltawski
8a39f66130 Merge branch 'MDL-49606-master' of git://github.com/jleyva/moodle 2015-03-31 13:59:05 +01:00
Dan Poltawski
0ec875745a Merge branch 'MDL-49645_master' of git://github.com/markn86/moodle 2015-03-31 13:28:19 +01:00
Dan Poltawski
2a9db845f8 Merge branch 'MDL-49641-get_external_files_master' of https://github.com/jpahullo/moodle 2015-03-31 13:15:06 +01:00
Dan Poltawski
90748dfb52 Merge branch 'MDL-49674-master-commentformat' of git://github.com/mudrd8mz/moodle 2015-03-31 12:16:58 +01:00
Dan Poltawski
deadda2f86 Merge branch 'MDL-48880' of git://github.com/jmvedrine/moodle 
Conflicts:
	mod/lesson/db/upgrade.php
	mod/lesson/version.php
 2015-03-31 11:21:11 +01:00
Dan Poltawski
4e664d1689 Merge branch 'MDL-26689' of git://github.com/jmvedrine/moodle 2015-03-31 10:46:30 +01:00
Dan Poltawski
7d9df98458 Merge branch 'wip-MDL-46960-master' of https://github.com/marinaglancy/moodle 2015-03-31 09:55:08 +01:00
Dan Poltawski
7e5c5b83c1 Merge branch 'm29_MDL-43818_Unable_Download_Package_Via_URL' of https://github.com/scara/moodle 2015-03-31 09:27:46 +01:00
Dan Poltawski
5b73c94858 Merge branch 'MDL-49525-master' of git://github.com/xow/moodle 2015-03-31 09:24:06 +01:00
Dan Poltawski
a7ef012dc4 Merge branch 'wip-mdl-48096' of https://github.com/rajeshtaneja/moodle 2015-03-31 08:57:59 +01:00
Rajesh Taneja
4df12b9372 MDL-48096 scorm: Include section number in cm 2015-03-31 15:51:47 +08:00
David Monllao
58aa74522d Merge branch 'MDL-49696-master' of git://github.com/andrewnicols/moodle 2015-03-31 15:42:11 +08:00
Andrew Nicols
649acb9833 MDL-49696 theme_bootstrapbase: Update thirdpartylibs.xml + readme 2015-03-31 15:33:39 +08:00
David Monllao
4451f89b07 Merge branch 'MDL-44874-master' of git://github.com/andrewnicols/moodle 2015-03-31 15:22:03 +08:00
Andrew Nicols
6efd119da2 Merge branch 'MDL-49695_master' of git://github.com/markn86/moodle 2015-03-31 15:14:45 +08:00
Rajesh Taneja
d421a973d1 MDL-48605 unit_test: Fixed file_temp_cleanup_task 
touch should only work on temp and below
dir's. With path we get temp/.. and temp/.
So we were modfying moodledata dir as well
and it was failing because of permission issues.
 2015-03-31 14:59:48 +08:00
Andrew Nicols
ea3a71faf7 MDL-49294 logging: Improve cleanup tests 2015-03-31 14:11:25 +08:00
Andrew Nicols
70be2642fc MDL-44874 core: Add per-request directory functions 
This adds functionality to create individual request directories which can
be only be used for the current request. They are removed by a shutdown
handler.
 2015-03-31 13:58:44 +08:00
Andrew Nicols
78045f6583 Merge branch 'log_cleanup_29' of https://github.com/tlevi/moodle 2015-03-31 12:56:31 +08:00
Andrew Nicols
e2c7ed7459 MDL-49669 badges: Add comment to explain CURLOPT_POSTREDIR 2015-03-31 12:19:12 +08:00
Andrew Nicols
59784e6cdf Merge branch 'MDL-49669_master' of https://github.com/totara/openbadges 2015-03-31 12:12:26 +08:00