mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
57,923 Commits 36 Branches 519 Tags
Commit Graph

57923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
e3b494e379 Merge branch 'w49_MDL-36737_m25_glossstrict' of git://github.com/skodak/moodle 2012-12-10 19:37:24 +08:00
Dan Poltawski
91c5477606 Merge branch 'MDL-36755_master' of git://github.com/markn86/moodle 
Conflicts:
	blocks/course_overview/version.php
 2012-12-10 19:32:10 +08:00
Dan Poltawski
6aa4fccc74 MDL-36167 fix trailing whitespace 2012-12-10 17:35:58 +08:00
Dan Poltawski
76089dc378 Merge branch 'MDL-36167-master' of git://github.com/damyon/moodle 2012-12-10 17:31:41 +08:00
Dan Poltawski
69e0b225c1 Merge branch 'MDL-36732' of git://github.com/timhunt/moodle 2012-12-10 15:17:46 +08:00
Dan Poltawski
adce3fa833 Merge branch 'MDL-36549' of git://github.com/rwijaya/moodle 2012-12-10 14:18:32 +08:00
Dan Poltawski
3b49f655b2 Merge branch 'MDL-36856' of git://github.com/kastashov/moodle 2012-12-10 14:04:22 +08:00
Dan Poltawski
9278e2dbef Merge branch 'MDL-36835-master' of git://github.com/damyon/moodle 2012-12-10 14:01:56 +08:00
Dan Poltawski
8df07e5086 Merge branch 'MDL-36538_webdav_memory' of git://github.com/davosmith/moodle 2012-12-10 13:06:37 +08:00
Dan Poltawski
9c714c83b7 Merge branch 'w49_MDL-35456_m25_paypal' of git://github.com/skodak/moodle 2012-12-10 12:03:03 +08:00
Dan Poltawski
2e6aff57e5 Merge branch 'MDL-35404' of git://github.com/timhunt/moodle 2012-12-10 11:36:38 +08:00
Dan Poltawski
7689a5837a Merge branch 'wip-MDL-36939-m25' of git://github.com/samhemelryk/moodle 2012-12-10 11:08:42 +08:00
Sam Hemelryk
845774bf33 Merge branch 'MDL-30961-master' of git://github.com/mouneyrac/moodle 2012-12-10 14:59:42 +13:00
Dan Poltawski
d31c08b698 Merge branch 'MDL-36680_hidden' of git://github.com/andyjdavis/moodle 2012-12-10 09:56:09 +08:00
Sam Hemelryk
754f808546 Merge branch 'MDL-36946-master' of git://github.com/micaherne/moodle 2012-12-10 14:43:40 +13:00
Sam Hemelryk
11e95000bd Merge branch 'MDL-34592_master' of git://github.com/lazydaisy/moodle 2012-12-10 14:28:44 +13:00
Sam Hemelryk
d60ac860ea Merge branch 'MDL-36608_master' of git://github.com/lazydaisy/moodle 2012-12-10 14:24:39 +13:00
Sam Hemelryk
018e659061 Merge branch 'MDL-36978' of git://github.com/lazydaisy/moodle 2012-12-10 14:21:37 +13:00
Sam Hemelryk
9a3e76e01e Merge branch 'MDL-36579_modLtiBackupFields' of git://github.com/moodlerooms/moodle 2012-12-10 14:16:00 +13:00
Mark Nielsen
e893c6d442 MDL-36607: Improve block drag and drop 
* Adding support for subpage
* Adding support for regions that do not start with "side-"
 2012-12-10 14:12:57 +13:00
