mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 15:40:17 +01:00
Code Issues Projects Releases Wiki Activity
69,897 Commits 36 Branches 527 Tags
Commit Graph

69897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
93c51a1d0a MDL-46171 assign: Fix for the update script on MySQL. 2014-09-30 21:16:24 +08:00
Dan Poltawski
73a37dff73 Merge branch 'MDL-47294-master' of git://github.com/FMCorz/moodle 2014-09-30 08:47:31 +01:00
Dan Poltawski
216b6aa7ee Merge branch 'MDL-47200-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2014-09-30 08:35:19 +01:00
Dan Poltawski
53e9b39b18 Merge branch 'm28_MDL-47097' of https://github.com/totara/moodle 2014-09-30 08:30:59 +01:00
Dan Poltawski
d452f49cf9 Merge branch 'MDL-32275-master' of git://github.com/gurgus/moodle 2014-09-30 08:29:02 +01:00
Dan Poltawski
0645eb6866 Merge branch 'MDL-46171-master' of git://github.com/damyon/moodle 2014-09-30 08:03:40 +01:00
Sam Hemelryk
6caf85e6d6 Merge branch 'MDL-46084-master' of https://github.com/sbourget/moodle 2014-09-30 11:28:26 +13:00
Sam Hemelryk
ff28497a1d Merge branch 'MDL-47419-master' of git://github.com/ankitagarwal/moodle 2014-09-30 10:35:47 +13:00
Sam Hemelryk
c8398fb95a MDL-45893 user: fixed user menu for guest 2014-09-30 10:25:23 +13:00
Sam Hemelryk
2957fdddd5 Merge branch 'm28_MDL-47170' of https://github.com/totara/moodle 2014-09-30 10:03:06 +13:00
Sam Hemelryk
14aa5a408a MDL-46652 output: more thorough custom menu multilang tests 2014-09-30 09:54:08 +13:00
Sam Hemelryk
3cfbdd9e5a Merge branch 'MDL-46652-master' of git://github.com/jethac/moodle 2014-09-30 09:52:54 +13:00
Sam Hemelryk
fc2856aab1 Merge branch 'MDL-47214-ClientIp-wrong-with-multiple-proxies' of https://github.com/mhughes2k/moodle 2014-09-30 08:48:20 +13:00
Dan Poltawski
1c647a4473 Merge branch 'MDL-46920-master' of git://github.com/jethac/moodle 2014-09-29 16:25:41 +01:00
Dan Poltawski
190ceae64b Merge branch 'MDL-47069-master-plugin-dependency' of git://github.com/mudrd8mz/moodle 2014-09-29 12:46:11 +01:00
Dan Poltawski
e9eb00a0d7 Merge branch 'MDL-47163-master' of git://github.com/jleyva/moodle 2014-09-29 12:29:59 +01:00
Dan Poltawski
17382ec952 Merge branch 'MDL-47307-master' of git://github.com/FMCorz/moodle 2014-09-29 12:04:01 +01:00
Dan Poltawski
c7ed7235c7 Merge branch 'MDL-47358-master' of git://github.com/FMCorz/moodle 2014-09-29 11:58:14 +01:00
Dan Poltawski
2633f23627 Merge branch 'MDL-47322-master' of https://github.com/sammarshallou/moodle 2014-09-29 11:12:29 +01:00
Dan Poltawski
156cd01e7b Merge branch 'wip_MDL-47333_m28_fonts' of https://github.com/skodak/moodle 2014-09-29 10:42:50 +01:00
Dan Poltawski
f03b612191 Merge branch 'MDL-45893-master-v2' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-29 10:30:42 +01:00
Sam Hemelryk
525b6ebeb9 Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges 2014-09-29 15:18:03 +13:00
Sam Hemelryk
fcf0cc04b3 Merge branch 'MDL-47295-master' of git://github.com/FMCorz/moodle 2014-09-29 15:17:24 +13:00
Sam Hemelryk
55f0eb8328 Merge branch 'wip_MDL-47300_m28_tcpdf' of https://github.com/skodak/moodle 2014-09-29 15:15:47 +13:00
Sam Hemelryk
a9a09787e4 Merge branch 'wip-MDL-47398-master' of git://github.com/marinaglancy/moodle 2014-09-29 14:35:06 +13:00
Sam Hemelryk
71668d2efc Merge branch 'MDL-47408-master' of https://github.com/DmitryNefedov/moodle 2014-09-29 14:32:38 +13:00
Sam Hemelryk
ddd0d4a56b Merge branch 'master_MDL-47404' of https://github.com/danmarsden/moodle 2014-09-29 14:23:18 +13:00
Sam Hemelryk
b87711a0dc Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle 2014-09-29 14:21:39 +13:00
Sam Hemelryk
503324d241 Merge branch 'MDL-39190' of https://github.com/pauln/moodle 2014-09-29 14:19:52 +13:00
Sam Hemelryk
a93039706c Merge branch 'MDL-20250_grade_settings2' of https://github.com/andyjdavis/moodle 2014-09-29 14:10:30 +13:00
Eloy Lafuente (stronk7)
9288030937 Merge branch 'MDL-47411-master-submodules' of git://github.com/mudrd8mz/moodle 2014-09-29 01:42:32 +02:00
Sam Hemelryk
e0533f2633 Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle 2014-09-29 11:35:23 +13:00
Sam Hemelryk
cec3ac8baf Merge branch 'MDL-42974-master' of https://github.com/sammarshallou/moodle 2014-09-29 11:21:19 +13:00
Sam Hemelryk
51606b8e63 Merge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle 2014-09-29 11:19:06 +13:00
Jean-Michel Vedrine
d92f768baa MDL-32870 mod_lesson: added support for files to question answers and responses 2014-09-29 11:00:28 +13:00
Sam Hemelryk
29b72af1b2 Merge branch 'MDL-43566' of https://github.com/willylee/moodle 2014-09-29 09:51:35 +13:00
Sam Hemelryk
d672e25b6c Merge branch 'MDL-47395' of git://github.com/nebgor/moodle 2014-09-29 09:11:25 +13:00
Sam Hemelryk
3604d399e3 Merge branch 'MDL-47381' of git://github.com/timhunt/moodle 2014-09-29 09:06:35 +13:00
Sam Hemelryk
c8674e5ca5 Merge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle 2014-09-29 09:02:52 +13:00
Sam Hemelryk
50dfb7cf38 MDL-47252 mod_forum: fixed whitespace 2014-09-29 08:44:43 +13:00
Sam Hemelryk
a038c1e0a3 Merge branch 'MDL-47252-master' of git://github.com/gurgus/moodle 2014-09-29 08:43:51 +13:00
Eloy Lafuente (stronk7)
cfbd81253b MDL-47242 theme_bootstrapbase: Fixed whitespace (take2) 
Seems that previous whitespace fix was not ok.
 2014-09-28 18:27:40 +02:00
