mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-03 15:32:43 +02:00
Code Issues Projects Releases Wiki Activity
54,408 Commits 36 Branches 528 Tags
Commit Graph

12348 Commits

Author SHA1 Message Date
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
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
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
Dan Poltawski
5ab8fde00e Merge branch 'MDL-33718' of git://github.com/netspotau/moodle-mod_assign 2012-06-14 12:25:50 +08:00
Dan Poltawski
a1394f429b Merge branch 'MDL-33464' of git://github.com/netspotau/moodle-mod_assign 2012-06-14 12:20:14 +08:00
Dan Poltawski
54588ca214 Merge branch 'MDL-27156_file_cap' of git://github.com/andyjdavis/moodle 2012-06-14 12:00:18 +08:00
Damyon Wiese
d9eb908d74 MDL-33718: Help text change for assignment module. 2012-06-14 11:23:27 +08:00
Andrew Davis
1812ea3e06 MDL-27156 repositories: switched some spots over to using get_user_max_upload_file_size() instead of get_max_upload_file_size() 2012-06-14 09:19:25 +07:00
Damyon Wiese
07a4677eb1 MDL-33464: Do not create a grade item on upgrade (mod_assign) because we already reassigned the old one 2012-06-14 09:14:40 +08:00
Sam Hemelryk
78338b8b0e Merge branch 'MDL-33645-master' of git://github.com/ankitagarwal/moodle 2012-06-14 11:31:46 +12:00
Eloy Lafuente (stronk7)
3f2939fa3e Merge branch 'w24_MDL-33204_m23_importsort' of git://github.com/skodak/moodle 2012-06-13 18:01:31 +02:00
Dan Poltawski
5c2bbfd6e9 Merge branch 'MDL-33611' of git://github.com/timhunt/moodle 2012-06-13 18:00:01 +08:00
Tim Hunt
3f0e034d75 MDL-33611 quiz: acutally use the right help string 
The previous commit for this bug actually managed to use the wrong one.
 2012-06-13 10:43:04 +01:00
Dan Poltawski
52f2bb2995 Merge branch 'MDL-33611' of git://github.com/timhunt/moodle 2012-06-13 16:39:24 +08:00
Dan Poltawski
966f3a11e1 Merge branch 'w24_MDL-33553_m23_portfoliostrict' of git://github.com/skodak/moodle 2012-06-13 16:22:27 +08:00
Dan Poltawski
2333058eb0 Merge branch 'MDL-33691' of git://github.com/netspotau/moodle-mod_assign 2012-06-13 15:24:42 +08:00
Dan Poltawski
1904310572 Merge branch 'MDL-33608-master-1' of git://git.luns.net.uk/moodle 2012-06-13 14:02:05 +08:00
Ankit Agarwal
09b46f0e13 MDL-33645 assign: Teachers should not be allowed to change grades if it is overridden in the gradebook 2012-06-13 13:20:54 +08:00
Marina Glancy
0b2bfbd1c6 MDL-33550 Correctly process situation when file reference source is missing 
- do not die with fatal error if source file in moodle internal repository is missing;
- moved code duplication for moodle repositories into class repository (functions send_file, get_reference_details, get_file_by_reference, get_file_reference);
- update file status after repository::sync_external_file so we know that it is missing (or not missing anymore). Do not run this function more than once for file within one request;
- display readable name for Private Files and Server files with the new format;
- display broken icon in filemanager if we know that source is missing, display information (for admin) where it was located before: see repository::get_reference_details() and extending classes;
- removed unnecessary queries in stored_file::sync_external_file();
- syncronize files before displaying it's size in mod_resource, do not query  directly
 2012-06-13 12:11:06 +08:00
Dan Poltawski
9379a9190d Merge branch 'MDL-33576-2' of git://github.com/netspotau/moodle-mod_assign 2012-06-13 11:28:39 +08:00
Sam Hemelryk
7cbd6d8353 Merge branch 'MDL-33675-master-1' of git://git.luns.net.uk/moodle 2012-06-13 15:24:07 +12:00
Damyon Wiese
571cc0b7d2 MDL-33691: The grading table is showing "graded" for assignments with a NULL grade 2012-06-13 11:01:37 +08:00
Dan Poltawski
38569ad3a2 Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle 2012-06-13 10:12:21 +08:00
Damyon Wiese
e7ade405eb MDL-33576: If grade set to "No grade" in mod_assign hide inputs for quickgrading 2012-06-13 08:55:02 +08:00
Dan Marsden
cb6782d4a5 MDL-32937 SCORM: better lang for dnd interface 2012-06-13 09:59:11 +12:00
Andrew Robert Nicols
8635302e54 MDL-33675 Add updated help texts for modules to appear in activity chooser 2012-06-12 13:38:17 +01:00
Eloy Lafuente (stronk7)
2903a92b29 Merge branch 'MDL-33123-master' of git://github.com/ankitagarwal/moodle 2012-06-12 12:33:54 +02:00
Tim Hunt
7ead73c106 MDL-33611 quiz: improve help string 
Thanks to Helen and Michelle. Who would have thought that 124 words
would require such a team effort!
 2012-06-12 10:38:47 +01:00
Dan Poltawski
8409bd51f4 Merge branch 'MDL-33612' of git://github.com/timhunt/moodle 2012-06-12 17:38:25 +08:00
Petr Skoda
6498b6190a MDL-33553 fix mod_data E_STRICT issue 2012-06-12 11:05:02 +02:00
Dan Poltawski
203d255116 Merge branch 'MDL-33393' of git://github.com/timhunt/moodle 
Conflicts:
	mod/quiz/lang/en/quiz.php
 2012-06-12 17:00:09 +08:00