Commit graph

54573 commits

Author SHA1 Message Date
Aparup Banerjee
36080a2da2 MDL-30337 : removed extra css affecting LTR when it shouldn't. 2012-06-19 14:27:41 +08:00
Dan Poltawski
4bf433b5fb MDL-33121 book - improve a lang string
+ Make a comment match coding style
2012-06-19 14:15:11 +08:00
Dan Poltawski
34741af185 Merge branch 'MDL-33121' of git://github.com/rwijaya/moodle 2012-06-19 14:14:54 +08:00
Dan Poltawski
c1ac8fa189 Merge branch 'MDL-33821-master-1' of git://git.luns.net.uk/moodle 2012-06-19 13:27:07 +08:00
Sam Hemelryk
9d7d2b03c8 MDL-33423 filepicker: Fixed visibility problem with loading icon 2012-06-19 16:53:44 +12:00
Dan Poltawski
8655fb96cf MDL-33808 - format title on the repository instance screen 2012-06-19 12:10:56 +08:00
Dan Poltawski
a2e6088c7f MDL-33469 repository_picasa: oops, wrong pluginname in string 2012-06-19 11:56:45 +08:00
Dan Poltawski
102f928621 MDL-33808 - incorrect cleaning of repository names 2012-06-19 11:27:04 +08:00
Marina Glancy
1778f310f3 MDL-33417 Show reference icon for files in filepicker 2012-06-19 11:15:51 +08:00
Eloy Lafuente (stronk7)
f18ad1b781 Merge branch 'MDL-33523_master' of git://github.com/dmiletic/moodle 2012-06-19 03:09:30 +02:00
Eloy Lafuente (stronk7)
926b08ca4b Merge branch 'MDL-33623' of git://github.com/danpoltawski/moodle 2012-06-19 03:05:52 +02:00
Eloy Lafuente (stronk7)
25c94edb27 Merge branch 'MDL-33469' of git://github.com/danpoltawski/moodle 2012-06-19 03:01:30 +02:00
Eloy Lafuente (stronk7)
f98973c2ff Merge branch 'MDL-33294' of git://github.com/danpoltawski/moodle 2012-06-19 02:59:46 +02:00
Eloy Lafuente (stronk7)
f2904fe243 Merge branch 'MDL-33724' of git://github.com/danpoltawski/moodle 2012-06-19 02:56:19 +02:00
Sam Hemelryk
2395a7510f MDL-33825 css_optimiser: Fixed bug where !important was being lost for advanced background styles 2012-06-19 12:32:56 +12:00
Sam Hemelryk
624ef76c2f MDL-33811 Fixed left over debugging code preventing proper setting of YUI gallery version 2012-06-19 11:26:23 +12:00
Eloy Lafuente (stronk7)
e165512d3a Merge branch 'MDL-33778' of git://github.com/timhunt/moodle 2012-06-19 00:54:39 +02:00
Sam Hemelryk
2e7ce603ff MDL-33423 filepicker: Added delay and fade in to loading icon 2012-06-19 10:11:21 +12:00
Sam Hemelryk
514d31c805 MDL-33715 css_optimiser: enablecssoptimiser setting now triggers theme_reset_all_caches when changed 2012-06-19 10:10:20 +12:00
Andrew Robert Nicols
48e6de1c34 MDL-33821 Fix SQL syntax for recent glossary activity 2012-06-18 16:02:02 +01:00
Tim Hunt
72f2e13d04 MDL-33778 quiz statistics: part and class ids can be strings, not just ints. 2012-06-18 14:39:21 +01:00
Dan Poltawski
07384ecc8b Merge branch 'MDL-33818' of git://github.com/timhunt/moodle 2012-06-18 21:33:26 +08:00
Tim Hunt
584ae11a52 MDL-33818 quiz restore: quiz_attempt.state not restoring old MBZ
This field was new in 2.3, so we need to set it when restoring backups
from 2.2 or before, using the same logic as in upgrade.
2012-06-18 14:09:06 +01:00
Andrew Robert Nicols
2de13ef252 MDL-33722 Set z-index for dndupload-status message to prevent it hiding other items 2012-06-18 11:35:58 +01:00
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