mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 20:50:21 +01:00
Code Issues Projects Releases Wiki Activity
53,748 Commits 36 Branches 523 Tags
Commit Graph

53748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
cf36df4316 Merge branch 'MDL-33315_blog_rss' of git://github.com/andyjdavis/moodle 2012-05-24 16:49:28 +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
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
Dan Poltawski
5c44b03559 Merge branch 'wip-MDL-33146-master' of git://github.com/abgreeve/moodle 2012-05-24 16:05:25 +08:00
Dan Poltawski
ab1c1571a3 Merge branch 'MDL-33186-master-1' of git://git.luns.net.uk/moodle 2012-05-24 15:53:39 +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
Dan Poltawski
20005a0ed8 Merge branch 'wip-MDL-33152-master' of git://github.com/abgreeve/moodle 2012-05-24 14:39:58 +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
Andrew Davis
c53a64449a MDL-33315 blog: fixed up the navigation for when youre viewing another users blog 2012-05-24 09:40:59 +07: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
Sam Hemelryk
119e228621 Merge branch 'MDL-26562-23' of git://github.com/vadimonus/moodle 2012-05-24 11:00:09 +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
Aparup Banerjee
04b66cb43c Merge branch 'wip-mdl-33143' of git://github.com/rajeshtaneja/moodle 2012-05-23 16:44:00 +08:00
Adrian Greeve
9ec5ee5168 MDL-33146 - course - Changed weekdates to sectionname to fix a JavaScript error 2012-05-23 16:13:32 +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
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
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
d9038d715b Merge branch 'MDL-32338' of git://github.com/nebgor/moodle 2012-05-23 11:27:54 +08:00
Dan Poltawski
de424071ca MDL-32895 tool_assignmentupgrade: fix trailing whitespace 2012-05-23 11:20:23 +08:00
Dan Poltawski
f310b16d80 Merge branch 'MDL-32895' of git://github.com/netspotau/moodle-mod_assign 2012-05-23 11:13:03 +08:00
Dan Poltawski
91b24de2e5 Merge branch 'wip-MDL-31414-m23' of git://github.com/samhemelryk/moodle 2012-05-23 10:39:16 +08:00
Dan Poltawski
c14cad3167 Merge branch 'MDL-33074_groupmode_button' of git://github.com/davosmith/moodle 2012-05-23 10:26:40 +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
Eloy Lafuente (stronk7)
5a5cdaf92e on-demand release 2.3dev 2012-05-22 18:07:42 +02:00
Eloy Lafuente (stronk7)
2575871e5a Fix permissions 2012-05-22 18:06:52 +02:00
Ruslan Kabalin
7d84dfe704 MDL-33189: Make checkboxcontroller functionable 2012-05-22 14:26:09 +01:00
Andrew Robert Nicols
088258c160 MDL-33186 Ensure that the comment textarea exists before toggling it 2012-05-22 11:24:24 +01:00
Dan Poltawski
198244e2d9 Merge branch 'dev_MDL-33177_restore_warning' of git://github.com/dongsheng/moodle 2012-05-22 17:14:43 +08: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
Dongsheng Cai
ac0628e913 MDL-33177 Fixed restore warning when backup has external contents 2012-05-22 14:43:06 +08:00
Dan Poltawski
21878be7c8 Merge branch 'wip-files23-fixes' of git://github.com/marinaglancy/moodle 2012-05-22 14:32:35 +08:00
Barbara Ramiro
67fab8a534 MDL-33160 new filetype icons 2012-05-22 14:25:23 +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
afe23ae76a Merge branch 'dev_MDL-33154_sesskey_error' of git://github.com/dongsheng/moodle 2012-05-22 13:57:51 +08:00
Dan Poltawski
d106cf1d7d Merge branch 'w21_MDL-32564_m23_timezonecontext' of git://github.com/skodak/moodle 2012-05-22 13:34:18 +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