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
Dan Poltawski
490ef89365 Merge branch 'wip-MDL-33409-master' of git://github.com/marinaglancy/moodle 2012-06-05 12:09:44 +08:00
nread
e3e4ca5ae9 MDL-32117 equella: owner field in JSON maps back to author 2012-06-05 13:45:25 +10:00
Tim Barker
8de9272c6c MDL-33476 repositories: Added instructions to assist with setting up Dropbox keys 2012-06-05 10:19:06 +08:00
nread
826b34836a MDL-32117 equella: pass through course shortname too 2012-06-05 11:45:24 +10:00
Marina Glancy
9945ec5e13 MDL-33445 Added file size check to files inserted by reference 2012-06-05 09:26:26 +08:00
Marina Glancy
2dfa16ef8a MDL-33409 Newly copied files should take on the userid of the current user, and dates reset 
- changed function repository::copy_to_area so it accepts more file attributes, pass changed attributes to it
- changed file_info::copy_to_storage and file_info_stored::copy_to_storage to accept more file attributes
- simplified file size check for moodle files in repository/repository_ajax.php
- removed unused code in repository/repository_ajax.php
 2012-06-05 09:26:26 +08:00
Eloy Lafuente (stronk7)
080f585f39 Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle 2012-06-04 21:47:14 +02:00
Dan Poltawski
1cf840074b Merge branch 'wip-MDL-33218-master' of git://github.com/barbararamiro/moodle 2012-06-04 17:13:35 +08:00
Dan Poltawski
095b8c5818 MDL-32117 equella: Add validation rules to instance form 
Also change equella_action to hardcoded value
 2012-06-04 15:29:46 +08:00
Dan Poltawski
e3e691cc6e MDL-32117 equella: die after redirection 
To make it clear that nothing else happens.
 2012-06-04 15:29:46 +08:00
Dan Poltawski
2e47347c88 MDL-32117 equella: callback.php params 
* Properly cleaned and filtered
* Add utf8 content type

(Thanks Petr Škoda)
 2012-06-04 15:29:45 +08:00
Dan Poltawski
c1e688bba4 MDL-32117 equella: Moodle style checker issues 
* Whitespace around control statements
* DOS formated version.php
 2012-06-04 15:29:45 +08:00
Dan Poltawski
1256d67102 MDL-32117 equella: remove unused full_url() method 2012-06-04 15:29:45 +08:00
Dan Poltawski
dcd51551d2 MDL-32117 equella: improve version.php 
* Include component name
* Include requires version

(Thanks Petr Škoda)
 2012-06-04 15:29:12 +08:00
Dan Poltawski
bf4b1698a5 MDL-32117 equella: remove another unused global 2012-06-04 15:29:11 +08:00
Dan Poltawski
e38919c070 MDL-32117 equella: Make private functions private 
Match mimetype function name to moodle coding style.
 2012-06-04 12:32:15 +08:00
Dan Poltawski
7406ee9f57 MDL-32117 equella: Switch get_all_editing_roles to get_users_with_capability 
This is the core function to do the same thing
 2012-06-04 12:32:15 +08:00
Dan Poltawski
32f7f85862 MDL-32117 equella: Remove custom 'context tree' handling. 
user_has_role_assignment will check parent contexts itself so there is
no need to do this manally
 2012-06-04 12:32:10 +08:00
Dan Poltawski
3e3910a58d MDL-32117 equella: Remove unusused globals 2012-06-04 12:30:40 +08:00
Dan Poltawski
130b3f8c4f MDL-32117 equella: various E_STRICT fixes 
* Make send_file compatible with its parent
* mktime -> time()
* callback.php: fix pass by reference warnings
 2012-06-04 12:29:15 +08:00