Juan Leyva
feae0f9f42 MDL-47200 WebServices: Add core_files_get_files to the mob app service 2014-09-27 22:58:38 +02:00
Juan Leyva
29ad8f9746 MDL-47163 messages: Upgrade Mobile notifications to use Airnotifier v2 2014-09-27 22:55:56 +02:00
Dmitry Nefedov
e2e1c98a7f MDL-47408 user: Add enableblogs checking before adding blog's link. 2014-09-27 15:23:13 +08:00
Michael Hughes
ad2fc0d83f MDL-47214 General: Multiple IP addresses in X-Forwarded-For Fixed 
Fixed getremoteaddr() function handle multiple IP addresses
Addressed point 2 on Dan's list
Stopped changing $CFG value after started test.
 2014-09-26 16:28:57 +01:00
sam marshall
5298d02f6e MDL-42974 UI: Modal dialogs do not work in IE8 2014-09-26 15:47:36 +01:00
sam marshall
38584d1167 MDL-47380 Availability: Editing interface broken in IE8 2014-09-26 15:47:00 +01:00
sam marshall
06c0603825 MDL-47322 Availability: empty availability should be saved as null 
As part of the unit test modifications for this change, I added the get_json
function to the availability conditions that didn't have it. (This is a function
for use in unit tests.)
 2014-09-26 15:42:37 +01:00
Tim Hunt
02643dafe7 MDL-47381 qformat: Behat tests have wrong plugin type. 2014-09-26 11:46:06 +01:00