mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-08 18:03:19 +02:00
Code Issues Projects Releases Wiki Activity
65,241 Commits 36 Branches 530 Tags
Commit Graph

14689 Commits

Author SHA1 Message Date
James Pratt
7d6b28d87a MDL-42957 (3) quiz statistics : removing assertEquals(time(), ..) tests 2013-11-28 17:57:02 +07:00
James Pratt
487e7e6602 MDL-42957 (2) quiz statistics : Hardcoded sql LIMIT clause 
Fixing some typos and adding some tests.
 2013-11-28 17:13:26 +07: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
Ankit Agarwal
ddea17fc22 MDL-42803 behat: Fix random behat errors in CI 2013-11-11 14:03:26 +08:00
Sam Hemelryk
0fd6069ecd Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle 2013-11-11 13:10:44 +08:00
Marina Glancy
b180048946 Merge branch 'MDL-42683-master-2' of git://github.com/mouneyrac/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-11 15:02:48 +11:00
Marina Glancy
f1be232f68 Merge branch 'MDL-42081-master-nomerge2' of git://github.com/mouneyrac/moodle 2013-11-11 15:02:01 +11:00
Jerome Mouneyrac
7444cf322e MDL-42081 EditPDF: Add default stamp images 2013-11-11 11:39:27 +08:00
Adrian Greeve
5b1944bbba MDL-40612 libraries: Tidy up and improvement of the code for additional name fields. 
Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()
 2013-11-11 11:01:14 +08:00
Damyon Wiese
f845946821 MDL-36224 LTI: Whitespace fix 2013-11-11 10:04:10 +08:00
Andreas Grabs
6d645211be MDL-41775 mod_feedback - Input fields are shown with a fixed width on bootstrap based themes 2013-11-08 10:42:49 +01:00
Damyon Wiese
2bdd5ff4aa MDL-36224 LTI: Fix up docs, add plugininfo class and create subplugin folder. 2013-11-08 14:35:32 +08:00
Mark Nielsen
8cf7670e58 MDL-36224: Improving lti_get_types 
If there are no LTI source plugins that
need to be added to the activity chooser
menu, then fallback to the default
activity chooser display.
 2013-11-08 14:35:31 +08:00
Mark Nielsen
4d7a2c9e1c MDL-36224: Minor updates to LTI 
* No debug display on service.php
* Send a 400 header on error
 2013-11-08 14:35:31 +08:00
Chris Scribner
fdbf2f229c MDL-36224: Adding subplugins.php 2013-11-08 14:35:31 +08:00
Chris Scribner
976b5bca31 MDL-36224: Add support for pluggable extensions to add new LTI services 2013-11-08 14:35:31 +08:00
Aparup Banerjee
b661e76c3f MDL-42711 hide course theme option for non bootstrapbase based themes. some other minor fixes too. 2013-11-08 13:10:40 +08:00
Damyon Wiese
c8868cefe2 MDL-42679 Scorm: Remove stale yui shifted css files. 2013-11-08 11:54:48 +08:00
Damyon Wiese
13f04e7c91 Merge branch 'MDL-42679-master' of git://github.com/andrewnicols/moodle 2013-11-08 11:23:00 +08:00
Dan Poltawski
f9dc4bd78b MDL-42704 quiz statistics: make test more tolerant 2013-11-08 11:11:31 +08:00
Dan Poltawski
379cbb459a Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle 2013-11-08 11:11:28 +08:00
Marina Glancy
9fec5cb333 Merge branch 'MDL-42760-master' of git://github.com/mouneyrac/moodle 2013-11-08 14:10:41 +11:00
Jamie Pratt
ec477ba1bb MDL-42704 quiz statistics : SQL Errors under MSSQL 2013-11-07 18:05:10 +07:00
Tim Hunt
a289a2b51c MDL-42540 quiz manual grading should have setType 2013-11-07 09:44:24 +00:00
Dan Poltawski
48fe93fa26 Merge branch 'MDL-41615_c' of git://github.com/rwijaya/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-07 17:17:32 +08:00