moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 03:46:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
70029 commits 37 branches 544 tags 1.3 GiB
Commit graph

572 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
2975f1a0cc Merge branch 'MDL-42782-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-06-10 01:08:45 +02:00
Mary Evans
430b74c3d0 MDL-45507 theme_bootstrapbase: Fix regression for theme based custom menu 
in renderers/core_renderer.php.
 2014-06-08 23:51:33 +01:00
Sam Hemelryk
0591c2056d Merge branch 'MDL-44486-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-06-04 09:51:37 +12:00
Jetha Chan
bd77886b41 MDL-42782 usability: fix for extreme course page indenting 2014-06-03 11:15:59 +08:00
Marina Glancy
78ee646dd9 Merge branch 'MDL-45525-27' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 14:28:36 +08:00
Marina Glancy
143eef0e37 Merge branch 'MDL-45536-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 14:25:10 +08:00
Damyon Wiese
c186e87ab7 Merge branch 'MDL-45476-master' of git://github.com/phalacee/moodle 2014-05-20 13:06:09 +08:00
Sam Hemelryk
46921d74a6 Merge branch 'MDL-44323-master' of git://github.com/danpoltawski/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 15:42:32 +12:00
Sam Hemelryk
d57e3f8201 Merge branch 'MDL-45380-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-05-20 08:52:54 +12:00
Andrew Nicols
531c263a86 MDL-45536 theme: Use width auto for inputs and textareas specifying them 2014-05-16 12:09:40 +08:00
Dan Poltawski
376a17e4ae MDL-44323 admin: use correct css class for warning 
The notifyproblem notification is consistent with the rest of
the warnings we report.
 2014-05-15 12:00:11 +08:00
Jetha Chan
8bb2d47619 MDL-45525 themes: minor forum improvements 
Fixed an RTL style that wasn't kicking in properly.
 2014-05-13 14:31:44 +08:00
Jason Fowler
1d20cf37cb MDL-45476 Quiz: Fixing atto on multiple choice pages 2014-05-13 08:06:04 +08:00
Jetha Chan
b993411de1 MDL-41383 theme: filepicker zoom resiliency 
Fixed an issue that broke the file picker on bootstrapbase when zooming in and out.
 2014-05-12 17:16:58 +08:00
Frederic Massart
2c47e5005b MDL-45380 theme_bootstrapbase: Restore config override highlight 2014-05-12 15:42:17 +08:00
Andrew Nicols
72704adf03 MDL-44486 core: Rewrite JavaScript progressbar 2014-05-12 15:29:47 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release 
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
 2014-05-09 02:12:28 +02:00
Marina Glancy
2cba18ee43 Merge branch 'MDL-45282_message' of git://github.com/andyjdavis/moodle 2014-05-07 16:52:11 +08:00
Andrew Davis
f624f56999 MDL-45282 core_user: fixed up some oddities in the bulk user messaging screen 2014-05-07 15:34:29 +08:00
Jetha Chan
cecd602d8b MDL-45290 rubrics: overflow, delete button alignment 
Adjusted delete button alignment, restored overflow rule, amended button alignment, minor RTL fixes.
 2014-05-06 16:47:20 +08:00
Jetha Chan
fe778267f2 MDL-45290 rubric: IE8 and minor fixes, RTL 
Added a fallback style for IE8, adjusted some minor styles, added RTL capability.
 2014-05-06 10:44:59 +08:00
Jetha Chan
73eb9f4339 MDL-45290 rubric: visual fixups 
Fixed up visual issues with rubric editor on Clean.
 2014-05-02 14:27:14 +08:00
Dan Poltawski
eb72c1ff05 Merge branch '44729-27' of git://github.com/samhemelryk/moodle 2014-05-02 09:44:49 +08:00
Sam Hemelryk
09d5cfadc5 MDL-44729 theme_bootstrapbase: override the maintenance renderer 
This patch overrides the maintenance renderer in the bootstrapbase
theme in order to override the notification method in the same way
we override the core renderer notification method.
This ensures now that clean is standard that notifications during
maintenance tasks (install, upgrade etc) look pretty.
 2014-05-02 13:42:22 +12:00
Jetha Chan
13e118ca65 MDL-36836 filepicker: alfresco select box fix 
Adjusted position of alfresco select box; amended border/background application in base.
 2014-05-01 16:08:02 +08:00
