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

12179 Commits

Author SHA1 Message Date
Dan Poltawski
2a3ff9e8df Merge branch 'MDL-33153-master-integration' of github.com:FMCorz/moodle 2012-05-22 11:44:23 +08:00
Sam Hemelryk
2a4fbc327c MDL-32932 mod_assign: Coding style clean up and security improvement 2012-05-22 14:21:47 +12:00
Sam Hemelryk
c5b8ae0eb7 Merge branch 'MDL-32932' of git://github.com/netspotau/moodle-mod_assign 
Conflicts:
	mod/assign/gradingtable.php
 2012-05-22 14:21:41 +12:00
Frederic Massart
50fb4c8fd9 MDL-33153 Resource: rename submit button to 'save changes' in folder resource 2012-05-22 09:36:29 +08:00
Dan Poltawski
2b4f1cbc32 Merge branch 'wip-files23' of git://github.com/marinaglancy/moodle 2012-05-21 18:19:32 +08:00
Marina Glancy
559276b153 MDL-32247,MDL-32831,MDL-32900 Use correct url building of file type icons 
- function get_mimetypes_array() now contains also information about filetype groups and language strings
- use 'smart' human-readable mimetype description
- never determine filetype group based on filetype icon image! remove function mimeinfo_from_icon()
- get rid of class filetype_parser and file lib/filestorage/file_types.mm, replaced with functions file_get_typegroup(), file_extension_in_typegroup() and file_mimetype_in_typegroup()
- support multiple icon sizes, not only 16 and 32
- retrieve filetype icon only using proper functions file_..._icon() from lib/filelib.php throughout the code
- increase size of repository thumbnails to 90 and icons to 24 (will take effect when new icons exist)
 2012-05-21 16:01:04 +08:00
Dongsheng Cai
6723372514 MDL-28666 Extends repository to support references 
1. Allow repository to create references to external contents
2. Extends files API to handle file references
3. Generic file caching
4. Backup/restore file references
5. Download external contents if repository uninstalled
6. Allow filepicker to display iframe
7. PHPUnit test suits
 2012-05-21 11:57:51 +08:00
Sam Hemelryk
2cd972c1c6 MDL-32709 Pre-integration trivial clean up 
* Added a comment for the BOOK_NUM_* defines.
* Fixed broken redirects in tool/importhtml/index.php
* Fixed typo in book_preload_chapters [subchpaters => subchapters]
* Fixed copy paste docblock error in tool/print/locallib.php
* Removed the .gitignore file as Eloy had previously mentioned that.
 2012-05-21 14:06:00 +12:00
Eloy Lafuente (stronk7)
079be74dd5 MDL-32709 book: finish coding style review (errors only) 2012-05-21 01:50:20 +02:00
Eloy Lafuente (stronk7)
a1448fc012 MDL-32709 book: fix send_stored_file() call 2012-05-21 01:27:40 +02:00
Eloy Lafuente (stronk7)
9717aa2ddd MDL-32709 book: delete some not needed stuff 2012-05-21 01:26:52 +02:00
Eloy Lafuente (stronk7)
f7e6dd4d41 MDL-32709 book: now standard module + new strings added 
Note the lang file is completely disordered yet
 2012-05-21 00:54:53 +02:00
Eloy Lafuente (stronk7)
a87aa28d51 MDL-32709 book: Fix logs handling 2012-05-21 00:33:58 +02:00
Eloy Lafuente (stronk7)
b9a363548d MDL-32709 book: DB definition & upgrade cleanup 2012-05-20 21:48:07 +02:00
Eloy Lafuente (stronk7)
29656fe24b MDL-32709 book: coding style, deprecated and minor fixes 2012-05-20 21:47:58 +02:00
Eloy Lafuente (stronk7)
1fc9e895ef MDL-32709 book: replace some deprecated stuff. Some pending yet, blame $PAGE 2012-05-20 21:47:50 +02:00
Eloy Lafuente (stronk7)
98cef39d28 MDL-32709 book: Add some missing MOODLE_INTERNALs 2012-05-20 21:47:38 +02:00
Eloy Lafuente (stronk7)
3542c4f4a9 MDL-32709 book: general comments and phpdocs cleanup 2012-05-20 21:47:29 +02:00
Eloy Lafuente (stronk7)
e81c01b676 Subtree merged git://github.com/skodak/moodle-mod_book.git (master branch) into mod/book 2012-05-20 21:43:40 +02:00
Adrian Greeve
0a498686c0 MDL-32126 replaced _order with sortorder to make sorting work in oracle 2012-05-18 11:37:21 +02:00
Dan Poltawski
eeba64d02e MDL-32727 - quiz: fix incorrect variable name in upgrade 2012-05-18 15:08:07 +08:00
Dan Poltawski
ad10c481e1 Merge branch 'MDL-33048' of git://github.com/timhunt/moodle 2012-05-18 12:12:51 +08:00
Sam Hemelryk
d5e6fe3ecc Merge branch 'MDL-32727' of git://github.com/timhunt/moodle 
Conflicts:
	mod/quiz/db/upgrade.php
 2012-05-18 16:07:20 +12:00
