Commit graph

12352 commits

Author SHA1 Message Date
Dan Poltawski
c86d6be226 Merge branch 'MDL-29924-master' of git://github.com/FMCorz/moodle 2012-05-25 11:14:22 +08:00
Dan Poltawski
2528e8e52f MDL-33139 mod_forum: fix minor whitespace problem 2012-05-25 10:09:09 +08:00
Dan Poltawski
1e448fed27 Merge branch 'MDL-33139-master' of https://github.com/mackensen/moodle 2012-05-25 10:08:33 +08:00
Charles Fulton
c2c071a274 MDL-33139 forum: indicate which user's post was edited 2012-05-24 06:14:21 -07:00
Dan Poltawski
2625d99b52 Merge branch 'wip-MDL-33144-master' of git://github.com/marinaglancy/moodle 2012-05-24 16:32:32 +08:00
Ankit Agarwal
6a9949a489 MDL-33325 folder: 'set as main file' option removed, from filepicker when editing a file in a folder resource 2012-05-24 15:13:22 +08:00
Sam Hemelryk
119e228621 Merge branch 'MDL-26562-23' of git://github.com/vadimonus/moodle 2012-05-24 11:00:09 +12:00
Aparup Banerjee
04b66cb43c Merge branch 'wip-mdl-33143' of git://github.com/rajeshtaneja/moodle 2012-05-23 16:44:00 +08: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
Damyon Wiese
56ff1300d9 MDL-31414: Add sendlatenotifications support to the mod_assign upgrade tool
Prevents an SQL error on upgrade from mod_assignment to mod_assign
2012-05-23 14:05:35 +08:00
Rajesh Taneja
d598040a98 MDL-33143 wiki-2.0 : wiki edit form will have mform1 as id for JS to work 2012-05-23 12:50:45 +08:00
Sam Hemelryk
c831400563 MDL-31414 mod_assign: Fixed issue with assign cron when there was nothing to process 2012-05-23 16:23:53 +12:00
Dan Poltawski
f310b16d80 Merge branch 'MDL-32895' of git://github.com/netspotau/moodle-mod_assign 2012-05-23 11:13:03 +08:00
Sam Hemelryk
3f7b501e66 MDL-31414 mod_assign: Code cleanup for notification improvements
* No need to manually call update of providers that happens automatically.
* Added upgrade code for the new sendlatenotifications field.
* Added AMOS syntax for the two renamed strings
* Refactored assign::cron to use half as many DB queries
* Cleaned up unused vars and globals, coding style and phpdocs.
* Removed string notifications added previously but never used.

AMOS BEGIN
   MOV [emailgradermail,mod_assign],[gradersubmissionupdatedtext,mod_assign]
   MOV [emailgradermailhtml,mod_assign],[gradersubmissionupdatedhtml,mod_assign]
AMOS END
2012-05-23 09:34:23 +12:00
Damyon Wiese
75f87a5795 MDL-31414: Separate settings to control notifications for submissions, late submissions and submission receipts
This adds separate controls for the sending of notifications from the mod_assign.

The separate notifications are: student submission receipt (for students), feedback available (for students)
and submission updated (for graders). The grader notifications can be enabled for all submissions or just late ones.

Added code to reset the message providers on upgrade (only applies for a 2.3 dev version)
2012-05-23 08:29:22 +12:00
Charles Fulton
4cd5ae4f00 MDL-33194 forum: correct number of parameters for get_record() 2012-05-22 11:33:21 -07:00
Eloy Lafuente (stronk7)
2575871e5a Fix permissions 2012-05-22 18:06:52 +02:00
Sun Zhigang
4714f5323a MDL-33035 workshop: typo in strings 2012-05-22 19:22:12 +08:00
Dan Poltawski
b8644958e3 Merge branch 'w21_MDL-32379_m23_forumcron' of git://github.com/skodak/moodle 2012-05-22 13:05:28 +08:00
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
Vadim Dvorovenko
5429460127 MDL-26562 2012-05-20 19:44:32 +07:00
Petr Skoda
103f34d88d MDL-32379 fix forum cron user caching 2012-05-19 18:56:19 +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