Eloy Lafuente (stronk7)
|
d291dfd0aa
|
Merge branch 'MDL-32107-master' of git://github.com/sammarshallou/moodle
|
2012-06-05 00:42:59 +02:00 |
|
Eloy Lafuente (stronk7)
|
c76bd30885
|
Merge branch 'MDL-33133-master' of git://github.com/sammarshallou/moodle
|
2012-06-05 00:38:04 +02:00 |
|
Eloy Lafuente (stronk7)
|
080f585f39
|
Merge branch 'MDL-33507' of git://github.com/danpoltawski/moodle
|
2012-06-04 21:47:14 +02:00 |
|
Eloy Lafuente (stronk7)
|
0b702fca0b
|
Merge branch 'w23_MDL-33436_m23_testprinter' of git://github.com/skodak/moodle
|
2012-06-04 19:55:21 +02:00 |
|
Dan Poltawski
|
b3245b758c
|
Merge branch 'MD-31803' of git://github.com/mouneyrac/moodle
Conflicts:
admin/index.php
admin/renderer.php
version.php
|
2012-06-04 19:25:58 +08:00 |
|
Eloy Lafuente (stronk7)
|
a301675101
|
Merge branch 'w23_MDL-33007_m23_buggyiconv' of git://github.com/skodak/moodle
|
2012-06-04 11:33:47 +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
|
f27735e470
|
Merge branch 'MDL-33480' of git://github.com/stronk7/moodle
|
2012-06-04 16:59:49 +08:00 |
|
Petr Skoda
|
03f0cd1039
|
MDL-33007 fix incorrect min_fix_utf8() tests
Credit goest to Eloy Lafuente.
|
2012-06-04 10:45:44 +02:00 |
|
David Monllaó
|
d7eb773047
|
MDL-31823 - Remote hosts users created via mnet enrolments marked as confirmed
|
2012-06-04 10:39:41 +02:00 |
|
Dan Poltawski
|
1cbaf803d0
|
MDL-29173 - fix whitespace error
|
2012-06-04 16:32:25 +08:00 |
|
Dan Poltawski
|
6f337ea935
|
Merge branch 'MDL-29173_calc' of git://github.com/andyjdavis/moodle
|
2012-06-04 15:55:54 +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
|
d1546151e3
|
MDL-33511 admin/repositoryinstance.php: incorrect url
|
2012-06-04 15:26:21 +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
|
7b61ac39d2
|
MDL-33507 - oauth2lib: switch 'code' to oauth2code
To avoid param collisions in future.
|
2012-06-04 11:25:19 +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 |
|
Andrew Davis
|
c84d86e0b7
|
MDL-30880 grade: added a check for the feedback property existing before it is used
|
2012-06-04 09:17:06 +07:00 |
|
Andrew Davis
|
74a37e1deb
|
MDL-31460 mod_forum: added some controls to mod/forum/unsubscribeall.php to prevent the removal of subscriptions the user shouldnt be able to delete
|
2012-06-04 09:16:21 +07:00 |
|
Andrew Davis
|
94e40193a4
|
MDL-32649 rating: fixed the sorting in /rating/index.php
|
2012-06-04 09:13:26 +07:00 |
|
Eloy Lafuente (stronk7)
|
d57e6d531f
|
MDL-33503 backup: Bump internal release and version information.
|
2012-06-04 02:35:51 +02:00 |
|
Eloy Lafuente (stronk7)
|
f4624b6b0b
|
MDL-33502 restore: there are no files with itemid based on section numbers.
|
2012-06-04 02:15:57 +02:00 |
|
Eloy Lafuente (stronk7)
|
34570f86bc
|
MDL-33480 book print tool: display intro images properly
|
2012-06-04 01:46:53 +02:00 |
|