Andrew Nicols
ebdfde7664
Merge branch 'MDL-50287-master' of git://github.com/danpoltawski/moodle
2015-09-08 08:18:03 +08:00
Petr Skoda
e4ac3879c2
MDL-50860 core: improve creation of random strings
2015-09-08 01:07:37 +02:00
Tim Lock
d89dc6daa5
MDL-42670 mod_assign: Fix recent activity block when blind marking is on
2015-09-07 22:41:41 +02:00
Marina Glancy
f06d8d94a1
MDL-50744 enrol_meta: fix incorrect role assign
2015-09-07 10:29:02 +01:00
Adrian Greeve
40a154551f
MDL-48371 editors: Option for removing managefiles
...
We want to remove the managefiles button from the
editors in the wiki so that students don't delete
each others files.
2015-09-07 09:59:35 +01:00
Dan Poltawski
1dabedeedf
weekly release 3.0dev
2015-09-03 12:31:49 +01:00
Dan Poltawski
4837c7e472
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2015-09-03 12:31:47 +01:00
rajesh Taneja
58031eea30
MDL-51090 behat: switch to main window
2015-09-03 10:26:33 +01:00
Damyon Wiese
7cf70b0d97
MDL-38763 roles: Fix example context for mustache templates.
2015-09-03 10:19:21 +02:00
Ryan Wyllie
c47f3803f1
MDL-49536 theme_clean: update help text for logo
...
Updated the help text on the theme settings page to
mention that the theme logo will only be displayed on
the front page and login page.
Conflicts:
theme/upgrade.txt
2015-09-03 10:19:20 +02:00
Marina Glancy
e6acf72970
MDL-50919 behat: temporary fix until behat learns to wait for JQuery
2015-09-03 10:19:20 +02:00
Eloy Lafuente (stronk7)
e45f622b8e
Merge branch 'MDL-29801_master' of git://github.com/markn86/moodle
2015-09-02 19:19:27 +02:00
Eloy Lafuente (stronk7)
8a6900ff56
MDL-50919 tags: minor fixes and version bump
...
This fixes:
- An incorrect exception message.
- tablelib weird behavior creating up to
pagesize empty rows.
Also forces a version bump so new webservices will become installed.
2015-09-02 13:25:44 +02:00
Eloy Lafuente (stronk7)
544be5ad4d
Merge branch 'wip-MDL-50919-master' of https://github.com/marinaglancy/moodle
2015-09-02 11:42:11 +02:00
Mark Nelson
9cf81a1a16
MDL-29801 core_message: added behat test for deleting messages
2015-09-02 01:45:51 -07:00
Mark Nelson
36d29c089c
MDL-29801 core_message: added ability to delete messages
...
Thanks goes to Jetha for providing the HTML and CSS.
2015-09-02 01:31:17 -07:00
Mark Nelson
4582308508
MDL-29801 core_message: added delete message caps
2015-09-02 01:29:41 -07:00
Dan Poltawski
b85e8b747c
Merge branch 'MDL-50891_master-unit-test-fix' of git://github.com/dmonllao/moodle
2015-09-02 09:23:07 +01:00
Tim Hunt
6b3bd52fae
MDL-51090 question manual grading: fixing for testing issues
2015-09-02 15:09:34 +08:00
Marina Glancy
ef4c23ccd2
MDL-50919 tags: new WS core_tag_get_tags
2015-09-02 14:15:16 +08:00
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