67178 Commits

Author SHA1 Message Date
Marina Glancy
6f96d1a9a7 Merge branch 'w12_MDL-41115_m27_emaillogin' of git://github.com/skodak/moodle 2014-03-17 17:44:45 +08:00
Petr Škoda
b7679cdbfb MDL-41115 fix username field label when allowing login via email
Thanks Marina for spotting this!
2014-03-17 17:34:45 +08:00
Marina Glancy
9ceac20f74 Merge branch 'MDL-44356-M27' of git://github.com/lazydaisy/moodle 2014-03-17 17:08:30 +08:00
Juan Leyva
0a8ab74728 MDL-29807 Control to avoid duplicate shortnames 2014-03-17 09:53:45 +01:00
Juan Leyva
b129859207 MDL-29807 Service add admin page: should be able to enter the unique shortname of a service 2014-03-17 09:53:45 +01:00
Marina Glancy
c83a1da7d9 Merge branch 'master_MDL-39568' of git://github.com/danmarsden/moodle 2014-03-17 16:20:58 +08:00
Marina Glancy
93eab4fd77 Merge branch 'w12_MDL-43604_m27_mariadb10' of git://github.com/skodak/moodle 2014-03-17 16:03:08 +08:00
Marina Glancy
4715639b22 Merge branch 'w12_MDL-44603_m27_extgrade2' of git://github.com/skodak/moodle 2014-03-17 14:38:01 +08:00
Marina Glancy
992d71cd8f Merge branch 'w12_MDL-44500_m27_eventcourse' of git://github.com/skodak/moodle 2014-03-17 14:32:28 +08:00
Marina Glancy
784d9c2be0 Merge branch 'w12_MDL-44635_m27_ajaxlogs' of git://github.com/skodak/moodle 2014-03-17 14:30:03 +08:00
Marina Glancy
3b85de7b99 Merge branch 'w12_MDL-44339_m27_testdebug' of git://github.com/skodak/moodle 2014-03-17 13:48:27 +08:00
Marina Glancy
b26329fd55 Merge branch 'w12_MDL-44432_m27_logcron' of git://github.com/skodak/moodle 2014-03-17 13:03:18 +08:00
Petr Škoda
a446fc00fb MDL-44603 fix incorrect hint for grades related class location
Thanks Marina!
2014-03-17 12:57:21 +08:00
Petr Škoda
d3ab89fbb5 MDL-44635 discard error logging during ajax tests 2014-03-17 11:30:46 +08:00
Tim Lock
6b7aa837c9 MDL-44573: Remove HTML tags in outputs column in offline grading worksheet 2014-03-17 12:43:41 +10:30
Sam Hemelryk
9ea57c8bc3 Merge branch 'MDL-44608-master' of git://github.com/damyon/moodle 2014-03-17 12:37:02 +13:00
Petr Škoda
9c140a681e MDL-44300 force PHP 5.6.x to return raw file names for our own guessing 2014-03-17 12:34:02 +13:00
Sam Hemelryk
a8db93c5ac Merge branch 'w11_MDL-44299_m27_sessiongc' of https://github.com/skodak/moodle 2014-03-17 12:10:48 +13:00
Trevor Cunningham
9c35f55a05 MDL-39568 gradinform_guide: show maxgrade to students when viewing marking guide 2014-03-17 08:59:08 +13:00
Mary Evans
75716794ec MDL-44356 theme_bootstrapbase: Centralize the drag and drop arrow in filemanager. 2014-03-15 21:22:11 +00:00
roelmann
2498dce0e9 Make hidden items more visible in breadcrumb
modified:   theme/serenity/style/core.css
2014-03-15 20:45:58 +00:00
Mary Evans
1e6a8f731c MDL-44381 theme_brick: Removed whitespace and reference to arialist theme in config.php. 2014-03-15 14:34:13 +00:00
Nobelium
b4f71f0c10 MDL-41216 scorm: style.css now follows block format 2014-03-15 11:00:58 +00:00
Petr Škoda
37429ae33c MDL-44603 bump version to update web services 2014-03-15 11:10:10 +08:00
Petr Škoda
0fa50262e0 MDL-44603 fix core_grading_external class and test location 2014-03-15 11:08:21 +08:00
Petr Škoda
ed57d984a8 MDL-44603 add support for external service autoloading 2014-03-15 10:53:39 +08:00
Nobelium
76e9e1028f MDL-43341 SCORM Report: spacer.gif must be managed with $OUTPUT->spacer 2014-03-14 22:16:07 +00:00
Daniel Neis Araujo
db64fd6b1c MDL-44650 Remove invalid meta tags "pragma" and "expires" 2014-03-14 18:31:29 -03:00
Henning Bostelmann
013e85bbcc MDL-44505 mod_forum: Make mailing subject a configurable language string 2014-03-14 11:39:15 +00:00
Henning Bostelmann
c746c60803 MDL-44502 filelib: Add mimetype for Maple worksheets 2014-03-14 11:39:07 +00:00
Gilles-Philippe Leblanc
3d90e53dab MDL-44585 grade_import: Restrict the accepted types in the gradebook import 2014-03-14 07:21:02 -04:00
Petr Škoda
b2ad781349 MDL-44609 add component column to the scheduled task table 2014-03-14 15:48:25 +08:00
Petr Škoda
ce1f5ed57a MDL-44624 fix false failures in DML tests 2014-03-14 14:14:10 +08:00
Petr Škoda
5940a2bbff MDL-44599 undeprecate SITEID
There is no way we could implement multitenant now,
it means there is no reason to deprecate SITEID.
2014-03-14 13:43:04 +08:00
Petr Škoda
1fc70846f0 MDL-44527 import latest certificate bundle 2014-03-14 13:41:35 +08:00
Petr Škoda
cfc9130ec5 MDL-44522 import markdown 1.4.0 2014-03-14 13:40:11 +08:00
Petr Škoda
fc9cedb321 MDL-44521 import TCPDF 6.0.062 2014-03-14 13:38:37 +08:00
Petr Škoda
6becafba0e MDL-44516 import htmlpurifier 4.6.0 2014-03-14 12:11:49 +08:00
Petr Škoda
7ec0e0629c MDL-44515 import latest PHPExcel 1.8.0 2014-03-14 12:10:52 +08:00
Petr Škoda
9ede00db18 MDL-44500 detect context-courseid inconsistencies in new events 2014-03-14 12:08:12 +08:00
Ankit Agarwal
2523979821 MDL-42890 backup: Remove usage of log table in backup cron helper 2014-03-14 12:07:17 +08:00
Ankit Agarwal
dc06500559 MDL-42890 tool_log Default legacy reader should handle CRUD queries 2014-03-14 12:07:17 +08:00
Petr Škoda
a9336f676c MDL-44432 use new task scheduler in new logging plugins 2014-03-14 12:05:54 +08:00
Petr Škoda
589eca14f2 MDL-44604 fix task cleanup in plugin uninstallation 2014-03-14 12:04:04 +08:00
Damyon Wiese
bbd9226cb8 MDL-44608 Scheduled Tasks: Use $CFG->timezone if it is set to schedule tasks 2014-03-14 11:47:03 +08:00
Petr Škoda
c386f35bca MDL-44339 treat unexpected debugging() calls in phpunit tests as errors 2014-03-14 11:43:46 +08:00
Petr Škoda
5d4c82560b MDL-44191 hack around MySQL 5.6 inability to lower auto_increment 2014-03-14 11:31:43 +08:00
Petr Škoda
1dd74afe9e MDL-43604 add support for future hacky MariaDB versions
This patch also shows the real server version without
normalisation on the environment page, this should
hopefully help people to identify MariaDB...
2014-03-14 11:28:05 +08:00
Petr Škoda
50f5c84359 MDL-41115 add option to allow login via email 2014-03-14 11:25:09 +08:00
Fred Woolard
1c027ffa33 MDL-44416 Correct detail view paging 2014-03-13 19:44:38 -04:00