Sam Hemelryk
9d8abffc87 Merge branch 'MDL-35954_master' of git://github.com/markn86/moodle 2012-12-10 14:08:06 +13:00
Sam Hemelryk
1b4e47e43a Merge branch 'MDL-36433-master' of git://github.com/itamart/moodle 2012-12-10 12:13:32 +13:00
Sam Hemelryk
8b5944b9b9 Merge branch 'MDL-36764' of git://github.com/danpoltawski/moodle 2012-12-10 11:54:01 +13:00
Sam Hemelryk
a429049ce5 Merge branch 'MDL-36778' of git://github.com/danpoltawski/moodle 2012-12-10 11:51:38 +13:00
Sam Hemelryk
7e4dd7f6c2 Merge branch 'MDL-36887' of git://github.com/danpoltawski/moodle 2012-12-10 11:48:22 +13:00
Sam Hemelryk
533469cba4 Merge branch 'MDL-36640-master' of git://git.luns.net.uk/moodle 2012-12-10 11:42:57 +13:00
Mary Evans
e907c68530 MDL-34592 theme_magazine: Fixes the report grader fixed column misalignment in magazine/style/core.css theme, plus fixes all CORE themes with minor adjustment to grade/report/grader/style.css 2012-12-09 22:23:42 +00:00
Andrew Robert Nicols
e275e8c3cd MDL-36918 Decode HTML entities on ajax update title 2012-12-10 11:15:50 +13:00
Sam Hemelryk
fa9b53cdf8 Merge branch 'message_nav' of git://github.com/andyjdavis/moodle 2012-12-10 11:00:17 +13:00
Sam Hemelryk
70d09e7fd6 Merge branch 'MDL-36761_loop' of git://github.com/andyjdavis/moodle 2012-12-10 10:54:32 +13:00
Sam Hemelryk
f6c922e71f Merge branch 'MDL-34591_master' of git://github.com/grabs/moodle 2012-12-10 10:49:21 +13:00
Sam Hemelryk
d72f2212da Merge branch 'wip-MDL-35221-master' of git://github.com/kwiliarty/moodle 2012-12-10 10:41:35 +13:00
Sam Hemelryk
bb682c1ac2 Merge branch 'wip-MDL-36906-master' of git://github.com/abgreeve/moodle 2012-12-10 10:33:48 +13:00
Sam Hemelryk
6d48072205 Merge branch 'wip-MDL-36915-master' of git://github.com/abgreeve/moodle 2012-12-10 10:27:25 +13:00
Sam Hemelryk
d229ac0f0a Merge branch 'wip-MDL-37026-master' of git://github.com/abgreeve/moodle 2012-12-10 10:23:55 +13:00
Sam Hemelryk
13980de16b Merge branch 'MDL-33125' of git://github.com/aolley/moodle 2012-12-10 10:19:32 +13:00
Andreas Grabs
a8e85e05bc MDL-34591 - paypal does not allow unenrol 2012-12-09 19:10:52 +01:00
Mary Evans
3c202221a8 MDL-36978 theme_standardold: fixes misplaced block region check in layout/frontpage.php which, with hindsight should have been fixed in MDL-23226. 2012-12-08 22:20:05 +00:00
Petr Škoda
443bb9c103 MDL-36737 fix random glossary E_STRICT issue 2012-12-08 14:44:05 +01:00
Petr Škoda
b7a9c85118 MDL-35456 use HTTP 1.1 for PayPal IPN 2012-12-08 11:58:05 +01:00
Eloy Lafuente (stronk7)
4bd6f71bad weekly on-sync release 2.5dev 2012-12-08 02:58:07 +01:00
Davo Smith
e38f699271 MDL-36538 repository_webdav - save files directly to local filesystem, rather than buffering in memory 2012-12-07 09:17:28 +00:00
Sam Hemelryk
7d18285720 MDL-36939 cache: instance form validation now handles errors properly 2012-12-07 08:38:05 +13:00
Amy Groshek
62434c8a53 MDL-36960 - fix broken horizontal positioning of titles for docked blocks 2012-12-06 12:10:38 +08:00
David Mudrák
8663b090c0 MDL-36963 Do not attempt to remove the root folder of a plugin during the update deployment 
There is no need to move the root folder of a plugin during the update
deployment. We just need to operate with its contents. So the web server
process can have the write access for the plugin folder only.
 2012-12-06 11:03:35 +08:00
David Mudrák
dabe5acc42 MDL-36963 Add unit tests for directory operations in mdeploy.php 2012-12-06 11:03:35 +08:00
David Mudrák
75879a9e74 MDL-36963 Improve mdeploy worker::remove_directory() method 
The additional parameter allows to use this method without actual
removing the root of the path. That is, it is now possible to remove
the content of a folder only.
 2012-12-06 11:03:35 +08:00
David Mudrák
b68bbc5ae1 MDL-36963 Improve mdeploy worker::move_directory() method 
The additional parameter allows to use this method without actual
removing the root of the source location. That is, it is now possible to
move the content of a folder only.

Also, a small refactoring happened here as we will need a variant of
this method that does not throw exception if the target already exists.
 2012-12-06 11:03:35 +08:00
Adrian Greeve
3370f216a2 MDL-37026 - lib: The function user_can_assign() returns true for admins. 2012-12-06 10:52:09 +08:00
Eloy Lafuente (stronk7)
ee22329a90 Merge branch 'wip-MDL-36341-m24' of git://github.com/samhemelryk/moodle 2012-12-06 02:24:47 +01:00