mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-17 06:00:05 +01:00
Code Issues Projects Releases Wiki Activity
72,720 Commits 36 Branches 527 Tags
Commit Graph

16601 Commits

Author SHA1 Message Date
Dan Poltawski
422c29d339 Merge branch 'master_MDL-49054' of git://github.com/danmarsden/moodle 2015-03-24 15:12:24 +00:00
David Monllao
6f27fbb435 Merge branch 'MDL-49337-master' of git://github.com/jleyva/moodle 
Conflicts:
	lib/db/services.php
 2015-03-24 17:55:42 +08:00
Juan Leyva
067b3fda6a MDL-49337 webservices: Unit tests for mod_data_get_databases_by_courses 2015-03-24 10:46:36 +01:00
Juan Leyva
a090259eaa MDL-49337 webservices: Include the new WS in the mobile app service 2015-03-24 10:46:36 +01:00
Juan Leyva
5c438daad5 MDL-49337 webservices: mod_data services file definition 2015-03-24 10:46:35 +01:00
Juan Leyva
2ab3481990 MDL-49337 webservices: New WS mod_data_get_databases_by_courses 2015-03-24 10:46:35 +01:00
David Monllao
a2be9de182 Merge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle 
Conflicts:
	mod/lesson/version.php
 2015-03-24 13:25:26 +08:00
David Monllao
bedf3a0a39 MDL-49470 mod_lesson: Adding text space + unit test refinement 2015-03-24 11:59:05 +08:00
Stephen Bourget
14cdeb7ba9 MDL-49470 Lesson: Add page moved event 
Conflicts:
	mod/lesson/version.php
 2015-03-24 11:05:56 +08:00
Eloy Lafuente (stronk7)
6ae45106fc Merge branch 'MDL-48718-master' of git://github.com/jleyva/moodle 2015-03-24 01:51:44 +01:00
Eloy Lafuente (stronk7)
20e955a18e Merge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle 2015-03-24 01:38:15 +01:00
Eloy Lafuente (stronk7)
e448df5ec9 Merge branch 'wip-MDL-35482-master' of git://github.com/satrun77/moodle 2015-03-24 00:39:12 +01:00
Eloy Lafuente (stronk7)
0b8cb023c1 Merge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle 2015-03-24 00:30:16 +01:00
Dan Poltawski
6b578e9611 Merge branch 'MDL-35280_m29v2' of https://github.com/sbourget/moodle 2015-03-23 11:25:55 +00:00
Dan Poltawski
ab5b4d80c5 Merge branch 'MDL-21201-master-feedback_anon' of https://github.com/DSI-Universite-Rennes2/moodle 2015-03-23 11:03:28 +00:00
Marina Glancy
8eb35d9826 MDL-13831 workshop: process gradepass only if set 2015-03-23 16:52:20 +08:00
David Monllao
ef4b8bb98b Merge branch 'wip-MDL-13831-master' of git://github.com/marinaglancy/moodle 2015-03-23 11:51:09 +08:00
Marina Glancy
c977b35059 MDL-13831 grades: allow to set gradepass in mod_form 2015-03-23 11:11:37 +08:00
Gregory Faller
8164fad49d MDL-13831 course: add gradepass field to mod_form 2015-03-23 10:56:56 +08:00
Dan Marsden
b6906055ca MDL-49054 scorm: Remove some old debugging code. 2015-03-23 08:56:33 +13:00
Julien Boulen
bd338a4559 MDL-21201 Feedback: hide anonymous responses in recent activity reports 2015-03-20 16:28:11 +01:00
Juan Leyva
55a1fe4b8e MDL-48718 mod_imscp: imscp_export_contents unit tests 2015-03-20 14:43:48 +01:00
Juan Leyva
ed761ccfbf MDL-48718 mod_imscp: imscp_export_contents function implemented 2015-03-20 14:43:48 +01:00
Tony Butler
74cc07bedf MDL-43770 mod_choice: Add behat scenarios for 'include inactive' option 2015-03-20 09:55:16 +00:00
Tony Butler
799770cbd7 MDL-43770 mod_choice: Add option to include inactive users' responses 2015-03-20 09:55:16 +00:00
Tony Butler
6de3eee04c MDL-43770 mod_choice: Exclude responses from inactive users 2015-03-20 09:55:16 +00:00
Marina Glancy
985af410a7 MDL-28526 glossary: extra time and memory for export/import 2015-03-20 15:02:32 +08:00
Marina Glancy
27d01f7c8c MDL-28526 glossary: preserve images across export/import 2015-03-20 14:55:11 +08:00
Nadav Kavalerchik
47ecb3749e MDL-32285 IMS-CP: Add "Continue" button to package parse failure 2015-03-20 01:41:38 +02:00
Mohamed Alsharaf
324954141e MDL-35482 lesson: return to previous page after edit and page save 2015-03-20 12:01:24 +13:00
Jean-Michel Vedrine
4b570f7144 MDL-48715 mod_lesson: completion rules must not be dependent 2015-03-19 12:24:55 +01:00
Dan Poltawski
2e796a1615 Revert "Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github.com/SWiT/moodle" 
This reverts commit 94d0be78407fe2e6abf5acee7c7decda7ab837c2, reversing
changes made to f51ef4d102530e2a7c618d54ff06725e6bf20f4d.
 2015-03-19 12:24:54 +01:00
