62375 Commits

Author SHA1 Message Date
Nadav Kavalerchik
c9a2991b90 MDL-40716 - Activity labels are not visible in course completion report, when in RTL mode (theme/clean , bootstrap) 2013-07-24 08:47:25 +03:00
Damyon Wiese
ffc3f5308b weekly release 2.6dev 2013-07-19 09:47:55 +08:00
Damyon Wiese
e4ef98006f Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-07-19 09:19:29 +08:00
Eloy Lafuente (stronk7)
dbdfd37709 Merge branch 'wip_MDL-40074' of https://github.com/jamiepratt/moodle 2013-07-18 20:22:47 +02:00
Damyon Wiese
84c5f6416e MDL-35851 lesson: Handle importing questions into an empty lesson.
Also - make sure the page we are updating belongs to the lesson.
2013-07-18 16:45:44 +08:00
Frederic Massart
f45d70882e MDL-13114 tool_uploadcourse: Fixed typo in CLI help 2013-07-18 11:41:01 +10:00
Eloy Lafuente (stronk7)
07e045b844 MDL-39926 SCORM: objetives report now core plugin 2013-07-17 11:06:05 +02:00
Dan Poltawski
c5ceaeaf5e MDL-40604 course: remove deprecated function
* course_delete_module was calling delete_event
* Also fix missing inclusion from 379cd2d4
2013-07-17 14:11:11 +08:00
Dan Poltawski
e52c1ea65d MDL-40604 course: add test to cover course_delete_module 2013-07-17 14:11:10 +08:00
Dan Poltawski
caf8d39b17 MDL-40604 wiki: fix use of print_container 2013-07-17 14:11:10 +08:00
Damyon Wiese
afe36b8411 MDL-35851 Lesson: Check/fix the page order every time the pages are loaded 2013-07-17 13:04:04 +08:00
Marina Glancy
73f0d9b638 Merge branch 'MDL-40701-master' of git://github.com/danpoltawski/moodle 2013-07-17 12:45:18 +10:00
Dan Poltawski
f7d8f38e21 MDL-40701 mod_assignment: fix refresh events
It was getting the cm event with the wrong id and calling
deprecated functions
2013-07-17 10:29:25 +08:00
Frederic Massart
0d352dbcdd MDL-40424 user: Incorrect use of named parameters 2013-07-17 11:52:47 +10:00
Marina Glancy
576151c987 Merge branch 'MDL-40478-m' of git://github.com/andrewnicols/moodle 2013-07-17 11:09:08 +10:00
AMOS bot
d9a5196933 Automatically generated installer lang files 2013-07-17 00:42:25 +00:00
Eloy Lafuente (stronk7)
379cd2d4e3 MDL-40604 Fix 2 uses causing unit test failures
There are still a lot of deprecated uses in core
that we should move to the new counterparts ASAP.

This commit just fixes the 2 deprecated uses that
are causing unit tests to fail.
2013-07-17 02:34:07 +02:00
Eloy Lafuente (stronk7)
6a30b48dff MDL-40424 vomit back wrongly digested brace, grrr. 2013-07-17 01:43:11 +02:00
Eloy Lafuente (stronk7)
fb1788c598 Merge branch 'MDL-40424-master' of git://github.com/FMCorz/moodle
Conflicts:
	admin/oacleanup.php
