mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 23:42:39 +02:00
Code Issues Projects Releases Wiki Activity
59,148 Commits 36 Branches 528 Tags
Commit Graph

13407 Commits

Author SHA1 Message Date
Damyon Wiese
f22bc6d963 Fix permissions 2013-02-14 13:43:58 +08:00
Damyon Wiese
7688a3191c MDL-37883 Assignment Grade import/export. Additional fix to prevent different grade rounding on export. 2013-02-13 15:33:10 +08:00
Eloy Lafuente (stronk7)
fe4a6d3c38 Merge branch 'MDL-37953_master' of https://github.com/markn86/moodle 2013-02-12 10:12:01 +01:00
Dan Poltawski
6af8e417c3 Merge branch 'wip-mdl-37633' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	mod/forum/db/upgrade.php
	mod/forum/version.php
 2013-02-12 15:48:33 +08:00
Rajesh Taneja
afd5e85ca8 MDL-37633 Forum: Allow fronpage user to have forum:allowforcesubscribe capability by default 2013-02-12 14:57:47 +08:00
Dan Poltawski
26f94655d5 Merge branch 'MDL-37883-master' of git://github.com/damyon/moodle 2013-02-12 13:47:37 +08:00
Dan Poltawski
4dea0a7719 Merge branch 'MDL-37074-master' of git://github.com/damyon/moodle 2013-02-12 13:39:07 +08:00
Tim Hunt
b4be77c570 MDL-37924 quiz settings: change wrong 'fix' => 'adv'. 2013-02-12 13:36:54 +08:00
Mark Nelson
8076010d37 MDL-37953 mod_forum: using named parameters to build SQL statement 2013-02-12 10:31:10 +08:00
Damyon Wiese
234fdc206c Merge branch 'MDL-5875-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-02-12 10:09:26 +08:00
Matt Oquist
da48404391 MDL-37953 mod_forum: replace hard-coded numbers with defined values 
mod/forum/lib.php sets forum_posts.mailed to 0, 1, and 2. What do these numbers
mean? This patch creates defined values for these otherwise-mysterious
numbers.
 2013-02-11 15:20:18 +08:00
Dan Poltawski
354348865c Merge branch 'MDL-34137_label_dndupload' of git://github.com/davosmith/moodle 2013-02-11 14:55:13 +08:00
Dan Poltawski
9d7d0c4f2b Merge branch 'MDL-37039-master' of git://github.com/damyon/moodle 2013-02-11 14:32:53 +08:00
Dan Poltawski
2ae00d0d3c Merge branch 'MDL-37122-master' of git://github.com/damyon/moodle 2013-02-11 14:24:04 +08:00
Frederic Massart
506522d582 MDL-5875 forum: Option to display post word count 2013-02-11 12:08:46 +08:00
Damyon Wiese
40f1c065b4 Merge branch 'MDL-30637-master' of git://github.com/lucisgit/moodle 2013-02-11 10:37:03 +08:00
David Mudrák
b3c00549c5 MDL-37774 Do not pass trailing slash if the method does not want it 2013-02-08 12:05:44 +01:00
Davo Smith
fbe4579250 MDL-34137 mod_label - resize images when uploaded via drag & drop 2013-02-08 08:13:24 +00:00
Davo Smith
785e09a7e3 MDL-32456 mod_label - support course drag and drop upload images to create labels 2013-02-08 08:13:24 +00:00
Damyon Wiese
93d1de6d3f MDL-37039 Assignment - Do not apply filters to grading table for offline assignments 
Because the filters do not make sense for offline assignments, they are hidden. But if the active filter
prevents you from seeing any assignments you cannot change it. This change makes it so the filters are
also not applied when the assignment is an offline assignment.
 2013-02-08 15:44:18 +08:00
Damyon Wiese
7a15c5c458 MDL-37074 Assign theming: Use addClass/removeClass instead of setAttribute to preserve existing classes 2013-02-08 15:16:47 +08:00
Ruslan Kabalin
a00bafaa65 MDL-30637 mod_resource: Make content section expanded 
This just makes the interface look better
 2013-02-07 14:26:14 +00:00
Ruslan Kabalin
8763343ad9 MDL-30637 mod_folder: Make content section expanded 
This just makes the interface better
 2013-02-07 14:23:26 +00:00
Ruslan Kabalin
9d2a7df11b MDL-30638 mod_choice: Add required elements to repeated form items 
To make it work properly with MDL-30637
 2013-02-07 14:19:03 +00:00
Damyon Wiese
6b219310cf MDL-37122 core get_max_upload_sizes: Include "Course/Site/Activity limit (X)" in list of options 
This change removes the "0 bytes" option from the get_max_upload_sizes list
and replaces it with "Course limit (X)" or "Site limit (X)" (whichever is smaller).
This means we can remove all custom handling in the modules that were removing and
adding these options. It only affects pages that pass valid options for sitelimit and
courselimit - so admin pages will work correctly.

