Commit graph

66248 commits

Author SHA1 Message Date
Petr Škoda
e21117fdc0 MDL-44824 add missing subplugin type names 2014-03-27 11:47:51 +08:00
Petr Škoda
60b1e67bae MDL-44824 add missing subplugin type names 2014-03-27 11:47:42 +08:00
Dan Poltawski
683c7ee245 Merge branch 'wip-MDL-44686-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-26 05:17:55 +08:00
Eloy Lafuente (stronk7)
1179ba8aaa Merge branch 'wip-MDL-41285-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-25 21:53:53 +01:00
Marina Glancy
15ca2aede6 Merge branch 'mdl44573-moodle26' of git://github.com/tlock/moodle into MOODLE_26_STABLE 2014-03-25 16:21:20 +08:00
Marina Glancy
0f10b86557 Merge branch 'MDL-44665_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-03-25 14:29:23 +08:00
Sam Hemelryk
50fea8055f Merge branch 'MDL-43960-26' of git://github.com/damyon/moodle into MOODLE_26_STABLE 2014-03-25 12:30:47 +13:00
Tim Hunt
91148a2bb5 MDL-44665 declare all quiz page types in the blocks UI. 2014-03-21 14:43:42 +00:00
Marina Glancy
c0a9f0139a MDL-44686 behat: limit failure filename length to 255 chars 2014-03-21 15:50:31 +08:00
Marina Glancy
ceeac6bcc6 MDL-41285 block_recent_activity: behat test for structural changes 2014-03-21 15:47:20 +08:00
Damyon Wiese
941f4597b0 MDL-43985 Assign: Allow teachers to skip notifying students about grade update.
backport of MDL-33600
2014-03-21 14:45:12 +08:00
Marina Glancy
b8604eb33b weekly release 2.6.2+ 2014-03-20 16:00:14 +08:00
Jetha Chan
8c2ec9a11a MDL-44582 installer: added check for php json extension 2014-03-19 16:17:54 +13:00
Marina Glancy
4a7ab01717 MDL-42025 behat: changed behat tag _only_local to _file_upload 2014-03-19 10:40:41 +08:00
Marina Glancy
140caa5b67 Merge branch 'MDL-43341_26' of git://github.com/nobelium/moodle into MOODLE_26_STABLE 2014-03-19 10:35:44 +08:00
Marina Glancy
d632f1b82a MDL-44141 restore: added phpdocs 'since' for new method 2014-03-19 10:09:06 +08:00
Marina Glancy
c21f8f13e5 Merge branch 'MDL-44141-m26' of git://github.com/sammarshallou/moodle into MOODLE_26_STABLE 2014-03-19 09:50:11 +08:00
Nobelium
4c6bf7a9ff MDL-43341 SCORM Report: spacer.gif must be managed with ->spacer 2014-03-18 19:41:41 +00:00
sam marshall
0f2929fab1 MDL-44141 Completion: System updates data during restore
The completion system has code which is supposed to prevent it
updating completion status while grades are being restored. This
code was a nasty hack and had not worked for some time. As a result
completion dates were restored incorrectly.

