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
54,582 Commits 36 Branches 527 Tags
Commit Graph

12380 Commits

Author SHA1 Message Date
Damyon Wiese
99467a9f7f MDL-33853: Prevent locking an assignment submission from putting a grade of 0 in the gradebook 2012-06-22 11:12:06 +08:00
Damyon Wiese
dd9247adfe MDL-33954: Assignment "submissionreceipthtml" Language change 
Add the missing word: "see"
 2012-06-22 09:03:18 +08:00
Aparup Banerjee
7cacb2ef08 Merge branch 'wip-MDL-33297-master' of git://github.com/abgreeve/moodle 2012-06-21 17:34:57 +08:00
Dan Poltawski
75c8a109e5 Merge branch 'MDL-33878' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 15:21:13 +08:00
Dan Poltawski
22b0514e27 Merge branch 'MDL-33860' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 14:56:07 +08:00
Damyon Wiese
caff10a0b0 MDL-33850: Assignment: Change text to "Add submission" before anything has been submitted 
AMOS BEGIN
 CPY [addsubmission,mod_assignment],[addsubmission,mod_assign]
AMOS END
 2012-06-21 14:48:53 +08:00
Damyon Wiese
7056953a1c MDL-33860: Use get_string for All option in assignment grading table 2012-06-21 14:48:28 +08:00
Dan Poltawski
334de6b691 Merge branch 'MDL-33877' of git://github.com/netspotau/moodle-mod_assign 2012-06-21 10:04:29 +08:00
Sam Hemelryk
5f17311f52 MDL-27675 mod_feedback: Fixed up white space 2012-06-21 11:40:38 +12:00
Sam Hemelryk
d2448b8bd2 Merge branch 'MDL-27675_master' of git://github.com/grabs/moodle 2012-06-21 11:25:07 +12:00
Damyon Wiese
1f417de84a MDL-33877: Prevent duplicate records in grade items table after running assignment upgrade tool 
The cause was multiple calls to set_field on the same table. Changed to update_record.
 2012-06-20 14:33:33 +08:00
Dan Poltawski
b1c43c3f64 Merge branch 'w25_MDL-33831_m23_glossestrict' of git://github.com/skodak/moodle 2012-06-20 13:57:26 +08:00
Damyon Wiese
14c46e24a9 MDL-33878: Assignment - prevent error when removing overridden flag in gradebook 
This error only occurs when there is a submission but no grade in the assignment
and the feedback comments plugin is enabled.
 2012-06-20 13:11:19 +08:00
Dan Poltawski
d8d2eebb44 Merge branch 'MDL-33773' of git://github.com/netspotau/moodle-mod_assign 2012-06-20 11:25:08 +08:00
Adrian Greeve
35ca63c166 MDL-33297 - forum - workshop - glossary - data - Updated the check for files to allow students to see files they recently uploaded. 2012-06-20 10:49:18 +08:00
Sam Hemelryk
f7dc4a5630 Merge branch 'MDL-3971' of git://github.com/danpoltawski/moodle 2012-06-20 11:39:59 +12:00
Sam Hemelryk
ec1ca38996 Merge branch 'MDL-33843' of git://github.com/netspotau/moodle-mod_assign 2012-06-20 09:36:22 +12:00
Damyon Wiese
d9a88f427d MDL-33773: Make view/grade all submissions a link in assignment module 2012-06-19 22:08:21 +08:00
Petr Škoda
9bba13089d MDL-33831 fix E_STRICT issues in glossary 2012-06-19 13:57:11 +02:00
Damyon Wiese
5382eabbec MDL-33843: Remove custom dirty form handling and use default behaviour in assignment 2012-06-19 15:18:07 +08:00
Dan Poltawski
4bf433b5fb MDL-33121 book - improve a lang string 
+ Make a comment match coding style
 2012-06-19 14:15:11 +08:00
