mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-21 08:00:37 +01:00
Code Issues Projects Releases Wiki Activity
54,582 Commits 36 Branches 527 Tags
Commit Graph

13652 Commits

Author SHA1 Message Date
Dan Poltawski
cfed1268ef MDL-33990 - yui2: remove 2 uncessary requirements 
We no longer use yui2 logger and connection in set_user_prefs
 2012-06-25 14:42:00 +08:00
Eloy Lafuente (stronk7)
4f1d79538e Fix permissions. 2012-06-24 18:31:09 +02:00
Dan Poltawski
5b7621f78d Merge branch 'MDL-33717_admin_message2' of git://github.com/andyjdavis/moodle 2012-06-22 15:09:46 +08:00
Sam Hemelryk
088c374a6d Merge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2012-06-22 11:56:49 +12:00
Sam Hemelryk
c5541daf00 Merge branch 'MDL-33915' of git://github.com/danpoltawski/moodle 2012-06-22 09:02:50 +12:00
Barbara Ramiro
5a322c8cfc MDL-33381 Icon label removed for all file types to make it generic 2012-06-21 18:19:33 +08:00
Aparup Banerjee
7cacb2ef08 Merge branch 'wip-MDL-33297-master' of git://github.com/abgreeve/moodle 2012-06-21 17:34:57 +08:00
Dan Poltawski
2a67e6f28b MDL-33911 mathslib: add unit test to demonstrate problem 2012-06-21 16:00:45 +08:00
Dan Poltawski
026082b401 MDL-33915 - prevent use of rebuild_course_cache during upgrade 
It depends on upgrade changes itself
 2012-06-21 11:43:54 +08:00
Andrew Davis
7db6bb7f61 MDL-33717 files: improved display_size() so that it displays something nice for -1 2012-06-21 10:14:32 +07:00
David Mudrák
38ca2f1a83 MDL-33430 Add newcontextid and newitemid to backup_files_template 
These new fields will be used to hold the new location of the file once
it is sent to the filepool during the restore.
 2012-06-21 02:29:42 +02:00
David Mudrák
6feae1d256 MDL-33430 Make file_storage::unpack_reference() more picky on what it gets 2012-06-21 01:32:24 +02:00
Tim Hunt
4efc3d4096 MDL-33911 lib/evalmath: fix strict syntax notices 2012-06-20 13:48:37 +01:00
Dan Poltawski
5649520d9b Merge branch 'MDL-33891-master-1' of git://git.luns.net.uk/moodle 2012-06-20 17:43:47 +08:00
Andrew Robert Nicols
dfe15e0ef9 MDL-33891 Ensure that listen events are cancelled correctly when closing the dialogue 2012-06-20 10:18:19 +01:00
Aparup Banerjee
4c7d9eb5c2 Merge branch 'wip-MDL-33811-m23' of git://github.com/samhemelryk/moodle 2012-06-20 17:18:00 +08:00
Dan Poltawski
73ec069e3b Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle 2012-06-20 16:55:29 +08:00
Aparup Banerjee
c949723817 Merge branch 'wip-MDL-33825-m23' of git://github.com/samhemelryk/moodle 2012-06-20 16:50:54 +08:00
Dan Poltawski
e3c7845314 Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle 2012-06-20 16:38:13 +08:00
Andrew Davis
703ffaea05 MDL-27156 repositories: altered a check as the !empty() test on $PAGE->course was always failing for some reason 2012-06-20 15:17:12 +07:00
Marina Glancy
83d2700ec9 MDL-33832 Fixed filling of files.source field 
- also supress the error on unserialise (because people already may have broken files.source field)
- also display details about unparseable JSON error
- make source field look the same across repositories
 2012-06-20 16:09:37 +08:00