This commit implements a 'proper' way to find out if a restore is
currently running, replacing the previous hack.
2014-03-18 13:25:37 +00:00
Andreas Grabs
7ef24c3bde MDL-44653 mod_feedback - Include additional name fields using user_picture::fields() 2014-03-18 18:25:09 +08:00
Marina Glancy
d64521fec2 Merge branch 'MDL-38636-26' of git://github.com/roelmann/moodle into MOODLE_26_STABLE 2014-03-18 17:40:09 +08:00
Jerome Mouneyrac
1df485f566 MDL-42025 assignfeedback_editpdf: add behat tests 2014-03-18 17:17:45 +08:00
Marina Glancy
2aacf70ebd Merge branch 'w12_MDL-44191_m26_mysql56' of git://github.com/skodak/moodle into MOODLE_26_STABLE 2014-03-18 16:04:16 +08:00
Marina Glancy
99c8dbc2dd Merge branch 'MDL-44246_26' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-03-18 15:33:20 +08:00
Marina Glancy
7e0af0cdd5 Merge branch 'MDL-44416_26' of git://github.com/appalachianstate/moodle into MOODLE_26_STABLE 2014-03-18 14:46:25 +08:00
Marina Glancy
cb470c3c70 Merge branch 'MDL-44148-26' of git://github.com/jethac/moodle into MOODLE_26_STABLE 2014-03-18 14:33:42 +08:00
Jetha Chan
3a1237997a MDL-44148 portfolio: set_user_config usage fix
Amended user/portfolio.php's use of portfolio_plugin_base::set_user_config to be consistent with the API.
2014-03-18 14:27:02 +08:00
Sam Hemelryk
03ba50f556 Merge branch 'wip-MDL-44542-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-18 17:05:05 +13:00
Marina Glancy
c1db0e40d6 MDL-44524 feedback: fix bug in sql under oracle
Thanks to Rob King"
2014-03-18 11:59:30 +08:00
Sam Hemelryk
7b78b30212 Merge branch 'MDL-44502-26' of https://github.com/bostelm/moodle into MOODLE_26_STABLE 2014-03-18 14:41:07 +13:00
Sam Hemelryk
8b0892d605 Merge branch 'MDL-44433-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-03-18 14:36:04 +13:00
Mary Evans
ecdec8f8c7 MDL-44381 theme_brick: Removed whitespace and reference to arialist theme in config.php. 2014-03-18 14:33:41 +13:00
Sam Hemelryk
a2db21c633 Merge branch 'mdl44499-moodle26' of https://github.com/tlock/moodle into MOODLE_26_STABLE 2014-03-18 14:27:08 +13:00
Petr Škoda
5809fcf52f MDL-44527 import latest certificate bundle 2014-03-18 12:52:35 +13:00
Sam Hemelryk
80440a4a66 Merge branch 'w12_MDL-44516_m26_purifier' of https://github.com/skodak/moodle into MOODLE_26_STABLE 2014-03-18 11:48:34 +13:00
Sam Hemelryk
683b5caa06 Merge branch 'MDL-44585-moodle26' of https://github.com/StudiUM/moodle into MOODLE_26_STABLE 2014-03-18 09:03:31 +13:00
Marina Glancy
031d1e3f7d Merge branch 'MDL-44588_26' of git://github.com/timhunt/moodle into MOODLE_26_STABLE 2014-03-17 18:19:19 +08:00
Marina Glancy
234e7b0066 Merge branch 'w12_MDL-44624_m26_dmltest' of git://github.com/skodak/moodle into MOODLE_26_STABLE 2014-03-17 18:12:55 +08:00
Marina Glancy
682f0db9f6 Merge branch 'MDL-44356-M26' of git://github.com/lazydaisy/moodle into MOODLE_26_STABLE 2014-03-17 17:09:47 +08:00
Marina Glancy
322baf1570 Merge branch 'm26_MDL-39568' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-03-17 16:21:33 +08:00
Marina Glancy
b28a4887f5 Merge branch 'w12_MDL-44635_m26_ajaxlogs' of git://github.com/skodak/moodle into MOODLE_26_STABLE 2014-03-17 14:29:42 +08:00
Marina Glancy
1cd64d1208 Merge branch 'w12_MDL-44339_m26_testdebug' of git://github.com/skodak/moodle into MOODLE_26_STABLE 2014-03-17 13:53:01 +08:00
Petr Škoda
672de8ff9d MDL-44635 discard error logging during ajax tests 2014-03-17 11:31:56 +08:00
Tim Lock
bd5fbede39 MDL-44573: Remove HTML tags in outputs column in offline grading worksheet 2014-03-17 12:44:21 +10:30
Petr Škoda
678ab4101a MDL-44300 force PHP 5.6.x to return raw file names for our own guessing 2014-03-17 12:34:13 +13:00
Trevor Cunningham
33c621255d MDL-39568 gradinform_guide: show maxgrade to students when viewing marking guide 2014-03-17 09:03:26 +13:00
Mary Evans
834848461c MDL-44356 theme_bootstrapbase: Centralize the drag and drop arrow in filemanager. 2014-03-15 21:30:14 +00:00
roelmann
963009a0f8 modified: core.css 2014-03-15 20:54:47 +00:00
Henning Bostelmann
4b05939d2f MDL-44502 filelib: Add mimetype for Maple worksheets 2014-03-14 11:40:18 +00:00
Gilles-Philippe Leblanc
7ae964bf89 MDL-44585 grade_import: Restrict the accepted types in the gradebook import 2014-03-14 07:37:19 -04:00