mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-25 10:00:31 +01:00
Code Issues Projects Releases Wiki Activity
59,260 Commits 36 Branches 527 Tags
Commit Graph

13428 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
3b00c13bf1 MDL-37894 Amend tests with new openclose rule. 2013-02-20 01:36:20 +01:00
Eloy Lafuente (stronk7)
b70a3b7106 Merge branch 'MDL-38093' of git://github.com/timhunt/moodle 2013-02-20 00:44:54 +01:00
Eloy Lafuente (stronk7)
f1b011d3a8 Merge branch 'MDL-37894' of git://github.com/timhunt/moodle 2013-02-20 00:39:44 +01:00
Eloy Lafuente (stronk7)
6d6bd5f114 MDL-32620 whitespace + comment fixes. 2013-02-19 13:21:18 +01:00
Eloy Lafuente (stronk7)
1ead0c63e9 Merge branch 'MDL-32620' of git://github.com/scriby/moodle 2013-02-19 13:13:43 +01:00
Dan Poltawski
61df003d53 Merge branch 'master_MDL-37660' of git://github.com/danmarsden/moodle 2013-02-19 15:04:56 +08:00
Dan Poltawski
fd507a8715 Merge branch 'm25_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https://github.com/scara/moodle 2013-02-19 13:41:45 +08:00
Dan Poltawski
3770eadb82 Merge branch 'MDL-38047-master' of git://github.com/damyon/moodle 2013-02-19 13:31:11 +08:00
Damyon Wiese
b27fc5b64f Merge branch 'wip-MDL-33774-master' of git://github.com/marinaglancy/moodle 2013-02-19 12:36:40 +08:00
Tim Hunt
e58b2c326b MDL-38093 quiz settings: make overall feeback editors collapsible. 2013-02-18 18:13:51 +00:00
Tim Hunt
6e78a7bdb4 MDL-37894 Show the quiz close date even if the quiz is not open yet. 
People care a lot about deadlines!
 2013-02-18 10:27:37 +00:00
Dan Poltawski
9c70147d54 Merge branch 'MDL-31983-master' of git://github.com/FMCorz/moodle 2013-02-18 15:54:22 +08:00
Dan Marsden
61fbdb0eec MDL-37660 SCORM: move time related settings into general section and improve lang 2013-02-15 23:48:32 +13:00
Frederic Massart
ebd9ae6523 MDL-31983 navigation: Move reports from Navigation to Settings 2013-02-15 13:06:26 +08:00
Damyon Wiese
a5c793c38c MDL-38047 Assignment unit tests - Shave 1 minute from the unit tests for mod_assign. 2013-02-15 12:36:21 +08:00
Damyon Wiese
b0da618b61 MDL-37337 Assignment: Restructure assignment settings screen to make it "wieldy" 2013-02-15 11:26:21 +08:00
Eloy Lafuente (stronk7)
9e7e1b1c9e MDL-38040 Clean core from CRLFs 2013-02-15 02:13:32 +01:00
Matteo Scaramuccia
f1e316870d MDL-37449 Incorrect doubled 'u.email' field in the SQL query (Oracle error: ORA-00918) 2013-02-14 21:38:05 +01:00
Marina Glancy
3008f86c3f MDL-33774 mod_label stores the content where it is supposed to 
removed hardcoded checking for 'label' module type

changed label update script
 2013-02-14 19:46:19 +11:00
Damyon Wiese
f22bc6d963 Fix permissions 2013-02-14 13:43:58 +08:00
Mark Nielsen
e5ed5e6ab7 MDL-32620: Fixing up white space in comment 2013-02-13 09:21:03 -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