mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity
55,021 Commits 36 Branches 519 Tags
Commit Graph

1092 Commits

Author SHA1 Message Date
Dan Poltawski
c9e084dd3a Merge branch 'wip-MDL-34213-master' of git://github.com/marinaglancy/moodle 2012-07-16 09:54:54 +08:00
Sam Hemelryk
b0965de588 Merge branch 'MDL-34240' of git://github.com/danpoltawski/moodle 2012-07-16 10:37:53 +12:00
Marina Glancy
0c2fe3aac1 MDL-34213 fixed mistype causing wrong link in some browsers 2012-07-13 16:12:17 +08:00
Dan Poltawski
999427e985 MDL-34240 - google plugins: switch to PARAM_RAW_TRIMMED 
This ensures the client credentials which are entered are trimmed
as users are finding problems with bad pastes.
 2012-07-13 10:09:25 +08:00
Dan Poltawski
c94068f215 Merge branch 'wip-MDL-33950-master' of git://github.com/marinaglancy/moodle 2012-07-10 14:56:46 +08:00
Sam Hemelryk
3bfe07a5ad Merge branch 'wip-MDL-33444-master' of git://github.com/marinaglancy/moodle 2012-07-10 12:27:47 +12:00
Sam Hemelryk
3b37c5ceb9 Merge branch 'MDL-34107_filename_dot' of git://github.com/davosmith/moodle 2012-07-10 11:47:20 +12:00
Dan Poltawski
098c02be10 Merge branch 'MDL-34077-master' of git://github.com/FMCorz/moodle 2012-07-09 13:37:20 +08:00
Marina Glancy
6dc82385ab MDL-33950 Correctly initialise repository and check access in js and non-js filepicker 2012-07-06 09:44:07 +08:00
Marina Glancy
7e897e67ab MDL-33473,MDL-33950,MDL-33837 Allow non-js filepicker to pick files from moodle repositories 
- MDL-33473 actually make non-js filepicker to work with local repositories
- MDL-33950 validate that file is accessible
- MDL-33837 when picking a server file marked as main, do not make it main in current filearea
 2012-07-06 09:44:07 +08:00
Marina Glancy
1bd0174743 MDL-33950 check if source file is accessible in repository_ajax.php 
- repository::copy_to_area() does not check access any more, and repository_recent::copy_to_area() is unnecessary
- added repository::file_is_accessible() that checks access to the picked file (regardless of accessibility of the file it is referencing to)
 2012-07-06 09:44:07 +08:00
Marina Glancy
6133c2ea21 MDL-33444 Upload repository can specify custom label for filepicker 2012-07-06 09:43:50 +08:00
Dan Poltawski
c75599f966 Merge branch 'wip-MDL-34047-master' of git://github.com/marinaglancy/moodle 2012-07-04 09:51:25 +08:00
Sam Hemelryk
c425663c4c Merge branch 'MDL-27125_master_2' of git://git.catalyst.net.nz/moodle-r2 2012-07-04 09:32:45 +12:00
Sam Hemelryk
5439f90aa3 Merge branch 'wip-MDL-33749-master' of https://github.com/kwiliarty/moodle 2012-07-04 08:33:14 +12:00
Kevin Wiliarty
b1eeb76ec2 MDL-33749 follow redirects for URL downloader 2012-07-03 14:16:51 -04:00
Davo Smith
970f0c0a36 MDL-34107 Upload repository - do not add a dot to files without an extension 2012-07-02 08:10:24 +01:00
Marina Glancy
81c4a77827 MDL-34047 repository URL downloader must say that it returns only images 2012-07-02 14:12:20 +08:00
Marina Glancy
adbb904b9c MDL-33837 picking file from server files should not copy 'Main file' property 2012-07-02 14:11:39 +08:00
Aparup Banerjee
99c3c503e0 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:41:09 +08:00
Frederic Massart
545ca38628 MDL-34077 Repositories: Flickr and Picasa can have custom names 2012-06-28 12:11:18 +08:00
Aparup Banerjee
f5fee1e148 Merge branch 'MDL-33694' of git://github.com/danpoltawski/moodle 2012-06-25 16:45:23 +08:00
Dan Poltawski
6100b006f1 Merge branch 'wip-MDL-33777-master' of git://github.com/marinaglancy/moodle 2012-06-25 16:18:27 +08:00
Dan Poltawski
b0d3162930 Merge branch 'wip-MDL-33997-master' of git://github.com/marinaglancy/moodle 2012-06-25 16:08:33 +08:00
Marina Glancy
c8161eec94 MDL-33997 Repository should not support references by default 2012-06-25 16:03:25 +08:00
Dan Poltawski
72b33964f6 MDL-33694 repository: docs about 2.3 changes 2012-06-25 16:01:54 +08:00
Marina Glancy
c01f7628f7 MDL-33777 Equella repository properly set the source and display file origin 2012-06-25 10:57:02 +08:00
nread
75d1891548 MDL-33980 equella: course ID number should be being passed through, not the course database ID 2012-06-25 12:33:49 +10:00
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