Dan Poltawski
34741af185 Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle 2012-06-19 14:14:54 +08:00
Dan Poltawski
c1ac8fa189 Merge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle 2012-06-19 13:27:07 +08:00
Eloy Lafuente (stronk7)
e165512d3a Merge branch 'MDL-33778' of git://github.com/timhunt/moodle 2012-06-19 00:54:39 +02:00
Andrew Robert Nicols
48e6de1c34 MDL-33821 Fix SQL syntax for recent glossary activity 2012-06-18 16:02:02 +01:00
Tim Hunt
72f2e13d04 MDL-33778 quiz statistics: part and class ids can be strings, not just ints. 2012-06-18 14:39:21 +01:00
Tim Hunt
584ae11a52 MDL-33818 quiz restore: quiz_attempt.state not restoring old MBZ 
This field was new in 2.3, so we need to set it when restoring backups
from 2.2 or before, using the same logic as in upgrade.
 2012-06-18 14:09:06 +01:00
Rossiani Wijaya
0a5b9e79e3 MDL-33121 Book Module: removing prev/next value from book_preload_chapters and more code cleaning 2012-06-18 16:10:15 +08:00
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle 
Conflicts:
	mod/assign/version.php
 2012-06-18 16:08:39 +08:00
Aparup Banerjee
341d989d63 Merge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle 2012-06-18 16:03:08 +08:00
Dan Poltawski
584c219edf Merge branch 'wip-MDL-33603-master-v2' of git://github.com/abgreeve/moodle 2012-06-18 15:07:10 +08:00
Dan Poltawski
f418c54875 Merge branch 'wip-mdl-33607' of git://github.com/rajeshtaneja/moodle 2012-06-18 14:34:35 +08:00
Dan Poltawski
2b5f4dbbca Merge branch 'MDL-33699' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:49:16 +08:00
Dan Poltawski
53db3251da Merge branch 'MDL-33793' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:28:07 +08:00
Dan Poltawski
728aee9767 Merge branch 'MDL-33697' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:12:56 +08:00
Dan Poltawski
8a7b0be111 Merge branch 'MDL-33327-2' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 12:17:49 +08:00
Nadav Kavalerchik
0a1617e23f MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Right align item's content (when viewing a Glossary activity in RTL mode)

Conflicts:

	mod/glossary/styles.css
 2012-06-18 11:26:07 +08:00
Nadav Kavalerchik
4d488c25b6 MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Right align content (when viewing a Lesson activity in RTL mode)
 2012-06-18 11:24:50 +08:00
Adrian Greeve
db79db63ed MDL-33603 - data - added another sql query to allow links to records to work. 2012-06-18 10:21:38 +08:00
Rajesh Taneja
6947c57a06 MDl-33607 wiki-2: check subwiki before fetching it from db 2012-06-18 10:20:29 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Eloy Lafuente (stronk7)
798c9100d8 MDL-33794 assign: fix some incorrect function names 2012-06-18 02:17:03 +02:00
Eloy Lafuente (stronk7)
130aed6e7e MDL-33794 version.php: Fix some missing bits before bump. 2012-06-17 19:29:44 +02:00
Damyon Wiese
8b2cfdc1c6 MDL-33793: Add conditions to the assignment upgrade code to prevent overwriting grade items. 2012-06-17 22:41:59 +08:00
Dan Poltawski
dd4502af6b MDL-3971 - mod_forum: contain () in span 2012-06-16 14:21:28 +08:00
Damyon Wiese
a13edd499d MDL-33699: Allow grades of 0 in assignment quickgrading 2012-06-15 15:13:26 +08:00
Dan Poltawski
4585e6ac98 Merge branch 'wip-MDL-33550-master' of git://github.com/marinaglancy/moodle 2012-06-14 16:23:08 +08:00
Damyon Wiese
f750cf712c MDL-33697: Merge the 2 assignment notification types 
This is the best solution until Moodle supports capabilities on module message providers.

Unfortunately we already changed the mod_assignment language string so I can't put an AMOS
command to copy the new string.
 2012-06-14 15:31:23 +08:00
Damyon Wiese
a1e54f4d6c MDL-33327: Layout changes for the assignment grading table 
Move the grading actions to a single drop down list above the header
Move the grading options below the grading table (although that is inconsistent)

Conflicts:

	mod/assign/gradingtable.php
	mod/assign/locallib.php
 2012-06-14 15:22:42 +08:00
Dan Poltawski
1ae5eb704a Merge branch 'MDL-33035-m23' of git://github.com/sunner/moodle 2012-06-14 12:29:14 +08:00