Dan Poltawski
50bc155cce
Merge branch 'MDL-31460_unsubscribe' of git://github.com/andyjdavis/moodle
2012-06-05 09:33:38 +08:00
Marina Glancy
2ea47082f0
MDL-33479 removed legacy constructor causing strict notice in php5
2012-06-05 09:27:32 +08: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
Frederic Massart
775fe70093
MDL-30837 Accessibility: removed navigation icons default alt text
2012-06-05 09:11:46 +08:00
Helen Foster
3c97ce2461
MDL-31803 lang - make the mooch registration message more descriptive
2012-06-05 09:09:52 +08:00
Ankit Agarwal
5249ba7405
MDL-33369 course: Adding support for sectionid parameter for section view pages
2012-06-05 08:53:04 +08:00
Ankit Agarwal
586e797689
MDL-33401 blocks: Allow managers to have block:edit capability by default
2012-06-05 08:50:43 +08:00
Eloy Lafuente (stronk7)
0b1f477618
Merge branch 'MDL-32649_ratings_sort' of git://github.com/andyjdavis/moodle
2012-06-05 02:22:33 +02:00
Eloy Lafuente (stronk7)
aa12ec984c
MDL-32985 cron: prevent notices on "new" sites.
2012-06-05 02:14:13 +02:00
Eloy Lafuente (stronk7)
4baa746eae
Merge branch 'MDL-32985' of git://github.com/merrill-oakland/moodle
2012-06-05 02:02:12 +02:00
Eloy Lafuente (stronk7)
f61194e387
MDL-33080 IMSCC: look for imsmanifest.xml @ root dir
2012-06-05 01:04:29 +02:00
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