Andrew Nicols
5b932559ce MDL-44815 theme: Make chooser icons the standard 16px 
The only exception to this rule is the activity chooser which is allowed
24px.
 2014-05-01 11:54:26 +08:00
Jason Fowler
b23a320558 MDL-44916 Question: Fixing alignment in bootstrap themes 2014-04-28 11:37:26 +08:00
Nadav Kavalerchik
b992594aac MDL-45109 - theme/bootstrapbase - Fix Unordered and Ordered lists in RTL mode 2014-04-20 17:03:03 +03:00
Marina Glancy
09e1805072 Merge branch 'MDL-44951-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-16 14:44:04 +08:00
Dan Poltawski
30a3b12f88 Merge branch 'MDL-45076-master' of git://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-16 09:10:28 +08:00
Sam Hemelryk
19dfbe3001 Merge branch 'MDL-40674_master' of https://github.com/nadavkav/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-15 16:47:38 +12:00
Frederic Massart
f82bc6be01 MDL-45076 theme_bootstrapbase: Clean up participants controls LESS 2014-04-15 12:19:53 +08:00
Frederic Massart
a71b1f131e MDL-45076 theme_bootstrapbase: Select placement in participants page 
Usually the group selector is aligned with the label, but as we want
it to be consistent with the rest of the selects in the participants
page we need an override.
 2014-04-15 12:18:44 +08:00
Sam Hemelryk
e8bb3c3fa6 Merge branch 'MDL-41891_master' of https://github.com/nadavkav/moodle 2014-04-15 11:25:20 +12:00
Jetha Chan
cee8be6325 MDL-44951 theme_bootstrapbase: forum post css tweaks 
Adjusted forum post CSS for cleaner appearance.
 2014-04-11 14:40:54 +08:00
Damyon Wiese
2471088111 MDL-42195 Bootstrap: Make selector for responsive images 100% the same as bootstrap3. 2014-04-09 14:57:33 +08:00
Dan Poltawski
a935cccb2b Merge branch 'MDL-31679' of git://github.com/aolley/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-09 12:49:35 +08:00
Dan Poltawski
9eeacad9b8 Merge branch 'MDL-44507_master' of https://github.com/SWiT/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-09 11:52:33 +08:00
Marina Glancy
47a1315f02 Merge branch '44944-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-09 09:48:41 +08:00
Damyon Wiese
86bd7af5be MDL-42195 Bootstrap - put border and vertical-align back in the reset for all images 2014-04-08 17:04:43 +08:00
Marina Glancy
d175d25adc Merge branch 'MDL-44881-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-08 16:55:49 +08:00
Jason Fowler
0d5bfb9c65 MDL-44881 Filepicker: Fix alignment and padding on file-select dialog 2014-04-08 14:44:50 +08:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
 2014-04-08 13:30:41 +08:00
Dan Poltawski
3a047312b6 Merge branch '42317-27' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-08 09:22:38 +08:00
Marina Glancy
0f4fc5a878 Merge branch 'MDL-42195-master' of git://github.com/damyon/moodle 2014-04-08 08:53:35 +08:00
sam marshall
46d70f0535 MDL-44070 Conditional availability enhancements (10): autogenerated 
Includes all the autogenerated files (to make it easier/less worrying
when reviewing and rebasing).
 2014-04-07 20:12:03 +01:00
sam marshall
00c832d7a1 MDL-44070 Conditional availability enhancements (8): display 
Includes theme and renderer changes required for the new feature.
There are two parts: style required for the display as part of the
course page (when showing the list of conditions for an activity),
and style required for the settings form.

This change supports both the bootstrapbase theme (which was the
main theme used during development) and the old base theme.
 2014-04-07 20:11:56 +01:00
Marina Glancy
502ff062a0 Merge branch 'wip-mdl-44873' of git://github.com/rajeshtaneja/moodle 2014-04-07 16:16:25 +08:00
Dan Poltawski
5e8be14cb9 Merge branch 'MDL-41569-master' of git://github.com/damyon/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-07 16:01:56 +08:00
Sam Hemelryk
af23b60598 MDL-44944 theme_bootstrapbase: fixed content spacing issue with docked region 
Thanks Mary Evans for the peer-review and better solution
 2014-04-07 08:12:35 +12:00