moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66223 commits 37 branches 544 tags 1.3 GiB
Commit graph

66223 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Petr Škoda
a12c7eff9f MDL-44624 fix false failures in DML tests 2014-03-14 14:15:47 +08:00
Petr Škoda
9d66c76277 MDL-44516 import htmlpurifier 4.6.0 2014-03-14 12:12:22 +08:00
Petr Škoda
fa4dea1472 MDL-44339 treat unexpected debugging() calls in phpunit tests as errors 2014-03-14 11:44:48 +08:00
Petr Škoda
59de93ccdf MDL-44299 resolve collision with session_gc() in PHP 5.6 2014-03-14 11:35:05 +08:00
Petr Škoda
59f3898185 MDL-44191 hack around MySQL 5.6 inability to lower auto_increment 2014-03-14 11:32:23 +08:00
Fred Woolard
69c3994c3c MDL-44416 Correct detail view paging 2014-03-13 19:45:48 -04:00
Eloy Lafuente (stronk7)
872f4e2899 weekly release 2.6.2+ 2014-03-13 23:56:07 +01:00
Eloy Lafuente (stronk7)
d91852cc7e MDL-43266 testing: avoid assoc arrays for json 
Last commit switched from raw arrays to associative
arrays. That leads to json_encode() to generate an
object instead of an array, ultimately leading to
problems with the rest of code expecting an array.

By using array_values() we are moving back to the
non-associative array.

Also, fix some file permissions.
 2014-03-13 22:14:50 +01:00
Dan Poltawski
70fbd52bfd MDL-44433 lang: Update the name of country code CV 
ISO-3166 has updated this name to Cabo Verde:
https://www.iso.org/obp/ui/#iso:code:3166:CV
 2014-03-13 17:16:33 +08:00
Eloy Lafuente (stronk7)
3dd695bce0 Merge branch 'MDL-43266_26-last-fixes' of git://github.com/dmonllao/moodle into MOODLE_26_STABLE 2014-03-12 23:26:25 +01:00
Tim Hunt
77437a0e61 MDL-44588 quiz: fix crazy variable called $this. 2014-03-12 18:22:10 +00:00
David Monllao
8efc71b90c MDL-43266 testing: Removing duplicated keys 2014-03-12 17:51:07 +08:00
Frederic Massart
ff189a25a9 MDL-44334 lockscroll: Fix wrong warning message 2014-03-12 15:43:34 +08:00
Dan Poltawski
8a9b350182 Merge branch 'm26_MDL-43247' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-03-12 09:32:51 +08:00
Sam Hemelryk
390188606e Merge branch 'm26_MDL-37733' of git://github.com/danmarsden/moodle into MOODLE_26_STABLE 2014-03-12 14:13:14 +13:00
Dan Poltawski
2fabb89456 Merge branch 'MDL-44061-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 2014-03-12 09:08:52 +08:00
Eloy Lafuente (stronk7)
6d8f9d4756 Merge branch 'wip-MDL-32699-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-12 00:19:11 +01:00
Sam Hemelryk
559834f786 Merge branch 'MDL-42368-26' of git://github.com/danpoltawski/moodle into MOODLE_26_STABLE 2014-03-12 11:57:01 +13:00
Sam Hemelryk
ce05c00453 Merge branch 'MDL-44345-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE 2014-03-12 11:21:59 +13:00
David Monllao
0b5ac03e36 MDL-44246 behat: New mod_quiz test when JS is disabled 2014-03-11 17:22:18 +08:00
Dan Poltawski
1c57cd34e6 Merge branch 'MDL-44095_m26' of https://github.com/shashirepo/moodle into MOODLE_26_STABLE 2014-03-11 15:50:42 +08:00
Dan Poltawski
ab9986bf05 Merge branch 'wip-MDL-44337-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-11 15:41:51 +08:00
Dan Poltawski
a808f24536 Merge branch 'MDL-44480-26' of git://github.com/andrewnicols/moodle into MOODLE_26_STABLE 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-03-11 14:35:40 +08:00
Dan Poltawski
666af83e4e Merge branch 'wip-MDL-42870-m26' of git://github.com/marinaglancy/moodle into MOODLE_26_STABLE 2014-03-11 11:37:45 +08:00