mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-09 02:10:00 +01:00
Code Issues Projects Releases Wiki Activity
65,985 Commits 36 Branches 523 Tags
Commit Graph

65985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Poltawski
f9276172a2 Merge branch '41226-27' of git://github.com/samhemelryk/moodle 2014-01-13 11:11:10 +08:00
Dan Poltawski
58c8f0290f Merge branch '40821-27' of git://github.com/samhemelryk/moodle 2014-01-13 11:02:18 +08:00
Dan Poltawski
e41761a5e9 Merge branch '40693-27' of git://github.com/samhemelryk/moodle 2014-01-13 10:07:53 +08:00
Dan Poltawski
fb9360db3a Merge branch 'MDL-41152-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 10:03:51 +08:00
Sam Hemelryk
ee749e50be MDL-40205 theme: fixed overflow of block headers 2014-01-13 09:40:38 +08:00
Dan Poltawski
b5c8e7cbc3 Merge branch 'MDL-40705-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 09:35:50 +08:00
Dan Poltawski
f6652bc750 Merge branch 'MDL-39661-master' of git://github.com/FMCorz/moodle 2014-01-13 08:54:22 +08:00
Sam Hemelryk
3fa787ae4e MDL-40821 theme_bootstrapbase: fixed positioning of profile controls 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 08:17:24 +13:00
Sam Hemelryk
73d7e6eba9 MDL-40821 theme_bootstrapbase: show the current lang in the menu 2014-01-13 08:16:11 +13:00
Sam Hemelryk
73fc183d3a MDL-40693 theme_bootstrapbase: changed navbar separator to official separator 2014-01-13 08:15:46 +13:00
Eloy Lafuente (stronk7)
12efa52762 MDL-43646 "disapprove" changed to "undo approval" 2014-01-10 19:54:10 +01:00
Eloy Lafuente (stronk7)
7123ae8f9a MDL-43590 move unapprove to undo approval 2014-01-10 18:56:10 +01:00
Eloy Lafuente (stronk7)
577432283c Merge branch 'MDL-43590-en_fix' of git://github.com/mudrd8mz/moodle 2014-01-10 10:08:34 +01:00
Damyon Wiese
8a0667a994 weekly release 2.7dev 2014-01-10 14:19:48 +08:00
Damyon Wiese
fb4c6f454b Merge branch 'install_master' of git://git.moodle.org/moodle-install 2014-01-10 14:19:31 +08:00
Eloy Lafuente (stronk7)
b47b3c58e0 MDL-36721 make upgrade queries cross-db 2014-01-10 11:17:23 +08:00
Eloy Lafuente (stronk7)
24d74a6804 Merge branch 'wip-MDL-43283-master' of git://github.com/marinaglancy/moodle 2014-01-09 23:07:19 +01:00
Sam Hemelryk
c2dc13a017 MDL-43349 cache: added back are_requirements_met calls 2014-01-09 23:02:14 +01:00
Frederic Massart
138eb08746 MDL-41152 theme_bootstrapbase: Optimise width for gradebook tree view 2014-01-09 10:25:53 +01:00
Eloy Lafuente (stronk7)
305e60a5e2 Merge branch 'MDL-43330_master-skippedexception-namespace' of https://github.com/dmonllao/moodle 2014-01-09 10:19:25 +01:00
Marina Glancy
1f47813b29 MDL-43283 mod_chat: corrected SQL query to follow strict groupping rules 2014-01-09 15:37:38 +08:00
David Monllao
9920d28b0a MDL-43330 behat: Using the tag that includes the exception namespace 2014-01-09 12:08:21 +08:00
AMOS bot
b9fec1d364 Automatically generated installer lang files 2014-01-09 00:42:11 +00:00
Helen Foster
480fca77b3 MDL-43590 Merge English strings from the en_fix language pack 2014-01-09 01:06:01 +01:00
Andrew Nicols
b5154feacc MDL-40119 Forms: Remove cursor style override for calendar button 2014-01-08 11:13:37 +01:00
Eloy Lafuente (stronk7)
d68829aac0 Merge branch 'MDL-43423_master-increase-timeout' of git://github.com/dmonllao/moodle 2014-01-08 09:55:08 +01:00
David Monllao
845ceaff9f MDL-43423 behat: Increasing the timeout to 6 seconds 2014-01-08 16:51:17 +08:00
Dan Poltawski
7de1b42f55 Merge branch 'wip-MDL-43606-master' of git://github.com/marinaglancy/moodle 2014-01-08 14:32:57 +08:00
Marina Glancy
c6cd067f14 MDL-43606 tinymce_managefiles: bump version 
to allow smooth upgrade from contributed plugin in 2.5
 2014-01-08 13:58:41 +08:00