Dan Poltawski
82258830b7 Merge branch 'MDL-32933' of git://github.com/netspotau/moodle-mod_assign 2012-05-18 11:23:47 +08:00
Dan Poltawski
7e89cbe0ac Merge branch 'MDL-31675-file-browsing' of git://github.com/mudrd8mz/moodle 2012-05-18 10:30:22 +08:00
Dan Poltawski
33e693b5e1 Merge branch 'MDL-32909' of git://github.com/netspotau/moodle-mod_assign 2012-05-18 10:05:32 +08:00
Sam Hemelryk
67cfce0245 Merge branch 'MDL-33069' of git://github.com/danpoltawski/moodle 2012-05-18 10:48:23 +12:00
Helen Foster
2e6b68f4a8 MDL-32925 lang: Add extended help texts for all modules 
Thanks to Mary Cooch & Martin Dougiamas who contributed to this
rewording.

AMOS BEGIN
   REM These module help texts are going to be displayed more prominently in the Moodle interface
AMOS END
 2012-05-18 00:27:04 +08:00
Tim Hunt
36e48cb82f MDL-33048 quiz / my moodle: fatal error due to missing include. 2012-05-17 16:06:41 +01:00
Dan Poltawski
d6c94cf4eb MDL-33069 assignment: change pluralname to (2.2) 2012-05-17 17:28:26 +08:00
Dan Poltawski
aa141671a3 Merge branch 'MDL-31814' of git://github.com/timhunt/moodle 2012-05-17 14:11:14 +08:00
Sam Hemelryk
b945325339 Merge branch 'MDL-31850-master' of https://github.com/mackensen/moodle 2012-05-17 14:49:03 +12:00
Sam Hemelryk
72f1957393 Merge branch 'MDL-32903' of git://github.com/netspotau/moodle-mod_assign 2012-05-17 14:24:40 +12:00
Damyon Wiese
d37ec15ca1 MDL-32903: Remove unused variable $tempsettings from mod_assign 
This was left over from when I removed all the pass by reference calls.
 2012-05-17 08:30:54 +08:00
Sam Hemelryk
bcc52e748a Merge branch 'master_MDL-32794' of git://github.com/danmarsden/moodle 2012-05-17 12:27:50 +12:00
Sam Hemelryk
536e3203e7 Merge branch 'MDL-32904' of git://github.com/netspotau/moodle-mod_assign 2012-05-17 11:54:07 +12:00
Sam Hemelryk
7b06151288 Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle 
Conflicts:
	course/lib.php
	theme/base/style/course.css
 2012-05-17 10:55:35 +12:00
Juho Viitasalo
e566bfa1ae MDL-31850 wiki: extra whitespace removed from form 2012-05-16 03:43:17 -07:00
Aparup Banerjee
485e67982c Merge branch 'MDL-32633' of git://github.com/timhunt/moodle 2012-05-16 15:59:07 +08:00
Aparup Banerjee
9e66e96049 Merge branch 'MDL-31657' of git://github.com/scriby/moodle 2012-05-16 14:32:51 +08:00
Aparup Banerjee
ca91bdcdf7 MDL-32921 lti : reused a moodle_url. 2012-05-16 13:49:32 +08:00
Aparup Banerjee
184287f0ce Merge branch 'MDL-32921' of git://github.com/scriby/moodle 2012-05-16 13:48:42 +08:00
Sam Hemelryk
19d1525f6b Merge branch 'MDL-32641-master-1' of git://git.luns.net.uk/moodle 2012-05-16 13:14:59 +12:00
Sam Hemelryk
ba94f1d503 Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle 2012-05-16 13:09:32 +12:00
Sam Hemelryk
3cb5b9ccf6 Merge branch 'MDL-31458' of git://github.com/danpoltawski/moodle 2012-05-16 09:12:17 +12:00
Tim Hunt
4267fc5272 MDL-32727 quiz upgrade: sort out potential unique key violations 
... before trying to create the unique index that should be there.
The violations may come from old buggy code.

We do two things.
1. First we delete all previews.
2. Then, if there are still problems, we renumber attempts to eliminate
the duplicates.
 2012-05-15 15:23:53 +01:00
Damyon Wiese
bf78ebd650 MDL-32932: Add quickgrading support to mod_assign 2012-05-15 13:33:59 +08:00
Damyon Wiese
a769a00157 MDL-32933: Add outcomes to mod_assign and upgrade tool 2012-05-15 12:27:27 +08:00
Aparup Banerjee
c459e91789 Merge branch 'MDL-25695-master' of https://github.com/mackensen/moodle 2012-05-15 11:03:07 +08:00
Dan Marsden
0ae299769c MDL-32794 SCORM prevent items in tree that have no navigation from triggering a navigation change. 2012-05-15 09:36:35 +12:00