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

761 Commits

Author SHA1 Message Date
Damyon Wiese
1f738c8c0c MDL-43074 assignfeedback_editpdf: Use escapeshellarg for all args in exec command. 
This is to fix a reported problem with windows compatibility (e.g. when ghostscript is installed in
a folder with spaces in the name).
 2013-12-09 10:52:35 +08:00
Damyon Wiese
9a046c0683 MDL-40096 assign: Prevent js error because uniqid() is not unique. 
Use html_writer::random_id instead because it incorporates a static counter.
 2013-12-09 10:25:15 +08:00
Pavel Sokolov
a66555328b MDL-43199 assign: fix js error when expanding comments for non editing teachers in assign grading table 2013-12-06 12:57:20 +08:00
Marina Glancy
07622451a3 MDL-42174 behat: deprecate upload file to filepicker step in favour of filemanager 2013-12-05 21:00:25 +11:00
Sam Hemelryk
db9c8f4c7d Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle 2013-12-04 09:43:43 +13:00
Sam Hemelryk
a59a423926 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle 2013-12-03 11:12:34 +13:00
Ruslan Kabalin
749700e4a7 MDL-43071 assign: Fix offline grades import for scale grading. 2013-11-26 16:36:37 +00:00
Damyon Wiese
3a5c3b3cbf MDL-42919 Assign: Remove no-label form hacks 2013-11-26 13:30:36 +08:00
Damyon Wiese
47578dbff4 MDL-42930 Add 2.6.0 upgrade line 2013-11-18 11:47:17 +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
Damyon Wiese
b22292ed50 Merge branch 'MDL-42705-master-nomerge' of git://github.com/mouneyrac/moodle 2013-11-13 14:42:32 +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
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
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
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
Marina Glancy
9fec5cb333 Merge branch 'MDL-42760-master' of git://github.com/mouneyrac/moodle 2013-11-08 14:10:41 +11:00
Jerome Mouneyrac
eb11ae0d5c MDL-42760 EditPDF: sometimes the dropdown or search comment appear below the editpdf 2013-11-07 16:11:51 +08:00
Jason Fowler
f2b8eb222a MDL-42600 EditPDF: Fix padding etc on toolbars 2013-11-07 12:15:11 +08:00
Dan Poltawski
02c6bd358f Merge branch 'MDL-42728-en_fix' of git://github.com/mudrd8mz/moodle 
Conflicts:
	lang/en/moodle.php
 2013-11-07 09:34:31 +08:00
sam marshall
db0f0097e8 MDL-42084 Unit tests: Remove unnecessary 'clear time limit change' lines 2013-11-06 16:40:04 +00:00
sam marshall
3ef7279f26 MDL-42084 Core: Change set_time_limit to core_php_time_limit::raise everywhere 
Exceptions (places where set_time_limit is still left) are:

Third-party libraries:
  ADODB
  PHPMailer

Moodle core:
  PHPUnit - not relevant (CLI mode)
 2013-11-06 16:40:01 +00:00
sam marshall
3749c94627 MDL-42714 Backup: For tgz packer, handle missing zlib extension 2013-11-06 12:34:46 +00:00
Marina Glancy
bdb7c88635 Merge branch 'MDL-42031-master' 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-06 17:18:38 +11:00
Jerome Mouneyrac
d40ce26f05 MDL-42031 assginfeedback_editpdf: fix next/previous/select page 2013-11-06 14:13:19 +08:00
Damyon Wiese
951b414b65 Merge branch 'MDL-40975-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2013-11-06 13:06:01 +08:00
Marina Glancy
c32ba4e2fb Merge branch '42690-26' of git://github.com/samhemelryk/moodle 2013-11-06 15:52:03 +11:00
David Monllao
047a8800f4 MDL-40975 course: Adapt behat tests to the new course editing interface 2013-11-06 11:41:00 +08:00
Marina Glancy
09af1e2864 MDL-42672 blocks: warnings on /mod/xxx/index.php for frontpage course 2013-11-06 14:21:24 +11:00
Marina Glancy
a43db075ff Merge branch 'MDL-42402-master-fix3' of git://github.com/damyon/moodle 2013-11-06 11:52:15 +11:00
Helen Foster
5a25566060 MDL-42728 Merge English strings from the en_fix language pack 2013-11-05 23:41:44 +01:00
Damyon Wiese
cb35482abf MDL-42402 EditPDF: CSS fix for hover on drop down menus 
Also required a fix for the comment search window because it was picking up the same styles.
 2013-11-06 00:41:04 +08:00
Damyon Wiese
237f484188 MDL-42671 EditPDF: Disable EditPDF is zlib is not available 
Also put a warning on the admin page if this is the case.
 2013-11-06 00:26:05 +08:00
Damyon Wiese
1d38083c9d MDL-42402 EditPDF: Make the colours match the mockup in MDL-41633 2013-11-05 14:49:06 +08:00
Damyon Wiese
057a79922e Merge branch 'MDL-42701' of git://github.com/stronk7/moodle 2013-11-05 13:10:52 +08:00
Damyon Wiese
6655b6102a MDL-42402 EditPDF: Fix the styles again 
More fixes for the vertical alignment of the images in the toolbar buttons and the dropdowns.
 2013-11-05 10:30:11 +08:00
Eloy Lafuente (stronk7)
f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Dan Poltawski
6db9f41419 Merge branch 'MDL-42355_editpdf_deselect_comment' of git://github.com/davosmith/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-04 20:10:24 +08:00
Sam Hemelryk
19195b602c MDL-42690 mod_assign: remove submit button from single grading interface 2013-11-04 16:02:43 +08:00
Damyon Wiese
2bd27878db MDL-42350 assign: Test group submission + drafts 2013-11-04 15:50:26 +08:00
Sam Hemelryk
7a47babb9e MDL-42350 mod_assign: fixed display of submission button 2013-11-04 15:50:25 +08:00
Damyon Wiese
d04bea30da Merge branch 'wip-MDL-42400-master' of git://github.com/marinaglancy/moodle 2013-11-04 13:11:42 +08:00
Marina Glancy
78d877d40b Merge branch 'MDL-42402-master' of git://github.com/damyon/moodle 2013-11-04 15:53:22 +11:00
Jerome Mouneyrac
7abb7c72ec MDL-42683 EditPDF: stamp picker button size is wrong 2013-11-04 12:35:30 +08:00
Petr Škoda
0c431257e9 MDL-42387 standardise file lifetime handling 2013-11-01 10:42:18 +01:00
Marina Glancy
35e903971b Merge branch 'MDL-42565-master' of git://github.com/ankitagarwal/moodle 2013-11-01 12:42:17 +11:00
Marina Glancy
003a81ee11 Merge branch 'MDL-42356-master' 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-01 12:16:20 +11:00