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
Stephen Bourget
113486d2eb
MDL-35280 Quiz: Allow course reset to remove overrides
2015-03-16 19:41:15 -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
Dan Poltawski
f4e1913530
Merge branch 'MDL-49152-master' of git://github.com/damyon/moodle
2015-03-16 14:26:15 +00:00
Dan Poltawski
3bec364f35
Merge branch 'MDL-49442-master' of git://github.com/jethac/moodle
2015-03-16 13:31:07 +00:00
Dan Poltawski
e4d0db1769
Merge branch 'MDL-49163-master' of git://github.com/damyon/moodle
2015-03-16 11:01:18 +00:00
Dan Poltawski
6a24f0a796
Merge branch 'MDL-45725-master' of https://github.com/lucisgit/moodle
2015-03-16 10:52:02 +00:00
Tony Butler
60ec267b0b
MDL-45725 core_lib: Add unit test for persistent flexible tables
2015-03-16 10:41:11 +00:00
Tony Butler
f5ba1b93a2
MDL-45725 core_lib: Save user preferences for flexible tables
2015-03-16 10:41:11 +00:00
Dan Poltawski
8f5378700a
Merge branch 'MDL-44367_master' of git://github.com/dmonllao/moodle
2015-03-16 09:57:16 +00:00
David Monllao
7035377b58
Merge branch 'MDL-49445' of git://github.com/timhunt/moodle
2015-03-16 15:38:02 +08:00
Tony Levi
d9b3bb0f87
MDL-49531 behat: Fix parallel runner with extraopts
2015-03-16 16:34:43 +10:30
Andrew Nicols
5d41952fbb
Merge branch 'MDL-47712-int-fix' of git://github.com/dmonllao/moodle
2015-03-16 13:50:11 +08:00
David Monllao
fd822c0bc5
Merge branch 'MDL-19670-master' of git://github.com/gurgus/moodle
2015-03-16 13:45:31 +08:00
David Monllao
365377bcb2
MDL-47712 question_multianswer: Concat as string
2015-03-16 12:28:51 +08:00
David Monllao
da7f38007e
Merge branch 'MDL-47712-master' of git://github.com/dthies/moodle
2015-03-16 10:33:14 +08:00
David Monllao
5f2747c866
Merge branch 'master_MDL-44548' of git://github.com/danmarsden/moodle
2015-03-16 10:04:14 +08:00
David Monllao
4950f166d5
Merge branch 'wip-MDL-47729-master' of git://github.com/marinaglancy/moodle
2015-03-16 09:49:05 +08:00
Dan Marsden
9e733da743
MDL-44548 mod_scorm: force an external sync to check for updated files.
2015-03-16 09:02:26 +13:00
Jean-Michel Vedrine
b7a2633d7d
MDL-48715 mod_lesson: behat test for time spent completion condition
2015-03-15 15:25:30 +01:00
Jean-Michel Vedrine
d0445cf70d
MDL-48715 mod_lesson: add a time spent custom completion rule
2015-03-15 15:24:55 +01:00
Damyon Wiese
9bdcf57951
MDL-49152 output: Templates for renderers (JS and PHP)
...
Mustache support for rendering templates from either php or js.
2015-03-14 22:48:40 +08:00
Daniel Thies
530a2cb0d1
MDL-47712 qtype_multianswer: Move mathjaxloader spans to outer question
2015-03-13 20:43:03 -05:00
Tim Hunt
ca0ceacd27
MDL-49446 behat: should_not_be_visible steps were not working
...
I fixed all similar problems in this class, even ones where it did
actually work becuase the two exceptions were of different types.
This pattern seems to have been copied and pasted a lot in this class,
and I am sure that will happen again, so I did not want to leave any
dangerous potential examples around.
2015-03-13 14:28:47 +00:00
Tim Hunt
5954a9de10
MDL-49445 behat: selectors should match the most specific tr or li
...
I also fixed the text rule, which already did this, to use the same
idiom. It is unnecessarily inefficient to count all the things and
compare to 0. Not exists should be faster.
Also, updated all the selectors here to consistently start relative to
the current node (.//, not //).
2015-03-13 14:28:13 +00:00
Tim Hunt
e1ace26f11
MDL-49389 blocklib: avoid notices when moving blocks to the bottom
2015-03-13 14:27:11 +00:00
Tim Hunt
fd7a8af50b
MDL-40990 qbehaviours: method to say if attempts can finish naturally
2015-03-13 14:23:02 +00:00
Matt Switlik
4ac4a9cc52
MDL-49121 mod/lesson: master optimize lesson report and fixed for coding guidelines
2015-03-13 09:04:03 -04:00
Gary Krige
8098d21b52
MDL-49309 user: sort cohorts by name in bulk user actions
2015-03-13 12:29:39 +02:00