mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
65,238 Commits 36 Branches 519 Tags
Commit Graph

17373 Commits

Author SHA1 Message Date
Sam Hemelryk
cfd1e08a50 MDL-42629 actionmenu: alt and title on icon removed if the same as text being displayed 2013-11-05 09:49:13 +08:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Dan Poltawski
c6cb4f8ec8 MDL-42533 conditionlib: Add clarifying comments 2013-11-04 22:04:01 +08:00
Dan Poltawski
07ba528bd4 Merge branch 'MDL-42533-master' of git://github.com/FMCorz/moodle 2013-11-04 21:51:57 +08:00
Jerome Mouneyrac
066ef320af MDL-42332 Automate MDLQA-5260 and MDLQA-5261 - A badge can be awarded based on activity and course completion + add i_trigger_cron behat step 2013-11-04 17:17:58 +08:00
Damyon Wiese
b50bd4bcad Merge branch 'w45_MDL-42525_m26_plugininfoperf' of https://github.com/skodak/moodle 2013-11-04 16:44:54 +08:00
Dan Poltawski
28cc8d4b43 Merge branch 'wip-mdl-42537' of https://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/upgrade.txt
 2013-11-04 16:39:39 +08:00
Dan Poltawski
71fbce4410 Merge branch 'MDL-42551' of git://github.com/stronk7/moodle 2013-11-04 16:21:25 +08:00
Rajesh Taneja
d61d3e82d0 MDL-42537 calendar: locale charset on windows will come from calendartype 
date_format_string() will now convert date on windows based on calendar type used
 2013-11-04 15:54:19 +08:00
Ankit Agarwal
e5eff0b626 MDL-42287 behat: Use string from scorm content, instead of scorm structure 2013-11-04 15:52:42 +08:00
Sam Hemelryk
acdb2159fb Merge branch 'MDL-42648_M26' of git://github.com/lazydaisy/moodle 2013-11-04 14:00:30 +08:00
Marina Glancy
753ce05b8c Merge branch 'MDL-42617' of git://github.com/jleyva/moodle 2013-11-04 16:14:35 +11:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Marina Glancy
ad5a1a5d48 Merge branch 'MDL-42633-master' of git://github.com/ankitagarwal/moodle 2013-11-04 15:59:27 +11:00
Dan Poltawski
9261a3b0d1 Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle 2013-11-04 12:30:12 +08:00
Jerome Mouneyrac
7c2efc115c MDL-40874 Retire MyMobile as a standard theme 2013-11-04 14:18:41 +11:00
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
Mary Evans
0664129b46 MDL-42648 lib: Clean theme throws exception if set_pagelayout is called too late. 2013-11-02 00:43:48 +00: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
Petr Škoda
2384d33136 MDL-42525 improve performance of plugin listing 2013-11-01 10:36:04 +01:00
Petr Škoda
93b3aaf466 MDL-42602 remove incorrect snapshot from \core\event\user_loggedin 
* all snapshots in events should match the DB data
* the snapshot from user table will not be necessary most probably
 2013-11-01 10:34: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