mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-25 02:16:06 +02:00
Code Issues Projects Releases Wiki Activity
60,338 Commits 37 Branches 536 Tags
Commit Graph

60338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
d29afc4577 Merge branch 'MDL-38907-master' of git://github.com/damyon/moodle 2013-04-09 00:58:02 +02:00
Eloy Lafuente (stronk7)
5df002ad68 Merge branch 'MDL-38849' of git://github.com/timhunt/moodle 2013-04-09 00:52:27 +02:00
Eloy Lafuente (stronk7)
5a0443cc14 Merge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle 2013-04-08 16:57:38 +02:00
David Mudrák
b7acd9be50 MDL-39023 Make get_language_dependencies() aware of circular dependency risk 
The patch reimplements the core_string_manager::get_language_dependencies()
so that potentially mis-configured language packs with circular
dependencies or self dependency do not make the site unavailable.
Unit tests for the expected behaviour are added.
 2013-04-08 14:31:27 +02:00
Tim Hunt
c4dbaf74e8 MDL-38849 editor collapsing: cope with verbose languages 
We can't fix the width of the tab, because the length of the string
'Show editing tools' varies a LOT between langauges.
 2013-04-08 10:44:51 +01:00
Tim Hunt
e7373221cf MDL-38849 editor CSS: re-format to match coding style. 2013-04-08 10:37:22 +01:00
Damyon Wiese
c2bb7f6007 MDL-38907 Course: Remove unused CSS causing jump menu to be center aligned. 2013-04-08 16:45:44 +08:00
Damyon Wiese
4fd1861c8f Merge branch 'MDL-37562-master' of git://github.com/ankitagarwal/moodle 2013-04-08 15:42:36 +08:00
Dan Poltawski
91a3c9ba9f Merge branch 'MDL-38179_master' of git://github.com/dmonllao/moodle 2013-04-08 15:36:07 +08:00
Ankit Agarwal
8aba76fddf MDL-37562 calendar: Updating upgrade.txt to mention calendar_update_subscription() 2013-04-08 15:03:31 +08:00
Ankit Agarwal
ab37339d09 MDL-37562 calendar: Remove all hardcoded updating of calendar subscriptions, use calendar_update_subscription() instead 2013-04-08 15:03:31 +08:00
Ankit Agarwal
5ae4e15344 MDL-37562 calendar: Adding unit tests for calendar_update_subscription() 2013-04-08 15:03:31 +08:00
Dan Poltawski
0fc2ab8047 Merge branch 'MDL-37676' of git://github.com/appalachianstate/moodle 2013-04-08 14:05:21 +08:00
Ankit Agarwal
1f7981e079 MDL-37562 calendar: Adding a api calendar_update_subscription() to update calendar events 2013-04-08 13:45:24 +08:00
Damyon Wiese
278c280e8f Merge branch 'MDL-38878_master' of git://github.com/dmonllao/moodle 2013-04-08 13:02:38 +08:00
Damyon Wiese
5fbfc955d8 Merge branch 'MDL-39015-master' of git://github.com/danpoltawski/moodle 2013-04-08 12:32:56 +08:00
Dan Poltawski
fd0768c0e7 MDL-39015 navigation: remove course reports from navigation 
Regression from the commit in
278065528aed2e6d712292b09ecdedf3d5b26bfe
 2013-04-08 12:25:14 +08:00
Damyon Wiese
a6c215ab1f Merge branch 'MDL-38741-master' of git://github.com/danpoltawski/moodle 2013-04-08 12:00:52 +08:00
Dan Poltawski
bf48be3c7c Merge branch 'MDL-38634' of git://github.com/rlorenzo/moodle 2013-04-08 11:55:55 +08:00
Dan Poltawski
b23fcda2b9 Merge branch 'MDL-39006' of git://github.com/stronk7/moodle 2013-04-08 11:14:03 +08:00
Tim Lock
be47011d3c MDL-35868: quiz: Use correct attemptnumber when a last attempt exists. 2013-04-08 11:09:04 +08:00
Dan Poltawski
efc9febcd8 Merge branch 'wip-MDL-38701-m25' of git://github.com/marinaglancy/moodle 2013-04-08 10:22:59 +08:00
David Monllao
f9d3667e7b MDL-38179 behat: Step definition to click on a table row element 2013-04-08 10:07:21 +08:00
Marina Glancy
498e9a9a38 MDL-38701 Added missing require_once() before calling course_get_format 2013-04-08 11:34:05 +10:00
David Monllao
7b33327126 MDL-38878 behat: Also update composer dependencies after site install/reinstall 2013-04-08 09:03:04 +08:00
Rex Lorenzo
1207ae1a34 MDL-38634 folder: Problems displaying multiple folder resources inline in the course page 2013-04-07 17:28:24 -07:00
Eloy Lafuente (stronk7)
0fd23b76de MDL-39006 environment: raise all uses of 5.3.2 to 5.3.3 2013-04-07 18:32:15 +02:00
Eloy Lafuente (stronk7)
69ea3d7dd3 NOBUG: Bump to 2.5beta+ 
we don't package tagged commits in master, so let's
bump to beta+ and get the packaging done.
 2013-04-05 14:29:54 +02:00
