Commit graph

17388 commits

Author SHA1 Message Date
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
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
Marina Glancy
0219e54100 Merge branch 'MDL-42587' of git://github.com/aolley/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
9b0cc9ddf2 Merge branch 'MDL-41041-master' of git://github.com/FMCorz/moodle 2013-11-01 08:56:58 +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
Barbara Ramiro
dee6073da2 MDL-42102 tinymce: improved icons 2013-11-01 08:55:29 +08:00
Damyon Wiese
575d38d099 ie9 svg compatibility fixes 2013-11-01 08:55:29 +08:00
David Monllao
63950e4d0b MDL-42236 behat: New steps to look for elements visibility 2013-11-01 08:55:27 +08:00
Damyon Wiese
574c1699a7 Merge branch 'MDL-42558-master' of git://github.com/ankitagarwal/moodle 2013-11-01 08:55:25 +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
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
Jean-Michel Vedrine
6713708261 MDL-41624 DragMath crashes Firefox 2013-10-30 17:55:34 +01:00
Sam Hemelryk
c037f9edf8 MDL-33536 navigation: hide hidden categories from the navbar 2013-10-30 13:34:07 +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
Marina Glancy
d90c811585 MDL-41337 files: Fixed bug with accidental delete of the root directory 2013-10-29 20:29:35 +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
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
Jason Fowler
1389bcd7e6 MDL-42407 Filepicker: generate a smarter zIndex for the filepicker 2013-10-29 14:55:46 +08:00
Dan Poltawski
76aa53f2d8 Merge branch 'MDL-42507-master' of git://github.com/andrewnicols/moodle 2013-10-29 14:48:27 +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
Dan Poltawski
e29dcc5a5b Merge branch 'wip-mdl-42556' of https://github.com/rajeshtaneja/moodle 2013-10-29 12:10:44 +08:00
Adam Olley
eed17976dc MDL-42587: calendar: Fix regression that stops dates autocorrecting 2013-10-29 14:19:08 +10:30
Andrew Nicols
dd8e6cd932 MDL-40470 JavaScript: Correct issue when checking select change in Firefox 2013-10-29 10:43:47 +08:00
Marina Glancy
9b5e2461d5 MDL-28463 grades: use get_course() method 2013-10-29 11:33:55 +11:00
Marina Glancy
b85b9b7c29 MDL-28463 grades: inform conditionlib that grades changed 2013-10-29 11:33:21 +11:00
Marina Glancy
9d88b492b1 MDL-42318 coursecat: do not allow to sort if there are invisible children 2013-10-29 10:26:56 +11:00
Matteo Scaramuccia
bc242bbda5 MDL-39810 Files: IE doesn't recognize JSON MIME Type (RFC4627).
Affected versions:
- IE 8+, under Compatibility View.
2013-10-28 23:34:35 +01:00
Rajesh Taneja
abedc1a84c MDL-42556 Events: passing modified user info to user_deleted event
Deleting user modifies few fields and leave rest as un-modified
So passing modified data to event, to keep it small
2013-10-28 16:37:56 +08:00
Rajesh Taneja
0d22c24829 MDL-42557 Events: added idnumber to course_deleted event data 2013-10-28 16:16:25 +08:00
Dan Poltawski
b1a6c9dc52 Merge branch 'wip-mdl-41811' of git://github.com/rajeshtaneja/moodle
Conflicts:
	login/change_password.php
2013-10-28 15:37:05 +08:00
Rajesh Taneja
726a3be81a MDL-42557 Events: Removed timemodified hack from course_deleted event 2013-10-28 13:01:14 +08:00
Ankit Agarwal
a993b0b93a MDL-42558 events: Enrollment actions are administration not teaching 2013-10-28 11:51:39 +08:00
Dan Poltawski
96d0198b8a Merge branch 'wip-mdl-42491-master' of git://github.com/deraadt/moodle 2013-10-28 11:21:26 +08:00
Dan Poltawski
4baf482daa Merge branch 'MDL-41504-master' of git://github.com/andrewnicols/moodle 2013-10-28 11:10:43 +08:00