mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-18 22:50:19 +01:00
Code Issues Projects Releases Wiki Activity
64,735 Commits 36 Branches 527 Tags
Commit Graph

64735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael de Raadt
2bec969e2a MDL-42703 Course: Remove alias from queries to satisfy MSSQL 2013-11-05 10:52:24 +08:00
Dan Poltawski
5386f0bbfe on-demand release 2.6beta+ 2013-11-01 15:49:16 +08:00
Dan Poltawski
4c3b5e6e1f Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-11-01 15:47:31 +08:00
Rajesh Taneja
3b732cd6cc MDL-42492 course: Show option to move category to top level 
added behat to test move category
 2013-11-01 15:53:38 +11:00
Marina Glancy
df27570b93 Merge branch '42619-26' of git://github.com/samhemelryk/moodle 2013-11-01 13:23:30 +11:00
Sam Hemelryk
12ceaa5514 MDL-42619 block_community: delete course redirect bug fix 2013-11-01 10:17:15 +08:00
Damyon Wiese
a123eb58b1 MDL-42102 TinyMCE: Toolbar wrapping < 480px. 
Prevent wrap plugin from wrapping toolbars shorter than 5 buttons.
 2013-11-01 10:08:52 +08:00
Marina Glancy
1637827d75 Merge branch 'wip-mdl-42584' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/classes/event/user_deleted.php
 2013-11-01 13:04:29 +11:00
Marina Glancy
35e903971b Merge branch 'MDL-42565-master' of git://github.com/ankitagarwal/moodle 2013-11-01 12:42:17 +11:00
Marina Glancy
003a81ee11 Merge branch 'MDL-42356-master' of git://github.com/mouneyrac/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-01 12:16:20 +11:00
Marina Glancy
d2941e8808 Merge branch 'MDL-42471-master' of git://github.com/andrewnicols/moodle 2013-11-01 09:00:05 +08:00
Marina Glancy
f5b2c9f4af Merge branch 'MDL-42351-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-01 09:00:03 +08:00
Marina Glancy
bbb430bf5e Merge branch 'MDL-41624' of git://github.com/jmvedrine/moodle 2013-11-01 08:59:31 +08:00
Dan Poltawski
b674a3f6f2 MDL-42102 ie9 SVG fixes 2013-11-01 08:59:31 +08:00
Dan Poltawski
e394484179 Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/tinymce/tiny_mce/3.5.8/themes/advanced/skins/moodle/ui.css
 2013-11-01 08:59:27 +08:00
Barbara Ramiro
ca4e42cfa3 MDL-42102 TinyMCE: Update icons 2013-11-01 08:57:41 +08:00
Marina Glancy
595d9876bb Merge branch 'MDL-40971_M26' of git://github.com/lazydaisy/moodle 2013-11-01 08:57:40 +08:00
Andrew Nicols
6492c72ac4 MDL-42012 TinyMCE: Remove black background on foreground color picker 2013-11-01 08:57:40 +08:00
Jason Fowler
4c86dd513a MDL-42102 TinyMCE: Fixing dropdown positioning 2013-11-01 08:57:39 +08:00
Sam Hemelryk
cda49969c3 MDL-42300 course: improved category re-sort controls. 
* The top action now works on top level categories and has
  a better title.
* Each category has its own resort actions now.
 2013-11-01 08:57:39 +08:00
Marina Glancy
0219e54100 Merge branch 'MDL-42587' of git://github.com/aolley/moodle 2013-11-01 08:57:38 +08:00
Marina Glancy
b53c155276 Merge branch 'wip-MDL-42599-master' of git://github.com/abgreeve/moodle 2013-11-01 08:57:38 +08:00
Dan Poltawski
3dc774b8ef Merge branch 'MDL-42517-m' of git://github.com/micaherne/moodle 2013-11-01 08:57:37 +08:00
Dan Poltawski
d61d4c1bf6 Merge branch 'MDL-42482_editpdf_blank_comments' of git://github.com/davosmith/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-01 08:57:33 +08:00
Dan Poltawski
fcdc588976 Merge branch 'wip-mdl-42594' of https://github.com/rajeshtaneja/moodle 2013-11-01 08:56:58 +08:00
Dan Poltawski
9b0cc9ddf2 Merge branch 'MDL-41041-master' of git://github.com/FMCorz/moodle 2013-11-01 08:56:58 +08:00
Dan Poltawski
fc74cc8238 Merge branch 'MDL-42352_editpdf_scrolling' of git://github.com/davosmith/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-01 08:56:53 +08:00
Dan Poltawski
e9b7148ba7 Merge branch 'MDL-42589-master' of git://github.com/damyon/moodle 2013-11-01 08:55:32 +08:00
Damyon Wiese
4562fdc240 MDL-42589: Fix file picker display in ie9/ie10 
CSS change to fix blank file picker bug in IE.
 2013-11-01 08:55:32 +08:00
