Commit graph

64945 commits

Author SHA1 Message Date
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
32fcea7415 MDL-42385 behat: New test to cover MDL-38661
Also refactoring set site settings step
as it has problems to deal with multiple-field
settings.
2013-10-30 18:32:12 +08: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
Mark Nelson
1b377fa26f MDL-42613 core_group: removed unnecessary table row when there is no group description or picture 2013-10-30 17:59:15 +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
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
Mark Nelson
2072af6c1d MDL-42592 mod_chat: passed additional name fields to be used by the fullname function 2013-10-29 16:41:46 +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