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

55562 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marina Glancy
cfc4db405c MDL-33550 Set default status for file =0 and correct setting user in phpunit test 2012-06-14 14:52:31 +08:00
Dan Poltawski
414ce30812 Revert MDL-33513 
This reverts commit b2cf2b807f.
This reverts commit 24b96f0170.
This reverts commit 39c60294a6.
This reverts commit 8a288971e2.
 2012-06-14 13:57:45 +08:00
Sam Hemelryk
1875b6fb89 MDL-33468 css_optimiser: Coding style clean up and renamed cssslib_test => csslib_test 2012-06-14 17:28:26 +12:00
Sam Hemelryk
de3a460e17 MDL-33468 css_optimiser: Fixed aggressive optimisation so that it only combines siblings and doesn't reorder 2012-06-14 17:25:19 +12:00
Dan Poltawski
bc1f298b2a MDL-33175 - filemanager: make dndupload icon clickable 2012-06-14 13:25:05 +08:00
Rajesh Taneja
d01ebb940d MDL-33506 Filepicker: Search box text will be selected on focus 2012-06-14 13:03:08 +08:00
Sam Hemelryk
778121751d Merge branch 'MDL-32767' of git://github.com/danpoltawski/moodle 2012-06-14 16:37:08 +12: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
745b178e42 Merge branch 'wip-MDL-33592-m23' of git://github.com/samhemelryk/moodle 2012-06-14 12:22:39 +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
d21a98a633 MDL-27156 - version bump for new capability 2012-06-14 12:12:39 +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
Dan Poltawski
cd925ac79b Merge branch 'dev_MDL-33513_files_source' of git://github.com/danpoltawski/moodle 2012-06-14 11:12:21 +08:00
Aparup Banerjee
38d488cea1 MDL-33400 Lib : fixed character miscount 2012-06-14 10:56:40 +08:00
Dan Poltawski
b2cf2b807f MDL-33513 repositories - fix misleading phpdocs 2012-06-14 10:55:30 +08:00
Dan Poltawski
813f6964ca MDL-33400 questionlib - minor whitespace/equality imporvement 2012-06-14 10:28:34 +08:00
Dan Poltawski
e46dfeb7fc Merge branch 'MDL-33400' of git://github.com/nebgor/moodle 2012-06-14 10:27:23 +08:00
Andrew Davis
845c2ae110 MDL-27156 repositories: switched the file manager and the file picker over to using get_user_max_upload_file_size() 2012-06-14 09:19:26 +07: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
Andrew Davis
8ac95c279c MDL-27156 repository: Added a new capability so that select users can bypass file size restrictions 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
Sam Hemelryk
043a53fb25 Merge branch 'MDL-33541' of git://github.com/danpoltawski/moodle 2012-06-14 11:27:37 +12:00
Sam Hemelryk
f90848689c Merge branch 'MDL-33554' of git://github.com/mouneyrac/moodle 2012-06-14 11:20:16 +12:00
Aparup Banerjee
0dd0f96373 MDL-33400 Libraries : added callback to *_question_pluginfile without 'mod_' prefix 2012-06-14 01:30:52 +08: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
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
sam marshall
a098f340fe MDL-33466: Group restriction should hide activity even with 'show availability' option 
This is a modified version of fix by Luke Tucker at NetSpot - thanks.
 2012-06-13 13:08:30 +01: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