Commit graph

65363 commits

Author SHA1 Message Date
Ankit Agarwal
7e1da23dfc MDL-41316 tool_spamcleaner: Fix sql queries
AS keyword is not allowed in sql qeries for table alias as Oracle doesn't support it
Thanks to Sara Cenni for suggesting the patch
2013-11-13 16:32:24 +08:00
Aparup Banerjee
6f8624f77a MDL-42711 made all theme menu strings in chat popup translatable 2013-11-13 16:22:34 +08:00
Mark Nelson
8eb2ea83d2 MDL-42100 tool_capability: fixed incorrect links 2013-11-13 00:20:28 -08:00
Damyon Wiese
6bce5b846a Merge branch 'wip-MDL-42833-master' of git://github.com/marinaglancy/moodle 2013-11-13 15:57:07 +08:00
Marina Glancy
4c35937514 Merge branch 'MDL-42849-master' of git://github.com/andrewnicols/moodle 2013-11-13 18:24:06 +11:00
Frederic Massart
c7b3c10e3b MDL-42768 restore: Use sql_compare_text instead for text comparison 2013-11-13 14:46:30 +08:00
Damyon Wiese
b22292ed50 Merge branch 'MDL-42705-master-nomerge' of git://github.com/mouneyrac/moodle 2013-11-13 14:42:32 +08:00
Aparup Banerjee
9c53c70c3c MDL-42711 consolidated responsive styles into responsive.less 2013-11-13 13:58:51 +08:00
Damyon Wiese
34b67813ec Merge branch 'MDL-42598' of git://github.com/timhunt/moodle 2013-11-13 13:43:52 +08:00
Barbara Ramiro
c3349e7576 MDL-42711 theme bootstrapbase chat.less :Override max-width for chat user picture on chrome and safari 2013-11-13 13:33:26 +08:00
Andrew Nicols
83f91454f9 MDL-42849 ActionMenu: Tweak selector for filler and padding for edit menu 2013-11-13 13:32:36 +08:00
Damyon Wiese
df6be935e1 MDL-42684 TinyMCE: Fix bootstrap CSS for putting text editors below labels. 2013-11-13 13:26:36 +08:00
Damyon Wiese
2034716c16 Merge branch 'MDL-33536-master' of git://github.com/damyon/moodle 2013-11-13 13:10:42 +08:00
Damyon Wiese
db7092b076 MDL-42684 Forms: Display text editors and file pickers with the label above the field.
This includes the front page description admin field.
2013-11-13 12:52:00 +08:00
Marina Glancy
1d2a7ef54f Merge branch 'wip-mdl-42799' of https://github.com/rajeshtaneja/moodle
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
2013-11-13 15:43:44 +11:00
Damyon Wiese
f51d0384f7 Merge branch 'MDL-41797' of git://github.com/rwijaya/moodle 2013-11-13 11:50:36 +08:00
Aparup Banerjee
462f3dc768 MDL-42711 theme : final css compiled. 2013-11-13 11:25:12 +08:00
Aparup Banerjee
2a8ab91c70 MDL-42711 theme port from LM: fixed up mod_feedback analysis bar heights from auto to 5px 2013-11-13 11:20:14 +08:00
Aparup Banerjee
cd578aa0e4 MDL-42711 theme port from LM: Info, Date and Author on the latest News block reordered
This also adds some simple clean style padding fixes for a better look.
2013-11-13 11:07:03 +08:00
Marina Glancy
5268dbffef Merge branch 'MDL-42827-master' of git://github.com/andrewnicols/moodle 2013-11-13 13:28:46 +11:00
Barbara Ramiro
b8037f4fa2 MDL-42711 theme port from LM: Chat for Clean theme - minimal styling
(this converts colours to suit clean theme more)
2013-11-13 10:22:41 +08:00
Aparup Banerjee
ef7810de36 MDL-42711 theme port from LM: padded date and footer in upcoming events block (part of commit for MDLSITE-2427) 2013-11-13 10:13:11 +08:00
Damyon Wiese
2b997ab5dd MDL-33536 Navigation: Add missing require_once for safety. 2013-11-13 09:59:44 +08:00
rwijaya
80fd00729b MDL-41797 external tools module: fix heading levels.
AMOS BEGIN
CPY [submissions, core_grades], [submissions, mod_lti]
AMOS END
2013-11-13 09:52:32 +08:00
Aparup Banerjee
ed289a2cdd Merge branch 'MDL-42711-master' of github.com:nebgor/moodle into MDL-42711-master 2013-11-13 09:51:09 +08:00
Aparup Banerjee
95b2934b23 Merge pull request #3 from mudrd8mz/MDL-42711-lmnet-clean-theme-backport
MDL-42711 LMNET clean theme backport
2013-11-12 17:48:46 -08:00
David Mudrák
ead1f5bda0 MDL-42711 theme port from LM: vertical alignment of the course icon
When the course name spans over multiple lines, vertically centered icon does
not look nice (or at least our beloved Benevolent Dictator for Life does not
like it ;-). This hack alignes the icon vertically with the first line of the
course name all the time (or at least it tries to).
2013-11-13 02:32:05 +01:00
David Mudrák
3bae4448cf MDL-42711 theme port from LM: let the course name use the full line width 2013-11-13 02:12:45 +01:00
Marina Glancy
9fcd029012 MDL-42833 course: correction to navigation path in management interface 2013-11-13 12:03:46 +11:00
David Mudrák
24b65a44c9 MDL-42711 theme port from LM: improve RSS client block styling
This significantly increases the readability of items in the block.
2013-11-13 02:03:02 +01:00
Eloy Lafuente (stronk7)
662c5263b0 Merge branch '42832-26' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-13 01:55:52 +01:00
David Mudrák
8bf57320e6 MDL-42711 theme port from LM: forum layout on small screen devices
This is a backport of MDLSITE-2445.  Wrapping the 'Started by' and 'Last post'
texts helps. On smaller device, these two get smaller font too. This is far
from optimal but better than the current (default) behaviour.
2013-11-13 01:48:05 +01:00
AMOS bot
7fc75f76ca Automatically generated installer lang files 2013-11-13 00:47:29 +00:00
David Mudrák
1765866fff MDL-42711 theme port from LM: survey module styling
Backport some Survey module styling from the standard theme to improve the
usability of the interface. The style is originally defined in
theme/standard/styles/modules.css
2013-11-13 01:26:21 +01:00
David Mudrák
a5b83691ff MDL-42711 theme port from LM: improve the initial bar display 2013-11-13 01:17:13 +01:00
Eloy Lafuente (stronk7)
5658129967 Merge branch 'MDL-42790' of git://github.com/timhunt/moodle 2013-11-13 01:12:27 +01:00
Eloy Lafuente (stronk7)
64dcfd6ea3 Merge branch 'MDL-42839-master' of git://github.com/sammarshallou/moodle 2013-11-13 01:09:49 +01:00
Marina Glancy
930fbd0505 Merge branch 'MDL-38574' of git://github.com/timhunt/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-11-13 11:05:25 +11:00
Eloy Lafuente (stronk7)
183f84b5c3 Merge branch 'wip_master_mdl-42723' of https://github.com/iarenaza/moodle 2013-11-13 01:03:09 +01:00
Eloy Lafuente (stronk7)
aa7bc816d9 Merge branch 'wip-MDL-42672-master' of git://github.com/marinaglancy/moodle 2013-11-12 20:07:05 +01:00
sam marshall
5c138b258d MDL-42839 MUC: Memcache server configuration too sensitive to whitespace 2013-11-12 12:33:36 +00:00
Tim Hunt
c1db10b6d5 MDL-38574 qtype chooser: quick fix to make it fit on-screen.
MDL-32729 will provide a better fix for this, but we may as well apply
this quick fix on stable branches.
2013-11-12 11:35:42 +00:00
Sam Hemelryk
c31fc5a099 Merge branch 'MDL-42812-r1' of git://github.com/abgreeve/moodle 2013-11-12 16:30:39 +08:00
Rajesh Taneja
baf881b803 MDL-42799 Assignment: Min. width/height for widget is set to 1
It was possible for user to add widgets with width/height = 0
which were not displayed to user and doesn't have much meaning to it
This patch will set min. width/height to 1
2013-11-12 16:17:40 +08:00
Aparup Banerjee
8353186f4e MDL-42711 theme port from LM: reimplemented fixes from MDLSITE-2451 to align group icons in forumpost css class (forum/blog). 2013-11-12 15:58:31 +08:00
Aparup Banerjee
73c4e333c3 MDL-42711 theme port from LM: reimplemented fixes from MDLSITE-2451 to align group icons if forumpost 2013-11-12 15:56:40 +08:00
Adrian Greeve
f3fbb6137b MDL-42812 mod_quiz: Fixed up a syntax error for additional name fields. 2013-11-12 15:46:45 +08:00
Sam Hemelryk
aa861f6297 MDL-42832 course: management viewmode string improvements 2013-11-12 15:32:59 +08:00
Damyon Wiese
3ebaeb11b0 Merge branch '41392-26-r1' of git://github.com/samhemelryk/moodle 2013-11-12 15:11:25 +08:00
Jerome Mouneyrac
bb2f7c3ce9 MDL-42705 EditPDF: Progress bar styles in editpdf need to be moved to base theme. 2013-11-12 15:09:19 +08:00