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
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
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
Petr Škoda
c3f0f2fd79
MDL-40683 fix user upload form validation problem
2013-10-29 12:05:29 +01:00
Marina Glancy
d90c811585
MDL-41337 files: Fixed bug with accidental delete of the root directory
2013-10-29 20:29:35 +11:00
Dan Poltawski
d147e833c0
Merge branch 'wip-MDL-42441-master' of git://github.com/marinaglancy/moodle
2013-10-29 17:28:25 +08:00
Rajesh Taneja
3d49e6ba22
MDL-42594 Navigation: Site admin navigation will show loading icon
...
While loading site admin navigation loading icon will be displayed
2013-10-29 17:27:53 +08:00
Marina Glancy
0ae13c0f63
MDL-42441 modules: Remove unnecessary code when creating the module in D&D
...
property groupmodelink is not used at all and groupmode is already processed
properly in core functions (respecting groupmodeforce property in course).
This looks like old code that has not been updated. It's a shame we
duplicate module creation login in draganddrop library
2013-10-29 20:12:51 +11:00
Petr Škoda
fc4365d0fe
MDL-42555 fix moodle_url typo in namespaces
2013-10-29 17:03:58 +08:00
Jason Fowler
90792eff8b
MDL-42102 TinyMCE - Matching toolbar UI from other areas of Moodle
2013-10-29 16:54:13 +08:00
Barbara Ramiro
5bfa35589e
MDL-42102 tinymce: new icons
2013-10-29 16:54:05 +08:00
Damyon Wiese
e17bac441d
Merge branch 'wip-MDL-40683-master' of git://github.com/abgreeve/moodle
2013-10-29 16:42:48 +08:00
Rajesh Taneja
aa13929988
MDL-42584 Events: modified get_description in events
...
blog_entry_created - Removed summary field
blog_entry_deleted - Removed summary field and unwanted entry record
blog_entry_updated - Fixed single quotes and removed summary field
course_module_created - Removed subject
course_module_updated - Removed subject
user_deleted - Removed user firstname and last name
course_module_viewed - Fixed description
2013-10-29 15:24:23 +08:00
Dan Poltawski
2dd8e9357f
MDL-42407 upgrade.txt clarify description
2013-10-29 15:15:19 +08:00
Dan Poltawski
576abe8f39
Merge branch 'MDL-42407-master' of git://github.com/phalacee/moodle
2013-10-29 15:08:13 +08:00
Dan Poltawski
c966d2e8c8
Merge branch 'MDL-42528' of https://github.com/merrill-oakland/moodle
2013-10-29 15:03:52 +08:00
Jason Fowler
1389bcd7e6
MDL-42407 Filepicker: generate a smarter zIndex for the filepicker
2013-10-29 14:55:46 +08:00
Dan Poltawski
6cd49ef747
Merge branch 'wip-MDL-42463-master' of git://github.com/marinaglancy/moodle
2013-10-29 14:54:44 +08:00
Dan Poltawski
76aa53f2d8
Merge branch 'MDL-42507-master' of git://github.com/andrewnicols/moodle
2013-10-29 14:48:27 +08:00
Dan Poltawski
c426631850
Merge branch 'MDL-42401-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-10-29 14:43:02 +08:00
Dan Poltawski
02b87ac151
MDL-42236 fix trailing whitespace
2013-10-29 14:41:16 +08:00
Michael de Raadt
9f3da4079a
MDL-41092 assign: Fix duplicate key error in assign cron
2013-10-29 14:38:48 +08:00
John Beedell
614bf85a9e
MDL-41473 book: Book html zip import, incorrect url produced for internal linking to other chapters
2013-10-29 14:31:01 +08:00
Jason Fowler
e89c21b2f6
MDL-42236 File Manager - Fixing files and whitespace for UI consistency project
2013-10-29 14:24:37 +08:00
Barbara Ramiro
c38ecee56f
MDL-42149 Usability - Adding new icons for file manager/picker
2013-10-29 14:24:26 +08:00
Jason Fowler
f57697d428
MDL-42236 File Manger/Picker - Matching UI with standard UI
2013-10-29 14:24:04 +08:00
Damyon Wiese
5fb9161b5e
Merge branch 'MDL-40470-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/yui/build/moodle-core-formautosubmit/moodle-core-formautosubmit-min.js
2013-10-29 13:57:51 +08:00
Damyon Wiese
afb5f285cd
Merge branch 'm26_MDL-39810_IE_Compatibility_View_Does_Not_Recognize_JSON_RFC4627_MIME_Type' of https://github.com/scara/moodle
2013-10-29 13:44:34 +08:00
Dan Poltawski
d3428bc93a
Merge branch 'w44_MDL-42485_m26_memcachedlocktimeout' of https://github.com/skodak/moodle
2013-10-29 13:42:56 +08:00
Dan Poltawski
7d3cdcc90d
Merge branch 'wip-mdl-42557' of https://github.com/rajeshtaneja/moodle
2013-10-29 13:16:44 +08:00
Dan Poltawski
b6df9f8f55
Merge branch 'wip-mdl-42560' of git://github.com/rajeshtaneja/moodle
2013-10-29 13:09:23 +08:00