mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 14:27:22 +01:00
Code Issues Projects Releases Wiki Activity
66,973 Commits 36 Branches 519 Tags
Commit Graph

66973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hemelryk
a8db93c5ac Merge branch 'w11_MDL-44299_m27_sessiongc' of https://github.com/skodak/moodle 2014-03-17 12:10:48 +13:00
Petr Škoda
589eca14f2 MDL-44604 fix task cleanup in plugin uninstallation 2014-03-14 12:04:04 +08:00
Eloy Lafuente (stronk7)
c0e88129d1 weekly release 2.7dev 2014-03-13 23:55:50 +01:00
Eloy Lafuente (stronk7)
630bb85d9e 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:11:03 +01:00
Eloy Lafuente (stronk7)
1700bec3c6 Merge branch 'MDL-43266_master-last-fixes' of git://github.com/dmonllao/moodle 
Conflicts:
	lib/phpunit/classes/util.php
 2014-03-13 19:12:25 +01:00
Eloy Lafuente (stronk7)
ad246c2d2c NOBUG: Bump version 2014-03-13 18:34:56 +01:00
Dan Poltawski
f28b83ecea MDL-33653 quiz: remove unused string 2014-03-13 18:33:30 +01:00
Sam Hemelryk
e9c78971b5 Revert "MDL-40699 Language - Add option to Override Moodle's default behaviour to reset the UI language on logout" 
This reverts commit 08174740fbdc5d0a86d67c3736d4c78dced11331.
 2014-03-13 18:33:29 +01:00
Sam Hemelryk
2d1823eb51 MDL-43497 role: added missing string 2014-03-13 18:33:28 +01:00
Tim Hunt
2f83d71ccc MDL-44534 also fix the mod_quiz behat tests. 
They had duplicated code. I refactored.
 2014-03-13 18:33:27 +01:00
David Monllao
ced0f98322 MDL-44236 behat: Fixing wrong old step call 2014-03-13 18:33:27 +01:00
Frederic Massart
c13854785f MDL-44334 lockscroll: Fix wrong warning message 2014-03-13 18:33:26 +01:00
Dan Poltawski
41244dd3ce Merge branch 'MDL-40913_master-fix' of https://github.com/markn86/moodle 2014-03-13 18:33:26 +01:00
Dan Poltawski
06a241bb8d Merge branch 'MDL-43236_master-fix-tablenode' of git://github.com/dmonllao/moodle 2014-03-13 18:33:25 +01:00
Mark Nelson
f6a4a90e70 MDL-40913 core_message: fixed triggering the 'message_sent' event when the 'noreply' address is used 2014-03-13 18:33:25 +01:00
Marina Glancy
b7d1cfca84 MDL-44337 behat grammer improvements, see MDL-43236 2014-03-13 18:33:24 +01:00
David Monllao
12427e7746 MDL-43236 behat: Include missing used namespace 2014-03-13 18:33:24 +01:00
Sam Hemelryk
63afbaa6be Merge branch 'master_MDL-37733' of git://github.com/danmarsden/moodle 2014-03-13 18:33:23 +01:00
Dan Poltawski
45ff52dab5 Merge branch 'MDL-44061-master' of git://github.com/andrewnicols/moodle 2014-03-13 18:33:21 +01:00
Sam Hemelryk
b679a1760a Merge branch 'MDL-40699-UI-language-changes-when-logging-out-of-Moodle' of git://github.com/michael-milette/moodle 2014-03-13 18:33:20 +01:00
Eloy Lafuente (stronk7)
478baf8334 Merge branch 'wip-MDL-32699-master' of git://github.com/marinaglancy/moodle 2014-03-13 18:33:20 +01:00
Sam Hemelryk
f3deabee48 Merge branch 'MDL-42368-master' of git://github.com/danpoltawski/moodle 2014-03-13 18:33:19 +01:00
Eloy Lafuente (stronk7)
38c5e34c00 Merge branch 'mdl27_mdl-43497_allow_force_language_02' of https://github.com/brki/moodle 2014-03-13 18:33:15 +01:00
Sam Hemelryk
5f2fcc388b Merge branch 'MDL-44345-master' of git://github.com/FMCorz/moodle 2014-03-13 18:32:54 +01:00
Sam Hemelryk
ee4655eec1 Merge branch 'MDL-41173' of https://github.com/danielneis/moodle 2014-03-13 18:32:52 +01:00
Dan Poltawski
9b9e2655d2 Merge branch 'MDL-44478-master' of git://github.com/andrewnicols/moodle 2014-03-13 18:32:49 +01:00
Eloy Lafuente (stronk7)
e649662489 Merge branch 'MDL-44534' of git://github.com/timhunt/moodle 
Conflicts:
	question/tests/behat/copy_questions.feature
 2014-03-13 18:32:41 +01:00
