mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-05 08:23:01 +02:00
Code Issues Projects Releases Wiki Activity
62,353 Commits 36 Branches 529 Tags
Commit Graph

62353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Damyon Wiese
259e3c2525 Merge branch 'MDL-40464-master' of git://github.com/ankitagarwal/moodle 2013-07-16 15:44:38 +08:00
Damyon Wiese
924ea4845a Merge branch 'wip-MDL-40638-master' of git://github.com/abgreeve/moodle 
Conflicts:
	version.php
 2013-07-16 15:14:49 +08:00
Marina Glancy
3e2b5734dd Merge branch 'w29_MDL-40549_m26_oacleanup' of https://github.com/skodak/moodle 2013-07-16 17:07:23 +10:00
Damyon Wiese
06c8b60936 Merge branch 'MDL-40462_master' of https://github.com/markn86/moodle 2013-07-16 15:00:46 +08:00
Petr Škoda
b961cc4c59 MDL-40549 remove last traces of oacleanup 
Thanks Marina!
 2013-07-16 09:00:46 +02:00
Damyon Wiese
ed9e492087 Merge branch 'MDL-40431_master' of https://github.com/markn86/moodle 2013-07-16 14:49:25 +08:00
Damyon Wiese
792522198a MDL-40167 tests: The dock subsystem was removed 
Fix the unit test that counts the core subsystems.
 2013-07-16 14:29:59 +08:00
Marina Glancy
b7361a9be7 Merge branch 'MDL-35851-master' of git://github.com/damyon/moodle 2013-07-16 16:10:13 +10:00
Damyon Wiese
d33d712541 MDL-35851 lesson: removed expensive upgrade step. 
Just deal with the bad data when displaying the lesson instead.

Conflicts:

	mod/lesson/db/upgrade.php
 2013-07-16 14:05:07 +08:00
Damyon Wiese
d981272e64 Merge branch 'wip-mdl-40428' of git://github.com/rajeshtaneja/moodle 2013-07-16 13:33:27 +08:00
Damyon Wiese
539819dc40 Merge branch 'MDL-40195' of git://github.com/aolley/moodle 2013-07-16 13:28:52 +08:00
Damyon Wiese
6ec1f2f2eb Merge branch 'wip-MDL-40167-m26' of git://github.com/samhemelryk/moodle 2013-07-16 13:25:54 +08:00
Marina Glancy
cb8c7b9d56 MDL-39812 recompile less for bootstrapbase 2013-07-16 15:19:38 +10:00
Marina Glancy
e2abbde44e Merge branch 'MDL-39812_bootstrapbase' of git://github.com/rwijaya/moodle 2013-07-16 14:29:24 +10:00
Marina Glancy
792e6059be Merge branch 'wip-MDL-40426-master' of git://github.com/abgreeve/moodle 2013-07-16 13:48:27 +10:00
Damyon Wiese
8eb3e1f94f Merge branch 'w29_MDL-40558_m26_guestdelete' of https://github.com/skodak/moodle 2013-07-16 11:28:57 +08:00
Damyon Wiese
2f9aeafe5e Merge branch 'MDL-40524' of git://github.com/aolley/moodle 2013-07-16 11:24:06 +08:00
Marina Glancy
ff2ca3ef3d Merge branch 'MDL-13114-master' of git://github.com/FMCorz/moodle 2013-07-16 13:07:17 +10:00