753199ba63
Merge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle
2012-05-25 09:57:35 +08:00
4c88645920
MDL-33173 Filepicker: renamed private files edit page to main page
2012-05-25 09:24:39 +08:00
6347a6216d
MDL-33172: Fixed whitespace
2012-05-25 11:37:07 +12:00
3447100cdb
MDL-33172 - filestorage: Fix oracle incompatibilites
...
Fixes the following problems:
* When we select from two tables with the same named fields (id)
and ask to sort by that field, Oracle doesn't know which table to
sort frm unless that field is named in the SELECT. Here we do that
by explicitly naming the fields. This keeps compatibility with before
the reference table was added.
* Text comparisong without sql_compare_text
2012-05-25 11:17:56 +12:00
ac29403e39
MDL-33172 - filestorage: Add unit test for breaking oracle functions
2012-05-25 11:17:56 +12:00
798f0dece2
MDL-33114 import TinyMCE 3.5.1.1 and fix preview
2012-05-24 23:15:52 +02:00
4b0992ca19
Merge branch 'wip-MDL-33329-master' of git://github.com/marinaglancy/moodle
2012-05-24 23:30:23 +08:00
0fb13aa3d8
Merge branch 'dev_MDL-33127_draft_storing' of git://github.com/dongsheng/moodle
2012-05-24 16:34:32 +08:00
2625d99b52
Merge branch 'wip-MDL-33144-master' of git://github.com/marinaglancy/moodle
2012-05-24 16:32:32 +08:00
2d7c111734
MDL-33329 Filepicker form element can not link by reference. Also better handling of maxbytes
2012-05-24 16:14:02 +08:00
505978801f
MDL-33162 filepicker: fix trailingw hitespace
2012-05-24 16:12:15 +08:00
77cb9b6ce6
Merge branch 'wip-MDL-33162-master' of git://github.com/barbararamiro/moodle
2012-05-24 16:10:06 +08:00
a91b4aa661
MDL-33318 lib : code style fix
2012-05-24 15:40:06 +08:00
ee45a48b9c
turning off the hspace attribute on move icon image...
2012-05-24 03:07:46 -04:00
a9352f1f3c
MDL-33162, MDL-33183, MDL-33150 Adjusted styles filemanager, file picker and file picker form element
...
- MDL-33162 Vertical align text to the middle of 24px icon for table view and tree view both on filemanager and filepicker
- MDL-33183 Layout file picker on form element on edit profile for drag and drop with dashed border and animated arrow consistent with filemanager (outputrenderers.php)
- MDL-33150 Added more space in between tool buttons both for file manager and filepicker
2012-05-24 15:02:52 +08:00
b9dade0c65
Merge branch 'master_MDL-33318' of git://github.com/danmarsden/moodle
2012-05-24 14:46:38 +08:00
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
313514ec9b
Merge branch 'w22_MDL-33293_m23_revisions' of git://github.com/skodak/moodle
2012-05-24 11:26:35 +08:00
eef67fe8c5
MDL-33318 use $CFG->admin in path correctly - thanks to Clarence Prudhoe for report/fix
2012-05-24 14:08:01 +12:00
cd7963eabd
Merge branch 'MDL-32203c' of git://github.com/srynot4sale/moodle
2012-05-24 11:42:39 +12:00
8dd37f1f69
Merge branch 'MDL-33189-master-1' of git://git.luns.net.uk/moodle
2012-05-24 11:11:13 +12:00
5d0d373733
MDL-33212 Course page: Eye icon should override other conditions
2012-05-23 13:46:51 +01:00
7fcd3c30fd
MDL-33019: Check that message providers' plugins are enabled and exist
2012-05-23 10:47:08 +01:00
1635da56cd
MDL-33293 init JS and theme revisions to timestamps in install to match new reset code
2012-05-23 11:28:10 +02:00
f11db1a602
MDL-33293 use time() instead of counter for theme and JS revisions
...
This should help on sites that reset database, reinstall or switch databases.
2012-05-23 11:11:13 +02:00
ae7f35b934
MDL-33144 display filetype icon and mimetype based on extension
...
- use finfo to determine mimetype of a file only when it is unknown from file extension
- display filetype icon and mimetype in filemanager based on file extension
- fixed a small issue with specifying extension instead of group in file_get_typegroup()
- allow only web-compartible image types when embedding into editor or using in database field
- created new groups web_video and web_audio to use in resource module
2012-05-23 14:51:55 +08:00
419c47c74a
Merge branch 'wip-mdl-32155' of git://github.com/rajeshtaneja/moodle
2012-05-23 13:28:01 +08:00
34b455fc98
MDL-32155 blocks: User can't access file, if block is hidden or doesn't have block:view capability
2012-05-23 12:52:27 +08:00
d9038d715b
Merge branch 'MDL-32338' of git://github.com/nebgor/moodle
2012-05-23 11:27:54 +08:00
8c222e1768
MDL-33084 grade: made localize() and unlocalize() in lib/mathslib.php static as they are used as if they were static
2012-05-23 07:19:01 +07:00
7d84dfe704
MDL-33189: Make checkboxcontroller functionable
2012-05-22 14:26:09 +01:00
37eba7d5d6
Merge branch 'dev_MDL-33149_stored_file_access' of git://github.com/dongsheng/moodle
2012-05-22 16:51:33 +08:00
291a3d1fb6
MDL-33149 stored_file::repository should be private
2012-05-22 15:00:49 +08:00
65fead53fb
MDL-33127 Fixed the problem when storing draft files
2012-05-22 14:50:47 +08:00
21878be7c8
Merge branch 'wip-files23-fixes' of git://github.com/marinaglancy/moodle
2012-05-22 14:32:35 +08:00
e563582760
MDL-33158 fixed bugs with restricting file typs in filepicker
...
- extension was returned without leading dot which resulted in improper validation
- fixed human-readable mime type in error message
- fixed youtube repository to support video files and pass filetype validation
2012-05-22 14:24:11 +08:00
ca9875db1b
MDL-33160 fixed some icons and groups for file types
2012-05-22 14:18:06 +08:00
34b84d45b6
MDL-32766 course view section log: update patch
2012-05-22 14:02:48 +08:00
e3c0211879
MDL-33147 Added transaction support for some Files APIs
2012-05-22 13:51:04 +08:00
49f6790323
Merge branch 'MDL-33116-master' of git://github.com/sammarshallou/moodle
2012-05-22 12:51:45 +08:00
3e832fe3e5
Merge branch 'MDL-32981-master' of github.com:FMCorz/moodle
2012-05-22 11:14:12 +08:00
c598ea55fe
MDL-32981 Filepicker: my private files uses edit page instead of view
2012-05-22 10:56:11 +08:00
c8f0f2cd85
Merge branch 'wip-MDL-33066-m23' of git://github.com/samhemelryk/moodle
2012-05-22 10:30:36 +08:00
4be0947bbe
MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php
2012-05-22 08:30:39 +07:00
d9bd472bee
MDL-33135 Prevent duplicate form submission on the course activity chooser
2012-05-21 16:55:47 +01:00
a3c17aed9f
MDL-33116 Media filter broken with slasharguments off
2012-05-21 14:24:42 +01:00
243e9bf984
MDL-32752: Drag-drop: Follow the ghost note if the drop target is missed.
...
Simulate drop_hit and substitute target of where ghost node was dropped last
time.
2012-05-21 13:59:44 +01:00
b99065be04
MDL-33032 - dont require repository/lib.php until necessary
...
This is an ugly fix to a broken installer only.
2012-05-21 20:04:42 +08:00
1082e7daf7
MDL-31901: Fix trailing whitespace
2012-05-21 19:18:44 +08:00
6a0d7194f7
MDL-31901: filemanager/picker.js - match coding style
...
* No inline ifs
* Spacing between ternary operators
* Missing ;'s
2012-05-21 18:25:56 +08:00
Dan Poltawski