Dan Poltawski
33c6c949e5 Merge branch 'MDL-43534-master' of git://github.com/andrewnicols/moodle 2014-01-08 11:56:53 +08:00
Dan Poltawski
f446874d53 Merge branch 'MDL-43532-master' of git://github.com/andrewnicols/moodle 2014-01-08 11:43:39 +08:00
Dan Poltawski
a6fa74bca3 Merge branch 'MDL-43595-master' of git://github.com/damyon/moodle 2014-01-08 11:34:46 +08:00
Damyon Wiese
cf1110eb62 MDL-43595: The dropdowns for editpdf stopped working due to a recent change. 2014-01-08 09:15:58 +08:00
Eloy Lafuente (stronk7)
ab7f498343 Merge branch 'MDL-40119-master' of git://github.com/andrewnicols/moodle 2014-01-08 02:15:03 +01:00
Eloy Lafuente (stronk7)
e6a6eb7838 Merge branch 'w01_MDL-42797_m27_admin' of https://github.com/skodak/moodle 2014-01-08 02:09:55 +01:00
Eloy Lafuente (stronk7)
69ebcb4222 Merge branch 'MDL-43423_master' of git://github.com/dmonllao/moodle 2014-01-08 02:02:29 +01:00
Eloy Lafuente (stronk7)
a1017ec837 Merge branch 'MDL-43330_master' of git://github.com/dmonllao/moodle 2014-01-08 01:59:21 +01:00
Eloy Lafuente (stronk7)
0601a82aff Merge branch 'wip-MDL-42310-master' of git://github.com/abgreeve/moodle 2014-01-08 01:32:28 +01:00
Dan Poltawski
267d4927b4 Merge branch 'MDL-43173_master' of git://github.com/dmonllao/moodle 2014-01-08 08:21:06 +08:00
Eloy Lafuente (stronk7)
45f6a8340b Merge branch 'm27_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle 2014-01-08 00:45:51 +01:00
Eloy Lafuente (stronk7)
b8a8f3dd01 Merge branch 'MDL-42607_rss' of https://github.com/andyjdavis/moodle 2014-01-08 00:39:15 +01:00
Eloy Lafuente (stronk7)
430740f65a Merge branch 'MDL-42392-master' of git://github.com/andrewnicols/moodle 2014-01-08 00:23:40 +01:00
Eloy Lafuente (stronk7)
78b31176cb Merge branch 'w01_MDL-43515_m27_phpunitdocs' of https://github.com/skodak/moodle 2014-01-08 00:13:28 +01:00
Eloy Lafuente (stronk7)
382addccef Merge branch '23837-27' of git://github.com/samhemelryk/moodle 2014-01-07 23:42:55 +01:00
Eloy Lafuente (stronk7)
7ad46ac29d Merge branch 'w01_MDL-43503_m27_pagedldap' of https://github.com/skodak/moodle 2014-01-07 23:40:51 +01:00
Eloy Lafuente (stronk7)
b3b1b18a4f Merge branch 'MDL-43451-master' of git://github.com/andrewnicols/moodle 2014-01-07 23:32:38 +01:00
Dan Poltawski
7d374cdf4a Merge branch 'w01_MDL-43510_m27_test404' of https://github.com/skodak/moodle 2014-01-07 17:28:15 +08:00
Dan Poltawski
ac60c5b60e Merge branch 'MDL-43270-master' of git://github.com/andrewnicols/moodle 2014-01-07 17:23:07 +08:00
Dan Poltawski
571944c2a1 Merge branch 'm27_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle 2014-01-07 17:20:44 +08:00
Damyon Wiese
8af52d3188 Merge branch 'MDL-34356-master' of git://github.com/andrewnicols/moodle 2014-01-07 16:57:49 +08:00