moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54632 commits 37 branches 540 tags 1.3 GiB
Commit graph

12384 commits

Author SHA1 Message Date
Tim Hunt
9378c99b02 MDL-33119 quiz complete report: fix placeholders in attempt string. 2012-06-01 08:45:41 -06:00
Tim Hunt
fc86f69b52 MDL-33485 quiz manual grading report: fix SQL typo. 2012-06-01 08:11:48 -06:00
Eloy Lafuente (stronk7)
dac01a7444 Merge branch 'MDL-33389_master' of git://github.com/kordan/moodle 2012-05-31 16:14:57 +02:00
Aparup Banerjee
ffbe29a6bd Merge branch 'MDL-33140' of git://github.com/timhunt/moodle 2012-05-31 14:15:19 +08:00
Tim Hunt
602a76d86a MDL-33140 quiz browser security: block copy/paste more 2012-05-30 14:48:39 -06:00
Dan Poltawski
2605112e0b Merge branch 'MDL-33045-master-2' of git://git.luns.net.uk/moodle 2012-05-30 14:14:50 +08:00
Sam Hemelryk
378eb6f6a2 Revert "Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle" 
This reverts commit a09a9be812, reversing
changes made to 08e0aaa173.
 2012-05-30 16:34:11 +12:00
Dan Poltawski
d88f1a51fc Merge branch 'MDL-33414' of git://github.com/netspotau/moodle-mod_assign 2012-05-30 11:45:32 +08:00
Sam Hemelryk
6fbe06e530 Merge branch 'MDL-33385' of git://github.com/netspotau/moodle-mod_assign 2012-05-30 15:26:27 +12:00
Dan Poltawski
7e82553331 Merge branch 'MDL-33404_resource_dnd_defaults' of https://github.com/moodler/moodle 2012-05-30 09:38:22 +08:00
Damyon Wiese
0047693f09 MDL-33385: Assignment plugin settings not visible in admin tree. 
* Also fixes a regression where file_submissions were not set to default for new installs.
 2012-05-30 09:01:11 +08:00
Damyon Wiese
7ee1548acb MDL-33414: The setting $showviewlink needs to be passed by reference 
This was preventing the view full submission/feedback link from appearing
everywhere in the assignment when the submission/feedback content had been
truncated in the summary because it was too long (or too many files)
 2012-05-30 08:37:56 +08:00
kordan
311300e208 MDL-3389 mod_book: changed "Summary" to "Description" in mod_form 2012-05-29 19:23:33 +02:00
Dan Poltawski
e73b42ca57 Merge branch 'wip-MDL-33399-m23' of git://github.com/samhemelryk/moodle 2012-05-29 14:57:05 +08:00
Martin Dougiamas
5fece0f28d MDL-33404 Fix defaults for ordinary files that are drag/dropped into the course page 2012-05-29 12:58:24 +08:00
Sam Hemelryk
849b9a6af7 MDL-33399 mixed: Fixed up calls to get_area_files that used empty sorts 2012-05-29 16:44:28 +12:00
Ruslan Kabalin
c1d09c6fa3 MDL-33042: Assign: get rid of email statements in messaging functions 2012-05-28 11:48:18 +01:00
Ruslan Kabalin
599f7a279c MDL-33045: Assign: remove references to old assignment in URLs 2012-05-28 10:53:40 +01:00
Ruslan Kabalin
f5b32abe57 MDL-33045: Assign: Make get_module_name() return something 2012-05-28 10:52:11 +01:00
Dan Poltawski
5ab310d5d3 Merge branch 'wip-MDL-32199-master' of git://github.com/abgreeve/moodle 2012-05-28 15:18:51 +08:00
Dan Poltawski
0fe4db6dd1 Merge branch 'MDL-33194-master' of https://github.com/mackensen/moodle 2012-05-28 14:58:56 +08:00
Adrian Greeve
17ec4bf045 Alteration to the code to hide the body of the post / discussion 2012-05-28 13:09:23 +08:00
Andrew Robert Nicols
7ea78d9f28 MDL-32199 Ensure that forum RSS feeds don't leak posts and discussions 2012-05-28 13:09:22 +08:00
Damyon Wiese
2c6a3dbfca MDL-33319: Support quickgrading in feedback plugins 2012-05-28 11:10:09 +08:00
Sam Hemelryk
064cac7866 MDL-27675 mod_feedback: Tidy up of phpdocs and scope within feedback mod 2012-05-28 13:38:36 +12:00
Sam Hemelryk
a09a9be812 Merge branch 'MDL-27675_master_wip' of git://github.com/grabs/moodle 2012-05-28 13:37:59 +12:00
Sam Hemelryk
c994797ea9 Merge branch 'MDL-33120' of git://github.com/stronk7/moodle 2012-05-28 11:12:36 +12:00
Sam Hemelryk
7824c9d820 Merge branch 'MDL-33325-master' of git://github.com/ankitagarwal/moodle 2012-05-28 10:52:24 +12:00
eLeDia GmbH (Andreas Grabs)
1cb73662b2 MDL-27675 - Feedback module abuses data_submitted 2012-05-28 00:40:05 +02:00
Andreas Grabs
9a2c4dbd00 MDL-27675 - Feedback module abuses data_submitted 2012-05-28 00:40:04 +02:00
Eloy Lafuente (stronk7)
a60d964abc MDL-33120 book: changes in code based on amended strings 
- Replace numberingoptions_help by numberingoptions_desc.
- Delete the faq code and related styles.
- Bump version to force lang/style refresh.
 2012-05-27 17:42:53 +02:00
Helen Foster
9e302b63b9 MDL-33120 book: Amend module strings 
Al the changes are fixes but numberingoptions_help
that is one change of string key too, hence we instruct AMOS to move it.

AMOS BEGIN
 MOV [numberingoptions_help,mod_book],[numberingoptions_desc,mod_book]
AMOS END
 2012-05-27 17:31:31 +02:00
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