Commit graph

54494 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
e04a0e32c7 Merge branch 'MDL-33552' of git://github.com/danpoltawski/moodle 2012-06-18 12:31:37 +02:00
Dan Poltawski
6855fec7fd Merge branch 'MDL-33136_dndfilemanager_replace_file' of git://github.com/davosmith/moodle 2012-06-18 17:36:03 +08:00
Aparup Banerjee
44b836d629 Merge branch 'MDL-33175' of git://github.com/danpoltawski/moodle 2012-06-18 17:14:11 +08:00
Eloy Lafuente (stronk7)
f4a9bf65da Moodle release 2.3beta 2012-06-18 10:36:52 +02:00
Eloy Lafuente (stronk7)
b18066df83 Merge branch 'install_master' of git://github.com/amosbot/moodle 2012-06-18 10:29:12 +02:00
Rossiani Wijaya
0a5b9e79e3 MDL-33121 Book Module: removing prev/next value from book_preload_chapters and more code cleaning 2012-06-18 16:10:15 +08:00
Dan Poltawski
3248a1e1e4 Merge branch 'MDL-33794' of git://github.com/stronk7/moodle
Conflicts:
	mod/assign/version.php
2012-06-18 16:08:39 +08:00
Aparup Banerjee
341d989d63 Merge branch 'MDL-30337_no_risk' of git://github.com/nebgor/moodle 2012-06-18 16:03:08 +08:00
Aparup Banerjee
751fe70671 MDL-30337 theme : cleanup after conflict. 2012-06-18 16:02:34 +08:00
Davo Smith
b8a22d22fe MDL-33136 Dndupload filemanager - moved 'overwrite all' and 'rename all' buttons onto new line 2012-06-18 08:56:39 +01:00
Davo Smith
d0b2d44528 MDL-33136 Dndupload filemanager - user asked to rename/overwrite file when droping file with existing name 2012-06-18 08:55:41 +01:00
Dan Poltawski
f715dc3fd5 Merge branch 'MDL-33573-master-1' of git://git.luns.net.uk/moodle 2012-06-18 15:35:05 +08:00
Dan Poltawski
e73c1cafa1 Merge branch 'MDL-33775-master-integration' of git://github.com/FMCorz/moodle 2012-06-18 15:18:02 +08:00
Frederic Massart
a41b1d96b6 MDL-33775 Course: fix redirect to course/section in paged mode 2012-06-18 15:10:33 +08:00
Dan Poltawski
584c219edf Merge branch 'wip-MDL-33603-master-v2' of git://github.com/abgreeve/moodle 2012-06-18 15:07:10 +08:00
Dan Poltawski
f418c54875 Merge branch 'wip-mdl-33607' of git://github.com/rajeshtaneja/moodle 2012-06-18 14:34:35 +08:00
Dan Poltawski
2b5f4dbbca Merge branch 'MDL-33699' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:49:16 +08:00
Dan Poltawski
1eab24d1a4 Merge branch 'MDL-33779' of git://github.com/timhunt/moodle 2012-06-18 13:43:36 +08:00
Dan Poltawski
53db3251da Merge branch 'MDL-33793' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:28:07 +08:00
Dan Poltawski
728aee9767 Merge branch 'MDL-33697' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 13:12:56 +08:00
Andrew Davis
448c2f5b9b MDL-27156 repositories: altered filepicker.php so that users with the ability to ignore course file size restrictions are not incorrectly restricted 2012-06-18 11:33:28 +07:00
Dan Poltawski
8a7b0be111 Merge branch 'MDL-33327-2' of git://github.com/netspotau/moodle-mod_assign 2012-06-18 12:17:49 +08:00
Nadav Kavalerchik
6abbcf194e MDL - RTL Theme fixes for Moodle 2 (theme/canvas)
Right align Forms in Report pages (when in RTL mode)
2012-06-18 11:34:51 +08:00
Nadav Kavalerchik
409c12f21a MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
Right align Fields in forms (when in RTL mode)

Conflicts:

	theme/base/style/course.css
2012-06-18 11:31:33 +08:00
Dan Poltawski
8b5039361a MDL-33469 google plugins - string update
Improved strings to try and ensure maximum support for users during
upgrade.
2012-06-18 11:28:27 +08:00
Nadav Kavalerchik
0a1617e23f MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
Right align item's content (when viewing a Glossary activity in RTL mode)

Conflicts:

	mod/glossary/styles.css