Dan Poltawski
51bd152e34 Merge branch 'MDL-41664_master' of https://github.com/markn86/moodle 2013-11-01 08:55:31 +08:00
Barbara Ramiro
6ce5fd3556 MDL-42102 TinyMCE: Correct additional icons 2013-11-01 08:55:30 +08:00
Dan Poltawski
d7052f748b Merge branch 'MDL-42102-master' of git://github.com/andrewnicols/moodle 2013-11-01 08:55:30 +08:00
Barbara Ramiro
dee6073da2 MDL-42102 tinymce: improved icons 2013-11-01 08:55:29 +08:00
Damyon Wiese
3b4e5a83f4 Merge branch 'MDL-38734-master' of git://github.com/danpoltawski/moodle 2013-11-01 08:55:29 +08:00
Damyon Wiese
575d38d099 ie9 svg compatibility fixes 2013-11-01 08:55:29 +08:00
Damyon Wiese
bb1a600046 Merge branch 'MDL-41092-master' of git://github.com/ankitagarwal/moodle 2013-11-01 08:55:28 +08:00
Damyon Wiese
4d2bd6735f MDL-41092 Assign: Expose SQL error in cron unit test 2013-11-01 08:55:28 +08:00
David Monllao
63950e4d0b MDL-42236 behat: New steps to look for elements visibility 2013-11-01 08:55:27 +08:00
Jason Fowler
98719c48fa MDL-42236 Filepicker: fixing search box for repositories 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-01 08:55:27 +08:00
Sam Hemelryk
9620bcebee Merge branch 'wip-MDL-42379-master' of git://github.com/abgreeve/moodle 2013-11-01 08:55:26 +08:00
Damyon Wiese
574c1699a7 Merge branch 'MDL-42558-master' of git://github.com/ankitagarwal/moodle 2013-11-01 08:55:25 +08:00
Sam Hemelryk
ab4fdbdf42 Merge branch 'MDL-42284_behat' of https://github.com/andyjdavis/moodle 2013-11-01 08:55:25 +08:00
Sam Hemelryk
2e29034313 Merge branch 'MDL-42574-master' of git://github.com/ankitagarwal/moodle 2013-11-01 08:55:24 +08:00
Damyon Wiese
3b4ace3ec8 Merge branch 'MDL-41251_c' of git://github.com/rwijaya/moodle 2013-11-01 08:55:24 +08:00
Damyon Wiese
6df3cf52c5 Merge branch 'MDL-42579_m26_2' of git://github.com/sbourget/moodle 2013-11-01 08:55:23 +08:00
Damyon Wiese
da13302f91 Merge branch 'wip-MDL-41337-master' of git://github.com/marinaglancy/moodle 2013-11-01 08:55:23 +08:00
Sam Hemelryk
df2d3777cc Merge branch 'MDL-42542-master' of git://github.com/FMCorz/moodle 
Conflicts:
	version.php
 2013-11-01 08:55:21 +08:00
Mary Evans
de957f5848 MDL-40971 grade: Importing Outcomes breaks Clean theme. 2013-10-30 23:46:47 +00:00
Jean-Michel Vedrine
6713708261 MDL-41624 DragMath crashes Firefox 2013-10-30 17:55:34 +01:00
Ankit Agarwal
e24c2c1a73 MDL-42565 assign: Status of grading is not displayed anymore 2013-10-30 14:28:21 +08:00