Sam Hemelryk
1098226524
Merge branch 'MDL-42184-master-3' of git://github.com/mouneyrac/moodle
2013-11-19 10:15:33 +13:00
Sam Hemelryk
34592ffd98
Merge branch 'MDL-42853-master' of git://github.com/FMCorz/moodle
...
Conflicts:
theme/bootstrapbase/style/moodle.css
2013-11-19 10:08:45 +13:00
Damyon Wiese
ef16df1449
Merge branch 'MDL-42100_master' of https://github.com/markn86/moodle
2013-11-18 16:08:57 +08:00
Dan Poltawski
66a02845e9
Merge branch 'MDL-42880b' of git://github.com/timhunt/moodle
2013-11-18 15:37:01 +08:00
Damyon Wiese
79149e85fb
Merge branch 'MDL-42808-master' of git://github.com/FMCorz/moodle
2013-11-18 15:26:52 +08:00
Damyon Wiese
67016a4d39
Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle
2013-11-18 15:12:56 +08:00
Damyon Wiese
7f2c374dcd
Merge branch 'MDL-42582-master' of git://github.com/sammarshallou/moodle
2013-11-18 14:55:18 +08:00
Dan Poltawski
b6813d8f6a
Merge branch 'MDL-42884_master' of https://github.com/markn86/moodle
2013-11-18 14:41:06 +08:00
Dan Poltawski
728f924ec1
Merge branch 'MDL-42930-master' of git://github.com/damyon/moodle
...
Conflicts:
mod/scorm/db/upgrade.php
2013-11-18 14:32:55 +08:00
Damyon Wiese
61cdb947e8
Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle
2013-11-18 14:05:17 +08:00
Damyon Wiese
47578dbff4
MDL-42930 Add 2.6.0 upgrade line
2013-11-18 11:47:17 +08:00
Dan Marsden
0d7eb69164
MDL-41695 SCORM: allow unlimited decimal places in CMIDecimal
2013-11-18 10:27:10 +13:00
Dan Marsden
27c58e5583
MDL-40223 SCORM: update scorm->launch param after restore - also check that scorm->launch is valid.
2013-11-18 09:44:54 +13:00
Eloy Lafuente (stronk7)
953b6e2b34
MDL-42929 backup: keep own version & release updated.
2013-11-17 02:32:43 +01:00
Eloy Lafuente (stronk7)
b58bc15af5
weekly back-to-dev release 2.7dev
2013-11-16 23:46:18 +01:00
Eloy Lafuente (stronk7)
2b10fa0433
Moodle release 2.6
v2.6.0
2013-11-16 17:28:07 +01:00
Tim Hunt
c590848158
MDL-42880 quiz settings: remove unnecessary disabledif rules.
...
These rules were causing problems in the case where the form was
sumitted with validation errors. In that case, the During the attempt ->
The attempt checkbox was becoming unset, and hence the other During the
attmept checkboxes became disabled, and the values were not saved.
Thanks to Sam Marshall for suggesting this fix.
2013-11-15 15:09:25 +00:00
Eloy Lafuente (stronk7)
ad9e81eb98
Merge branch 'MDL-42926-master' of git://github.com/damyon/moodle
2013-11-15 16:06:22 +01:00
Damyon Wiese
ab9300dffe
MDL-42926 Bootstrap base: Remove 6px spacing between form elements
...
This was accidentally copied from the css for base. It is only visible when
the form fields are displayed with the label above the field. (less than 1200px).
2013-11-15 22:58:10 +08:00
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
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
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
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