moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 19:06:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66971 commits 37 branches 544 tags 1.3 GiB
Commit graph

15163 commits

Author SHA1 Message Date
Sam Hemelryk
657b29e7bc Merge branch 'MDL-43037_master' of https://github.com/markn86/moodle 2013-11-26 08:36:36 +13:00
Tim Lock
16c25753a8 MDL-43020: Fix lesson scale warnings when deleting user attempts 2013-11-25 15:08:19 +10:30
Marina Glancy
8a3a584da5 MDL-43006 behat: adding javascript tag because of behat bug 
behat without JS does not submit the empty textarea field causing notice in the form processing
 2013-11-25 14:59:28 +11:00
Dan Poltawski
83a97ce6c7 Merge branch 'master_MDL-42992' of git://github.com/danmarsden/moodle 2013-11-25 11:17:47 +08:00
Tim Lock
74dd3bd6c7 MDL-43020: Fix calculation of lesson scale value warning 2013-11-25 09:31:56 +10:30
Mark Nelson
12bb281e5e MDL-43037 mod_quiz: retrieve all name fields for the user override pages 2013-11-23 16:17:54 -08:00
Marina Glancy
6f5db6a6a8 MDL-42508 folder: add module generator 2013-11-22 18:56:48 +11:00
Marina Glancy
490dca1a6f MDL-42508 imspcp: add module generator 2013-11-22 15:25:38 +11:00
Marina Glancy
15cca13822 MDL-42508 scorm: add module generator 2013-11-22 15:25:37 +11:00
Tim Lock
da7e5daf1e MDL-43020: Fix calculation of lesson scale value using gradeitem grademax 2013-11-22 07:17:38 +10:30
Dan Marsden
18a34b07e6 MDL-42992 SCORM: Always allow IE to resize window 2013-11-21 10:22:42 +13:00
Dan Poltawski
2a0a33a6ee Merge branch 'MDL-42504' of git://github.com/timhunt/moodle 2013-11-19 10:30:16 +08:00
Dan Poltawski
0cf4e15baf Merge branch 'MDL-42181' of git://github.com/mkassaei/moodle 2013-11-19 10:04:59 +08:00
Damyon Wiese
86249e9aeb Merge branch 'master_MDL-40223' of git://github.com/danmarsden/moodle 2013-11-19 09:49:57 +08:00
Dan Marsden
eef4c4c175 MDL-40223 SCORM: pass limit into function instead of hardcoding to allow cross-db 2013-11-19 13:23:06 +13:00
Dan Poltawski
66a02845e9 Merge branch 'MDL-42880b' of git://github.com/timhunt/moodle 2013-11-18 15:37:01 +08:00
Damyon Wiese
67016a4d39 Merge branch 'master_MDL-41695' of git://github.com/danmarsden/moodle 2013-11-18 15:12:56 +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
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
M Kassaei
0328341f97 MDL-42181 quiz nav: highight all buttons when all Qs on one page 2013-11-15 15:30:31 +00: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
Tim Hunt
52b612f08b MDL-42504 quiz autosave: alert users if connection lost. 
When the auto-save fails, we alert the user that they may have lost their
internet connection so that they don't do more work that they might just
lose.
 2013-11-15 15:08:13 +00: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
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
96c124fca0 MDL-42711 added RTL styles to chat.less . 2013-11-14 16:57:48 +08: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
Aparup Banerjee
6f8624f77a MDL-42711 made all theme menu strings in chat popup translatable 2013-11-13 16:22:34 +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
Damyon Wiese
34b67813ec Merge branch 'MDL-42598' of git://github.com/timhunt/moodle 2013-11-13 13:43:52 +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
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
Eloy Lafuente (stronk7)
aa7bc816d9 Merge branch 'wip-MDL-42672-master' of git://github.com/marinaglancy/moodle 2013-11-12 20:07:05 +01: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
Adrian Greeve
f3fbb6137b MDL-42812 mod_quiz: Fixed up a syntax error for additional name fields. 2013-11-12 15:46:45 +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
Sam Hemelryk
0ac5863d86 Merge branch 'wip-MDL-41158-master-two' of git://github.com/abgreeve/moodle 2013-11-12 13:20:12 +08:00
Damyon Wiese
93e55a8bf9 MDL-42804 Database - SQL keywords should be uppercase. 2013-11-12 12:05:08 +08:00
rwijaya
94738ee7d6 MDL-42804 data_mod: fix alternate name warning for deleting an entry 2013-11-12 12:05:08 +08:00
Marina Glancy
c7ef597040 Merge branch 'MDL-42540' of git://github.com/timhunt/moodle 2013-11-12 14:47:54 +11:00
Adrian Greeve
e351bed5c1 MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything. 2013-11-12 11:30:16 +08:00
Adrian Greeve
3263a3562d MDL-41158 mod_workshop: Workshop submission alternate name field fix. 2013-11-12 10:40:23 +08:00
Adrian Greeve
29fa62cfd9 MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything. 2013-11-12 10:17:59 +08:00
Marina Glancy
82b211b6d0 Merge branch 'MDL-41775_master' of git://github.com/grabs/moodle 2013-11-12 11:23:51 +11:00
Eloy Lafuente (stronk7)
5d875d18e0 Merge branch 'MDL-40481' of git://github.com/timhunt/moodle 2013-11-12 00:38:35 +01:00
Damyon Wiese
16fafb9aed Merge branch 'MDL-42803-master' of git://github.com/ankitagarwal/moodle 2013-11-11 17:16:51 +08:00