Commit graph

54111 commits

Author SHA1 Message Date
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
Andrew Davis
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
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)
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
Mary Evans
5f73d19ddd MDL-33191 theme_magazine: changes to magazine/config.php fixes $THEME->layouts for Base & Standard 2012-05-22 16:54:00 +01: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
Rossiani Wijaya
34b84d45b6 MDL-32766 course view section log: update patch 2012-05-22 14:02:48 +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
Dongsheng Cai
e3c0211879 MDL-33147 Added transaction support for some Files APIs 2012-05-22 13:51:04 +08:00
Rossiani Wijaya
15a848ba90 MDL-32766 course log: specify log for viewing course section 2012-05-22 13:50:40 +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
Adrian Greeve
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
Dan Poltawski
49f6790323 Merge branch 'MDL-33116-master' of git://github.com/sammarshallou/moodle 2012-05-22 12:51:45 +08:00
Dan Poltawski
f4e9103a95 Merge branch 'MDL-32744-master-3' of git://git.luns.net.uk/moodle 2012-05-22 12:28:37 +08:00
Dongsheng Cai
7992b93686 MDL-33154 added missing sesskey to navgation nodes 2012-05-22 12:14:59 +08:00
Dan Poltawski
c1e1560843 Merge branch 'wip-mdl-33027' of git://github.com/rajeshtaneja/moodle 2012-05-22 11:54:30 +08:00
Dan Poltawski
2a3ff9e8df Merge branch 'MDL-33153-master-integration' of github.com:FMCorz/moodle 2012-05-22 11:44:23 +08:00
Rajesh Taneja
bcf7175f4e MDL-33027 theme: Hidden section link will be displayed dimmed in section navigation 2012-05-22 11:31:35 +08:00
Rajesh Taneja
c129f430bb MDL-33027 themes: Modified heading to be displayed for section in all themes 2012-05-22 11:31:34 +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
Sam Hemelryk
cba59b3d83 Merge branch 'MDL-32204-mnet-auth' of git://github.com/mudrd8mz/moodle 2012-05-22 14:49:35 +12:00
Sam Hemelryk
0b02faa076 Merge branch 'MDL-33051' of git://github.com/danpoltawski/moodle 2012-05-22 14:40:31 +12:00
Sam Hemelryk
4f4476081f Merge branch 'MDL-33055_master' of git://github.com/kordan/moodle 2012-05-22 14:31:59 +12:00
Dan Poltawski
c8f0f2cd85 Merge branch 'wip-MDL-33066-m23' of git://github.com/samhemelryk/moodle 2012-05-22 10:30:36 +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
Dan Poltawski
5d6e603e1f Merge branch 'MDL-33167' of git://github.com/lazydaisy/moodle 2012-05-22 10:18:45 +08:00
Mary Evans
228408475c MDL-33167 theme_afterburner: added z-index to fix issue with yui3-widget when adding activity or resourse using new feature dialogue box 2012-05-22 03:05:42 +01:00
Rajesh Taneja
2b1b897271 MDL-33102 blogs: userid will be added during blog visibility upgrade 2012-05-22 09:49:27 +08:00
Frederic Massart
50fb4c8fd9 MDL-33153 Resource: rename submit button to 'save changes' in folder resource 2012-05-22 09:36:29 +08:00
Andrew Davis
4be0947bbe MDL-29173 grade: altered the definiton of round() in /lib/evalmath/evalmath.class.php 2012-05-22 08:30:39 +07:00
Sam Hemelryk
ad5d189c93 Merge branch 'MDL-33118' of git://github.com/lazydaisy/moodle 2012-05-22 11:38:03 +12:00