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
73161 commits 37 branches 540 tags 1.3 GiB
Commit graph

73161 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Marina Glancy
058caae6f3 MDL-49687 enrol: allow to add user to multiple gorups 2015-04-02 17:02:39 +08:00
LE PERF Stephane
ab2fa7a768 MDL-49677 enrol_self: allow fullname and email in the welcome message 2015-04-02 09:42:20 +02:00
John Phoon
28e31ae43f MDL-28592 webservices: Add manual unenrol users to external services 2015-04-02 17:37:44 +11:00
Tony Levi
a7e4cff20a MDL-49395 accesslib: Make get_suspended_userids more efficient 2015-04-02 13:53:49 +10:30
Adrian Greeve
7efd0c0adb MDL-49380 enrol_cohort: Update to code and introduction of a constant. 2015-04-02 09:49:35 +08:00
Juan Leyva
d4fdd3a1b0 MDL-49330 core_notes: Fixed unit tests (broken in postgres) 2015-04-01 13:02:25 +02:00
Juan Leyva
ea2f0e3e87 MDL-49314 webservices: Fix unit tests for handling hidden activities 2015-04-01 12:22:08 +02:00
Costantino Cito
12068d65cb MDL-49330 core_notes: Unit tests for get_course_notes 2015-04-01 10:44:45 +02:00
Costantino Cito
9857381dc3 MDL-49330 core_notes: New external function core_notes_get_course_notes 2015-04-01 10:44:45 +02:00
Juan Leyva
9cd1093c33 MDL-49314 webservices: Check groups using groups_user_groups_visible 2015-04-01 10:21:17 +02:00
Juan Leyva
aa5faf0070 MDL-49314 groups: Unit tests for groups_user_groups_visible 2015-04-01 10:19:26 +02:00
Juan Leyva
c616c5f145 MDL-49314 groups: New API function groups_user_groups_visible 2015-04-01 10:19:26 +02:00
Juan Leyva
f578820b3b MDL-49314 webservices: Unit tests for the new external function 2015-04-01 10:19:25 +02:00
Juan Leyva
604afeff1c MDL-49314 webservices: Add the new function to the mobile service 
The commit also include some clean-up
 2015-04-01 10:19:25 +02:00
Costantino Cito
5f2406c94a MDL-49314 webservices: New WS get_activities_completion_status 2015-04-01 10:19:25 +02:00
Rajesh Taneja
bed97c39eb MDL-49513 behat: Set admin config using php api 
Added a new set to set config using set_config() api
to make steps faster and more efficient
 2015-04-01 14:25:23 +08:00
Adrian Greeve
df9dbc9f42 MDL-49380 enrol_cohort: Unit tests and formatting update. 2015-04-01 14:05:29 +08:00
Mark Nelson
b25e15b224 MDL-49736 core_question: fixed ability to unhide questions 2015-03-31 22:57:51 -07: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
Tim Lock
1241b871cf MDL-38210 report_participation: implement get view/post actions 2015-04-01 10:26:44 +10:30
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
David Mudrák
3e4f5e6591 MDL-47773 comment: Indicate comment being saved via AJAX 
This should be considered as quick & dirty usability fix as the whole JS
should ideally be rewritten and this behaviour should use CSS classes.
 2015-03-31 13:59:59 +02:00