2012-06-18 11:26:07 +08:00
Nadav Kavalerchik
4d488c25b6 MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
Right align content (when viewing a Lesson activity in RTL mode)
2012-06-18 11:24:50 +08:00
Nadav Kavalerchik
d180d19a83 MDL-32479 - RTL Theme fixes for Moodle 2 (theme/base)
Support for blocks columns switch when in rtl mode:
theme/base/layout/frontpage.php
theme/base/layout/general.php

Right align course completion checkbox to the right side of the activities and resources, when in RTL mode
theme/base/style/course.css

Right align DOCK bar, when in RTL mode
theme/base/style/dock.css

First-name and Last-name Initials (filter) bar (on every users list) letters spacing (usability issue, NOT RTL issue)
theme/base/style/core.css

Conflicts:

	theme/base/style/core.css
	theme/base/style/course.css
2012-06-18 11:24:04 +08:00
Adrian Greeve
db79db63ed MDL-33603 - data - added another sql query to allow links to records to work. 2012-06-18 10:21:38 +08:00
Rajesh Taneja
6947c57a06 MDl-33607 wiki-2: check subwiki before fetching it from db 2012-06-18 10:20:29 +08:00
Rajesh Taneja
4e782b32f3 MDL-33425 user: Replaced filepicker with filemanager on edit profile page 2012-06-18 10:19:48 +08:00
Eloy Lafuente (stronk7)
c5e783e512 MDL-33794 version.php: Bump all versions, requires and dependencies to 2012061700 2012-06-18 02:37:00 +02:00
Eloy Lafuente (stronk7)
798c9100d8 MDL-33794 assign: fix some incorrect function names 2012-06-18 02:17:03 +02:00
Petr Skoda
d8bf2a14b6 MDL-32003 last db related phpdocs cleanup commit 2012-06-17 22:56:30 +02:00
Petr Skoda
002252f714 MDL-32003 standardise null case 2012-06-17 22:56:30 +02:00
Petr Skoda
2edc3fecfb MDL-32003 fix broken table ordering and cleanup other xmldb ordering 2012-06-17 22:56:30 +02:00
Petr Skoda
aaddfac50c MDL-32003 more xmldb phpdocs and PHP4-ism cleanup 2012-06-17 22:56:30 +02:00
Petr Skoda
85d6dd382e MDL-32003 fix xmldb editor code indentations, phpdocs and PHP4-isms 2012-06-17 22:56:29 +02:00
Petr Skoda
a6d9d4efc2 MDL-32003 fix PHP4-isms in core xmldb code 2012-06-17 22:56:29 +02:00
Petr Skoda
ef7c3f108a MDL-32003 protect xmldb class internals
Use getters and setters instead!
2012-06-17 22:56:29 +02:00
Petr Skoda
01be2287c7 MDL-32003 drop unused statement constants
These were last used in 2.2 upgrade, not allowed any more.
2012-06-17 22:56:29 +02:00
Petr Skoda
94417438b3 MDL-32003 fix phpdocs in xmldb abstraction 2012-06-17 22:56:28 +02:00
Petr Skoda
5a070f0477 MDL-32003 fix phpdocs in DDL layer 2012-06-17 22:56:28 +02:00
Petr Skoda
00902cd974 MDL-32003 fix phpdocs and use __DIR__ for includes in dml layer
DML layer is not supposed to use $CFG,
it is better to rely on __DIR__ in self-contained libs…
2012-06-17 22:56:28 +02:00
Eloy Lafuente (stronk7)
130aed6e7e MDL-33794 version.php: Fix some missing bits before bump. 2012-06-17 19:29:44 +02:00
Damyon Wiese
8b2cfdc1c6 MDL-33793: Add conditions to the assignment upgrade code to prevent overwriting grade items. 2012-06-17 22:41:59 +08:00
Dan Poltawski
dd4502af6b MDL-3971 - mod_forum: contain () in span 2012-06-16 14:21:28 +08:00
Dan Poltawski
15ea1c9105 MDL-33294 - block_blog_recent: fix E_STRICT error
Default object from empty value
2012-06-16 12:46:07 +08:00
Dan Poltawski
7f3b68a892 MDL-33294 - block_blog_tags: fix E_STRICT error
Default object from empty value
2012-06-16 12:45:41 +08:00
AMOS bot
0187c8637c Automatically generated installer lang files 2012-06-16 00:31:27 +00:00