mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-08 09:02:07 +01:00
Code Issues Projects Releases Wiki Activity
53,808 Commits 36 Branches 523 Tags
Commit Graph

13389 Commits

Author SHA1 Message Date
Dan Poltawski
e7b7cd5b98 Merge branch 'w21_MDL-33075_m23_phpunitclassreflex' of git://github.com/skodak/moodle 2012-05-25 15:25:30 +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
Dan Poltawski
9a16bd1798 Merge branch 'w22_MDL-33114_m23_tinymce3511' of git://github.com/skodak/moodle 2012-05-25 11:00:53 +08:00
Dan Poltawski
588d3a7e1f Merge branch 'MDL-33135-master-3' of git://git.luns.net.uk/moodle 2012-05-25 10:55:49 +08:00
Dan Poltawski
10a9d27d74 Merge branch 'w21_MDL-33034_m23_roletests' of git://github.com/skodak/moodle 2012-05-25 10:37:48 +08:00
Dan Poltawski
753199ba63 Merge branch 'MDL-33173-master' of git://github.com/FMCorz/moodle 2012-05-25 09:57:35 +08:00
Frederic Massart
4c88645920 MDL-33173 Filepicker: renamed private files edit page to main page 2012-05-25 09:24:39 +08:00
Sam Hemelryk
6347a6216d MDL-33172: Fixed whitespace 2012-05-25 11:37:07 +12:00
Dan Poltawski
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
Dan Poltawski
ac29403e39 MDL-33172 - filestorage: Add unit test for breaking oracle functions 2012-05-25 11:17:56 +12:00
Petr Skoda
798f0dece2 MDL-33114 import TinyMCE 3.5.1.1 and fix preview 2012-05-24 23:15:52 +02:00
Dan Poltawski
4b0992ca19 Merge branch 'wip-MDL-33329-master' of git://github.com/marinaglancy/moodle 2012-05-24 23:30:23 +08:00
Dan Poltawski
0fb13aa3d8 Merge branch 'dev_MDL-33127_draft_storing' of git://github.com/dongsheng/moodle 2012-05-24 16:34:32 +08:00
Dan Poltawski
2625d99b52 Merge branch 'wip-MDL-33144-master' of git://github.com/marinaglancy/moodle 2012-05-24 16:32:32 +08:00
Marina Glancy
2d7c111734 MDL-33329 Filepicker form element can not link by reference. Also better handling of maxbytes 2012-05-24 16:14:02 +08:00
Dan Poltawski
505978801f MDL-33162 filepicker: fix trailingw hitespace 2012-05-24 16:12:15 +08:00
Dan Poltawski
77cb9b6ce6 Merge branch 'wip-MDL-33162-master' of git://github.com/barbararamiro/moodle 2012-05-24 16:10:06 +08:00
Aparup Banerjee
a91b4aa661 MDL-33318 lib : code style fix 2012-05-24 15:40:06 +08:00
Barbara Ramiro
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
Aparup Banerjee
b9dade0c65 Merge branch 'master_MDL-33318' of git://github.com/danmarsden/moodle 2012-05-24 14:46:38 +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
Dan Poltawski
313514ec9b Merge branch 'w22_MDL-33293_m23_revisions' of git://github.com/skodak/moodle 2012-05-24 11:26:35 +08:00
Dan Marsden
eef67fe8c5 MDL-33318 use $CFG->admin in path correctly - thanks to Clarence Prudhoe for report/fix 2012-05-24 14:08:01 +12:00
Sam Hemelryk
cd7963eabd Merge branch 'MDL-32203c' of git://github.com/srynot4sale/moodle 2012-05-24 11:42:39 +12:00
Sam Hemelryk
8dd37f1f69 Merge branch 'MDL-33189-master-1' of git://git.luns.net.uk/moodle 2012-05-24 11:11:13 +12:00
Petr Skoda
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
Petr Skoda
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
Marina Glancy
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
Dan Poltawski
419c47c74a Merge branch 'wip-mdl-32155' of git://github.com/rajeshtaneja/moodle 2012-05-23 13:28:01 +08:00
Rajesh Taneja
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
Dan Poltawski
d9038d715b Merge branch 'MDL-32338' of git://github.com/nebgor/moodle 2012-05-23 11:27:54 +08:00
Ruslan Kabalin
7d84dfe704 MDL-33189: Make checkboxcontroller functionable 2012-05-22 14:26:09 +01:00
Dan Poltawski
37eba7d5d6 Merge branch 'dev_MDL-33149_stored_file_access' of git://github.com/dongsheng/moodle 2012-05-22 16:51:33 +08:00
Dongsheng Cai
291a3d1fb6 MDL-33149 stored_file::repository should be private 2012-05-22 15:00:49 +08:00
Dongsheng Cai
65fead53fb MDL-33127 Fixed the problem when storing draft files 2012-05-22 14:50:47 +08:00
Dan Poltawski
21878be7c8 Merge branch 'wip-files23-fixes' of git://github.com/marinaglancy/moodle 2012-05-22 14:32:35 +08:00
Marina Glancy
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
Marina Glancy
ca9875db1b MDL-33160 fixed some icons and groups for file types 2012-05-22 14:18:06 +08:00
Dan Poltawski
49f6790323 Merge branch 'MDL-33116-master' of git://github.com/sammarshallou/moodle 2012-05-22 12:51:45 +08:00
Dan Poltawski
3e832fe3e5 Merge branch 'MDL-32981-master' of github.com:FMCorz/moodle 2012-05-22 11:14:12 +08:00
Frederic Massart
c598ea55fe MDL-32981 Filepicker: my private files uses edit page instead of view 2012-05-22 10:56:11 +08:00
Dan Poltawski
c8f0f2cd85 Merge branch 'wip-MDL-33066-m23' of git://github.com/samhemelryk/moodle 2012-05-22 10:30:36 +08:00
Andrew Robert Nicols
d9bd472bee MDL-33135 Prevent duplicate form submission on the course activity chooser 2012-05-21 16:55:47 +01:00
sam marshall
a3c17aed9f MDL-33116 Media filter broken with slasharguments off 2012-05-21 14:24:42 +01:00
Dan Poltawski
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
Dan Poltawski
1082e7daf7 MDL-31901: Fix trailing whitespace 2012-05-21 19:18:44 +08:00
Dan Poltawski
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
7d44f9c2a2 MDL-28666: filelib - remove unusused globals 2012-05-21 18:21:36 +08:00
Dan Poltawski
2b4f1cbc32 Merge branch 'wip-files23' of git://github.com/marinaglancy/moodle 2012-05-21 18:19:32 +08:00
David Mudrak
10f0978bff MDL-32471 redefining the tinyicon thumbnail size to 24x24 
As requested by the Files 2.3 UI team.
 2012-05-21 11:37:29 +02:00