moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62030 commits 37 branches 544 tags 1.3 GiB
Commit graph

13972 commits

Author SHA1 Message Date
Dan Poltawski
3a3621821a Merge branch 'MDL-39173-master' of git://github.com/damyon/moodle 2013-04-22 11:41:41 +01:00
Damyon Wiese
f5e9aa843c Merge branch 'wip-mdl-38851' of git://github.com/rajeshtaneja/moodle 2013-04-22 15:11:59 +08:00
Damyon Wiese
00ec4acc8f Merge branch 'MDL-39182_master' of https://github.com/markn86/moodle 2013-04-22 14:00:11 +08:00
Mark Nelson
f5ad424b11 MDL-39182 mod_forum: display the post threshold warning message in a more noticeable area 2013-04-22 13:33:36 +08:00
Frederic Massart
613abe1b02 MDL-38572 assign: Improving usability of the module form 2013-04-22 13:28:38 +08:00
Frederic Massart
47f0ae5908 MDL-39264 chat: Reformat module settings form 2013-04-22 11:03:28 +08:00
Damyon Wiese
b363d54ccd Merge branch 'MDL-39050' of git://github.com/timhunt/moodle 2013-04-22 10:25:46 +08:00
Sam Hemelryk
54ed002fdc Merge branch 'wip-MDL-39118-master' of git://github.com/abgreeve/moodle 2013-04-22 13:41:45 +12:00
Adrian Greeve
e06d54289d MDL-39118 - mod_data: removed areamaxbytes option for uploading files and images. 
Setting the maximum size for a file or picture field to the course upload limit
would send a value of 0 to the file picker. This patch checks for this 0 value
and handles it appropriately.
 2013-04-22 09:28:51 +08:00
Tim Hunt
ba86e1d1ee MDL-39186 quiz password form: set param types. 2013-04-19 18:28:59 +01:00
Dan Poltawski
b93945e9b9 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 
Conflicts:
	mod/scorm/module.js
 2013-04-19 15:20:02 +01:00
Dan Poltawski
aa15c5f3ff Merge branch 'MDL-38361' of https://github.com/prateeksachan/moodle 2013-04-19 15:11:33 +01:00
Tim Hunt
53f8948899 MDL-39050 quiz access rules: settings.php files should work. 2013-04-19 11:50:25 +01:00
Rajesh Taneja
1fe56a2a00 MDL-38851 Administration: Fixed setType in admin section 2013-04-19 15:18:33 +08:00
Damyon Wiese
dd3b3a81d1 Merge branch 'MDL-39167' of git://github.com/timhunt/moodle 2013-04-19 13:13:28 +08:00
Damyon Wiese
29e2fecb44 MDL-39173 Assign - Remove permissions check and OUTPUT from previous patch 
The permissions check is not correct (even users with grade capability should not
see user identities) and $assignment->get_renderer() is preferred over $OUTPUT.
 2013-04-19 13:05:12 +08:00
Sam Chaffee
0399580003 MDL-39173 Assign - Enable comments for blind marking assignments (anonymous ones) 2013-04-19 13:03:05 +08:00
Sam Hemelryk
2b2b967ecb MDL-38646 mod_folder: improved upgrade of showexpanded 2013-04-19 16:28:29 +12:00
Sam Hemelryk
a03fdbb099 Merge branch 'MDL-38646' of git://github.com/rlorenzo/moodle 2013-04-19 16:23:21 +12:00
Sam Hemelryk
52b4bd37e7 Merge branch 'MDL-38710-master' of git://github.com/damyon/moodle 2013-04-19 14:41:25 +12:00
Sam Hemelryk
4d35c88e10 Merge branch 'MDL-39185_master' of https://github.com/markn86/moodle 2013-04-19 13:53:55 +12:00
Sam Hemelryk
ff76b6044b Merge branch 'MDL-39135-master' of git://github.com/damyon/moodle 2013-04-19 13:48:32 +12:00
Rex Lorenzo
57e228045b MDL-38646 folder: change column from show_expanded to showexpanded 2013-04-18 17:28:35 -07:00
David Mudrák
9e31e23d60 MDL-38603 Reorganise Workshop settings form 
Example submissions settings moved into a dedicated section.
Self-assessment setting moved to the assessment section. There is no
need for the dedicated Workshop features section any more. All Workshop
feedback settings moved into a dedicated section.

Reorganised grading settings - the grading strategy put into the top
place as it is the essential setting. All other three settings are
related to calculating actual grades.

No advanced setting fields in the Workshop form. Mixing collapsible
sections with advanced fields (that are not even marked as "advanced"
any more) does not work well.

AMOS BEGIN
 CPY [feedback,mod_assign],[feedbacksettings,mod_workshop]
AMOS END
 2013-04-18 23:31:35 +02:00
