Mark Nelson
0c7cca226d
MDL-48012 tool_recyclebin: removed indexes as FKs exist
2016-03-22 11:12:08 +08:00
Dan Poltawski
5aaa2b3750
Merge branch 'MDL-52158-master' of https://github.com/xow/moodle
2016-03-22 10:32:34 +08:00
Eloy Lafuente (stronk7)
55e90f2270
Merge branch 'MDL-53393-master' of git://github.com/cameron1729/moodle
2016-03-22 03:16:51 +01:00
David Monllao
a018d82af7
MDL-53513 libraries: Fix lessphp version
2016-03-22 09:57:51 +08:00
David Monllao
809307b490
Merge branch 'MDL-53513-master' of git://github.com/lameze/moodle
2016-03-22 09:56:21 +08:00
Dan Poltawski
c71d11404d
Merge branch 'wip-MDL-52619-master' of git://github.com/abgreeve/moodle
2016-03-22 09:54:03 +08:00
David Monllao
64fe3af054
Merge branch 'MDL-53456-master' of git://github.com/lameze/moodle
2016-03-22 09:50:34 +08:00
David Monllao
67f884029d
Merge branch 'MDL-53512-master' of git://github.com/lameze/moodle
2016-03-22 09:47:36 +08:00
David Monllao
01cd5aeef6
Merge branch 'MDL-53455-master' of git://github.com/lameze/moodle
...
Conflicts:
lib/jquery/plugins.php
2016-03-22 09:44:49 +08:00
David Monllao
cdc6407a10
Merge branch 'wip-MDL-53458-master' of git://github.com/abgreeve/moodle
2016-03-22 09:35:19 +08:00
Eloy Lafuente (stronk7)
c572ac8f3a
Merge branch 'MDL-53357-dont-break-urls' of https://github.com/brendanheywood/moodle
2016-03-22 02:25:40 +01:00
Andrew Nicols
d7dbef7366
MDL-53181 core: Add selectors to user menu items
2016-03-22 09:20:21 +08:00
Simey Lameze
6648283a77
MDL-53512 libraries: update google API library to version 1.1.7
2016-03-22 08:38:11 +08:00
David Monllao
37f45f44b7
Merge branch 'MDL-53409-master' of git://github.com/crazyserver/moodle
2016-03-22 08:01:16 +08:00
Eloy Lafuente (stronk7)
675c6d4b54
Merge branch 'wip-MDL-45274-master' of https://github.com/marinaglancy/moodle
2016-03-22 00:45:48 +01:00
David Monllao
ab89d2aebc
MDL-53454 lib: Fix incorrect jquery version
2016-03-22 07:44:31 +08:00
David Monllao
854cd1464b
Merge branch 'MDL-53454-master' of git://github.com/lameze/moodle
2016-03-22 07:42:52 +08:00
Eloy Lafuente (stronk7)
8eb8e5df83
Merge branch 'MDL-48307-master' of git://github.com/marinaglancy/moodle
2016-03-22 00:28:02 +01:00
David Monllao
88027ca371
Merge branch 'wip-MDL-53457-master' of git://github.com/abgreeve/moodle
2016-03-22 07:24:37 +08:00
Tim Hunt
0c8a90d7cb
MDL-53507 quiz editing: was possible to lose questions
...
If you dragged a question to the top of the quiz, it could
disappear. Several other cases of dragging questions to the
same place in sequence, but to a different page/section were
also failing, and have been fixed.
2016-03-21 23:14:53 +00:00
David Monllao
145bb61d79
Merge branch 'wip-MDL-53465-master' of git://github.com/abgreeve/moodle
2016-03-22 07:12:52 +08:00
David Monllao
bc9f8c5e1c
Merge branch 'MDL-53518-master' of git://github.com/lameze/moodle
2016-03-22 06:56:40 +08:00
David Monllao
f811003aae
Merge branch 'MDL-53519-master' of git://github.com/lameze/moodle
2016-03-22 06:51:57 +08:00
Eloy Lafuente (stronk7)
197f99a808
Merge branch 'MDL-52978_master' of git://github.com/markn86/moodle
2016-03-21 23:07:16 +01:00
Eloy Lafuente (stronk7)
b1871ae68b
MDL-53034 mod_quiz: version mini-bump
2016-03-21 23:01:46 +01:00
Eloy Lafuente (stronk7)
5032fb4f54
Merge branch 'MDL-53034-master' of git://github.com/jleyva/moodle
2016-03-21 22:58:28 +01:00
Eloy Lafuente (stronk7)
3720f100ea
Merge branch 'MDL-52888-master' of git://github.com/jleyva/moodle
2016-03-21 22:40:43 +01:00
Eloy Lafuente (stronk7)
7cc45b2e72
Merge branch 'MDL-52868-master' of git://github.com/jleyva/moodle
2016-03-21 22:20:00 +01:00
Dan Poltawski
26f59e5080
Merge branch 'MDL-52863-master' of git://github.com/jleyva/moodle
2016-03-21 17:42:19 +08:00
Dan Poltawski
f6a0594e7e
Merge branch 'MDL-52852-master' of git://github.com/jleyva/moodle
2016-03-21 17:27:20 +08:00
Dan Poltawski
121b46e033
Merge branch 'MDL-52830-master' of git://github.com/jleyva/moodle
2016-03-21 17:09:15 +08:00
Dan Poltawski
00a6c59936
MDL-52813 mod_quiz: bump version
...
Diverge from stable branching
2016-03-21 17:05:05 +08:00
Brendan Heywood
318e5cb302
MDL-53562 forum: Fixed missing forum subject Re: prefix
2016-03-21 19:41:40 +11:00
Dan Poltawski
2569face4e
Merge branch 'MDL-52813-master' of git://github.com/jleyva/moodle
2016-03-21 16:37:57 +08:00
Brendan Heywood
852797d15c
MDL-53049 themes: Offset href anchor when bootstrap header is fixed
...
On large screens the bootstrap header is static and can obscure the
anchor target content underneath it.
2016-03-21 19:25:51 +11:00
Willem Roes
96f56b6e29
MDL-52646 mod_scorm: fix missing launch_data for SCORM 2004
2016-03-21 09:00:50 +01:00
Dan Poltawski
e372bb043e
MDL-53260 cli: fix trailing whitespace
2016-03-21 15:23:37 +08:00
Dan Poltawski
c4173bb8ba
Merge branch 'MDL-53260-master' of git://github.com/junpataleta/moodle
2016-03-21 15:14:23 +08:00
Jun Pataleta
830f8bc780
MDL-53260 upgrade: Make lang option default to the site language
2016-03-21 15:08:59 +08:00
Dan Poltawski
fd2cdbd2a7
Merge branch 'MDL-53407-editing-css' of https://github.com/Dagefoerde/moodle
2016-03-21 14:48:41 +08:00
Dan Poltawski
3a0b30c7c7
Merge branch 'MDL-52952-master' of https://github.com/xow/moodle
2016-03-21 14:44:15 +08:00
Brendan Heywood
f725d955b9
MDL-53147 theme_bootstrapbase: Fix message page responsive layout issues
2016-03-21 17:26:31 +11:00
Dan Poltawski
5821479ef6
Merge branch 'MDL-53239_master' of git://github.com/dmonllao/moodle
2016-03-21 14:12:10 +08:00
Adrian Greeve
1f8ab584e9
MDL-52752 filters: Update MathJax to version 2.6
2016-03-21 14:10:00 +08:00
Dan Poltawski
732d4f8318
Merge branch 'MDL-53315-imap-namespace' of https://github.com/brendanheywood/moodle
2016-03-21 14:01:46 +08:00
Simey Lameze
931eef1226
MDL-53455 libraries: upgrade jquery migrate to version 1.4.0
2016-03-21 13:42:54 +08:00
Dan Poltawski
3afc41ea95
Merge branch 'wip-mdl-53564' of https://github.com/rajeshtaneja/moodle
2016-03-21 13:37:00 +08:00
Simey Lameze
dfc7c0a9df
MDL-53519 auth_cas: update cas to version 1.3.4
2016-03-21 13:16:03 +08:00
Simey Lameze
af4a2f0d62
MDL-53518 libraries: upgrade mardown to 1.6.0 version
2016-03-21 13:04:05 +08:00
Simey Lameze
b0d985e81f
MDL-53513 libraries: update lessphp to version 1.7.0.10
2016-03-21 13:01:43 +08:00
