60355 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
187afd0f52 Merge branch 'w14_MDL-39019_m25_mssqldatatype' of git://github.com/skodak/moodle 2013-04-09 02:01:04 +02:00
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
Eloy Lafuente (stronk7)
5a0443cc14 Merge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle 2013-04-08 16:57:38 +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
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
Damyon Wiese
c2bb7f6007 MDL-38907 Course: Remove unused CSS causing jump menu to be center aligned. 2013-04-08 16:45:44 +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
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
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
Dan Poltawski
fd0768c0e7 MDL-39015 navigation: remove course reports from navigation
Regression from the commit in
278065528aed2e6d712292b09ecdedf3d5b26bfe
2013-04-08 12:25:14 +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
Dan Poltawski
b23fcda2b9 Merge branch 'MDL-39006' of git://github.com/stronk7/moodle 2013-04-08 11:14:03 +08:00
Tim Lock
be47011d3c MDL-35868: quiz: Use correct attemptnumber when a last attempt exists. 2013-04-08 11:09:04 +08:00
Dan Poltawski
efc9febcd8 Merge branch 'wip-MDL-38701-m25' of git://github.com/marinaglancy/moodle 2013-04-08 10:22:59 +08:00
David Monllao
f9d3667e7b MDL-38179 behat: Step definition to click on a table row element 2013-04-08 10:07:21 +08:00
Marina Glancy
498e9a9a38 MDL-38701 Added missing require_once() before calling course_get_format 2013-04-08 11:34:05 +10:00
David Monllao
7b33327126 MDL-38878 behat: Also update composer dependencies after site install/reinstall 2013-04-08 09:03:04 +08:00
Rex Lorenzo
1207ae1a34 MDL-38634 folder: Problems displaying multiple folder resources inline in the course page 2013-04-07 17:28:24 -07:00
Eloy Lafuente (stronk7)
0fd23b76de MDL-39006 environment: raise all uses of 5.3.2 to 5.3.3 2013-04-07 18:32:15 +02:00
Petr Škoda
d958e6bd70 MDL-34222 import simplepie 1.3.1 2013-04-07 15:35:27 +02:00
Petr Škoda
b207e601f5 MDL-38786 import YUI 3.9.1 2013-04-06 19:08:09 +02:00
Tim Hunt
82081c1f7d MDL-38912 prevent time-outs during unit tests. 2013-04-05 18:37:25 +01:00
Eloy Lafuente (stronk7)
69ea3d7dd3 NOBUG: Bump to 2.5beta+
we don't package tagged commits in master, so let's
bump to beta+ and get the packaging done.
2013-04-05 14:29:54 +02:00
Dan Poltawski
422f68fb86 Moodle release 2.5beta v2.5.0-beta 2013-04-05 18:03:30 +08:00
Dan Poltawski
1a90b9b6dc fix permissions 2013-04-05 17:56:05 +08:00
Dan Poltawski
0676f20581 ie9 svg compatibility fixes 2013-04-05 17:55:06 +08:00
Dan Poltawski
203a2538d6 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-04-05 17:52:13 +08:00
Damyon Wiese
eafa0ba46a Merge branch 'MDL-35073_master' of https://github.com/markn86/moodle 2013-04-05 17:39:13 +08:00
Mark Nelson
c517765430 MDL-35073 badges: passed the session key in the enable access URL 2013-04-05 17:10:43 +08:00
Damyon Wiese
8806e79a14 Merge branch 'openbadges-fixes' of https://github.com/danpoltawski/moodle 2013-04-05 17:10:14 +08:00