74400 Commits

Author SHA1 Message Date
Marina Glancy
8e35585390 MDL-50919 tags: new UI for managing tags 2015-09-02 14:15:13 +08:00
Marina Glancy
0cf7252406 MDL-50919 behat: Step for keypress event in behat 2015-09-02 14:15:09 +08:00
David Monllao
c3e1c9b1f3 MDL-50891 core_useragent: Restore default after tests 2015-09-02 13:08:47 +08:00
David Monllao
8b25614c93 MDL-51172 core_files: Using an invented file format 2015-09-02 10:26:26 +08:00
David Monllao
dacf3ce4b8 Merge branch 'MDL-51172' of git://github.com/ramdesh/moodle 2015-09-02 10:25:24 +08:00
David Monllao
433eb975a0 Merge branch 'MDL-50529_dupe' of git://github.com/andyjdavis/moodle 2015-09-02 09:58:17 +08:00
David Monllao
f242c83c77 Merge branch 'MDL-51090' of git://github.com/timhunt/moodle 2015-09-02 09:47:34 +08:00
David Monllao
c32c21802b Merge branch 'MDL-50971' of git://github.com/NeillM/moodle 2015-09-02 09:23:11 +08:00
David Monllao
25d9ae9a93 Merge branch 'MDL-50891-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/deprecatedlib.php
2015-09-02 08:54:55 +08:00
David Monllao
11e1e7cf39 Merge branch 'MDL-50920' of git://github.com/sk-unikent/moodle 2015-09-02 08:44:36 +08:00
Eloy Lafuente (stronk7)
89875d2a8a Merge branch 'MDL-50641-master' of git://github.com/danpoltawski/moodle 2015-09-02 01:53:09 +02:00
Eloy Lafuente (stronk7)
17d2a336d1 MDL-43896 admin: Avoid empty(expression), not working under PHP 5.4 2015-09-02 01:20:09 +02:00
Eloy Lafuente (stronk7)
10006e8ff9 Merge branch 'MDL-48494-master-component' of git://github.com/mudrd8mz/moodle 2015-09-02 00:32:13 +02:00
Eloy Lafuente (stronk7)
7cc3cf6fc0 Merge branch 'MDL-43896-master-modulesyntax' of git://github.com/mudrd8mz/moodle 2015-09-02 00:30:33 +02:00
Tim Hunt
b2694c0219 MDL-51090 question: further refinements to validating manual grades 2015-09-01 23:05:37 +01:00
Dan Poltawski
c8d19ebea0 MDL-50690 themes: fix commenting coding style
(See also CONTRIB-5891)
2015-09-01 21:11:11 +01:00
Dan Poltawski
20706d0fea Merge branch 'wip_MDL-50690_master' of git://github.com/gjb2048/moodle 2015-09-01 20:59:58 +01:00
AMOS bot
0be100ddef Automatically generated installer lang files 2015-09-02 00:05:28 +08:00
Dan Poltawski
75ac8bac26 Merge branch 'MDL-49950_duplicate_string' of https://github.com/andyjdavis/moodle 2015-09-01 16:20:34 +01:00
Dan Poltawski
d1d7d9fd74 Merge branch 'MDL-51236-master' of git://github.com/andrewnicols/moodle 2015-09-01 15:18:31 +01:00
Dan Poltawski
7d8684c552 MDL-38763 fix trailing whitespace 2015-09-01 12:43:23 +01:00
Dan Poltawski
3e5bcbf851 Merge branch 'MDL-38763-master-amd' of git://github.com/mastnym/moodle 2015-09-01 12:17:05 +01:00
David Monllao
85a930f628 Merge branch 'MDL-51234-master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2015-09-01 18:33:40 +08:00
David Monllao
1652309d02 Merge branch 'MDL-51109-master' of git://github.com/danpoltawski/moodle 2015-09-01 18:31:26 +08:00
Dan Poltawski
a6e9c23016 MDL-51109 task: more debug info for failed scheduled tasks 2015-09-01 10:59:55 +01:00
Dan Poltawski
cd7b48a2e7 Merge branch 'wip-MDL-25451-master' of git://github.com/marinaglancy/moodle 2015-09-01 10:36:17 +01:00
Dan Poltawski
522c7fd350 Merge branch 'MDL-45841' of git://github.com/timhunt/moodle 2015-09-01 10:14:45 +01:00
David Monllao
1780c76493 Merge branch 'wip-mdl-50963' of git://github.com/rajeshtaneja/moodle 2015-09-01 16:06:14 +08:00
David Monllao
05e4b8760a MDL-51179 editor_atto: Updating since tag to only 3.0
This commit should be reverted if we finally backport this solution.
2015-09-01 16:00:32 +08:00
David Monllao
9f6a55f7ea Merge branch 'MDL-51179-master' of git://github.com/damyon/moodle
Conflicts:
	lib/upgrade.txt
