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
66,008 Commits 36 Branches 523 Tags
Commit Graph

66008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damyon Wiese
1bedb6b92f MDL-33952 Assignment: Remove behat tests for mod_assignment - it is not a real activity anymore. 2014-01-14 09:57:05 +08:00
Eloy Lafuente (stronk7)
295f7a6137 Merge branch 'MDL-43109' of https://github.com/mdikih/moodle 2014-01-13 21:51:27 +01:00
Eloy Lafuente (stronk7)
c33eb444fc Merge branch 'MDL-43395-master' of git://github.com/danpoltawski/moodle 2014-01-13 19:10:13 +01:00
Eloy Lafuente (stronk7)
b9da30cfd2 Merge branch 'MDL-33600-master' of git://github.com/damyon/moodle 2014-01-13 16:31:00 +01:00
Dan Poltawski
06cdbf8382 Merge branch 'MDL-40849-master' of git://github.com/FMCorz/moodle 2014-01-13 15:38:22 +08:00
Frederic Massart
bfa0c3ab4f MDL-40849 gradingform_guide: Fixed CSS issues with Bootstrapbase 2014-01-13 08:11:07 +01:00
Dan Poltawski
d1426e2843 Merge branch 'MDL-33952-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assignment/lang/en/assignment.php
 2014-01-13 12:55:36 +08:00
Dan Poltawski
8c0ddd430a Merge branch '43598-43262-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-debug.js
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue.js
	lib/yui/src/notification/js/dialogue.js
 2014-01-13 12:42:13 +08:00
Dan Poltawski
dbfdd1a4f9 Merge branch 'MDL-39603-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-01-13 12:34:53 +08:00
Dan Poltawski
3ef74a63a6 Merge branch 'MDL-43262-master' of git://github.com/andrewnicols/moodle 2014-01-13 12:11:17 +08:00
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
Dan Poltawski
c582565a06 MDL-43395 dml: warn about invalid limit params 
Help developers to find bugs by throwing a DEBUG_DEVELOPER message
rather than ignoring this case completely.
 2014-01-13 08:42:07 +08:00
Sam Hemelryk
d9bf4be487 MDL-43598 dialogue: fixed bug with render procedure 2014-01-13 08:27:46 +13:00
Andrew Nicols
a67233e76f MDL-43262 JavaScript: Correct use of centered attribute override 
This should be done using an attribute modification, rather than at the
constructor level.
 2014-01-13 08:26:28 +13:00
Andrew Nicols
c46cca4f94 MDL-43262 JavaScript: Correct visible attribute override 
This should be done using an attribute modification, rather than at the
constructor level.
 2014-01-13 08:26:28 +13:00
Andrew Nicols
16d024348a MDL-43262 JavaScript: Correct width attribute override 
This should be done using an attribute modification, rather than at the
constructor level.
 2014-01-13 08:26:28 +13: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
Frederic Massart
86048e8136 MDL-39603 theme_bootstrapbase: Alignment of filter form elements on enrol page 2014-01-08 10:37:41 +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
Damyon Wiese
40cb48792a MDL-33952 Assignment - bon voyage! 
mod_assignment has been replaced with a stub that only exists to support restoring and
auto upgrading to mod_assign. If you require mod_assignment for some old plugin, then
overwrite with the 2.6 version manually.
 2014-01-08 14:51:06 +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
8e1266bf77 MDL-33600 Assign: Add an admin setting to set the default for sendstudentnotifications 2014-01-08 11:03:59 +08:00