David Monllao
dca7e05dbf
Merge branch 'MDL-52086' of git://github.com/bostelm/moodle
2015-11-23 16:10:25 +08:00
David Monllao
72dd7162e1
Merge branch 'MDL-52029-31' of git://github.com/vadimonus/moodle
2015-11-23 15:42:27 +08:00
David Monllao
5269e6002d
Merge branch 'MDL-52160-master' of git://github.com/FMCorz/moodle
2015-11-23 14:07:21 +08:00
David Monllao
6f77b910ee
Merge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle
2015-11-23 13:56:06 +08:00
David Monllao
6a82d5d04e
Merge branch 'MDL-43069-master' of git://github.com/danpoltawski/moodle
2015-11-23 13:32:35 +08:00
Dan Poltawski
b58d059525
MDL-37834 assign: avoid newlines in status column of csv
...
Previously we were generating a CSV file with newlines in it, which
seems to cause problems importing into some versions of MS Excel.
Instead seperate status lines by '-' - this column is only used to
provide context to the teacher in the spreadsheet.
2015-11-20 18:36:30 +00:00
AMOS bot
67f357121a
Automatically generated installer lang files
2015-11-21 00:04:07 +08:00
David Monllao
2af06c4cba
MDL-52095 themes: Padding to the left on RTL langs
2015-11-20 10:03:38 +08:00
AMOS bot
6026e76349
Automatically generated installer lang files
2015-11-20 00:04:07 +08:00
Dan Poltawski
2b11b94c0c
weekly on-sync release 3.1dev
2015-11-19 09:21:07 +00:00
Dan Poltawski
c8407f0109
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2015-11-19 09:21:04 +00:00
Eloy Lafuente (stronk7)
65b70071ca
Merge branch 'wip-MDL-52203-master' of https://github.com/marinaglancy/moodle
2015-11-19 09:45:30 +01:00
Dan Poltawski
ef65a6a9c5
Merge branch 'MDL-42571_master-fix2' of git://github.com/dmonllao/moodle
2015-11-19 07:06:16 +00:00
David Monllao
c181efe978
MDL-42571 editpdf: Fix search comments
...
They are also hidden instead of destroyed.
2015-11-19 14:59:03 +08:00
Dan Poltawski
de1519002e
Merge branch 'wip-MDL-52194-master' of https://github.com/marinaglancy/moodle
2015-11-19 06:47:30 +00:00
Dan Poltawski
78b2c65c0a
Merge branch 'MDL-52162_master' of git://github.com/dmonllao/moodle
2015-11-19 06:33:54 +00:00
David Monllao
402f4a1f53
MDL-42571 editpdf: Fix comments search and multiple views drawing
2015-11-19 12:29:20 +08:00
Marina Glancy
3be59be349
MDL-52203 qtype_multianswer: avoid fatal error during upgrade
2015-11-19 11:06:48 +08:00
Henning Bostelmann
3847c105b0
MDL-52086 output renderers: show subtree only when tab is activated
2015-11-18 16:11:32 +00:00
AMOS bot
44c4d1406d
Automatically generated installer lang files
2015-11-19 00:04:45 +08:00
Pavel Sokolov
4dab33b586
MDL-43069 assign: prevent JS error on grading table
...
Previously submission comments failed to expand if you hid
the file submissions column.
2015-11-18 15:41:42 +00:00
Dan Poltawski
65b26a461e
MDL-45934 backup: do not reset completion enabled flag
...
The 'completion enabled' flag does not reflect any course data, its a
course setting. Previously when doing a backup deleteting existing
course content this was forced off when it should not have been.
2015-11-18 11:45:45 +00:00
Dan Poltawski
a49fca44e0
MDL-49490 assign: can't export to portfolio on non-submission
2015-11-18 09:10:20 +00:00
Juan Leyva
705afe6ffc
MDL-52108 core_message: Move library inclusion outside the class methods
2015-11-18 09:52:29 +01:00
Marina Glancy
228f66ad7f
MDL-52194 flowplayer: do not check request
...
$_REQUEST variable may contain cookies in some php configurations. See also MDL-48085
2015-11-18 15:35:55 +08:00
David Monllao
0519a1dabb
MDL-52162 question: Removing unnecessary dependency
...
APIs dependencies were correctly removed during MDL-38214 review although
this unnecessary require remained here.
Credit to Marina Glancy.
2015-11-18 13:16:39 +08:00
Vadim Dvorovenko
626ff7c8b8
MDL-52029 installer: Unstyled installer if display_errors is on
...
Error in MDL-43839 solution caused inclusion of unexistent file in
install/css.php.
2015-11-18 08:44:04 +07:00
Dan Poltawski
14c855d8cd
Merge branch 'MDL-52140' of git://github.com/stronk7/moodle
2015-11-17 16:27:42 +00:00
Eloy Lafuente (stronk7)
6d29c4acdd
MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts
2015-11-17 17:08:56 +01:00
Dan Poltawski
8c9dbacd79
MDL-52185 report: remove ugly bullet points
2015-11-17 15:33:58 +00:00
Dan Poltawski
09ca2e85c6
MDL-52180 travis: remove weekly release checker
...
To prevent false positives
2015-11-17 09:43:04 +00:00
Juan Leyva
4bc38ba96a
MDL-51925 enrol: Support ordering in get_enrolled_users WS
2015-11-17 09:49:03 +01:00
Rajesh Taneja
8f76de32d9
MDL-50163 behat: Return subcontext from session
...
Creating a new context with new mink context
with different session was keeping the session
and was not returning proper session information
2015-11-17 13:27:10 +08:00
rajesh Taneja
131d4ac2b0
MDL-50163 behat: Restart session after scenario with switch_window
...
Restart session after a scenario with switch window
is finished. This will close all open browser windows
and open a new browser window
2015-11-17 12:12:03 +08:00
David Monllao
08cc1ad828
Merge branch 'MDL-51988-master' of git://github.com/danpoltawski/moodle
2015-11-17 10:20:59 +08:00
Russell Smith
bb2c0b4526
MDL-50700 gradereport_overview: Call $PAGE->set_course
...
To ensure correct blocks are displayed.
2015-11-17 10:01:57 +08:00
David Monllao
f2b28f8130
Merge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle
2015-11-17 08:54:50 +08:00
Dan Poltawski
a461fcf9db
Merge branch 'MDL-52021-master-test' of git://github.com/junpataleta/moodle
2015-11-16 16:21:17 +00:00
AMOS bot
b1f7f87c25
Automatically generated installer lang files
2015-11-17 00:05:09 +08:00
Tim Hunt
e168e38813
MDL-52166 gradebook: overview report fails with separate groups
2015-11-16 14:37:42 +00:00
Juan Leyva
90d50ad439
MDL-52074 ws: Add enrol_self_get_instance_info to the mobile service
2015-11-16 13:16:45 +01:00
Frederic Massart
333dcd863f
MDL-52160 navigation: Really remove module settings empty nodes
2015-11-16 19:46:48 +08:00
Dan Poltawski
8d5935d53b
Merge branch 'MDL-52139' of git://github.com/stronk7/moodle
2015-11-16 09:28:37 +00:00
David Monllao
6bcff8abf5
Merge branch 'MDL-47065-master' of git://github.com/danpoltawski/moodle
2015-11-16 15:25:42 +08:00
David Monllao
f9cccec39f
Merge branch 'MDL-41643-master' of git://github.com/jojoob/moodle
2015-11-16 14:54:19 +08:00
David Monllao
53f8e45279
Merge branch 'MDL-50687-master' of git://github.com/danpoltawski/moodle
2015-11-16 14:25:48 +08:00
David Monllao
fb680f7959
Merge branch 'MDL-50564-master' of git://github.com/junpataleta/moodle
2015-11-16 14:19:18 +08:00
David Monllao
09083ab0a8
Merge branch 'MDL-42571' of git://github.com/blaky/moodle
...
Conflicts:
mod/assign/feedback/editpdf/version.php
2015-11-16 13:39:59 +08:00
Eloy Lafuente (stronk7)
d83775b89b
MDL-52139 backup: Bump release to 3.1
2015-11-16 00:39:17 +01:00
Eloy Lafuente (stronk7)
26653c8b5c
weekly back-to-dev release 3.1dev
2015-11-15 23:23:46 +01:00