2015-09-01 15:57:21 +08:00
rajesh Taneja
a9c9ae52e5 MDL-50963 behat: fixed error string in behat 2015-09-01 14:48:11 +08:00
David Monllao
eb41f5539e Merge branch 'MDL-50999-master' of git://github.com/andrewnicols/moodle 2015-09-01 14:35:18 +08:00
Martin Mastny
2493568970 MDL-38763 core_role: AMD module for managing permissions 2015-09-01 07:31:58 +02:00
David Monllao
45cd3f6033 MDL-51013 themes: Info about new navbar_button function 2015-09-01 12:35:31 +08:00
Kevin Wiliarty
77241abbad MDL-51013 themes: Suppress navbar button when custom menu is empty 2015-09-01 12:35:24 +08:00
Damyon Wiese
988592c556 MDL-51179 Atto: Extend autosave fix to cover text changes
Added new functions to editor api - set/get_text so the
original form text can be determined from an editor.

When calling use_editor() you should first call set_text() with
the text that will be inserted in the form element.

There is also a new scheduled task for cleaning Atto autosave drafts.
2015-09-01 12:23:00 +08:00
Eloy Lafuente (stronk7)
0df465d10a Merge branch 'wip-MDL-50791-master' of git://github.com/marinaglancy/moodle 2015-09-01 01:52:10 +02:00
Eloy Lafuente (stronk7)
c5f05ff551 Merge branch 'mdl-50963' of https://github.com/cdsmith-umn/moodle 2015-09-01 01:42:06 +02:00
Mark Nelson
1efd323842 MDL-29801 install: added message deleted fields 2015-08-31 15:09:51 -07:00
Eloy Lafuente (stronk7)
07db0bbd8f Merge branch 'MDL-49536-master' of git://github.com/ryanwyllie/moodle 2015-08-31 20:48:18 +02:00
Eloy Lafuente (stronk7)
315918f187 Merge branch 'MDL-50677-master' of git://github.com/FMCorz/moodle 2015-08-31 20:31:26 +02:00
Marina Glancy
7a4ff165cb MDL-25451 roles: check if user can assign foles in block 2015-08-31 16:03:27 +08:00
David Mudrák
033761fe9b MDL-48494 admin: Fail validation of plugins with no component declared 2015-08-31 10:01:34 +02:00
David Mudrák
98ea697349 MDL-48494 admin: Require plugins declare their component in version.php 2015-08-31 10:01:34 +02:00
David Mudrák
f5f5a60ac9 MDL-43896 admin: Fail validation of plugins with $module in version.php 2015-08-31 09:57:50 +02:00
David Mudrák
01889f019d MDL-43896 admin: Drop support for the $module syntax in version.php 2015-08-31 09:57:50 +02:00
David Monllao
d0efe9a080 Merge branch 'MDL-51131-master' of git://github.com/marinaglancy/moodle 2015-08-31 14:07:49 +08:00
David Monllao
5d98022e81 Merge branch 'MDL-51084-master' of git://github.com/marinaglancy/moodle 2015-08-31 12:54:49 +08:00
David Monllao
5e567834dd Merge branch 'MDL-51181-m' of git://github.com/micaherne/moodle 2015-08-31 10:55:08 +08:00
David Monllao
abbf64e363 Merge branch 'MDL-51215-master' of git://github.com/marinaglancy/moodle 2015-08-31 10:45:19 +08:00