Commit graph

2840 commits

Author SHA1 Message Date
Sam Hemelryk
118530e605 Merge branch 'MDL-34526_master' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/canvas/config.php
2012-07-31 16:57:32 +12:00
Mary Evans
0f78d5c065 MDL-34528 theme_canvas: Removed redundent exclude stylesheet configurations from CANVAS theme 2012-07-31 16:51:50 +12:00
Dan Poltawski
b95744a3b5 Merge branch 'MDL-34624' of git://github.com/lazydaisy/moodle 2012-07-31 11:10:29 +08:00
Sam Hemelryk
989e5c49fa Merge branch 'MDL-34494_master' of git://github.com/kordan/moodle 2012-07-31 12:43:44 +12:00
Sam Hemelryk
30585a3752 Merge branch 'MDL-28568_noncontact_warning' of git://github.com/andyjdavis/moodle 2012-07-31 12:00:53 +12:00
Dan Poltawski
957a8d48fc Merge branch 'MDL-34460-master-integration' of git://github.com/FMCorz/moodle 2012-07-30 14:18:54 +08:00
Mary Evans
4543168efb MDL-34526 theme_canvas: incorporating MDL-34528 - Remove redundent exclude stylesheet configurations from CANVAS theme 2012-07-29 21:31:47 +01:00
Mary Evans
6f7cb98f10 MDL-34526 theme_canvas: added custommenu + enabled dock + defined block-regions in frontpage.php & general.php 2012-07-29 17:51:05 +01:00
kordan
e7d53b43ec MDL-34405 theme_formal_white: added background for quiz overview 2012-07-29 15:55:23 +02:00
kordan
3518d78f10 MDL-34494 theme_formal_white: replaced old style core_renderer::MAIN_CONTENT_TOKEN with $OUTPUT->main_content() 2012-07-29 15:27:09 +02:00
Mary Evans
e0c380994a MDL-34624 theme_base: added background color to style/admin.css for role edit default 2012-07-29 14:23:19 +01:00
Nadav Kavalerchik
9358953d90 MDL-34513 - RTL Theme fixes for Moodle 2 (theme/mymobile)
+ Right align frontpage course list
+ right align activity and resource titles
+ Two Columns on/off slider fix
+ Right align content in Blocks
+ Fix checkbox question types in quiz
+ Right align titles of fields in Forms
+ minor ui tweaks
2012-07-27 16:30:19 +03:00
Frederic Massart
4373103084 MDL-34460 Librairies: Replaced deprecated get_context_instance() 2012-07-26 13:23:28 +08:00
Sam Hemelryk
11946cada0 Merge branch 'MDL-34412_master' of git://github.com/lazydaisy/moodle 2012-07-23 12:42:23 +12:00
Sam Hemelryk
97918ad586 Merge branch 'MDL-34370_master' of git://github.com/lazydaisy/moodle 2012-07-23 12:40:08 +12:00
Mary Evans
1febf3b138 MDL-34370 theme_fusion: added CSS in style/core.css to enable weeks to be moved when editing 2012-07-22 17:55:59 +01:00
Mary Evans
4470ad0950 MDL-34412 theme_afterburner: defined #EEE as background-color in afterburner_styles.css for filemanager and filepicker input, select, button & textarea 2012-07-20 23:12:06 +01:00
Marina Glancy
c81f332876 MDL-34221 disabledIf support for filemanager and filepicker elements 2012-07-20 10:49:30 +08:00
Davo Smith
b1c669a711 MDL-34221 Filepicker - disableIf now prevents drag and drop upload 2012-07-20 10:49:30 +08:00
Andrew Davis
77d187ed1e MDL-28568 message: added a warning message when the user is about to message someone who cant reply 2012-07-19 17:14:50 +08:00
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 c947ea3e3f.
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