Commit graph

57366 commits

Author SHA1 Message Date
Davo Smith
91813c1b4b MDL-35288 drag and drop upload - adjust error message text when attempting to upload a folder 2012-10-03 08:46:55 +01:00
Jean-Philippe Gaudreau
7f40888801 Fixing feedback's view when assignment is set to no grade. Also refactoring the use of method view_feedback for upload (single and advenced) assignments
Conflicts:

	mod/assignment/type/upload/assignment.class.php
	mod/assignment/type/uploadsingle/assignment.class.php
2012-10-03 14:41:32 +08:00
David Monllao
d91750bc5a MDL-35187 groups Adding admin pagelayout to group members edition 2012-10-03 14:40:22 +08:00
Damyon Wiese
8e9efe602a MDL-35763: Add ignoredirty class to drop down lists in assignment grading options form. 2012-10-03 11:52:50 +08:00
Dan Poltawski
fcdd35d0fc Merge branch 'MDL-35754-master' of git://github.com/FMCorz/moodle 2012-10-03 10:26:14 +08:00
Frederic Massart
df435dda49 MDL-35754 libraries: openpopup() does not fail when window name is not set 2012-10-03 09:54:27 +08:00
Eloy Lafuente (stronk7)
b478f2ec10 Merge branch 'MDL-35744' of git://github.com/timhunt/moodle 2012-10-03 00:40:10 +02:00
Sam Hemelryk
40b26758db Merge branch 'wip-MDL-33829-master' of https://github.com/andyjdavis/moodle 2012-10-03 10:07:37 +13:00
Sam Hemelryk
a0251e5006 Merge branch 'MDL-35654_master' of git://github.com/lazydaisy/moodle 2012-10-03 09:53:05 +13:00
Eloy Lafuente (stronk7)
db0ea4323d Merge branch 'MDL-35660' of git://github.com/netspotau/moodle-mod_assign 2012-10-02 22:02:23 +02:00
Eloy Lafuente (stronk7)
c740703c18 Merge branch 'w40_MDL-31437_m24_cohortsync' of git://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2012-10-02 22:00:12 +02:00
Eloy Lafuente (stronk7)
60e5d95a31 Merge branch 'master_MDL-35227' of git://github.com/danmarsden/moodle 2012-10-02 21:39:07 +02:00
Eloy Lafuente (stronk7)
5a2c374326 Merge branch 'w40_MDL-35701_m24_enroldb' of git://github.com/skodak/moodle 2012-10-02 21:27:55 +02:00
Eloy Lafuente (stronk7)
f7a506fb87 Merge branch 'master_MDL-35557' of git://github.com/danmarsden/moodle 2012-10-02 20:26:32 +02:00
Iñaki Arenaza
34b10e26c6 MDL-31968 Make NTLM REMOTE_USER format configurable by the admin
Signed-off-by: Iñaki Arenaza <iarenaza@mondragon.edu>
2012-10-02 16:56:10 +02:00
Tim Hunt
b3c18b8621 MDL-35744 quiz: fix review options for Never submitted attempts 2012-10-02 15:51:45 +01:00
Eloy Lafuente (stronk7)
b94ffc6d8c Merge branch 'master_MDL-35562' of git://github.com/danmarsden/moodle 2012-10-02 15:54:32 +02:00
Ruslan Kabalin
9d7525fb1a MDL-35715 course dragdrop Fix the ability to drag back to the empty section 2012-10-02 14:35:28 +01:00
Eloy Lafuente (stronk7)
2aeb0fbb60 Merge branch 'MDL-35673-master' of git://git.luns.net.uk/moodle 2012-10-02 09:55:20 +02:00
Dan Poltawski
001d5a034c Merge branch 'MDL-35687' of git://github.com/netspotau/moodle-mod_assign 2012-10-02 14:44:28 +08:00
Dan Poltawski
813a7724cf Merge branch 'MDL-35636' of git://github.com/mouneyrac/moodle 2012-10-02 14:40:23 +08:00
Dan Poltawski
497359f970 Merge branch 'MDL-33789_master' of git://github.com/kordan/moodle 2012-10-02 14:38:20 +08:00
Frederic Massart
81adabd244 MDL-28235 form: Removed close icon of help icon popups 2012-10-02 14:34:15 +08:00
Dan Poltawski
c38e18ec37 Merge branch 'MDL-35684' of git://github.com/netspotau/moodle-mod_assign 2012-10-02 14:33:01 +08:00
Frederic Massart
edb3b7b473 MDL-28235 form: Help button popup close accessibility improved
AMOS BEGIN
 CPY [close,editor],[close,form]