Dan Poltawski
7eb98397dc Revert "MDL-49121 mod_lesson: Fixed typo in link creation" 
This reverts commit feb8ca8c72dcf429d3c06df6587b57221ae615f4.
 2015-03-19 12:24:52 +01:00
Rajesh Taneja
909064a1ce MDL-49121 mod_lesson: Fixed typo in link creation 2015-03-19 12:24:50 +01:00
Rajesh Taneja
56159e91d7 MDL-49445 behat: Change selector as underline tr has same string 2015-03-19 12:24:49 +01:00
Stephen Bourget
e0f7b96347 MDL-49430 Lesson: Add restarted and resumed events 2015-03-18 13:30:29 -04:00
David Monllao
4abb49603e MDL-40990 mod_quiz: Changing upgrade process according to version 2015-03-18 08:34:48 +08:00
David Monllao
7794f80126 Merge branch 'MDL-48715' of git://github.com/jmvedrine/moodle 2015-03-18 08:31:03 +08:00
David Monllao
63fe1c12f7 Merge branch 'MDL-40990' of git://github.com/timhunt/moodle 2015-03-18 08:22:06 +08:00
Jean-Michel Vedrine
10e2355f8c MDL-48715 mod_lesson: use only one field for time spent rule 2015-03-17 20:47:01 +01:00
Tim Hunt
441d284ada MDL-40990 quiz: option to require prev Q finished before next shown 
Further improvements to this code, including resolving edge cases:

* The new feature can only be used when it is possible for the
previous question in the quiz to be complete.

* Also, this new feature cannot be used in combination with shuffle
questions, because that make no sense; nor in combination with
sequential navigation, because to make that work properly would be a lot
of effort. If someone needs that to work later, it should be possible
for them to implement it.

* There were changes in the edit renderer API, to try to make things
more  consistent, and to make it less likely we will need to change
things again in the future. See mod/quiz/upgrade.txt.

* As part of this change, the styling of the Edit quiz page was tweaked
to make slighly more efficient use of the horizontal space, and to be
more symmetrical.
 2015-03-17 17:16:22 +00:00
M Kassaei
f7785e42b3 MDL-40990 quiz: option to require prev Q finished before next shown 2015-03-17 17:10:13 +00:00
Dan Poltawski
94d0be7840 Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github.com/SWiT/moodle 2015-03-17 11:14:21 +00:00
Eloy Lafuente (stronk7)
f51ef4d102 Merge branch 'MDL-49296_m29v3' of https://github.com/sbourget/moodle 2015-03-17 12:03:50 +01:00
Stephen Bourget
d27e9a2cdb MDL-49296 Lesson: Add titles to action links 2015-03-16 20:33:22 -04:00
Stephen Bourget
113486d2eb MDL-35280 Quiz: Allow course reset to remove overrides 2015-03-16 19:41:15 -04:00
Dan Poltawski
4501ee4b16 Merge branch 'MDL-48965' of git://github.com/jmvedrine/moodle 2015-03-16 21:05:56 +00:00
Dan Poltawski
f5526fdf8f Merge branch 'wip-MDL-49267-master' of git://github.com/marinaglancy/moodle 2015-03-16 15:52:36 +00:00
Dan Poltawski
448a80c6e9 Merge branch 'MDL-48717-master' of git://github.com/jleyva/moodle 2015-03-16 15:28:50 +00:00
Juan Leyva
e6d6393478 MDL-48717 book: book_exports_contents unit tests 2015-03-16 15:59:20 +01:00