Dan Poltawski
422f68fb86 Moodle release 2.5beta v2.5.0-beta 2013-04-05 18:03:30 +08:00
Dan Poltawski
1a90b9b6dc fix permissions 2013-04-05 17:56:05 +08:00
Dan Poltawski
0676f20581 ie9 svg compatibility fixes 2013-04-05 17:55:06 +08:00
Dan Poltawski
203a2538d6 Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2013-04-05 17:52:13 +08:00
Damyon Wiese
eafa0ba46a Merge branch 'MDL-35073_master' of https://github.com/markn86/moodle 2013-04-05 17:39:13 +08:00
Mark Nelson
c517765430 MDL-35073 badges: passed the session key in the enable access URL 2013-04-05 17:10:43 +08:00
Damyon Wiese
8806e79a14 Merge branch 'openbadges-fixes' of https://github.com/danpoltawski/moodle 2013-04-05 17:10:14 +08:00
Dan Poltawski
8b8641876b Merge branch 'MDL-36804-fix3' of git://github.com/damyon/moodle 2013-04-05 16:43:43 +08:00
Damyon Wiese
9f014461db MDL-36804 Assign attempt history: Submit button missing 2013-04-05 16:40:16 +08:00
Dan Poltawski
31f2822a5e Merge branch 'MDL-36804-master-fix2' of git://github.com/damyon/moodle 2013-04-05 16:00:35 +08:00
Damyon Wiese
e7af192606 MDL-36804 Assign history: Fix automatic coding error when using auto-reopen method 
This fix should call the gradebook function is_passed - but the gradebook is returning a record with
not enough information to create an instance of grade_grade.
 2013-04-05 15:53:38 +08:00
Dan Poltawski
2916ca61be MDL-35073 badges: fix incorrect fk name 
Good spotting Damyon!
 2013-04-05 15:47:15 +08:00
Dan Poltawski
bdc518b507 MDL-35073 badges: fix duplicate indexes 2013-04-05 15:27:32 +08:00
Dan Poltawski
c39896e85d Revert "MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets" 
This reverts commit fe104762c9acb0e178ae1d5ffe514c8109f48f0a.
 2013-04-05 14:34:07 +08:00
Damyon Wiese
a8fdb36cf2 MDL-36804 Assignment attempt history: Fix warning on saving a new grade. 
This is a fix for the case when there is a submission but no grade.
 2013-04-05 10:03:00 +08:00
Eloy Lafuente (stronk7)
577173a51f Merge branch 'MDL-38897-master' of git://github.com/danpoltawski/moodle 2013-04-05 03:21:52 +02:00
Damyon Wiese
6aa38ef89a Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle 2013-04-05 09:19:09 +08:00
Eloy Lafuente (stronk7)
6481aafbb8 MDL-38852 repository_recent: add missing type. 2013-04-05 03:06:15 +02:00
Eloy Lafuente (stronk7)
c5f4080a10 Merge branch 'MDL-38852-master' of git://github.com/danpoltawski/moodle 2013-04-05 02:51:48 +02:00
Eloy Lafuente (stronk7)
dbc5692fc5 Merge branch 'MDL-38883-master' of git://github.com/danpoltawski/moodle 2013-04-05 02:48:37 +02:00
Eloy Lafuente (stronk7)
8f3885f23d Merge branch 'MDL-38886-master' of git://github.com/danpoltawski/moodle 2013-04-05 02:46:15 +02:00
Marina Glancy
97d5e39c49 MDL-38708 Changed test to be more accurate 2013-04-05 10:52:09 +11:00