It also orders the list so the course/site limit options will be first
(as it will be the largest).

AMOS START
 REM [courseuploadlimit, core] has been parameterized to get [uploadlimitwithsize, core]
AMOS END
 2013-02-07 10:50:52 +08:00
Damyon Wiese
070d431771 MDL-37883 Assign offline marking: Properly handle french decimal grades when importing worksheet. 2013-02-06 15:43:19 +08:00
Dan Poltawski
6b106e2e8e Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle 2013-02-06 13:21:31 +08:00
Rajesh Taneja
45281abcfa MDL-30144 Assignmnet 2.2: fixed context retrival 2013-02-06 12:36:25 +08:00
Dan Poltawski
9631a80283 Merge branch 'MDL-37800_master' of git://github.com/grabs/moodle 2013-02-05 12:43:06 +08:00
Damyon Wiese
183e656eea Merge branch 'MDL-30102_master' of git://github.com/markn86/moodle 2013-02-05 11:23:01 +08:00
Eloy Lafuente (stronk7)
70e963ea9c Merge branch 'MDL-37801_glossary_links' of git://github.com/davosmith/moodle 2013-02-05 01:01:14 +01:00
Eloy Lafuente (stronk7)
8d8f9cf756 Merge branch 'master_MDL-33078' of git://github.com/danmarsden/moodle 2013-02-04 23:58:41 +01:00
Mark Nelson
a9a0cb691c MDL-30102 mod_forum: adding webservice function to allow for the retrieval of forum discussions 2013-02-04 19:28:29 +08:00
Dan Marsden
a022192a3b MDL-33078 SCORM: rebuild toc when calling LMSCommit to improve pre-req handling 2013-02-04 22:04:06 +13:00
Damyon Wiese
935ec5e77e Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle 2013-02-04 16:18:00 +08:00
Dan Poltawski
6ac9f15969 Merge branch 'master_MDL-29207' of git://github.com/danmarsden/moodle 2013-02-04 15:54:43 +08:00
Dan Poltawski
cf936fa297 Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle 2013-02-04 13:54:27 +08:00
Dan Poltawski
4ac341c9b6 Merge branch 'MDL-37646-master' of git://github.com/damyon/moodle 2013-02-04 13:49:23 +08:00
Damyon Wiese
c15cda6138 Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle 2013-02-04 12:48:42 +08:00
Dan Poltawski
d5a13bca09 Merge branch 'MDL-37710-master' of git://github.com/damyon/moodle 2013-02-04 12:12:11 +08:00
Dan Poltawski
b9299c61ca Merge branch 'MDL-37635-master' of git://github.com/damyon/moodle 2013-02-04 11:56:45 +08:00
Dan Marsden
361069cbbb MDL-29207: SCORM prereq callback is pure js - move it to module.js so it can be cached better. 2013-02-03 20:27:52 +13:00
Dan Marsden
5f03868a53 MDL-29207 SCORM: Auto-continue doesn't work with Pre-req due to JS errors 2013-02-03 20:27:39 +13:00
Dan Marsden
6496979459 MDL-36800 SCORM: Fix Yui().use calls - thanks to Nancy Cheng for the fix 2013-02-03 20:21:16 +13:00
Andreas Grabs
25d37fe24c MDL-37800 mod_feedback - item "information" does not appear correctly 2013-02-01 11:44:52 +01:00
Michael Hughes
127d66f183 MDL-30144 Assignment 2.2: Download all as zip should only contain submission from active enroled users 2013-02-01 17:08:22 +08:00
Damyon Wiese
46692c3a81 MDL-37635 Assign: Prevent errors when viewing a feedback for an assignment with no gradeitem in gradebook 
Also adds unit tests to verify that:
Feedback is visible even if there is no grade
The grade is not shown if the gradeitem is hidden unless you have mod/assign:grade capability
 2013-02-01 13:46:08 +08:00
David Mudrák
1df3bc143c MDL-37806 Display 'Save and show next' button when assessing workshop submissions 
The button is displayed only when there is a pending (that is not
assessed yet) submission to assess.

AMOS BEGIN
 CPY [savenext,mod_assign],[saveandshownext,mod_workshop]
AMOS END
 2013-01-31 18:21:51 +01:00
David Mudrák
0001eea6dd MDL-37806 Add new workshop class method to return pending assessments 
This is a simple wrapper around workshop::get_assessments_by_reviewer()
that filters assigned assessments and returns just those that were not
graded by the reviewer yet.
 2013-01-31 18:21:50 +01:00
Davo Smith
56c0465bd4 MDL-37801 mod_glossary - encode / decode links to 'showentry' pages during backup & restore 2013-01-31 12:52:26 +00:00