moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55219 commits 37 branches 540 tags 1.3 GiB
Commit graph

13894 commits

Author SHA1 Message Date
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
Jonathan Harker
def4a8f5b7 MDL-27125 better manage file handles when downloading multiple files. 
Based on Dongsheng Cai's branch: s11_MDL-27125_curl_file_handler_master
 2012-06-20 16:46:29 +12: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
Frederic Massart
4954d6ed2c MDL-33814 Output renderers: table cell objects are only created when needed 2012-06-19 11:59:03 +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
Rajesh Taneja
4e782b32f3 MDL-33425 user: Replaced filepicker with filemanager on edit profile page 2012-06-18 10:19:48 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Petr Skoda
d8bf2a14b6 MDL-32003 last db related phpdocs cleanup commit 2012-06-17 22:56:30 +02:00
Petr Skoda
002252f714 MDL-32003 standardise null case 2012-06-17 22:56:30 +02:00
Petr Skoda
aaddfac50c MDL-32003 more xmldb phpdocs and PHP4-ism cleanup 2012-06-17 22:56:30 +02:00
Petr Skoda
a6d9d4efc2 MDL-32003 fix PHP4-isms in core xmldb code 2012-06-17 22:56:29 +02:00
Petr Skoda
ef7c3f108a MDL-32003 protect xmldb class internals 
Use getters and setters instead!
 2012-06-17 22:56:29 +02:00
Petr Skoda
01be2287c7 MDL-32003 drop unused statement constants 
These were last used in 2.2 upgrade, not allowed any more.
 2012-06-17 22:56:29 +02:00
Petr Skoda
94417438b3 MDL-32003 fix phpdocs in xmldb abstraction 2012-06-17 22:56:28 +02:00
Petr Skoda
5a070f0477 MDL-32003 fix phpdocs in DDL layer 2012-06-17 22:56:28 +02:00
Petr Skoda
00902cd974 MDL-32003 fix phpdocs and use __DIR__ for includes in dml layer 
DML layer is not supposed to use $CFG,
it is better to rely on __DIR__ in self-contained libs…
 2012-06-17 22:56:28 +02:00
Eloy Lafuente (stronk7)
a4b9f21e45 MDL-27156 maxfilesize: Comment out new cap use + return -1 as temp fix 
With the capability check and the return -1 commented
it has been checked here that it's possible to upload
and pick from filesystem repository files normally, so
I'm introducing this temp commit to allow people to
use those repos "normallly" until a proper fix arrives
supporting the new cap.
 2012-06-15 20:05:46 +02:00
Eloy Lafuente (stronk7)
b9647509d4 MDL-32279 filters: filters: setup() before filter() is better. 2012-06-15 10:12:53 +02:00
Dongsheng Cai
d6453211b6 MDL-33513: Make files->source field consistent 2012-06-15 14:51:07 +08:00