Tim Hunt
7d99d3e9c4
MDL-45660 question statistics: fix regression added by MDL-44981.
...
Also, make comparison more robust.
2014-05-22 16:16:03 +01:00
Eloy Lafuente (stronk7)
529d4cdbc6
weekly release 2.6.3+
2014-05-22 16:47:12 +02:00
Eloy Lafuente (stronk7)
cd07fceed1
Merge branch 'install_26_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_26_STABLE
2014-05-22 16:47:07 +02:00
James Pratt
26ae6e5792
MDL-42526 mod_assignment : fix record insert with assigment.id 0
2014-05-22 12:54:45 +07:00
AMOS bot
217613ab21
Automatically generated installer lang files
2014-05-22 01:08:09 +00:00
Simon Coggins
c017cc5ca9
MDL-45623: Fix assigned users count on role delete confirmation page
2014-05-22 08:16:46 +12:00
Rod Norfor
03966a4ec0
MDL-45654 cron: fix non-empty directories deletion
...
Remove errors when attempting to delete non-empty directories when
child directories do not get removed since the mtime was updated when
files were removed from the child directory.
2014-05-21 17:24:02 +01:00
Sam Hemelryk
b1cb63b24f
MDL-44711 course: fixed navigation expansion in course tests
2014-05-21 20:58:35 +12:00
Mark Nelson
ec373efd6d
MDL-45650 events: ensure correct objectid passed when triggering user_profile_viewed event
2014-05-21 00:25:48 -07:00
Mark Nelson
4a9dcf3f17
MDL-45607 events: changed the context passed to the user_profile_viewed event
2014-05-20 21:13:28 -07:00
Marina Glancy
f01e4739fd
MDL-45469 profile: make sure profile fields can be initialised without arguments
2014-05-21 11:53:53 +08:00
Dan Poltawski
7d5774aaa2
Merge branch 'wip-MDL-45371-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE
2014-05-21 10:03:09 +08:00
Marina Glancy
7a562bf521
MDL-45320 behat: change to block selector
2014-05-20 20:52:37 +08:00
Marina Glancy
0c11e7ed30
MDL-45320 block_html: behat tests
2014-05-20 20:52:14 +08:00
Marina Glancy
a33bc20d2e
MDL-45320 behat: Step definitions for blocks
2014-05-20 20:52:01 +08:00
David Monllao
e3353f92fc
MDL-45294 behat: Updating block references to aria label value
...
Also improving moodle selectors xpath expressions
readability.
2014-05-20 20:47:48 +08:00
David Monllao
28e5ece329
MDL-45294 behat: Supporting an aria-label as a block ref
2014-05-20 20:47:48 +08:00
Dan Poltawski
239db05eec
Merge branch '44711-26-r2' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-05-20 20:32:02 +08:00
Sam Hemelryk
4fc9f74029
MDL-44711 block_navigation: fixed typo in behat tests
2014-05-20 23:38:25 +12:00
Damyon Wiese
e679a371ef
MDL-45606 Unit test fix for MySQL and added a comment about the removed code.
2014-05-20 18:07:28 +08:00
Dan Poltawski
af8bd4de8e
Merge branch 'MDL-45496-m26' of https://github.com/micaherne/moodle into MOODLE_26_STABLE
2014-05-20 15:55:13 +08:00
Marina Glancy
1cbfc11612
Merge branch 'MDL-45525-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-05-20 14:30:14 +08:00
Marina Glancy
bf75a73cc5
Merge branch 'MDL-45536-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-05-20 14:26:31 +08:00
Marina Glancy
97dc7bfc0b
Merge branch 'wip-MDL-45512-26' of git://github.com/abgreeve/moodle into MOODLE_26_STABLE
2014-05-20 14:22:51 +08:00
Marina Glancy
f60c23a781
Merge branch 'MDL-43669-m26' of git://github.com/micaherne/moodle into MOODLE_26_STABLE
2014-05-20 14:16:27 +08:00
Marina Glancy
2b0b60631d
Merge branch 'MDL-44333_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-05-20 14:11:57 +08:00
Andrew Nicols
51a6bf7f1a
MDL-45536 theme: Use width auto for inputs and textareas specifying them
2014-05-20 14:08:58 +08:00
Damyon Wiese
2a6cc872ff
Merge branch 'm26_MDL-45583' of github.com:danmarsden/moodle into MOODLE_26_STABLE
2014-05-20 13:30:37 +08:00
Damyon Wiese
350e34d177
Merge branch 'MDL-45323-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE
2014-05-20 13:29:30 +08:00
Dan Poltawski
67f6ebacff
Merge branch 'MDL-45545-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-05-20 12:21:58 +08:00
Sam Hemelryk
e77dcc602d
Merge branch 'MDL-44323-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/less/moodle/admin.less
theme/bootstrapbase/style/moodle.css
2014-05-20 15:45:21 +12:00
Sam Hemelryk
aa1d665a3a
Merge branch 'MDL-44027-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
2014-05-20 15:39:31 +12:00
Dan Poltawski
2b0ea3051d
Merge branch 'MDL-45605-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE
2014-05-20 10:51:27 +08:00
Dan Poltawski
fa496d3fe1
Merge branch 'MDL-45546-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-05-20 10:24:40 +08:00
Dan Poltawski
fa4ff1bd10
Merge branch '44711-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-05-20 10:14:24 +08:00
Sam Hemelryk
43f39c235f
Merge branch 'MDL-45603-26' of https://github.com/merrill-oakland/moodle into MOODLE_26_STABLE
2014-05-20 13:59:33 +12:00
Marina Glancy
0e46c03356
Merge branch 'MDL-45469-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-05-20 09:52:48 +08:00
Dan Poltawski
940269660f
Merge branch 'MDL-44449_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-05-20 09:50:51 +08:00
Damyon Wiese
4c2ba6794b
Merge branch '44974-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE
2014-05-20 09:01:24 +08:00
Sam Hemelryk
7d14ae30e9
Merge branch 'MDL-45477-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-05-20 11:58:18 +12:00
Sam Hemelryk
8ffb738721
Merge branch 'MDL-45535-m26' of https://github.com/sammarshallou/moodle into MOODLE_26_STABLE
2014-05-20 11:55:47 +12:00
Sam Hemelryk
cf1cf9499f
Merge branch 'MDL-37838-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
2014-05-20 10:42:19 +12:00
Sam Hemelryk
d18bc9dc02
Merge branch 'MDL-45380-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2014-05-20 08:53:11 +12:00
Sam Hemelryk
17f8fb7f3e
Merge branch 'MDL-45135-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE
2014-05-20 08:47:21 +12:00
Tim Hunt
969c26def0
MDL-44449 quiz access rules should have a delete hook.
...
So they can clean up their settings when the quiz is deleted.
See
babf149c2c
for an example of using this.
2014-05-19 16:59:21 +01:00
Damyon Wiese
cbaad47bf2
Merge branch 'MDL-45472-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE
2014-05-19 20:47:49 +08:00
Damyon Wiese
9ccd8759ea
Merge branch 'MDL-43833_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-05-19 20:12:20 +08:00
Damyon Wiese
5b26aca437
Merge branch 'MDL-45527-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE
2014-05-19 20:07:00 +08:00
Damyon Wiese
2e0b5708f1
Merge branch 'MDL-45455_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE
2014-05-19 19:57:57 +08:00
Dan Poltawski
ce400f61e6
Merge branch 'MDL-45432-MOODLE_26_STABLE' of https://github.com/lucisgit/moodle into MOODLE_26_STABLE
2014-05-19 18:43:17 +08:00