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

17244 Commits

Author SHA1 Message Date
Damyon Wiese
b804196502 Merge branch '42452-26' of git://github.com/samhemelryk/moodle 2013-11-04 10:37:59 +08:00
Sam Hemelryk
ed7e6593db MDL-42452 actionmenu: improved constraint code 2013-11-04 10:25:25 +08:00
Marina Glancy
f19aab1565 Merge branch 'MDL-42664-performance_measuring_filter_manager' of git://github.com/mudrd8mz/moodle 2013-11-04 13:17:58 +11:00
Andrew Nicols
d248b44c33 MDL-42452 ActionMenu: Change constrains mechanism to show the entire menu 2013-11-04 09:38:00 +08:00
Sam Hemelryk
ae3fd8eb76 MDL-42452 block: action menu is now constrained to the block container 2013-11-03 16:42:40 +08:00
Damyon Wiese
6ff3923ba8 Merge branch 'w45_MDL-42497_m26_orphanedplugins' of https://github.com/skodak/moodle 2013-11-02 22:34:16 +08:00
Damyon Wiese
e0c14e5018 Merge branch 'w45_MDL-42387_m26_filelifetime' of https://github.com/skodak/moodle 2013-11-02 22:24:19 +08:00
Damyon Wiese
e9a20b4703 Merge branch 'wip-MDL-28463-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	version.php
 2013-11-01 21:31:57 +08:00
Petr Škoda
0c431257e9 MDL-42387 standardise file lifetime handling 2013-11-01 10:42:18 +01:00
Petr Škoda
a35fce24ca MDL-42497 add listing of orphaned subplugin types 2013-11-01 10:39:07 +01:00
David Mudrák
c928c60718 MDL-42664 Fix the filter_manager instantiation 
For legacy reasons, the $CFG->perfdebug uses values 7 for disabled and 15 for
enabled. Because of this typo, Moodle has always created instance of the slower
performance_measuring_filter_manager instead of the standard filter_manager,
regardless the perfdebug setting.
 2013-11-01 09:18:10 +01:00
Marina Glancy
b4dba228a7 MDL-28463 conditionlib: use MUC for caching grades, reset when grades are changed 2013-11-01 16:48:50 +11: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
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
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
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
Jean-Michel Vedrine
6713708261 MDL-41624 DragMath crashes Firefox 2013-10-30 17:55:34 +01: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