mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-13 12:10:34 +01:00
Code Issues Projects Releases Wiki Activity
65,507 Commits 36 Branches 523 Tags
Commit Graph

65507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sam marshall
597ac7e5d2 MDL-42582 Availability: Restriction display incorrect for multi-para Labels 
When a label has multiple paragraphs, its name (converted to plain text)
contains a line feed. Due to an error in regular expressions that don't
accept the line feed, this caused incorrect display on the course page
when that label is shown as a requirement for accessing another activity.
 2013-11-15 12:45:32 +00:00
sam marshall
8f46e2a808 MDL-42905 Backup progress: Pointless line of code should be deleted 2013-11-15 12:44:34 +00:00
Eloy Lafuente (stronk7)
5e6da548d7 Moodle release 2.6rc1 v2.6.0-rc1 2013-11-15 13:21:41 +01:00
Eloy Lafuente (stronk7)
9524fc754d on-demand release 2.6beta+ 2013-11-15 11:18:00 +01:00
Eloy Lafuente (stronk7)
a3d0f7c792 Merge branch 'install_master' of git://git.moodle.org/moodle-install 2013-11-15 11:17:55 +01:00
Damyon Wiese
f059744968 MDL-42887 Form collapsing CSS fixes. 
.fcontainer is not guaranteed to be in the form - we still need something else
for this selector to make it specific enough - so have replaced with #region-main (required).

Also - redid the question edit styles to be specific enough.
 2013-11-15 17:40:58 +08:00
Marina Glancy
2b6344c1d0 Merge branch 'MDL-42887-master' of git://github.com/damyon/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-15 17:27:50 +11:00
Damyon Wiese
d8383b247e MDL-42887 Forms: Collapse all field elements below their labels on screens less than 1180px 
Includes css fixes to make the question type edit screens look OK with this change.
 2013-11-15 13:40:27 +08:00
Mark Nelson
88a31771a6 MDL-42553 core_calendar: third party calendar types can now be uninstalled 2013-11-14 17:20:01 -08:00
Eloy Lafuente (stronk7)
9a36c7d95c Merge branch 'MDL-42447_master' of git://github.com/dmonllao/moodle 2013-11-15 02:11:27 +01:00
David Monllao
58a3a34e38 MDL-42447 performance: New var to add perf. info to redirections 2013-11-15 09:10:22 +08:00
Eloy Lafuente (stronk7)
234159ee9d Merge branch 'wip-MDL-42912-master' of git://github.com/marinaglancy/moodle 2013-11-15 02:04:45 +01:00
Marina Glancy
ceeb8102cd MDL-42912 glossary: oracle-compatibility of SQL queries 2013-11-15 11:36:11 +11:00
Eloy Lafuente (stronk7)
a269acfef7 Merge branch 'MDL-42859-master' of git://github.com/mouneyrac/moodle 2013-11-14 23:24:20 +01:00
Eloy Lafuente (stronk7)
30d0332f00 Merge branch 'w47_MDL-42860_m26_dbsess' of https://github.com/skodak/moodle 2013-11-14 23:22:26 +01:00
Damyon Wiese
f2f23af955 Merge branch 'MDL-42711-master' of git://github.com/nebgor/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-14 17:18:44 +08:00
Aparup Banerjee
fa41a73fe7 MDL-42711 theme - css recompiled after RTL fixes. 2013-11-14 17:04:09 +08:00
Barbara Ramiro
a28601c4ee MDL-42711 RTL fixed to chat.less 2013-11-14 17:01:03 +08:00
Aparup Banerjee
96c124fca0 MDL-42711 added RTL styles to chat.less . 2013-11-14 16:57:48 +08:00
Jerome Mouneyrac
7f1427e918 MDL-42859 filepicker: fix dropbox logout warning layout 2013-11-14 15:16:33 +08:00
Frederic Massart
7d31a2999b MDL-42853 course: Fix edit title icon margin on RTL 2013-11-14 10:59:35 +08:00
Frederic Massart
e161a5a319 MDL-42853 frontpage: RTL alignment to match LTR 2013-11-14 10:59:23 +08:00
AMOS bot
a3c5288ddd Automatically generated installer lang files 2013-11-14 00:45:19 +00:00
Mark Nelson
d498c973c4 MDL-42884 core_user: fixed issue when deleting users with invalid emails throws invalidusername exception 2013-11-13 16:11:27 -08:00
Eloy Lafuente (stronk7)
529d3bad0e Merge branch 'MDL-42768-master' of git://github.com/FMCorz/moodle 2013-11-13 23:15:23 +01:00
Eloy Lafuente (stronk7)
474719d327 Merge branch 'MDL-42866-master' of git://github.com/damyon/moodle 2013-11-13 23:09:09 +01:00
Damyon Wiese
60f0cd6bcd MDL-42866 EditPDF: Fix bad foreign key in install.xml 
Thanks Tim for reporting this!
 2013-11-13 21:46:44 +08:00
Petr Škoda
ea7aa014f9 MDL-42860 improve db session help string 2013-11-13 10:54:15 +01:00
Aparup Banerjee
b549e66e5e MDL-42711 added RTL styles to improvements. 2013-11-13 17:02:54 +08:00
Damyon Wiese
e4af9616c3 Merge branch 'MDL-40728-master-2' of git://github.com/mouneyrac/moodle 2013-11-13 16:57:34 +08:00
Jerome Mouneyrac
c8a661098e MDL-40728 courseupload: add missing help icons 2013-11-13 16:34:43 +08:00
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