16287 Commits

Author SHA1 Message Date
Petr Škoda
eb459f7192 MDL-40642 set more restrictive umask and use proper permission for new dirs and files 2013-07-19 09:18:44 +02:00
Eloy Lafuente (stronk7)
07e045b844 MDL-39926 SCORM: objetives report now core plugin 2013-07-17 11:06:05 +02:00
Marina Glancy
576151c987 Merge branch 'MDL-40478-m' of git://github.com/andrewnicols/moodle 2013-07-17 11:09:08 +10: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)
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)
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
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
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
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
Damyon Wiese
d981272e64 Merge branch 'wip-mdl-40428' of git://github.com/rajeshtaneja/moodle 2013-07-16 13:33:27 +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
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
Marina Glancy
ff2ca3ef3d Merge branch 'MDL-13114-master' of git://github.com/FMCorz/moodle 2013-07-16 13:07:17 +10:00
Marina Glancy
50d1d9949b Merge branch 'MDL-30740-master' of git://github.com/danpoltawski/moodle 2013-07-16 12:16:27 +10:00
Eloy Lafuente (stronk7)
e780e5cb8f Merge branch 'MDL-40112_master' of https://github.com/totara/openbadges
Conflicts:
	lib/db/upgrade.php
	version.php
2013-07-16 01:29:01 +02:00
Eloy Lafuente (stronk7)
adbdb9b5c7 Merge branch 'w29_MDL-40571_m26_adminblocks' of https://github.com/skodak/moodle 2013-07-16 00:26:44 +02:00
Damyon Wiese
7ce7bb538c Revert "MDL-35131 Caching: Purge all will clear course modinfo cache - Thanks to Thomas for patch"
This reverts commit 6ab62db65ca1719acdbf13d74756d20dbd987d1b.

This is breaking upgrades from 22 - purgeallcaches gets called during upgrade but
rebuild_course_caches is not a safe api to use in this case.
2013-07-15 21:24:07 +08:00
Dan Poltawski
562525dcc9 MDL-30740 Add repository_skydrive to standard plugins 2013-07-15 17:57:43 +08:00
Adrian Greeve
7809d1557c MDL-40638 - Administration: Update of version number to avoid alternate name fields breaking before upgrade.
With the alteration of the user table to include the new alternate name fields anyone
upgrading from one version to another will receive errors until they run the upgrade.
Forcing a redirect if major version upgrade will bypass this issue.
2013-07-15 15:49:26 +08:00
Dan Poltawski
c2ca2d8e91 MDL-28466 remove the enrol_authorize data
If there are no records, remove the plugin
2013-07-15 14:48:23 +08:00
Damyon Wiese
fff9752d2a Merge branch 'wip-mdl-35131' of git://github.com/rajeshtaneja/moodle 2013-07-15 11:54:24 +08:00
Frederic Massart
c122e7845d MDL-13114 tool_uploadcourse: Adding to standard plugins 2013-07-15 11:45:34 +08:00
Damyon Wiese
c49fea3be5 Merge branch 'w29_MDL-40435_m26_componentpermissions' of https://github.com/skodak/moodle 2013-07-15 11:25:37 +08:00
Marina Glancy
3fd0ea3c1e Merge branch 'MDL-28466-master' of git://github.com/danpoltawski/moodle 2013-07-15 13:07:37 +10:00
Damyon Wiese
527b24b104 Merge branch 'w29_MDL-40475_m26_componentcache' of https://github.com/skodak/moodle 2013-07-15 10:58:03 +08:00