David Mudrák
d34ea7dc33 MDL-38603 Deprecate usepeerassessment setting in Workshop 
There was a plan to make use of it initially when Workshop was rewritten
for Moodle 2.0. The idea was that the Workshop could be switched into a
simplified mode where teachers only make assessments (with all the
grading strategies available). But things evolved since then and now we
have Advanced grading methods available in the new Assignment module
that solves the use case well. So, having this option available is not
only confusing but - looking at the code - pretty useless.

For now, I am just hiding the setting from the settings form and the
code always considers it as if it was enabled. In the future, the field
can disappear from the database, too.
 2013-04-18 23:10:10 +02:00
Davo Smith
c4dccb99fb MDL-39219 mod_scorm - replace JSON with Y.JSON for IE7 compatibility 2013-04-18 12:44:24 +01:00
Tim Hunt
d823a63db0 MDL-39167 quiz access rules: need to validate their settings. 
We were missing the hook in the form validation method. We had them
everywhere else they were needed.
 2013-04-17 14:24:38 +01:00
Dan Poltawski
51850ccaf8 Merge branch 'MDL-38573-master-int' of git://github.com/FMCorz/moodle 2013-04-17 12:37:23 +01:00
Dan Poltawski
0107a90fe8 Merge branch 'MDL-39081' of git://github.com/rwijaya/moodle 2013-04-17 12:32:39 +01:00
Frederic Massart
ad4bbda9eb MDL-38573 choice: Reformat settings form 2013-04-17 15:54:59 +08:00
Mark Nelson
4a8a72656d MDL-39185 mod_forum: declare new object before creating member variables to prevent Strict Standards warning 2013-04-17 15:20:41 +08:00
Damyon Wiese
78d9d52a0a MDL-38710 assign: Fix one typo and change one param to PARAM_BOOL 2013-04-17 13:50:33 +08:00
Dan Poltawski
9231cd8826 MDL-38710 assign: convert selectedusers to PARAM_SEQUENCE 
This param type is more appropiate.
 2013-04-17 13:50:23 +08:00
Dan Poltawski
68d646f3eb MDL-38710 assign: fix missing setType calls 2013-04-17 13:50:23 +08:00
Dan Poltawski
dfd24d622f Merge branch 'MDL-39140_m25' of git://github.com/sbourget/moodle 2013-04-16 13:46:51 +01:00
Dan Poltawski
342b1901ac Merge branch 'MDL-39029' of git://github.com/jacks92/moodle 2013-04-16 13:30:10 +01:00
Dan Poltawski
f7f1465f91 Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle 2013-04-16 13:26:34 +01:00
Damyon Wiese
6a508eaccf Merge branch 'w15_MDL-34674_m25_spell' of git://github.com/skodak/moodle 2013-04-16 15:56:10 +08:00
Eloy Lafuente (stronk7)
4af6e51309 Merge branch 'master_MDL-37844' of git://github.com/danmarsden/moodle 2013-04-16 01:14:06 +02:00
Stephen Bourget
01b3704f1b MDL-39140 mod_folder: Fix missing call to setType() 2013-04-15 17:59:25 -04:00
Dan Poltawski
1184c3da23 MDL-39135 assign_feedback: fix missing renderer argument 
assign_user_summary expects extra profile fields
 2013-04-15 14:57:00 +01:00
Dan Poltawski
e5e5097081 NOBUG - reduce whitespace errors a little 2013-04-15 13:29:14 +01:00
Dan Poltawski
7e155b96fb Merge branch 'wip-MDL-38309-m25' of git://github.com/marinaglancy/moodle 2013-04-15 10:24:20 +01:00
Rossiani Wijaya
167b2c3d1e MDL-39081 workshop mod: fixed missing setType error 2013-04-15 15:42:22 +08:00
Marina Glancy
a5f82c5b21 MDL-38309 Substitute usage of print_tabs() with renderable tabtree 2013-04-15 12:13:13 +10:00
Damyon Wiese
986adc066c MDL-39092 Yuilib - remove more -coverage.js files 
Also slight tweak to the readme for someone who does not know shifter.
 2013-04-15 09:02:11 +08:00
Eloy Lafuente (stronk7)
35bff0716d Merge branch 'MDL-38947_master' of git://github.com/dmonllao/moodle 2013-04-15 02:22:23 +02:00
Eloy Lafuente (stronk7)
ef6fbe9eef Merge branch 'MDL-38948_master' of git://github.com/dmonllao/moodle 2013-04-15 02:22:06 +02:00
Eloy Lafuente (stronk7)
e9324d0863 Merge branch 'MDL-38949_master' of git://github.com/dmonllao/moodle 2013-04-15 02:19:58 +02:00
Eloy Lafuente (stronk7)
252612a670 Merge branch 'MDL-38962_master' of git://github.com/dmonllao/moodle 2013-04-15 02:08:35 +02:00