d4f69a462e
Merge branch 'MDL-52388-master' of git://github.com/cameron1729/moodle
2016-03-29 23:14:06 +02:00
0729ea9fd7
Merge branch 'wip-MDL-53274-master' of https://github.com/marinaglancy/moodle
2016-03-29 17:12:42 +08:00
b9280927d6
Merge branch 'MDL-53543_master' of git://github.com/dmonllao/moodle
2016-03-29 16:45:37 +08:00
9c048e21ac
MDL-53633 javascript: Ensure that ordering of options is preserved
2016-03-29 15:47:00 +08:00
0ae7fa12ac
Merge branch 'wip-MDL-52760-master' of https://github.com/marinaglancy/moodle
2016-03-29 12:55:46 +08:00
a042f56be5
Merge branch 'wip-mdl-53623' of https://github.com/rajeshtaneja/moodle
2016-03-29 12:49:27 +08:00
f7074f5db4
Merge branch 'MDL-45835-master' of git://github.com/cameron1729/moodle
2016-03-29 10:37:25 +08:00
225265b03d
MDL-53623 behat: catch expection if failed to trigger event
...
Inline editing element might hide before
event is triggred, so don't trigger exception
if exception happens
2016-03-29 09:52:37 +08:00
497cd6d48b
Merge branch 'MDL-53181-master' of git://github.com/andrewnicols/moodle
2016-03-29 09:50:52 +08:00
1bed89fe6a
Merge branch 'MDL-52945' of https://github.com/mr-russ/moodle
2016-03-29 09:43:30 +08:00
6a3116dd3c
Merge branch 'wip-MDL-50795-master' of git://github.com/abgreeve/moodle
2016-03-26 09:31:54 +08:00
3615219889
NOBUG: Fixed file access permissions
2016-03-24 12:58:10 +01:00
b31bbcf839
MDL-52388 output: Only stop displaying pager next link on last page
...
Thank you to Brenda Uga for working on this.
2016-03-24 16:56:30 +08:00
dd399f51ab
MDL-45835 group: events for groupings assign/unassign
2016-03-24 10:59:35 +08:00
387c8026a5
MDL-50795 atto: Pasting into atto removes background colour style.
...
Copying from one atto editor to another comes with a lot of style
information. This removes the color attributes which make the page
look ugly when competing with different themes.
2016-03-24 10:53:59 +08:00
94eb96aa78
MDL-52952 forms: Ignore autofill catching fields in form change checker
2016-03-23 11:54:27 +08:00
b5335149f4
Merge branch 'wip-MDL-53254-master' of https://github.com/marinaglancy/moodle
2016-03-23 09:17:11 +08:00
8ca99daf86
Merge branch 'MDL-53383-master' of git://github.com/andrewnicols/moodle
2016-03-23 08:14:23 +08:00
cbecc3c35a
MDL-53254 tags: little fixes after review
2016-03-22 17:10:34 +08:00
8261a8a3ed
MDL-53393 libraries: Fix thirdpartylib to point to directory
2016-03-22 09:06:04 +01:00
4a166bfd16
Merge branch 'wip-MDL-51867-master2' of https://github.com/marinaglancy/moodle
2016-03-22 13:13:57 +08:00
ce32fa5572
MDL-39524 tests: fix incorrect phpdoc
2016-03-22 12:56:53 +08:00
cdb2a2ef9f
Merge branch 'MDL-39524' of https://github.com/jrchamp/moodle
2016-03-22 12:52:26 +08:00
afda050660
MDL-39524 tests: unit test for get_real_size()
2016-03-22 12:47:07 +08:00
55e90f2270
Merge branch 'MDL-53393-master' of git://github.com/cameron1729/moodle
2016-03-22 03:16:51 +01:00
a018d82af7
MDL-53513 libraries: Fix lessphp version
2016-03-22 09:57:51 +08:00
809307b490
Merge branch 'MDL-53513-master' of git://github.com/lameze/moodle
2016-03-22 09:56:21 +08:00
c71d11404d
Merge branch 'wip-MDL-52619-master' of git://github.com/abgreeve/moodle
2016-03-22 09:54:03 +08:00
64fe3af054
Merge branch 'MDL-53456-master' of git://github.com/lameze/moodle
2016-03-22 09:50:34 +08:00
67f884029d
Merge branch 'MDL-53512-master' of git://github.com/lameze/moodle
2016-03-22 09:47:36 +08:00
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
cdc6407a10
Merge branch 'wip-MDL-53458-master' of git://github.com/abgreeve/moodle
2016-03-22 09:35:19 +08:00
d7dbef7366
MDL-53181 core: Add selectors to user menu items
2016-03-22 09:20:21 +08:00
6648283a77
MDL-53512 libraries: update google API library to version 1.1.7
2016-03-22 08:38:11 +08:00
37f45f44b7
Merge branch 'MDL-53409-master' of git://github.com/crazyserver/moodle
2016-03-22 08:01:16 +08:00
ab89d2aebc
MDL-53454 lib: Fix incorrect jquery version
2016-03-22 07:44:31 +08:00
854cd1464b
Merge branch 'MDL-53454-master' of git://github.com/lameze/moodle
2016-03-22 07:42:52 +08:00
88027ca371
Merge branch 'wip-MDL-53457-master' of git://github.com/abgreeve/moodle
2016-03-22 07:24:37 +08:00
145bb61d79
Merge branch 'wip-MDL-53465-master' of git://github.com/abgreeve/moodle
2016-03-22 07:12:52 +08:00
bc9f8c5e1c
Merge branch 'MDL-53518-master' of git://github.com/lameze/moodle
2016-03-22 06:56:40 +08:00
197f99a808
Merge branch 'MDL-52978_master' of git://github.com/markn86/moodle
2016-03-21 23:07:16 +01:00
fd2cdbd2a7
Merge branch 'MDL-53407-editing-css' of https://github.com/Dagefoerde/moodle
2016-03-21 14:48:41 +08:00
3a0b30c7c7
Merge branch 'MDL-52952-master' of https://github.com/xow/moodle
2016-03-21 14:44:15 +08:00
931eef1226
MDL-53455 libraries: upgrade jquery migrate to version 1.4.0
2016-03-21 13:42:54 +08:00
af4a2f0d62
MDL-53518 libraries: upgrade mardown to 1.6.0 version
2016-03-21 13:04:05 +08:00
b0d985e81f
MDL-53513 libraries: update lessphp to version 1.7.0.10
2016-03-21 13:01:43 +08:00
eb9a3e9379
MDL-53383 navigation: Do not require $type in remove()
...
navigation_node_collection -> remove function broken when $type is null
2016-03-21 12:16:26 +08:00
2f427c4cb4
MDL-53456 libraries: update requirejs to version 2.1.22
2016-03-21 12:10:48 +08:00
3e3f624549
MDL-53393 libraries: Upgrade Html2Text to 4.0.1
2016-03-21 12:05:33 +08:00
3357822d0c
Merge branch 'MDL-52207-master' of git://github.com/cameron1729/moodle
2016-03-21 11:53:30 +08:00
Eloy Lafuente (stronk7)