2013-07-17 01:21:51 +02:00
Eloy Lafuente (stronk7)
68d9f13273 Merge branch 'MDL-40477-m' of git://github.com/andrewnicols/moodle 2013-07-17 01:13:17 +02:00
Eloy Lafuente (stronk7)
0b3af0798c Merge branch 'w29_MDL-40220_m26_core_component' of https://github.com/skodak/moodle 2013-07-17 01:07:21 +02:00
Eloy Lafuente (stronk7)
afda9e2279 Merge branch 'wip-MDL-40634-m26' of git://github.com/samhemelryk/moodle 2013-07-17 00:58:26 +02:00
Eloy Lafuente (stronk7)
a6149155c0 Merge branch 'wip-MDL-40635-m26' of git://github.com/samhemelryk/moodle 2013-07-17 00:43:45 +02:00
Eloy Lafuente (stronk7)
f28051143f Merge branch 'MDL-40652_master' of git://github.com/lazydaisy/moodle 2013-07-17 00:41:15 +02:00
Eloy Lafuente (stronk7)
2be1185132 Merge branch 'w29_MDL-40611_m26_accesslibtest' of https://github.com/skodak/moodle 2013-07-17 00:32:32 +02:00
Eloy Lafuente (stronk7)
b8d73bd58e Merge branch 'w29_MDL-40546_m26_jscache' of https://github.com/skodak/moodle 2013-07-17 00:30:13 +02:00
Eloy Lafuente (stronk7)
a980261984 Merge branch 'MDL-40536-master' of git://github.com/danpoltawski/moodle 2013-07-17 00:24:10 +02:00
Eloy Lafuente (stronk7)
660ee07b60 Merge branch 'MDL-40604-master' of git://github.com/danpoltawski/moodle 2013-07-17 00:22:15 +02:00
Eloy Lafuente (stronk7)
3742ee163b Merge branch 'MDL-40690_master' of git://github.com/dmonllao/moodle 2013-07-17 00:17:30 +02:00
Petr Škoda
cc8fecb5ed MDL-40220 improve lib/upgrade.txt info for the new core_component class and deprecated functions 2013-07-16 22:43:31 +02:00
Petr Škoda
b0d1d941c9 MDL-40220 use new core_component::get_component_directory() 2013-07-16 22:42:37 +02:00
Petr Škoda
56da374e1e MDL-40220 use new core_component::normalize_component() 2013-07-16 22:41:00 +02:00
Petr Škoda
1c74b26090 MDL-40220 use new core_component::get_plugin_directory() 2013-07-16 22:38:38 +02:00
Petr Škoda
059e08ed92 MDL-40220 use new core_component::get_plugin_list_with_class() 2013-07-16 22:37:15 +02:00
Petr Škoda
bd3b3bba9f MDL-40220 use new core_component::get_plugin_list() 2013-07-16 22:36:11 +02:00
Petr Škoda
46f6f7f224 MDL-40220 use new core_component::get_plugin_types() 2013-07-16 22:31:48 +02:00
Eloy Lafuente (stronk7)
55fcd9323e Merge branch 'MDL-38857_master' of git://github.com/dmonllao/moodle 2013-07-16 22:02:18 +02:00
Eloy Lafuente (stronk7)
e28ae962be Merge branch 'w29_MDL-40423_m26_localsubdir' of https://github.com/skodak/moodle 2013-07-16 21:55:46 +02:00
Eloy Lafuente (stronk7)
4c8bba6686 MDL-39926 SCORM: Adapt report to alt name fields 2013-07-16 18:34:59 +02:00
Eloy Lafuente (stronk7)
88ad6d0a99 Merge branch 'master_MDL-39926' of git://github.com/danmarsden/moodle 2013-07-16 18:34:58 +02:00
David Monllao
39ec828571 MDL-40690 behat: Ignore StaleElementReference exception
Is another of the exceptions thrown by
Selenium when it tries to interact with
an element that disappeared from the DOM,
in happens randomly when redirecting the
user to another page with a wait period to
show him/her a message.
2013-07-16 16:45:12 +02:00
Damyon Wiese
1d1f7ac81f Merge branch 'MDL-40463-master' of git://github.com/FMCorz/moodle 2013-07-16 21:59:47 +08:00
Damyon Wiese
3fd74243a7 Merge branch 'wip-mdl-40467' of git://github.com/rajeshtaneja/moodle 2013-07-16 21:51:19 +08:00
Damyon Wiese
820ad5dfd8 Merge branch 'MDL-40465-master' of git://github.com/FMCorz/moodle 2013-07-16 21:35:38 +08:00
Damyon Wiese
b30a12db52 Merge branch 'wip-MDL-40621-master' of git://github.com/marinaglancy/moodle 2013-07-16 21:29:58 +08:00
Damyon Wiese
59e649180d Merge branch 'w29_MDL-40574_m26_editordelete' of https://github.com/skodak/moodle 2013-07-16 21:23:30 +08:00
Damyon Wiese
e202521f25 Merge branch 'wip-MDL-39299-master' of git://github.com/phalacee/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-07-16 20:59:41 +08:00
Eloy Lafuente (stronk7)
5b0804c4b1 Merge branch 'w29_MDL-40563_m26_themecaching' of https://github.com/skodak/moodle 2013-07-16 11:41:47 +02:00
Eloy Lafuente (stronk7)
3f0a8871d3 Merge branch 'MDL-40555-master' of git://github.com/FMCorz/moodle
Conflicts:
	cache/stores/static/lib.php
2013-07-16 09:57:34 +02:00
Jason Fowler
c604e01c13 MDL-39299 - Course - Correcting some rendering problems in bootstrapbase 2013-07-16 15:51:23 +08:00