Commit graph

60497 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
a035bc9b6d Merge branch 'w14_MDL-39024_m25_mssqlseek' of git://github.com/skodak/moodle 2013-04-09 01:58:20 +02:00
Eloy Lafuente (stronk7)
ce2cd44908 Merge branch 'w14_MDL-39022_m25_mssqlconcat' of git://github.com/skodak/moodle 2013-04-09 01:53:57 +02:00
Eloy Lafuente (stronk7)
60f9cae763 Merge branch 'MDL-38618_master' of git://github.com/dmonllao/moodle 2013-04-09 01:44:58 +02:00
Eloy Lafuente (stronk7)
70273fb6ae Merge branch 'MDL-38912' of git://github.com/timhunt/moodle 2013-04-09 01:36:20 +02:00
Eloy Lafuente (stronk7)
196bd8c885 Merge branch 'w14_MDL-38786_m25_yui391' of git://github.com/skodak/moodle 2013-04-09 01:32:35 +02:00
Eloy Lafuente (stronk7)
0460dc74db MDL-34222 simplepie: fix permissions. 2013-04-09 01:28:06 +02:00
Eloy Lafuente (stronk7)
de0fc867ad Merge branch 'w14_MDL-34222_m25_simplepie131' of git://github.com/skodak/moodle 2013-04-09 01:24:08 +02:00
Eloy Lafuente (stronk7)
b19e8a1fb9 Merge branch 'MDL-38744-master' of git://github.com/danpoltawski/moodle 2013-04-09 01:13:57 +02:00
Eloy Lafuente (stronk7)
d29afc4577 Merge branch 'MDL-38907-master' of git://github.com/damyon/moodle 2013-04-09 00:58:02 +02:00
Eloy Lafuente (stronk7)
5df002ad68 Merge branch 'MDL-38849' of git://github.com/timhunt/moodle 2013-04-09 00:52:27 +02:00
Petr Škoda
60e9a2fe5d MDL-39027 make sure sqlsrv does not return non-string data types 2013-04-08 23:29:52 +02:00
Petr Škoda
031a6de97a MDL-39038 nasty workaround for Oracle NULL concats 2013-04-08 23:23:08 +02:00
Andrew Robert Nicols
56d465b2d3 MDL 38508 JavaScript: Split out AJAX and non-AJAX help
We need to keep these two separate as scripts which define AJAX_SCRIPT
before loading config.php will use a different default renderer and will
return appropriate exceptions which can be parsed by M.core.exception and
M.core.ajaxException correctly.

