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

1114 commits

Author SHA1 Message Date
Sam Hemelryk
92e0842978 Merge branch 'MDL-33808' of git://github.com/danpoltawski/moodle 2012-06-21 10:19:05 +12:00
Dan Poltawski
73ec069e3b Merge branch 'wip-MDL-33832-master' of git://github.com/marinaglancy/moodle 2012-06-20 16:55:29 +08: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
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
Sam Hemelryk
dae0c90dbd Merge branch 'wip-mdl-33506' of git://github.com/rajeshtaneja/moodle 2012-06-20 09:15:48 +12: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
Dan Poltawski
bb046e61b6 Merge branch 'wip-MDL-33423-m23' of git://github.com/samhemelryk/moodle 2012-06-19 14:29:25 +08:00
Sam Hemelryk
9d7d2b03c8 MDL-33423 filepicker: Fixed visibility problem with loading icon 2012-06-19 16:53:44 +12:00
Dan Poltawski
8655fb96cf MDL-33808 - format title on the repository instance screen 2012-06-19 12:10:56 +08:00
Dan Poltawski
a2e6088c7f MDL-33469 repository_picasa: oops, wrong pluginname in string 2012-06-19 11:56:45 +08:00
Dan Poltawski
102f928621 MDL-33808 - incorrect cleaning of repository names 2012-06-19 11:27:04 +08:00
Marina Glancy
1778f310f3 MDL-33417 Show reference icon for files in filepicker 2012-06-19 11:15:51 +08:00
Eloy Lafuente (stronk7)
25c94edb27 Merge branch 'MDL-33469' of git://github.com/danpoltawski/moodle 2012-06-19 03:01:30 +02:00
Eloy Lafuente (stronk7)
f2904fe243 Merge branch 'MDL-33724' of git://github.com/danpoltawski/moodle 2012-06-19 02:56:19 +02:00
Sam Hemelryk
2e7ce603ff MDL-33423 filepicker: Added delay and fade in to loading icon 2012-06-19 10:11:21 +12: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
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
Dan Poltawski
8b5039361a MDL-33469 google plugins - string update 
Improved strings to try and ensure maximum support for users during
upgrade.
 2012-06-18 11:28:27 +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
Dongsheng Cai
d6453211b6 MDL-33513: Make files->source field consistent 2012-06-15 14:51:07 +08:00
Dan Poltawski
ed8e053e64 MDL-33724 repository_equella: missing string 2012-06-14 17:01:39 +08:00
Dan Poltawski
d4401b9643 Merge branch 'wip-MDL-33420-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:32:03 +08:00
Dan Poltawski
4585e6ac98 Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:23:08 +08:00
Marina Glancy
6fd1cf05b0 MDL-33550 reset repository static cache between unit tests 2012-06-14 16:21:04 +08:00
Dan Poltawski
414ce30812 Revert MDL-33513 
This reverts commit b2cf2b807f.
This reverts commit 24b96f0170.
This reverts commit 39c60294a6.
This reverts commit 8a288971e2.
 2012-06-14 13:57:45 +08:00
Rajesh Taneja
d01ebb940d MDL-33506 Filepicker: Search box text will be selected on focus 2012-06-14 13:03:08 +08:00
Dan Poltawski
54588ca214 Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle 2012-06-14 12:00:18 +08:00
Dan Poltawski
cd925ac79b Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle 2012-06-14 11:12:21 +08:00
Dan Poltawski
b2cf2b807f MDL-33513 repositories - fix misleading phpdocs 2012-06-14 10:55:30 +08:00
Andrew Davis
8ac95c279c MDL-27156 repository: Added a new capability so that select users can bypass file size restrictions 2012-06-14 09:19:25 +07:00
Sam Hemelryk
043a53fb25 Merge branch 'MDL-33541' of git://github.com/danpoltawski/moodle 2012-06-14 11:27:37 +12:00
Dongsheng Cai
24b96f0170 MDL-33513 Fixed source field 2012-06-13 19:57:10 +10:00
Dan Poltawski
3aad3a5e64 Merge branch 'wip-MDL-33452-master' of git://github.com/marinaglancy/moodle 2012-06-13 15:03:07 +08:00
Dan Poltawski
837eef2e64 MDL-33541 - remove cookies from filepicker 2012-06-13 12:17:52 +08:00
Marina Glancy
0b2bfbd1c6 MDL-33550 Correctly process situation when file reference source is missing 
- do not die with fatal error if source file in moodle internal repository is missing;
- moved code duplication for moodle repositories into class repository (functions send_file, get_reference_details, get_file_by_reference, get_file_reference);
- update file status after repository::sync_external_file so we know that it is missing (or not missing anymore). Do not run this function more than once for file within one request;
- display readable name for Private Files and Server files with the new format;
- display broken icon in filemanager if we know that source is missing, display information (for admin) where it was located before: see repository::get_reference_details() and extending classes;
- removed unnecessary queries in stored_file::sync_external_file();
- syncronize files before displaying it's size in mod_resource, do not query  directly
 2012-06-13 12:11:06 +08:00
Marina Glancy
be920f9acf MDL-33420 Enable references in Server files repository 2012-06-13 09:03:41 +08:00
Dan Poltawski
4a126f1725 MDL-32573 - repository: make instance_config_form static 2012-06-12 22:17:29 +08:00
Marina Glancy
c0e8f211d3 MDL-33452 It must not possible to create an alias to another alias 
- if the downloaded file is an alias we pretend that we operate with its source
 2012-06-12 11:03:54 +08:00
Eloy Lafuente (stronk7)
74ea1b95f4 MDL-32117 equella: add missing MOODLE_INTERNAL + phpdocs tidy 2012-06-12 02:23:14 +02:00
Eloy Lafuente (stronk7)
37b8257de5 Merge branch 'equella' of git://github.com/danpoltawski/moodle 2012-06-12 02:22:26 +02:00
Dongsheng Cai
39c60294a6 MDL-33513 box.net repository should have filename in source field 2012-06-11 17:41:32 +10:00
Dan Poltawski
d66e5720a1 MDL-32117 - equella: prevent errors when no username 2012-06-11 10:08:16 +08:00
Dongsheng Cai
8a288971e2 MDL-33513: Make files->source field consistent 2012-06-10 17:47:00 +10:00
Dan Poltawski
2960a22052 Merge branch 'MDL-33322' of git://github.com/rwijaya/moodle 2012-06-07 13:02:38 +08:00
Dan Poltawski
c770311367 Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle 2012-06-05 14:30:40 +08:00
Marina Glancy
6546a73dbb MDL-33445 reverted file size check for files inserted by reference 2012-06-05 13:57:16 +08:00
Marina Glancy
efa28f30f2 MDL-33391 Files API, Repository : mimetype should be determined from file extension when possible 2012-06-05 13:29:07 +08:00
Dan Poltawski
820b845415 Merge branch 'MDL-33476' of git://github.com/esqueeze/moodle 2012-06-05 12:15:47 +08:00