Dongsheng Cai
e88aa1e34c MDL-32117 Removed dots from language key names 2012-06-04 11:46:03 +08:00
Dongsheng Cai
da1f4aee95 MDL-32117 EQUELLA plugin: Added some TODO comments in callback.php and changed variable names to conform moodle coding style 2012-06-04 11:46:03 +08:00
Dongsheng Cai
36f8060a6b MDL-32117 EQUELLA plugin: Fixed file downloading redirect issue 2012-06-04 11:46:02 +08:00
Dongsheng Cai
9225747e11 MDL-32117 EQUELLA plugin: Fixed callback parameters 2012-06-04 11:46:02 +08:00
nread
7283bb95ae MDL-32117 EQUELLA plugin: EQUELLA only support references, not external files 2012-06-04 11:46:02 +08:00
nread
a3fde71746 MDL-32117 EQUELLA plugin: Remove warning when 'mimetypes' option is not set 2012-06-04 11:46:02 +08:00
nread
205f169edf MDL-32117 EQUELLA plugin: Turn off the login, refresh buttons and the search box 2012-06-04 11:46:02 +08:00
nread
1b4e7fbc37 MDL-32117 EQUELLA plugin: else if -> elseif 2012-06-04 11:46:02 +08:00
nread
11a55b46ff MDL-32117 EQUELLA plugin: Enforce selection restriction settings, but override if Moodle wants to restrict to specific MIME types as it is always going to be for resources only 2012-06-04 11:46:01 +08:00
nread
cb1871a829 MDL-32117 EQUELLA plugin: Don't restrict to MIME types if '*' is used, as user should be able to select any type at this point 2012-06-04 11:46:01 +08:00
nread
1be875bab7 MDL-32117 EQUELLA plugin: Don't include the 'mimeTypes' option if it's empty or we get the wrong stuff 2012-06-04 11:46:01 +08:00
nread
d3376ba684 MDL-32117 EQUELLA plugin: Spelling error in variable name 2012-06-04 11:46:01 +08:00
Dongsheng Cai
36bf3ff825 MDL-32117 EQUELLA plugin: Fixed the checking roles code when using filepicker in user context. Also format the SQL to use moodle coding style 2012-06-04 11:46:01 +08:00
nread
9c6d6c0eeb MDL-32117 EQUELLA plugin: Dynamic configuration for roles, and use 'write' tokens when selecting stuff 2012-06-04 11:46:01 +08:00
nread
b709660fb2 MDL-32117 EQUELLA plugin: Don't show close icons or cancel links in EQUELLA because we're inside the File Picker dialog which has its own close button. Also, always return URLs for selected resources in the '?attachment.uuid=abcd' format so that URLs work if filenames are changed 2012-06-04 11:46:00 +08:00
Dongsheng Cai
27bb724f16 MDL-32117 EQUELLA plugin: initial commit 2012-06-04 11:46:00 +08:00
Dan Poltawski
5df1b73748 MDL-33501 - oauth2lib: enforce sesskey in oauth2callback.php 
The sesskey needs to be embeded in the local url returned as this is the
only parameter we have control of.
 2012-06-04 11:11:38 +08:00
Dan Poltawski
db7602af7c MDL-33501 - oauth2lib: improve redirect url handling 
Only accept PARAM_LOCALURL for state params and enforce
use of moodle_url param in oauthlib to facilitate that.
 2012-06-04 10:57:39 +08:00
Marina Glancy
3c693ff4d2 MDL-33322: fixed strict standards 2012-06-01 10:53:10 +08:00
Sam Hemelryk
84ec16a861 Merge branch 'MDL-29857-3' of git://github.com/danpoltawski/moodle 2012-06-01 13:42:01 +12:00
Rossiani Wijaya
4239150a60 MDL-33322 Filepicker: fix filepicker for recent file with JS turned of 2012-05-31 12:06:32 +08:00
Dan Poltawski
ce30ff5df0 MDL-29857 google apis: OAuth 2.0 repository plugins upgrade 
We are disabling the plugins on upgrade and emailing admins
about this if they have a plugin configured.

This is required because OAuth 2 credentials are now required
in the plugin configuration.

NOTE: These strings are temporary and need to be improved.
 2012-05-31 00:19:30 +08:00
Dan Poltawski
4560fd1b66 MDL-29857 - google apis: Convert to OAuth 2.0 
Updated the various plugins to use OAuth 2.0 for authentication
against google apis. Google are phasing out AuthSub and pushing OAuth as
the replacement.

This changes repository_googledocs, repository_picasa,
portfolio_googledocs and portfolio_picasa

The token for requests is now stored in session rather than a user
prefence and it persists less but doesn't bother the user more than
necessary.

The google docs portfolio plugin is converted to use resumable upload
API as this appears to be what Google have replaced this with.

Unfortunately unlike authsub OAuth will require some setup by admins,
this is linked as a docs page.
 2012-05-31 00:00:25 +08:00
Marina Glancy
f92b65e5a6 MDL-33377 Do not allow to link to course files since reference is preferable 2012-05-28 16:27:22 +08:00
Marina Glancy
5e11746696 MDL-33218 fixing filemanager/filepicker look in IE 
now all YUI dialogues are under the div with id #filesskin. This way we can avoid using !important in CSS and use #filesskin instead. It will have priority over YUI skin in all browswers including IE (!important does not work in IE).

Conflicts:

	files/renderer.php
	theme/base/style/filemanager.css
 2012-05-28 11:54:33 +08:00
Aparup Banerjee
66905a4cf7 Merge branch 'MDL-33196' of git://github.com/rwijaya/moodle 2012-05-25 14:13:21 +08:00
Aparup Banerjee
09cb95f861 MDL-33324 Filepicker : fixed syntax. 2012-05-25 11:44:04 +08:00
Aparup Banerjee
0479a2873e MDL-33324 Filepicker : removed redundant parantheses. 2012-05-25 11:25:57 +08:00
Aparup Banerjee
708738cd73 Merge branch 'wip-MDL-33324-master' of git://github.com/marinaglancy/moodle 2012-05-25 11:25:25 +08:00
Marina Glancy
9213f5476f MDL-33324 fixed bugs with icons in filepicker/filemanager treeview 
- in treeview the icons for parent folders did not appear
- in treeview after refreshing (expanding subtrees) the image previews were replaced back to filetype icons
- also fixed a mistype in icon url in repository_local
 2012-05-24 14:10:40 +08:00