2770 Commits

Author SHA1 Message Date
Sam Hemelryk
4208d29749 Merge branch 'MDL-34214_dndupload_preview_element' of git://github.com/davosmith/moodle 2012-07-16 12:05:34 +12:00
Barbara Ramiro
2ab9a06c7f MDL-33841 Min-height set to remove unnecessary scrollbar on tree and list view 2012-07-12 20:00:23 +08:00
Sam Hemelryk
3c34f3213f Merge branch 'wip-MDL-33795-master' of https://github.com/barbararamiro/moodle 2012-07-09 17:14:08 +12:00
Davo Smith
4d40dc9256 MDL-34214 Course dndupload - removed unneeded classes from preview element 2012-07-07 19:02:23 +01:00
Eloy Lafuente (stronk7)
ecad7393e3 Revert "MDL-33303 Filepicker: resized to match HTML editor and made resizable"
This reverts commit c947ea3e3fee2e0ecf6b4cd386e04a768a18e662.
2012-07-05 23:21:34 +02:00
Barbara Ramiro
19ef00b916 MDL-33542, MDL-33542 Select dialogue details aligned
And loading gif smaller
2012-07-04 10:25:04 +08:00
Eloy Lafuente (stronk7)
20ef104713 Merge branch 'wip-MDL-33303-m24' of git://github.com/samhemelryk/moodle 2012-07-03 16:17:36 +02:00
Dan Poltawski
f884819546 Merge branch 'MDL-30903-master' of git://github.com/FMCorz/moodle 2012-07-03 11:51:04 +08:00
Dan Poltawski
7d27947851 Merge branch 'MDL-30883' of git://github.com/timhunt/moodle 2012-07-03 11:01:39 +08:00
Sam Hemelryk
73d38068d9 Merge branch 'MDL-33987_master' of git://github.com/lazydaisy/moodle 2012-07-03 14:14:31 +12:00
Eloy Lafuente (stronk7)
f1d9ceb0e4 Merge branch 'wip-MDL-33521-m24' of git://github.com/samhemelryk/moodle 2012-07-03 01:58:48 +02:00
Sam Hemelryk
a8d40508e9 Merge branch 'MDL-28151' of git://github.com/danpoltawski/moodle 2012-07-03 10:13:12 +12:00
Marina Glancy
4e02810b38 MDL-33721 show loading icon after file has been selected in filepicker, prevent clicking select button twice 2012-07-02 14:11:32 +08:00
Sam Hemelryk
d75e8e3ac8 MDL-33521 css: Fixed invalid CSS in core CSS and plugin styles.css files 2012-07-02 11:34:44 +12:00
Frederic Massart
c947ea3e3f MDL-33303 Filepicker: resized to match HTML editor and made resizable 2012-07-02 11:34:34 +12:00
Eloy Lafuente (stronk7)
6e4c643101 Merge branch 'MDL-34119_master' of git://github.com/lazydaisy/moodle 2012-07-02 00:30:46 +02:00
Mary Evans
4097797fcd MDL-34119_M23 theme_splash: Added colourswitcher.js and associated code in layout files and lib.php 2012-06-30 12:42:59 +01:00
Mary Evans
44ca33e489 MDL-34119_M23 theme_splash: removed redundant js call in lib.php. Added lang option to config.php + amended lang output in layout files. Added some css to style langmenu + removed redundant loginicon in pagelayout.css 2012-06-30 01:07:14 +01:00
Aparup Banerjee
99c3c503e0 MDL-34096 Installation : Added 2.3 upgrade line to db upgrade scripts. 2012-06-29 11:41:09 +08:00
Tim Hunt
f1b3d3e08e MDL-30883 question flags: aria attributes for accessibility
Also, update code to use html_writer, and fix pointer style when not
editable.
2012-06-26 09:58:11 +01:00
Mary Evans
b27464f617 MDL-33987_M23 theme_anomaly: amended some css values to style dock better also removed exclude parent theme stylesheet as it refered to a none existant file in base theme. 2012-06-26 04:12:38 +01:00
Dan Poltawski
4c8926c7c3 Merge branch 'wip-MDL-33987-m23' of git://github.com/samhemelryk/moodle 2012-06-25 15:08:12 +08:00
Aparup Banerjee
224d186ebb Merge branch 'wip-MDL-33419-master' of https://github.com/barbararamiro/moodle 2012-06-25 14:30:18 +08:00
Sam Hemelryk
511a58d945 MDL-33987 theme_anomaly: Fixed up a couple of issues with the dock
* Active title displayed incorrectly because they had a limited width which I removed
* Docked block content was indented because block titles are now floated in anomaly.
  To fix this I gave it a bottom border, forcing it clear.