AMOS END
2012-10-02 14:32:17 +08:00
Dan Poltawski
1e12c7a4f2 Merge branch 'wip-MDL-35263-master' of git://github.com/marinaglancy/moodle 2012-10-02 14:20:07 +08:00
Rajesh Taneja
e71696e012 MDL-35047 tool_xmldb: Added missing strings for xmldb 2012-10-02 14:19:09 +08:00
Marina Glancy
d0c05602f5 MDL-35263 removed unit test test_format_display_course_content()
since the function global_navigation::format_display_course_content() is removed
2012-10-02 14:16:54 +08:00
Dan Poltawski
ed27ce0163 Merge branch 'MDL-34570-master' of git://github.com/FMCorz/moodle 2012-10-02 13:56:48 +08:00
Dan Poltawski
f14ecbfff8 Merge branch 'MDL-35187' of git://github.com/lazydaisy/moodle 2012-10-02 13:45:19 +08:00
Rajesh Taneja
956082f18d MDL-35397 Administration: changed link for 'many other contributors'
Previously 'many other contributors' was pointing to http://docs.moodle.org/dev/Credits
now, it will point to http://moodle.org/dev.
2012-10-02 13:41:13 +08:00
Adam Olley
e3d9426ab5 enrol_manual: Set context correctly in manual enrolment user selector 2012-10-02 14:51:24 +09:30
Dan Poltawski
0d24043d66 Merge branch 'wip-MDL-35263-master' of git://github.com/marinaglancy/moodle 2012-10-02 12:49:26 +08:00
Damyon Wiese
21f77397a2 MDL-35728: Fix download all submissions for a team assignment when there are no groups 2012-10-02 12:39:23 +08:00
Marina Glancy
76ab3fa18f MDL-35263 corrected coding style 2012-10-02 12:23:43 +08:00
Dan Poltawski
dcc4c7199a Merge branch 'MDL-35683' of git://github.com/netspotau/moodle-mod_assign 2012-10-02 12:19:38 +08:00
Dan Poltawski
76811d0bb8 Merge branch 'MDL-35370' of git://github.com/timhunt/moodle 2012-10-02 12:07:41 +08:00
Dan Poltawski
c07189ebe8 Merge branch 'MDL-35693' of git://github.com/timhunt/moodle 2012-10-02 11:47:50 +08:00
Dan Poltawski
afbdebee62 Merge branch 'MDL-35698' of git://github.com/timhunt/moodle 2012-10-02 11:40:16 +08:00
Dan Poltawski
49ab2d5fb2 Merge branch 'WIP-MDL-35708-master_quiz' of git://github.com/nadavkav/moodle 2012-10-02 11:36:49 +08:00
Dan Poltawski
61badb5989 Merge branch 'MDL-35437' of https://github.com/raymondAntonio/moodle 2012-10-02 11:35:59 +08:00
Dan Poltawski
f7b3ac9427 Merge branch 'w40_MDL-35619_m24_otheravatars' of git://github.com/skodak/moodle 2012-10-02 10:41:47 +08:00
Dan Poltawski
624feda48d Merge branch 'MDL-35680' of git://github.com/timhunt/moodle 2012-10-02 09:52:12 +08:00
Dan Poltawski
a354add4c8 Merge branch 'MDL-33933-master' of https://github.com/mackensen/moodle 2012-10-02 09:43:38 +08:00
Dan Poltawski
229f543881 Merge branch 'MDL-33117_grade_display' of git://github.com/andyjdavis/moodle 2012-10-02 09:32:58 +08:00
Eloy Lafuente (stronk7)
1ef501ca03 MDL-35669 gravatar amend and complete gravatar tests. 2012-10-02 01:33:59 +02:00
Eloy Lafuente (stronk7)
b96a15cc11 MDL-35669 gravatar Fix secure image urls. 2012-10-02 01:19:33 +02:00
Sam Hemelryk
ee3502e793 Merge branch 'master_MDL-35472' of git://github.com/totara/moodle 2012-10-02 11:10:39 +13:00
Sam Hemelryk
e737ad93a1 Merge branch 'MDL-34257' of git://github.com/timhunt/moodle 2012-10-02 10:46:01 +13:00
Eloy Lafuente (stronk7)
1203b6ea05 Merge branch 'MDL-35669-master-2' of git://github.com/micaherne/moodle 2012-10-01 23:44:07 +02:00