This also addresses an issue whereby a missing heading could break the
tooltip.
2013-04-08 21:01:20 +01:00
Eloy Lafuente (stronk7)
5a0443cc14 Merge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle 2013-04-08 16:57:38 +02:00
Eloy Lafuente (stronk7)
d506f422c9 MDL-38999 timezones: add some TZ/stamps know to be problematic to tests. 2013-04-08 16:09:41 +02:00
David Mudrák
b7acd9be50 MDL-39023 Make get_language_dependencies() aware of circular dependency risk
The patch reimplements the core_string_manager::get_language_dependencies()
so that potentially mis-configured language packs with circular
dependencies or self dependency do not make the site unavailable.
Unit tests for the expected behaviour are added.
2013-04-08 14:31:27 +02:00
Petr Škoda
50f743021e MDL-39028 fix sqlsrv concat type conversion 2013-04-08 13:17:56 +02:00
Petr Škoda
03216719c3 MDL-38753 tweak count SQL to make stupid Oracle happy 2013-04-08 12:33:49 +02:00
Tim Hunt
c4dbaf74e8 MDL-38849 editor collapsing: cope with verbose languages
We can't fix the width of the tab, because the length of the string
'Show editing tools' varies a LOT between langauges.
2013-04-08 10:44:51 +01:00
Tim Hunt
e7373221cf MDL-38849 editor CSS: re-format to match coding style. 2013-04-08 10:37:22 +01:00
David Monllao
ad2f644087 MDL-38942 behat: New test
According to MDLQA-4582, a teacher can
set a group assignment.
2013-04-08 17:33:37 +08:00
Tim Hunt
a6f849cbe6 MDL-38935 quiz autosave: save HTML editor contents.
Also, ignore changes in scrollpos.
2013-04-08 10:29:58 +01:00
David Monllao
e613fd905b MDL-38945 behat: New test
According to MDLQA-142, a teacher can
organise students into groups within
a course.
2013-04-08 17:29:20 +08:00
David Monllao
ecd580f310 MDL-38945 behat: Step definition to add users to groups 2013-04-08 17:28:53 +08:00
Damyon Wiese
c2bb7f6007 MDL-38907 Course: Remove unused CSS causing jump menu to be center aligned. 2013-04-08 16:45:44 +08:00
David Monllao
862fcc8b70 MDL-38943 behat: New test
According to MDLQA-2417, teachers can
specify unique group and grouping ID numbers.
2013-04-08 16:41:40 +08:00
Petr Škoda
4c97487728 MDL-39024 fix MSSQL seek past the end of recordset 2013-04-08 10:36:37 +02:00
Petr Škoda
7a755250df MDL-39022 fix MSSQL concat type conversion 2013-04-08 10:19:51 +02:00
Petr Škoda
1b64533069 MDL-39019 make sure MSSQL does not return non-string data types 2013-04-08 10:06:55 +02:00
Damyon Wiese
4fd1861c8f Merge branch 'MDL-37562-master' of git://github.com/ankitagarwal/moodle 2013-04-08 15:42:36 +08:00
Dan Poltawski
91a3c9ba9f Merge branch 'MDL-38179_master' of git://github.com/dmonllao/moodle 2013-04-08 15:36:07 +08:00
Dan Poltawski
7925d3ff10 MDL-38934 - fix missing setType() calls in advanced grading forms 2013-04-08 15:24:20 +08:00
Ankit Agarwal
8aba76fddf MDL-37562 calendar: Updating upgrade.txt to mention calendar_update_subscription() 2013-04-08 15:03:31 +08:00
Ankit Agarwal
ab37339d09 MDL-37562 calendar: Remove all hardcoded updating of calendar subscriptions, use calendar_update_subscription() instead 2013-04-08 15:03:31 +08:00
Ankit Agarwal
5ae4e15344 MDL-37562 calendar: Adding unit tests for calendar_update_subscription() 2013-04-08 15:03:31 +08:00
David Monllao
bd1aca8834 MDL-38965 behat: New test
According to MDLQA-5229, an admin
can add or remove items from the
TinyMCE editor toolbar.
2013-04-08 14:42:47 +08:00
David Monllao
bd197963ef MDL-38944 behat: New test
According to MDLQA-2422; automatic
creation of groups.
2013-04-08 14:40:52 +08:00
Dan Poltawski
0fc2ab8047 Merge branch 'MDL-37676' of git://github.com/appalachianstate/moodle 2013-04-08 14:05:21 +08:00
Ankit Agarwal
1f7981e079 MDL-37562 calendar: Adding a api calendar_update_subscription() to update calendar events 2013-04-08 13:45:24 +08:00
Damyon Wiese
278c280e8f Merge branch 'MDL-38878_master' of git://github.com/dmonllao/moodle 2013-04-08 13:02:38 +08:00
Damyon Wiese
5fbfc955d8 Merge branch 'MDL-39015-master' of git://github.com/danpoltawski/moodle 2013-04-08 12:32:56 +08:00
David Monllao
1c1c28660a MDL-38952 behat: New test
According to MDLQA-134, a users
can manage their contacts.
2013-04-08 12:25:25 +08:00
Dan Poltawski
fd0768c0e7 MDL-39015 navigation: remove course reports from navigation
Regression from the commit in
278065528a
2013-04-08 12:25:14 +08:00
David Monllao
e6d18d9d00 MDL-38952 behat: Adding no-JS compatibility
This step is widely used by JS scenarios,
with Javascript disabled this step fails tests
as tree nodes al already expanded; we can
reuse JS scenarios for no-JS tests skiping
this step in no-JS mode.
2013-04-08 12:24:23 +08:00
Damyon Wiese
a6c215ab1f Merge branch 'MDL-38741-master' of git://github.com/danpoltawski/moodle 2013-04-08 12:00:52 +08:00
Dan Poltawski
bf48be3c7c Merge branch 'MDL-38634' of git://github.com/rlorenzo/moodle 2013-04-08 11:55:55 +08:00
David Monllao
1091aca74f MDL-38953 behat: New test
According to MDLQA-136, users
can search their message history.
2013-04-08 11:51:08 +08:00
David Monllao
21c6f11c1a MDL-38953 behat: Step definition to send a message 2013-04-08 11:50:37 +08:00
David Monllao
a34c0b1366 MDL-38953 behat: Disable email message processor
Disabled before storing database into
serialized files.
2013-04-08 11:46:13 +08:00
Dan Poltawski
b23fcda2b9 Merge branch 'MDL-39006' of git://github.com/stronk7/moodle 2013-04-08 11:14:03 +08:00