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

64779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marina Glancy
ad5a1a5d48 Merge branch 'MDL-42633-master' of git://github.com/ankitagarwal/moodle 2013-11-04 15:59:27 +11:00
Marina Glancy
78d877d40b Merge branch 'MDL-42402-master' of git://github.com/damyon/moodle 2013-11-04 15:53:22 +11:00
Dan Poltawski
9261a3b0d1 Merge branch 'MDL-39489_master' of git://github.com/dmonllao/moodle 2013-11-04 12:30:12 +08:00
Marina Glancy
feb09881fb Merge branch 'MDL-38664' of git://github.com/rwijaya/moodle 2013-11-04 15:13:42 +11:00
Dan Poltawski
92dc72a6b5 Merge branch 'MDL-40515' of git://github.com/aolley/moodle 2013-11-04 12:10:39 +08:00
Damyon Wiese
42fb49ae0b Merge branch 'MDL-35146_master' of https://github.com/markn86/moodle 2013-11-04 11:53:40 +08:00
Petr Škoda
1555e10cdf MDL-41941 clean message text 2013-11-04 11:40:13 +08:00
Damyon Wiese
6178bb2091 Merge branch 'MDL-40722-master' of git://github.com/andrewnicols/moodle 2013-11-04 11:33:04 +08:00
Jerome Mouneyrac
7c2efc115c MDL-40874 Retire MyMobile as a standard theme 2013-11-04 14:18:41 +11:00
Tim Hunt
78a492330d MDL-41820 XSS in the quiz responses report. 
Thanks to Michael Hess for finding this bug and reporting it to us.
 2013-11-04 11:12:42 +08:00
Damyon Wiese
f859f6b4e6 Merge branch 'MDL-42521_master' of git://github.com/grabs/moodle 2013-11-04 10:56:12 +08:00
Damyon Wiese
0d0b93ce2f Merge branch 'MDL-42663_master' of git://github.com/dmonllao/moodle 2013-11-04 10:49:06 +08: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
Marina Glancy
d0a91156ab Merge branch 'MDL-42583-master' of git://github.com/ankitagarwal/moodle 2013-11-04 12:52:15 +11:00
Damyon Wiese
23cd687d72 Merge branch 'MDL-38850' of git://github.com/rwijaya/moodle 2013-11-04 09:38:38 +08:00
Andrew Nicols
d248b44c33 MDL-42452 ActionMenu: Change constrains mechanism to show the entire menu 2013-11-04 09:38:00 +08:00
Andreas Grabs
73bbdce8c6 MDL-42521 mod_feedback - Feedback does not show line graphs in Clean theme 2013-11-03 19:11:27 +01: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
f21531eb77 Merge branch 'MDL-42546-master' of git://github.com/danpoltawski/moodle 2013-11-02 22:39:37 +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
Dan Poltawski
54173d4180 Merge branch 'MDL-42287-master' of git://github.com/ankitagarwal/moodle 2013-11-01 17:31:17 +08:00
David Monllao
92bfad6b1b MDL-42663 mod_lesson: Move definitions to show_clock() 
Seems that the required data is not always set
before timer.js is included.
 2013-11-01 16:37:45 +08: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
Dan Poltawski
5386f0bbfe on-demand release 2.6beta+ 2013-11-01 15:49:16 +08:00
Dan Poltawski
4c3b5e6e1f Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-11-01 15:47:31 +08: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
Dan Poltawski
472c06f816 MDL-42546 question: fix some bad phpdocs 2013-11-01 12:06:43 +08:00
Marina Glancy
df27570b93 Merge branch '42619-26' of git://github.com/samhemelryk/moodle 2013-11-01 13:23:30 +11:00
Sam Hemelryk
12ceaa5514 MDL-42619 block_community: delete course redirect bug fix 2013-11-01 10:17:15 +08: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
35e903971b Merge branch 'MDL-42565-master' of git://github.com/ankitagarwal/moodle 2013-11-01 12:42:17 +11:00
Marina Glancy
003a81ee11 Merge branch 'MDL-42356-master' of git://github.com/mouneyrac/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-01 12:16:20 +11:00
Marina Glancy
d2941e8808 Merge branch 'MDL-42471-master' of git://github.com/andrewnicols/moodle 2013-11-01 09:00:05 +08:00
Marina Glancy
f5b2c9f4af Merge branch 'MDL-42351-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-11-01 09:00:03 +08: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
Marina Glancy
595d9876bb Merge branch 'MDL-40971_M26' of git://github.com/lazydaisy/moodle 2013-11-01 08:57:40 +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
Sam Hemelryk
cda49969c3 MDL-42300 course: improved category re-sort controls. 
* The top action now works on top level categories and has
  a better title.
* Each category has its own resort actions now.
 2013-11-01 08:57:39 +08:00