15557 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)
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)
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
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
Dan Poltawski
91a3c9ba9f Merge branch 'MDL-38179_master' of git://github.com/dmonllao/moodle 2013-04-08 15:36:07 +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
Dan Poltawski
b23fcda2b9 Merge branch 'MDL-39006' of git://github.com/stronk7/moodle 2013-04-08 11:14:03 +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
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
Dan Poltawski
1a90b9b6dc fix permissions 2013-04-05 17:56:05 +08:00
Dan Poltawski
2916ca61be MDL-35073 badges: fix incorrect fk name
Good spotting Damyon!
2013-04-05 15:47:15 +08:00
Dan Poltawski
bdc518b507 MDL-35073 badges: fix duplicate indexes 2013-04-05 15:27:32 +08:00
Eloy Lafuente (stronk7)
577173a51f Merge branch 'MDL-38897-master' of git://github.com/danpoltawski/moodle 2013-04-05 03:21:52 +02:00
Andrew Robert Nicols
b0fb4c12d7 MDL-38667 JavaScript: Don't use -min files for YUI CSS 2013-04-04 17:18:56 +02:00
Aparup Banerjee
37240ce5c6 Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-04-04 15:07:01 +08:00
Dan Poltawski
b7d20148a1 MDL-38897 formslib: add unit tests for setType debugging 2013-04-04 14:59:21 +08:00
Dan Poltawski
48056d5459 MDL-38885 - don't test for setType in display() itself
Doing it in _process_submission is enough.
2013-04-04 14:58:14 +08:00
David Monllao
b82e0c17fb MDL-38691 behat: Fixing behat tests 2013-04-04 13:52:24 +08:00
Damyon Wiese
200571507f Merge branch 'wip-MDL-37009-master' of git://github.com/marinaglancy/moodle 2013-04-04 11:22:20 +08:00
Damyon Wiese
b38f932abf Merge branch 'MDL-38823_master-fix' of git://github.com/dmonllao/moodle 2013-04-04 10:34:50 +08:00
Eloy Lafuente (stronk7)
33871fbf3e Merge branch 'MDL-38751-master' of git://github.com/FMCorz/moodle 2013-04-04 01:07:23 +02:00
Eloy Lafuente (stronk7)
896efbeadb Merge branch 'MDL-38756-m' of git://github.com/andrewnicols/moodle 2013-04-03 21:59:18 +02:00
Eloy Lafuente (stronk7)
6b117438b9 Merge branch 'MDL-38482_master' of git://github.com/dmonllao/moodle 2013-04-03 16:48:42 +02:00
Eloy Lafuente (stronk7)
57902e2738 Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle 2013-04-03 13:33:16 +02:00
Eloy Lafuente (stronk7)
c9f8620492 Merge branch 'MDL-26956' of git://github.com/timhunt/moodle 2013-04-03 13:20:23 +02:00
Tim Hunt
d2e32121b0 MDL-26956 user selector: fix regressions sam caused. 2013-04-03 11:44:23 +01:00
Dan Poltawski
5cc929bc12 Merge branch 'MDL-38691-master-int' of git://github.com/FMCorz/moodle 2013-04-03 16:27:16 +08:00
Damyon Wiese
82b175e868 Merge branch 'w13_MDL-38627_m25_byteservingstop' of git://github.com/skodak/moodle 2013-04-03 15:48:35 +08:00
Damyon Wiese
dcf6318515 MDL-26644 Course - Version bump for upgrade script. 2013-04-03 14:32:19 +08:00
Damyon Wiese
7bf602d9d3 Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
2013-04-03 14:32:11 +08:00
Dan Poltawski
dc4260d918 Merge branch 'MDL-38681-master-int' of git://github.com/FMCorz/moodle 2013-04-03 14:27:08 +08:00
David Monllao
060bafefe3 MDL-38823 behat: New behat_form_radio
To deal with radio inputs after allowing
behat_form_field to delegate in specific
fields managers. It also fixes a BIG issue
when calling a no required class.
2013-04-03 13:55:42 +08:00