Aparup Banerjee
3262f547fc Merge branch 'MDL-33649-master-2' of git://git.luns.net.uk/moodle 2012-06-20 15:19:18 +08:00
Aparup Banerjee
7189225b7a Merge branch 'MDL-33728-master-1' of git://git.luns.net.uk/moodle 2012-06-20 14:49:16 +08:00
Aparup Banerjee
f65d3d1d18 Merge branch 'MDL-33703-master-3' of git://git.luns.net.uk/moodle 2012-06-20 14:39:58 +08:00
Aparup Banerjee
eca0371465 Merge branch 'MDL-33729-master-1' of git://git.luns.net.uk/moodle 2012-06-20 14:28:05 +08:00
Dan Poltawski
6e471afe8b Merge branch 'wip-MDL-33417-master' of git://github.com/marinaglancy/moodle 2012-06-20 13:42:19 +08:00
Andrew Davis
bc8da017b5 MDL-27156 repositories: altered filepicker.php so that users with the ability to ignore course file size restrictions are not incorrectly restricted 2012-06-20 11:27:31 +07:00
Dan Poltawski
f14651b6b1 Merge branch 'MDL-27156_part2' of git://github.com/andyjdavis/moodle 2012-06-20 11:17:01 +08:00
Adrian Greeve
35ca63c166 MDL-33297 - forum - workshop - glossary - data - Updated the check for files to allow students to see files they recently uploaded. 2012-06-20 10:49:18 +08:00
Jason Fowler
e85b7e7865 MDL-32290 - Repositories - Fixing missing slash from the URL path 2012-06-20 10:41:58 +08:00
Eloy Lafuente (stronk7)
cb172822e5 Merge branch 'w25_MDL-32003_m23_dbcleanup' of git://github.com/skodak/moodle 2012-06-20 02:03:47 +02:00
Sam Hemelryk
1e3d84785a Merge branch 'wip-mdl-33425' of git://github.com/rajeshtaneja/moodle 2012-06-20 11:32:04 +12:00
Sam Hemelryk
a9efc8ddb8 Merge branch 'MDL-32908' of git://github.com/danpoltawski/moodle 2012-06-20 10:31:52 +12:00
Andrew Robert Nicols
baca909631 MDL-33703 Adjust chooser location when changing browser orientation or size 2012-06-19 15:33:07 +01:00
Dan Poltawski
f189c540b9 Merge branch 'MDL-33842_antivirus_message' of git://github.com/davosmith/moodle 2012-06-19 21:52:27 +08:00
Davo Smith
78b4da1963 MDL-33842 Filemanager dndupload - now displays error messages (including antivirus) 2012-06-19 14:27:12 +01:00
Dan Poltawski
139d3639c8 Merge branch 'MDL-33582-master-integration' of git://github.com/FMCorz/moodle 2012-06-19 15:39:03 +08:00
Dan Poltawski
a80b5a0cf0 MDL-32908 - drop $USER->ajax 
Its not been respected for some time and is just confusing
 2012-06-19 15:07:18 +08:00
Aparup Banerjee
1ee9b37880 Merge branch 'wip-MDL-32990-master' of git://github.com/phalacee/moodle 2012-06-19 14:59:48 +08:00
Jason Fowler
9e9382530f MDL-32990 - Repositories - Updating Box.net API calls to use HTTPS 2012-06-19 14:46:44 +08:00
Marina Glancy
1778f310f3 MDL-33417 Show reference icon for files in filepicker 2012-06-19 11:15:51 +08:00
Sam Hemelryk
2395a7510f MDL-33825 css_optimiser: Fixed bug where !important was being lost for advanced background styles 2012-06-19 12:32:56 +12:00
Sam Hemelryk
624ef76c2f MDL-33811 Fixed left over debugging code preventing proper setting of YUI gallery version 2012-06-19 11:26:23 +12:00
Eloy Lafuente (stronk7)
e04a0e32c7 Merge branch 'MDL-33552' of git://github.com/danpoltawski/moodle 2012-06-18 12:31:37 +02:00
Dan Poltawski
6855fec7fd Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle 2012-06-18 17:36:03 +08:00
Aparup Banerjee
44b836d629 Merge branch 'MDL-33175' of git://github.com/danpoltawski/moodle 2012-06-18 17:14:11 +08:00
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle 
Conflicts:
	mod/assign/version.php
 2012-06-18 16:08:39 +08:00
Aparup Banerjee
341d989d63 Merge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle 2012-06-18 16:03:08 +08:00
Davo Smith
d0b2d44528 MDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping file with existing name 2012-06-18 08:55:41 +01:00
Andrew Davis
448c2f5b9b MDL-27156 repositories: altered filepicker.php so that users with the ability to ignore course file size restrictions are not incorrectly restricted 2012-06-18 11:33:28 +07:00