mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-06-03 06:35:57 +02:00
Code Issues Projects Releases Wiki Activity
71,899 Commits 37 Branches 536 Tags
Commit Graph

936 Commits

Author SHA1 Message Date
Dan Poltawski
b79dca85b7 Merge branch 'MDL-44907-master' of git://github.com/FMCorz/moodle 2015-01-12 11:28:12 +00:00
Frederic Massart
1920eebcaa MDL-44907 admin: Better styling of admin settings validation errors 2015-01-08 14:14:38 +08:00
Dan Poltawski
41284e89f1 MDL-45930 filemanager: Don't display filesize when unknown 
Thanks to Marina Glancy for the patch
 2014-12-30 14:16:49 +00:00
Dan Poltawski
524cbf743a Merge branch 'm28_MDL-45955a' of https://github.com/totara/moodle 2014-12-16 10:44:16 +00:00
Gilles-Philippe Leblanc
96b839b8a8 MDL-48539 filepicker: Missing file view_icon_selected in the file picker 2014-12-11 09:07:29 -05:00
Brian Barnes
bbb0733297 MDL-45955 forms: replaced labels in static text elements 2014-12-10 17:28:09 +13:00
Dan Poltawski
50944630bd Merge branch 'm29_MDL-48317' of https://github.com/totara/moodle 2014-12-04 11:37:53 +00:00
Eloy Lafuente (stronk7)
4ef19b1789 Merge branch 'MDL-48277-master' of git://github.com/danpoltawski/moodle 2014-11-25 18:38:24 +01:00
Sam Hemelryk
406712e989 Merge branch 'MDL-48246-M29' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-25 10:52:42 +13:00
Brian Barnes
270a8f1bf0 MDL-48317 groups: Removed table from User groups page 2014-11-24 10:43:15 +13:00
Dan Poltawski
17d4ff23ee Revert "MDL-46531 Make atto foreground colors and background colors configurable" 
This reverts commit cb6e1d527093bb955946498850ef8a51276a13a4.

This reverts commit 7a5e6054248ef18f05a228ab0db4d05e5d782180, reversing
changes made to 7b9fb265d20e53580a64dcd2be8546ff5b49bd26.

This reverts commit 06404b01180a2965804fab9e47715fdc2b6bdfb4, reversing
changes made to 0f87473fed2da15a8ba72ac9a578734fe2548f10.

Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-20 07:04:41 +00:00
Eloy Lafuente (stronk7)
4067991016 Merge branch '48206-29' of git://github.com/samhemelryk/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-19 21:28:51 +01:00
Dan Poltawski
03e93abad8 MDL-48277 css: enable duplicate definitions lint rule 
And remove duplicates found in code which were detected by this rule
(leaving the last rule defined as this would take precidence).

https://github.com/CSSLint/csslint/wiki/Disallow-duplicate-properties
 2014-11-18 22:11:36 +00:00
Dan Poltawski
9ec6c460e6 MDL-48277 css: remove invalid @-ms-keyframes rule 
This is directly copied from bootstrap, but was added to a beta version
of IE10, but never the production version so is uncessary.

Refs:
http://blogs.msdn.com/b/ie/archive/2012/06/06/moving-the-stable-web-forward-in-ie10-release-preview.aspx
https://github.com/CSSLint/csslint/issues/295
 2014-11-18 22:11:35 +00:00
Mary Evans
a263396486 MDL-47915 theme: use id='page-content' rather than 'content'. 
Also added JS fallback for themes using copied layouts in scorm
 2014-11-18 17:49:57 +00:00
Dan Poltawski
8d3fba4ce4 Merge branch 'm28_MDL-48041' of https://github.com/totara/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 13:10:57 +00:00
Sam Hemelryk
06404b0118 Merge branch 'MDL-46531-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-11-18 10:48:31 +13:00
Mary Evans
82b5f58f57 MDL-48246 theme: Fixed typo in 'hidepanelicon' 2014-11-17 14:58:37 +00:00
Sam Hemelryk
2ff98fb6e4 MDL-48206 block_comments: textarea width 100% 2014-11-14 11:40:33 +13:00
Brian Barnes
e19367db13 MDL-48041 messages: Removed HTML table around user images 2014-11-07 09:56:31 +13:00
Eloy Lafuente (stronk7)
de881693f7 MDL-48021 bump: Bump all versions to planned release 
This bumps all versions to planned 2.8 release
(2014111000) version and all the dependencies to
current 2.8rc1 (2014110400)
 2014-11-04 17:52:35 +01:00
