mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-03 15:29:08 +01:00
Code Issues Projects Releases Wiki Activity
64,868 Commits 36 Branches 523 Tags
Commit Graph

64868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Scotson
338021b90c MDL-40722 Theme: Add back a more-specific selector for some blocks 
This addresses an issue on narrow devices whereby block width is
incorrectly overridden with a more-specific selector.
 2013-11-01 07:53:32 +08:00
Juan Leyva
00461045a9 MDL-42617 Add support for frozen fields in searchableselector form elements 2013-10-31 11:18:24 +01:00
Ankit Agarwal
7887cc65f1 MDL-42633 messages: Fix alternate name warnings when a message popup is shown 2013-10-31 16:09:43 +08:00
Mark Nelson
af9fc21cfd MDL-42566 mod_data: introduced check to ensure the picture supplied is valid 2013-10-31 16:06:42 +08:00
Ankit Agarwal
fa3f7b972c MDL-42604 scorm: Minor coding style fixes 2013-10-31 14:29:15 +08:00
Ankit Agarwal
9bb0353c89 MDL-42583 events: Fix snapshot issues with note events 2013-10-31 13:43:37 +08:00
Marina Glancy
d3bd747db4 MDL-42318 coursecat: in unittests re-request category from DB after generating courses 2013-10-31 13:58:41 +11:00
Ankit Agarwal
4b3bf7f82b MDL-42273 behat: Automate groups and groupings import QAs 
MDLQA-2420 Importing groups with an ID number with permissions
MDLQA-2421 Importing groups with an ID number without permissions
MDLQA-5266 A teacher can import groupings as well as groups into a course
 2013-10-31 10:37:33 +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
David Monllao
905729bf33 MDL-42363 behat: Covering MDL-41817 testing 
Covering backup/restore without blocks
and with a single course section.
 2013-10-30 18:28:14 +08:00
Ankit Agarwal
e24c2c1a73 MDL-42565 assign: Status of grading is not displayed anymore 2013-10-30 14:28:21 +08:00
Mark Nelson
1d43da0220 MDL-41664 core_calendar: replaced class variables that stored minimum and maximum years with functions 
Also made slight changes to the existing functions.
 2013-10-30 12:42:12 +08:00
Adrian Greeve
73412d9680 MDL-41664 - Calendar: Add method for formating years in the new calendar plugin. 2013-10-30 11:53:16 +08:00
Adrian Greeve
5450ed4347 MDL-42599 forum rss: Update the sql statements to return all user name fields. 2013-10-30 11:25:59 +08:00
Stephen Bourget
bd56062327 MDL-42579 Glossary: Fix debug notice from missing name fields. 2013-10-29 22:56:53 -04:00
Ankit Agarwal
a0c779c198 MDL-42604 scorm: Fix division by zero warnings in error logs 2013-10-30 10:47:53 +08:00
Damyon Wiese
d79d1bd8fa MDL-42351 EditPDF: Fix jiggling of relatively positioned elements 
When calling setX/setY with YUI - YUI takes into account the position style
of the element. If none is set it assumes position relative. Position relative
is bad because relatively positioned elements still take up space in the page,
and all the elements after that node are positioned, taking into account the size
of that node. So when a node is resized or deleted, all nodes after that one in
the list of drawables are affected.

The magic fix - is just to set position: absolute on the drawables before calling setX/setY.
 2013-10-29 22:18:19 +08:00