moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
54573 commits 37 branches 540 tags 1.3 GiB
Commit graph

54573 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Eloy Lafuente (stronk7)
f7b3e092e9 Merge branch 'w24_MDL-33635_m23_sort' of git://github.com/skodak/moodle 2012-06-13 16:40:07 +02:00
Petr Skoda
bc53b4e9d7 MDL-33635 improve collatorlib::ksort() coding style and perf 
Thanks Eloy Lafuente for spotting my sloppy coding style!
 2012-06-13 16:37:56 +02:00
Dan Poltawski
5c2bbfd6e9 Merge branch 'MDL-33611' of git://github.com/timhunt/moodle 2012-06-13 18:00:01 +08:00
Dongsheng Cai
24b96f0170 MDL-33513 Fixed source field 2012-06-13 19:57:10 +10:00
Andrew Robert Nicols
b95b05085c MDL-33649 Hide page scrollbars when a chooser is open 
This has the effect of preventing page scrolling which makes the chooser
difficult to use when there are many options or the page is too small.
 2012-06-13 10:51:31 +01:00
Dan Poltawski
4413b48000 Merge branch 'MDL-33581' of git://github.com/mouneyrac/moodle 2012-06-13 17:45:27 +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
dff798fd4a Merge branch 'wip-MDL-33590-master' of git://github.com/marinaglancy/moodle 2012-06-13 16:33:50 +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
Barbara Ramiro
64063bdbe2 MDL-33661 Aligned assignment 2.2 and its subtypes 2012-06-13 16:00:03 +08:00
Dan Poltawski
eb6afd93b9 Merge branch 'wip-MDL-33597-m23' of git://github.com/samhemelryk/moodle 2012-06-13 15:45:19 +08:00
Rossiani Wijaya
fb909757a6 MDL-33121 Book Module: Removing unused book_log(), renamed css class and fixed the book_preload_chpaters: next and previous values 2012-06-13 15:42:58 +08:00
Tõnis Tartes
5b7e511ea8 MDL-33121 Book Module: performed minor changes and cleanup for the module 2012-06-13 15:28:07 +08:00
Rossiani Wijaya
b15ef0b058 MDL-33121 Book Module: Fixed documentation header 2012-06-13 15:25:23 +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
Barbara Ramiro
ee0f34b514 MDL-33005 Drag and drop animation revised to play once only 2012-06-13 15:12:53 +08:00
Dan Poltawski
3aad3a5e64 Merge branch 'wip-MDL-33452-master' of git://github.com/marinaglancy/moodle 2012-06-13 15:03:07 +08:00
Nadav Kavalerchik
25df8c4e48 MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Correctly align the filemanager-toolbar , .fp-repo-name , .fp-repo-area , .fp-list .fp-repo
.fp-vb-icons , .fp-vb-details , .fp-vb-tree (need more work!)
.fp-icon , .fp-filename
theme/base/style/core.css
theme/base/style/filemanager.css

Conflicts:
	resolved by taking out all non .dir-rtl lines as there were heavy changes to filemanager and filepicker.
	we can't afford changes or breakage to LTR at this point.

	theme/base/style/core.css
	theme/base/style/filemanager.css
 2012-06-13 14:44:43 +08:00
Nadav Kavalerchik
cbf4d2f3af MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Correctly align the fp-toolbar, fp-pathbar, fp-viewbar, header, fp-mkdir-dlg
Add rtl images to the YUI file-picker
theme/base/style/core.css

Conflicts:
resolution was simply sticking with .dir-rtl changes only as we are near release and .dirrtl is borked.

	theme/base/style/core.css
	theme/base/style/filemanager.css
 2012-06-13 14:22:00 +08:00
Dan Poltawski
3292d9f003 Merge branch 'master_MDL-33477' of git://github.com/danmarsden/moodle 2012-06-13 14:08:36 +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
Nadav Kavalerchik
8c5bd0591b MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base) 
Right align NEW YUI3 overlay Activity/Resource Chooser
theme/base/style/core.css
 2012-06-13 13:55:33 +08:00
Nadav Kavalerchik
7dd65ae2f2 MDL-32802 - RTL CSS fixes for Moodle 2 (lib/editor/tinymce) 
Right align theme Clearlooks2
/lib/editor/tinymce/tiny_mce/3.4.9/plugins/inlinepopups/skins/clearlooks2/window.css
 2012-06-13 13:55:17 +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
Dan Poltawski
837eef2e64 MDL-33541 - remove cookies from filepicker 2012-06-13 12:17:52 +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
Sam Hemelryk
463ccee1de Merge branch 'MDL-33128-master-1' of git://git.luns.net.uk/moodle 2012-06-13 15:40:39 +12:00
Sam Hemelryk
a54a08b818 Merge branch 'MDL-32573' of git://github.com/danpoltawski/moodle 2012-06-13 15:32:54 +12: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
Dan Marsden
c6e423695a MDL-33477 Advanced grading Marking Guide - fix lang 2012-06-13 14:09:41 +12:00
Dan Poltawski
b9c871b18a Merge branch 'wip-mdl-33664' of git://github.com/rajeshtaneja/moodle 2012-06-13 10:07:32 +08:00
Rajesh Taneja
b0fc12189b MDL-33664 Hub: required renderer is passed to backup->display and huburl is initalised before use. 2012-06-13 09:21:13 +08:00
Marina Glancy
be920f9acf MDL-33420 Enable references in Server files repository 2012-06-13 09:03:41 +08:00
Marina Glancy
ff32444a7c MDL-33590 Correctly determine that file is an archive to enable unzip in filemanager 2012-06-13 08:57:10 +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
Eloy Lafuente (stronk7)
0961ca7998 MDL-33682 backup: keep old behavior, aka, use section number on empty section name. 2012-06-13 00:54:21 +02:00
Eloy Lafuente (stronk7)
1df09d3af2 Merge branch 'MDL-33682' of git://github.com/timhunt/moodle 2012-06-13 00:37:42 +02:00
Eloy Lafuente (stronk7)
dbe4bcc959 Merge branch 'MDL-33681' of git://github.com/timhunt/moodle 2012-06-13 00:06:26 +02:00
Dan Marsden
cb6782d4a5 MDL-32937 SCORM: better lang for dnd interface 2012-06-13 09:59:11 +12:00
Aparup Banerjee
039e110509 Merge branch 'MDL-33610' of git://github.com/danpoltawski/moodle 2012-06-13 01:59:33 +08:00
Aparup Banerjee
fa4ae5ac9f Merge branch 'MDL-33593' of git://github.com/danpoltawski/moodle 2012-06-13 01:46:17 +08:00
Tim Hunt
ff5d6f8872 MDL-33682 backup: cope with sections called '0' 
It was not previously possible to have a section called 0 because of
bugs in the standard course formats, but we hit this with the OU course
format. You got an exception because backup settings tested to see if
their lable was empty, which means a section name of '0' was fatal.
Should work now.
 2012-06-12 17:46:47 +01:00
Tim Hunt
bb410a1ecc MDL-33681 course: cannot have a section called '0'. 
No reason to prevent this. It is just a matter of doing a proper test,
rather than the sloppy PHP !empty().
 2012-06-12 17:45:40 +01:00
Dan Poltawski
c17ec774d7 MDL-33552 - portfolio api E_STRICT fixes 
admin_config_form and admin_config_validation are now static
 2012-06-12 22:56:42 +08:00
Dan Poltawski
4a126f1725 MDL-32573 - repository: make instance_config_form static 2012-06-12 22:17:29 +08:00