2012-06-25 17:17:37 +12:00
Sam Hemelryk
125231acf9 MDL-33985 theme_base: Fixed bad conflict resolution of course CSS rtl fixes 2012-06-25 16:53:39 +12:00
Sam Hemelryk
cc0823118d Merge branch 'wip-MDL-33931-master' of git://github.com/abgreeve/moodle 2012-06-22 14:25:54 +12:00
Sam Hemelryk
088c374a6d Merge branch 'MDL-33430-reference-restore' of git://github.com/mudrd8mz/moodle
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
2012-06-22 11:56:49 +12:00
David Mudrák
7b5f67f77f MDL-33430 Notify user about file aliases failures at the final stage of the restore 2012-06-21 15:22:38 +02:00
Barbara Ramiro
a1b0852779 MDL-33419 Reference/source icons in table view and list view displayed and smaller 2012-06-21 17:13:43 +08:00
Adrian Greeve
612aee17b0 MDL-33931 - themes - Change of the base theme to align the submit and cancel buttons with the rest of the mform (15%) 2012-06-21 15:47:02 +08:00
Mary Evans
088511ded6 MDL-33785 theme_base: RTL fixes added to style/filemanager.css
Conflicts:

	theme/base/style/filemanager.css
2012-06-21 17:24:07 +12:00
Sam Hemelryk
21cb669f36 Merge branch 'MDL-33845_folder_whitespace' of git://github.com/moodler/moodle 2012-06-21 10:01:49 +12:00
Sam Hemelryk
45d011c896 Merge branch 'MDL-32479_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/base/style/core.css
2012-06-21 09:46:32 +12:00
Rajesh Taneja
99f374c457 MDL-33419 Filepicker: Reference/source icons are visible in filemanager list and table view 2012-06-20 15:07:58 +08:00
Aparup Banerjee
cd29a5822f Merge branch 'MDL-33722-master-wip' of git://git.luns.net.uk/moodle 2012-06-20 14:53:20 +08:00
Barbara Ramiro
f90ffd296a MDL-33795 Increased file picker width and height 2012-06-20 13:48:43 +08:00
Dan Poltawski
6e471afe8b Merge branch 'wip-MDL-33417-master' of git://github.com/marinaglancy/moodle 2012-06-20 13:42:19 +08:00
Aparup Banerjee
900183ebf7 MDL-33357 theme : mymobile whitespace fixes 2012-06-20 12:49:20 +08:00
Aparup Banerjee
b2d1c67e2c MDL-33357 theme : mymobile whitespaces fixup 2012-06-20 12:11:28 +08:00
Aparup Banerjee
23099d5beb Merge branch 'MDL-33357-3' of git://github.com/epsd/moodle 2012-06-20 12:11:07 +08:00
Aparup Banerjee
e77fe8f020 Merge branch 'MDL-33856-master-1' of git://git.luns.net.uk/moodle 2012-06-20 11:00:38 +08:00
John Stabinger
256c51fab0 MDL-33357 update mymobile inline for 2.3, attempt 3 2012-06-19 13:44:51 -04:00
Andrew Robert Nicols
61eadb51af MDL-33856 Correct CSS selectors for chooser dialogues in RTL languages 2012-06-19 10:32:32 +01:00
Dan Poltawski
5e3698fda0 Merge branch 'wip-MDL-33661-master' of https://github.com/barbararamiro/moodle
Conflicts:
	theme/base/style/core.css
2012-06-19 16:28:00 +08:00
Aparup Banerjee
9e4d54e15d Merge branch 'wip-MDL-33130-master' of https://github.com/barbararamiro/moodle
Conflicts:
	theme/base/style/core.css
	theme/base/style/filemanager.css
2012-06-19 16:09:43 +08:00
Martin Dougiamas
c23170914a MDL-33845 Removed the hideous amounts of whitespace around the folder edit view for canvas theme (and moved Folder CSS together) 2012-06-19 16:08:28 +08:00
Barbara Ramiro
af9c48cbe9 MDL-33130 Filemanager/Filepicker buttons, Activitity Chooser and Quiz revised to look consistent 2012-06-19 14:36:13 +08:00
Dan Poltawski
bb046e61b6 Merge branch 'wip-MDL-33423-m23' of git://github.com/samhemelryk/moodle 2012-06-19 14:29:25 +08:00
Aparup Banerjee
36080a2da2 MDL-30337 : removed extra css affecting LTR when it shouldn't. 2012-06-19 14:27:41 +08:00
Sam Hemelryk
9d7d2b03c8 MDL-33423 filepicker: Fixed visibility problem with loading icon 2012-06-19 16:53:44 +12:00