Frederic Massart
f2823ec4bc MDL-47839 core_grades: Minor styling improvements to setup/user report 2014-10-27 15:59:21 +08:00
Andrew Nicols
504d0a1821 MDL-47513 theme_base: Fix grader report when blocks are docked 2014-10-24 11:49:15 +02:00
Marina Glancy
c785cc9893 Merge branch 'MDL-47340-master' of git://github.com/jethac/moodle 2014-10-24 11:49:11 +02:00
Sam Hemelryk
614820522f Merge branch 'm28_MDL-47632' of https://github.com/totara/moodle 2014-10-24 11:48:21 +02:00
Jetha Chan
6287692843 MDL-47340 action_menu: selector, RTL, consistency fixes 2014-10-20 17:09:16 +08:00
Marina Glancy
a96ca70064 MDL-47290 Grades: added bold for course total 2014-10-17 15:22:32 +08:00
Barbara Ramiro
0947172dba MDL-47290 Grades: Minified CSS and applied coding style standards 2014-10-17 15:03:53 +08:00
Barbara Ramiro
d70e86b1bd MDL-47363 Grades: Style for the Setup grades 2014-10-17 14:59:09 +08:00
Barbara Ramiro
2c7a86eb7f MDL-47363 Grades: Style for the User report 2014-10-17 14:56:31 +08:00
Jetha Chan
8ef43cfde6 MDL-47576 user_menu: theme_base fixes 2014-10-16 16:18:38 +08:00
Brian Barnes
a87c17d14f MDL-47632 calendar: Fixed iCal link going blue after visiting it 2014-10-15 08:46:07 +13:00
Sam Hemelryk
9ff13804e5 Merge branch 'MDL-46481-master' of https://github.com/FMCorz/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-09 08:51:40 +13:00
Marina Glancy
2be0d5c3ed MDL-47541 core_grades: hints about aggregation settings on setup page 
Also do not indicate 'Natural' aggregation method
 2014-10-08 15:03:32 +08:00
Frederic Massart
70e7b634e4 MDL-46481 backup: Reposition one-click backup button 2014-10-08 13:45:24 +08:00
Dan Poltawski
99675668b4 Merge branch 'MDL-45893-master-v3' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-10-07 16:52:07 +01:00
Andrew Nicols
ee7432b32c MDL-46531 editor_atto: Color plugins should use classes rather than hardcoded colours 2014-10-06 12:07:31 +08:00
Marina Glancy
d75a2367c3 MDL-47520 core_grades: added CSS classes to the setup page 
Part of: MDL-46576
 2014-10-03 17:06:41 +08:00
Jetha Chan
6da0e4cfff MDL-45893 user_menu: based on action_menu, new responsive approach 2014-10-03 15:12:59 +08:00
Marina Glancy
6723bc66e1 MDL-47146 core_grades: correcly align the select column 
Part of: MDL-46576
 2014-10-03 13:54:39 +08:00
Dan Poltawski
76e348d46d Revert "MDL-45893 user_menu: revised based on action_menu" 
Was not yet ready for the prime time.

This reverts commit dc4bff329dc2faf56445effebaa6790e0bc76713.
This reverts commit a535004e5c54689dc664d780b15900e1e6e19f83.
This reverts commit c8398fb95af3533a1945e0b4f45ac939f3044d8d.
This reverts commit d24b8e52d38526bf62612c3569db1d3174613c77.

Conflicts:
	theme/bootstrapbase/less/moodle/modules.less
	theme/bootstrapbase/style/moodle.css
 2014-10-01 08:58:22 +01:00
Dan Poltawski
d62f99195a Merge branch 'm28_MDL-46127' of https://github.com/totara/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-30 09:55:03 +01:00
Brian Barnes
11edf09c61 MDL-46127 core_calendar: Removed tables when rendering a single event 2014-09-29 10:45:39 +13:00
Jetha Chan
d24b8e52d3 MDL-45893 user_menu: revised based on action_menu 2014-09-25 13:43:06 +08:00
Eloy Lafuente (stronk7)
db438e0c14 Merge branch 'm28_MDL-46716' of https://github.com/totara/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-08-26 02:16:50 +02:00
Brian Barnes
4a222f026a MDL-46716 core_calendar: Replaced iCal image with stylised text 2014-08-22 09:44:58 +12:00
Mary Evans
8c97393ce5 MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824 
Squashed commit of the following:

commit 5881cccc95c135e1440ce0c5441a84b462941758
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 02:15:05 2014 +0100

    MDL-46812 grade/report/grader: Reset previous commit for left scroller.

commit 5abeb60470f02ab4c79c27b2a6f6187e75891e0b
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 01:29:41 2014 +0100

    MDL-46812 grade/report/grader: Added jsenabled css body class to rtl style.

commit a95d23d8b753a590d980e5427e8c74ba597c2b91
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 21 00:59:06 2014 +0100

    MDL-46812 theme_base; Removed more redundent CSS.

commit 3fb326e5b39738343e0b7c0d9c8da17adf5a09bb
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Wed Aug 20 13:24:59 2014 +0100

    MDL-46812 theme_base: Removed redundent grade/report/grader CSS in style/grade.css

commit c602e7e277f9ce1fed6d0eccf72c547432e130b6
Author: Mary Evans <lazydaisy@visible-expression.co.uk>
Date:   Thu Aug 14 12:50:14 2014 +0100

    MDL-46812 grade/report/grader: Need to tie up loose ends in Gradebook after MDL-43824

        1. fixed gradebook layout when JS is disabled
        2. added height and background color to scroller when JS is enabled
        3. removed redundent top margin in user-grades table
 2014-08-21 11:13:56 +01:00
Marina Glancy
e913caab92 Merge branch 'MDL-46538_master' of git://github.com/lazydaisy/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-08-19 16:51:46 +08:00
Mary Evans
fcd90243b6 MDL-46829 theme_base: Fixed regression in Base caused by MDL-54031. 
So much for Peer Reviews.
 2014-08-14 13:35:26 +01:00
Eloy Lafuente (stronk7)
3376dae082 MDL-45031 theme: fix tabs base line alignment by 1px. 
Credit goes to Damyon Wiese, thanks!
 2014-08-13 21:31:11 +02:00