L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,565 Commits 38 Branches 564 Tags
f3fe1b8b35d4e085cedb59e951d794d61ba2f97d
Commit Graph

952 Commits

Author SHA1 Message Date
Dan Poltawski 57fc76ab92 Merge branch 'MDL-50102' of git://github.com/stronk7/moodle 2015-05-06 10:50:35 +01:00
Damyon Wiese 917bd02be5 MDL-49870 tool_templatelibrary: Allow docs in parent template only. 
If the mustache comment containing the docs for the template is
not found in the theme overridden template, search the original
core/plugin template for the docs.
 2015-05-06 14:54:56 +08:00
Eloy Lafuente (stronk7) 26ea380d24 MDL-50102 versions: bump all versions and requires near release 
version = planned 2015051100 release version
requires= current 2015050500 rc1 version

Note: On purpose, the course format social wrong version (2015102100)
has been kept unmodified. Looking forward a solution right now.
 2015-05-05 17:43:19 +02:00
Frederic Massart d71feab8ae MDL-49986 messages: Contacts in contact list should not be bold 2015-04-30 12:40:03 +08:00
Martin Mastny 000d624cc4 MDL-49926 gradereport: Cursor changes to pointer on hover 2015-04-24 13:16:08 +08:00
Frederic Massart 4d8c01c8dc MDL-49871 theme_base: Moving notification templates in right location 2015-04-15 14:14:21 +08:00
Ankit Agarwal b19cc4ef25 MDL-45898 myprofile: Redesign my profile page 
Part of MDL-45774.

Contributions by John Okely, Jetha Chan and Damyon Wiese (squashed branch).

AMOS BEGIN
CPY [coursebadges,core_badges], [badges,core_badges]
AMOS END
 2015-04-10 17:17:32 +08:00
Dan Poltawski bfceabab5d Merge branch 'MDL-41608-master' of git://github.com/jethac/moodle 2015-04-07 15:40:06 +01:00
David Monllao b81da1f27c MDL-43558 theme_base: We don't need edit toggle if modeditingmenu is disabled 2015-04-07 11:16:15 +08:00
Jetha Chan 263fb9d1bc MDL-41608 lib: add notification renderable using mustache 2015-03-30 14:29:11 +08:00
Jetha Chan d10ac16a2f MDL-48060 messaging: contact list paging bar style fixup 2015-03-04 17:37:04 +01:00
Eloy Lafuente (stronk7) caa7022ed0 Merge branch 'MDL-49237-master' of git://github.com/mastnym/moodle 2015-03-02 21:41:35 +01:00
Brian Barnes 35fe9b8aa4 MDL-48060 messaging: Removed table from contact list 2015-03-02 09:04:04 +13:00
Martin Mastny 7e7c15fbd1 MDL-49237 theme_base: made block calendar captions smaller in base theme 2015-02-25 15:29:39 +08:00
Jetha Chan 3451a51cdf MDL-37477 output: Add support for table captions 
Conflicts:
	lib/upgrade.txt
	theme/bootstrapbase/style/moodle.css
 2015-02-10 16:15:49 +08:00
Frederic Massart cf4a17cb9b MDL-48933 core_message: New dialog to send a message to a user 2015-02-02 11:03:38 +08:00
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 cb6e1d5270.

This reverts commit 7a5e605424, reversing
changes made to 7b9fb265d2.

This reverts commit 06404b0118, reversing
changes made to 0f87473fed.

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