8dd37f1f69
Merge branch 'MDL-33189-master-1' of git://git.luns.net.uk/moodle
2012-05-24 11:11:13 +12:00
119e228621
Merge branch 'MDL-26562-23' of git://github.com/vadimonus/moodle
2012-05-24 11:00:09 +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
04b66cb43c
Merge branch 'wip-mdl-33143' of git://github.com/rajeshtaneja/moodle
2012-05-23 16:44:00 +08:00
9ec5ee5168
MDL-33146 - course - Changed weekdates to sectionname to fix a JavaScript error
2012-05-23 16:13:32 +08: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
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
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
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
c831400563
MDL-31414 mod_assign: Fixed issue with assign cron when there was nothing to process
2012-05-23 16:23:53 +12:00
d9038d715b
Merge branch 'MDL-32338' of git://github.com/nebgor/moodle
2012-05-23 11:27:54 +08:00
de424071ca
MDL-32895 tool_assignmentupgrade: fix trailing whitespace
2012-05-23 11:20:23 +08:00
f310b16d80
Merge branch 'MDL-32895' of git://github.com/netspotau/moodle-mod_assign
2012-05-23 11:13:03 +08:00
91b24de2e5
Merge branch 'wip-MDL-31414-m23' of git://github.com/samhemelryk/moodle
2012-05-23 10:39:16 +08:00
c14cad3167
Merge branch 'MDL-33074_groupmode_button' of git://github.com/davosmith/moodle
2012-05-23 10:26:40 +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
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
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
4cd5ae4f00
MDL-33194 forum: correct number of parameters for get_record()
2012-05-22 11:33:21 -07:00
5a5cdaf92e
on-demand release 2.3dev
2012-05-22 18:07:42 +02:00
2575871e5a
Fix permissions
2012-05-22 18:06:52 +02:00
5f73d19ddd
MDL-33191 theme_magazine: changes to magazine/config.php fixes $THEME->layouts for Base & Standard
2012-05-22 16:54:00 +01:00
7d84dfe704
MDL-33189: Make checkboxcontroller functionable
2012-05-22 14:26:09 +01:00
4714f5323a
MDL-33035 workshop: typo in strings
2012-05-22 19:22:12 +08:00
088258c160
MDL-33186 Ensure that the comment textarea exists before toggling it
2012-05-22 11:24:24 +01:00
198244e2d9
Merge branch 'dev_MDL-33177_restore_warning' of git://github.com/dongsheng/moodle
2012-05-22 17:14:43 +08: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
ac0628e913
MDL-33177 Fixed restore warning when backup has external contents
2012-05-22 14:43:06 +08:00
21878be7c8
Merge branch 'wip-files23-fixes' of git://github.com/marinaglancy/moodle
2012-05-22 14:32:35 +08:00
67fab8a534
MDL-33160 new filetype icons
2012-05-22 14:25:23 +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
afe23ae76a
Merge branch 'dev_MDL-33154_sesskey_error' of git://github.com/dongsheng/moodle
2012-05-22 13:57:51 +08:00
e3c0211879
MDL-33147 Added transaction support for some Files APIs
2012-05-22 13:51:04 +08:00
15a848ba90
MDL-32766 course log: specify log for viewing course section
2012-05-22 13:50:40 +08:00
d106cf1d7d
Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle
2012-05-22 13:34:18 +08:00
b8644958e3
Merge branch 'w21_MDL-32379_m23_forumcron' of git://github.com/skodak/moodle
2012-05-22 13:05:28 +08:00
f5d0c2a69f
MDL-33152 - themes - Moved the action buttons more to the right, inline with the rest of the form.
2012-05-22 12:51:48 +08:00
49f6790323
Merge branch 'MDL-33116-master' of git://github.com/sammarshallou/moodle
2012-05-22 12:51:45 +08:00
f4e9103a95
Merge branch 'MDL-32744-master-3' of git://git.luns.net.uk/moodle
2012-05-22 12:28:37 +08:00
7992b93686
MDL-33154 added missing sesskey to navgation nodes
2012-05-22 12:14:59 +08:00
c1e1560843
Merge branch 'wip-mdl-33027' of git://github.com/rajeshtaneja/moodle
2012-05-22 11:54:30 +08:00
2a3ff9e8df
Merge branch 'MDL-33153-master-integration' of github.com:FMCorz/moodle
2012-05-22 11:44:23 +08:00
Sam Hemelryk