Dan Poltawski
454db7d467 Merge branch 'MDL-33653' of git://github.com/timhunt/moodle 2014-03-13 18:31:52 +01:00
Dan Poltawski
c6b7551c71 Merge branch 'MDL-40913_master' of https://github.com/markn86/moodle 2014-03-13 18:31:52 +01:00
Marina Glancy
e2cb3ffad6 MDL-43967 logging: references to the migrating dev docs 2014-03-13 18:31:52 +01:00
Dan Poltawski
7d1f141a44 Merge branch 'MDL-44095' of https://github.com/shashirepo/moodle 2014-03-13 18:31:49 +01:00
Dan Poltawski
a8aa086bf9 Merge branch 'wip-MDL-44337-master' of git://github.com/marinaglancy/moodle 2014-03-13 18:31:49 +01:00
Dan Poltawski
d8085046ba Merge branch 'wip-mdl-44458' of https://github.com/rajeshtaneja/moodle 2014-03-13 18:31:48 +01:00
Dan Poltawski
0fdb526f70 MDL-30085 bump version 2014-03-13 18:31:48 +01:00
David Monllao
d3daf24563 MDL-43266 testing: Removing duplicated keys 2014-03-12 17:49:55 +08:00
Petr Škoda
1985ef8342 MDL-44299 resolve collision with session_gc() in PHP 5.6 2014-03-12 10:43:30 +08:00
Rajesh Taneja
f325a6eb67 MDL-44458 notes: Fixed url in events 2014-03-11 15:26:20 +08:00
Juan Leyva
ba1dc59721 MDL-44462 mobile: Add mod_assign functions to service definition 
To support new functionality in the Moodle Mobile app.
 2014-03-11 14:49:23 +08:00
Dan Poltawski
72e2a1d7eb Merge branch 'MDL-44480-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
 2014-03-11 14:35:51 +08:00
Dan Poltawski
234f953c44 Merge branch 'MDL-41855' of git://github.com/nobelium/moodle 2014-03-11 12:59:23 +08:00
Dan Poltawski
b027184f10 Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle 2014-03-11 12:42:27 +08:00
Dan Poltawski
8674c5e415 Merge branch 'MDL-44497-master' of https://github.com/jamiepratt/moodle 2014-03-11 12:35:57 +08:00
Michael Milette
08174740fb MDL-40699 Language - Add option to Override Moodle's default behaviour to reset the UI language on logout 
This change adds an option to the Site Admin > Langauge > Language Settings page which can prevent Moodle from changing language when users log out.

Affected files:
	lang/en/admin.php
	admin/settings/language.php
	login/logout.php

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>
 2014-03-11 00:35:30 -04:00
Dan Poltawski
5f3b4694b3 Merge branch 'wip-MDL-42870-master' of git://github.com/marinaglancy/moodle 2014-03-11 11:37:44 +08:00
Dan Poltawski
060aa628b3 Merge branch 'master_MDL-44066' of git://github.com/danmarsden/moodle 2014-03-11 11:28:56 +08:00
Dan Poltawski
c7cc278017 Merge branch 'wip-MDL-43966-master' of git://github.com/marinaglancy/moodle 2014-03-11 10:50:55 +08:00
David Monllao
6a0f3c4869 MDL-43236 behat: Fixing missing changes 
All "" "" should exists and "" "" should not exists
must be converted to the ones using exist rather than exists.
 2014-03-11 10:07:25 +08:00
Sam Hemelryk
1aefc90960 Merge branch 'wip-MDL-40721-master' of git://github.com/marinaglancy/moodle 2014-03-11 14:22:33 +13:00
Sam Hemelryk
8daf8cbc0a Merge branch 'w11_MDL-44451_m27_addonloc' of https://github.com/skodak/moodle 2014-03-11 14:18:08 +13:00
Eloy Lafuente (stronk7)
6d9ba13dc8 Merge branch '44547-27' of git://github.com/samhemelryk/moodle 2014-03-11 00:28:34 +01:00