Commit graph

67344 commits

Author SHA1 Message Date
Sam Hemelryk
dbedde8d86 Merge branch 'MDL-44381-M27' of git://github.com/lazydaisy/moodle 2014-03-18 14:32:37 +13:00
Sam Hemelryk
b02d88d98c Merge branch 'mdl44499-master' of https://github.com/tlock/moodle 2014-03-18 14:26:56 +13:00
Sam Hemelryk
224f8dfda1 Merge branch 'w12_MDL-44527_m27_cacert' of https://github.com/skodak/moodle 2014-03-18 12:52:19 +13:00
Sam Hemelryk
43301757eb Merge branch 'w12_MDL-44515_m27_phpexcel' of https://github.com/skodak/moodle 2014-03-18 11:48:47 +13:00
Sam Hemelryk
0406fb9a4b Merge branch 'w12_MDL-44516_m27_purifier' of https://github.com/skodak/moodle 2014-03-18 11:48:21 +13:00
Sam Hemelryk
1c6dff6f1c Merge branch 'w12_MDL-44521_m27_tcpdf' of https://github.com/skodak/moodle 2014-03-18 11:48:11 +13:00
Sam Hemelryk
7286f5923d Merge branch 'w12_MDL-44522_m27_markdown' of https://github.com/skodak/moodle 2014-03-18 10:17:04 +13:00
Sam Hemelryk
114d1ccf32 Merge branch 'MDL-44550-master' of git://github.com/damyon/moodle 2014-03-18 09:43:42 +13:00
Sam Hemelryk
c16fc19461 Merge branch 'w12_MDL-44599_m27_siteid' of https://github.com/skodak/moodle 2014-03-18 09:30:39 +13:00
Sam Hemelryk
c961d9626e Merge branch 'w12_MDL-44609_m27_taskcomponent' of https://github.com/skodak/moodle 2014-03-18 09:16:09 +13:00
Sam Hemelryk
7aafc49c18 Merge branch 'MDL-44585-master' of https://github.com/StudiUM/moodle 2014-03-18 09:03:21 +13:00
Juan Leyva
eb625bcf64 MDL-29807 Fixed invalid add_record_snapshot references and also inexistent check of empty short names 2014-03-17 12:35:20 +01:00
Marina Glancy
e65825830f Merge branch 'MDL-44588' of git://github.com/timhunt/moodle 2014-03-17 18:18:36 +08:00
Marina Glancy
ea406e6b94 Merge branch 'w12_MDL-44624_m27_dmltest' of git://github.com/skodak/moodle 2014-03-17 18:12:16 +08:00
Marina Glancy
9051b7f4ea Merge branch 'MDL-44610-m' of git://github.com/micaherne/moodle 2014-03-17 18:08:57 +08:00
Marina Glancy
3087d9d34e Merge branch 'MDL-44650' of git://github.com/danielneis/moodle 2014-03-17 17:53:00 +08:00
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