mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity
67,800 Commits 36 Branches 519 Tags
Commit Graph

4016 Commits

Author SHA1 Message Date
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
Dan Poltawski
81ff1c7570 Merge branch 'MDL-45084-master' of git://github.com/FMCorz/moodle 2014-04-15 11:05:37 +08:00
Sam Hemelryk
e8bb3c3fa6 Merge branch 'MDL-41891_master' of https://github.com/nadavkav/moodle 2014-04-15 11:25:20 +12:00
Frederic Massart
034dbd7588 MDL-45084 theme: File was not chunked on IE 
This only applied when themedesignermode was disabled, because the
first chunk is 0, but 0 is resolved to false. We needed to compare
$chunk with null in order to know if it was set.
 2014-04-14 16:25:20 +08: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 Hemelryk
3fb4d8fa88 Merge branch 'MDL-44912-master-core' of git://github.com/FMCorz/moodle 2014-04-08 11:42:29 +12:00
Sam Hemelryk
87f2c808f7 Merge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
	lib/editor/atto/plugins/table/yui/src/button/js/button.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-08 08:59:54 +12: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
Andrew Nicols
ee616cff45 MDL-44760 editor_atto: Make menus consistent with Clean theme 2014-04-07 20:43:57 +08: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
Sam Hemelryk
20015af513 MDL-42317 theme_bootstrapbase: more responsive styling for forms with blocks pre && post 2014-04-06 15:40:09 +12:00
Sam Hemelryk
04f1a90d05 MDL-41551 theme_base: improved custom block region handling for base 2014-04-06 15:17:48 +12:00
Sam Hemelryk
225c418fd2 MDL-41511 blocks: improved how custom block regions were being rendered. 
There is a new theme property 'blockrendermethod' that can be set by the
theme in its config.php and tells Moodle what method it is using to render
blocks in the layout files.
Either blocks, or blocks_for_region.
Then when adding custom block regions to a page content we ensure we use
the same method the theme is using elsewhere.

This is really a hack becuase we (I) didn't properly deprecate
blocks_for_region when I added the blocks method.
 2014-04-06 15:17:47 +12:00
Rajesh Taneja
0ac63cfce7 MDL-44873 theme_bootstrapbase: Added support for notifytiny class 2014-04-04 13:19:13 +08:00
Damyon Wiese
9d5859925e MDL-42195 Bootstrap: Make bootstrap responsive images "opt-in". 
This responsive image behaviour prevents setting of image sizes in text editors,
as well as a string of pix icon bugs / profile image bugs across Moodle.

We are switching to Bootstrap 3 syntax where you need img-responsive class to images
that want this behaviour.
 2014-04-03 09:21:50 +08:00
Frederic Massart
907a6737fc MDL-44912 libraries: Allow empty values in admin setting colour picker 2014-04-02 17:20:58 +08:00
Frederic Massart
c682844ae9 MDL-44739 theme_more: Force default settings to be set 2014-04-02 14:56:44 +08:00
Sam Hemelryk
0ea11b7cee Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-02 09:27:23 +13:00
Sam Hemelryk
b9c16d401a Merge branch 'MDL-43284-master' of git://github.com/phalacee/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-04-02 09:27:03 +13:00
Marina Glancy
0a4af310fd Merge branch 'MDL-44741-master' of git://github.com/FMCorz/moodle 2014-04-01 14:43:49 +08:00
Frederic Massart
7ff7f5ad27 MDL-44741 theme_more: Updated description of the theme 2014-04-01 14:34:42 +08:00
Marina Glancy
0b5f523164 Merge branch 'MDL-44739-master' of git://github.com/FMCorz/moodle 2014-04-01 14:24:54 +08:00
Marina Glancy
502abeebb6 Merge branch 'MDL-44670-master' of git://github.com/FMCorz/moodle 2014-04-01 11:05:31 +08:00
Marina Glancy
1bc60971b1 Merge branch 'wip_MDL-44854_master' of git://github.com/gjb2048/moodle 2014-04-01 10:37:22 +08:00
Gareth J Barnard
7cc6112219 MDL-44854 theme: 'svg' font type not served. 2014-03-31 11:10:13 +01:00
Gareth J Barnard
9e98a0c04f MDL-44850 theme: 'eot' font type not served. 2014-03-31 11:01:30 +01:00
Jason Fowler
7105ac89bd MDL-43284 Theme: Clean theme errors with padding in Question Bank fixed 2014-03-27 10:33:45 +08:00
Matt Switlik
0a4fe80bff MDL-44507 filemanager: indicator for clicking Download All in filemanager 2014-03-26 14:34:36 -04:00
Andrew Robert Nicols
ac32c27e24 MDL-32729 Question: Switch to the YUI3 chooser dialogue 
This uses the core chooserdialogue and associated style changes to make an
easily generated chooser with question descriptions.
 2014-03-27 00:28:08 +08:00
Damyon Wiese
961c7b1912 MDL-44032: Atto - move bootstrap changes into overrides file. 2014-03-26 10:01:42 +08:00
Rossiani Wijaya
39e2a67a53 MDL-44032 Atto editor: add subscript and superscript plugins 2014-03-26 10:00:04 +08:00
Sam Hemelryk
bfb6e97eae Merge branch 'MDL-43784-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/classes/plugin_manager.php
	lib/db/upgrade.php
 2014-03-26 11:33:47 +13:00
Damyon Wiese
51e73837b6 MDL-41569: CSS Allow flexible table headers to wrap. 2014-03-25 13:51:26 +08:00