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

72656 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dan Poltawski
68d52a732f Merge branch 'master_MDL-48419' of https://github.com/danmarsden/moodle 2015-03-23 11:15: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
f1d498a62a MDL-48456 course: Using default max int value 2015-03-23 15:16:18 +08:00
David Monllao
ae9ed08f53 Merge branch 'MDL-48456-master' of git://github.com/dkns/moodle 2015-03-23 15:14:58 +08:00
David Monllao
2572356895 Merge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle 2015-03-23 14:59:05 +08:00
David Monllao
b191360fea Merge branch 'wip-MDL-27074-master' of git://github.com/marinaglancy/moodle 2015-03-23 14:54:37 +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
Marina Glancy
c96534600d MDL-27074 calendar: display group name for group events 2015-03-23 10:16:55 +08:00
Daniel Kosinski
551e64ccb9 MDL-48456 course: Increase timeout when deleting all courses in category 2015-03-22 16:21:51 +01:00
Julien Boulen
bd338a4559 MDL-21201 Feedback: hide anonymous responses in recent activity reports 2015-03-20 16:28:11 +01: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
Eloy Lafuente (stronk7)
a149d6a177 weekly release 2.9dev 2015-03-19 12:41:54 +01:00
Eloy Lafuente (stronk7)
a606eed6a5 Merge branch 'behat_parallel_extraopts' of https://github.com/tlevi/moodle 2015-03-19 12:24:55 +01: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 94d0be7840, reversing
changes made to f51ef4d102.
 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
Dan Poltawski
516c5d807a Merge branch 'wip-mdl-49121' of git://github.com/rajeshtaneja/moodle 2015-03-19 12:24:51 +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
Eric Merrill
a7fdadc94c MDL-47002 atto: Improve paste behaviour to ensure propper cleanup 
Old code failed to clean the editor div which resulted in
undesirable code being being left in the div for editing. To properly
handel incoming code, we should try to intercept and clean before the
paste, or clean the entire editable div.
 2015-03-18 09:27:44 -04:00
Dan Marsden
552281e461 MDL-48419 mod_scorm: Check net script too agressive 
in some cases high latency and network issues result in longer
than 2 sec responses from a server, increase this to avoid
excessive warnings.
 2015-03-18 20:06:39 +13: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
Eloy Lafuente (stronk7)
536cf8c298 Merge branch 'MDL-49361-master-stringman' of git://github.com/mudrd8mz/moodle 2015-03-17 12:00:29 +01:00
Eloy Lafuente (stronk7)
bac940ada7 Merge branch 'wip-MDL-49439-master' of https://github.com/marinaglancy/moodle 2015-03-17 11:58:35 +01:00
Dan Poltawski
bc468d42c7 Merge branch 'MDL-49309-bulkadd-cohort-sort' of https://github.com/GeeGee-Edu/moodle 2015-03-17 09:20:17 +00:00
Dan Poltawski
1fbc0e5f43 Merge branch 'MDL-49371_master' of git://github.com/dmonllao/moodle 2015-03-17 09:06:59 +00:00
David Monllao
9db120e338 MDL-49385 blocks: Adding todo tag 2015-03-17 14:52:12 +08:00
David Monllao
7d5fad1575 Merge branch 'MDL-49385-master' of git://github.com/lucisgit/moodle 2015-03-17 14:49:05 +08:00
Marina Glancy
fc77f56679 MDL-49439 enrol: Allow quick adding several instances 2015-03-17 14:01:34 +08:00
Stephen Bourget
d27e9a2cdb MDL-49296 Lesson: Add titles to action links 2015-03-16 20:33:22 -04:00
Eugene Venter
96e339cc58 MDL-49356 restore: handle course completion if still not defined 
Before this patch course completion only was restored if, appart from
other conditions... we were restoring to new course, never to existing
one.

This relaxes a bit that condition in order to be able to restore to an
existing course not having any course completion setting defined, so no
conflict will happen ever.
 2015-03-17 00:34:09 +01:00
Eloy Lafuente (stronk7)
e201bf16a0 Merge branch 'MDL-49389' of git://github.com/timhunt/moodle 2015-03-17 00:28:31 +01:00
Andrew Nicols
1f50bbf184 MDL-49381 message: Remove old useridfrom indexes 2015-03-17 00:26:20 +01:00
Mike Grant
d0c2bc6466 MDL-49276 config-dist: Removed legacy config options 
Both $CFG->logsql and $CFG->dblogerror had no use in moodle core
since ages ago (just the former had one use for nothing). Good time
to get rid of both as they are 100% misleading.
 2015-03-16 23:39:41 +01: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
Dan Poltawski
f3b35cffc3 Merge branch 'MDL-49187' of https://github.com/spvickers/moodle 2015-03-16 14:45:53 +00:00