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
Marina Glancy
f5b2c9f4af Merge branch 'MDL-42351-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-11-01 09:00:03 +08:00
Dan Poltawski
d61d4c1bf6 Merge branch 'MDL-42482_editpdf_blank_comments' 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-01 08:57:33 +08:00
Dan Poltawski
fc74cc8238 Merge branch 'MDL-42352_editpdf_scrolling' 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-01 08:56:53 +08:00
Damyon Wiese
bb1a600046 Merge branch 'MDL-41092-master' of git://github.com/ankitagarwal/moodle 2013-11-01 08:55:28 +08:00
Damyon Wiese
4d2bd6735f MDL-41092 Assign: Expose SQL error in cron unit test 2013-11-01 08:55:28 +08:00
Ankit Agarwal
e24c2c1a73 MDL-42565 assign: Status of grading is not displayed anymore 2013-10-30 14:28:21 +08:00
Damyon Wiese
d79d1bd8fa MDL-42351 EditPDF: Fix jiggling of relatively positioned elements 
When calling setX/setY with YUI - YUI takes into account the position style
of the element. If none is set it assumes position relative. Position relative
is bad because relatively positioned elements still take up space in the page,
and all the elements after that node are positioned, taking into account the size
of that node. So when a node is resized or deleted, all nodes after that one in
the list of drawables are affected.

The magic fix - is just to set position: absolute on the drawables before calling setX/setY.
 2013-10-29 22:18:19 +08:00
Dan Poltawski
c426631850 Merge branch 'MDL-42401-master' of git://github.com/damyon/moodle 
Conflicts:
	mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js
 2013-10-29 14:43:02 +08:00
Michael de Raadt
9f3da4079a MDL-41092 assign: Fix duplicate key error in assign cron 2013-10-29 14:38:48 +08:00
Jerome Mouneyrac
b9e946f827 MDL-42356 Edit PDF: When no stamps uploaded toolbar looks strange 2013-10-29 11:41:43 +08:00
Jerome Mouneyrac
aa3e4bdec7 MDL-42028 EditPDF: replace the loading icon by a progress bar 2013-10-28 13:48:22 +08:00
Marina Glancy
7fbe33fcf1 MDL-42400 generator: module generators call add_moduleinfo instead of direct inserts 2013-10-26 14:00:23 +11:00
Damyon Wiese
6d87dcebe2 MDL-42401 EditPDF: Allow dragging the edit pdf window. 
Also move the location of the call the centerDialogue so it fires after the drawing region is
added to the window.
 2013-10-24 13:50:58 +08:00
Damyon Wiese
298a7ee386 MDL-42402 EditPDF: CSS Improvements for editing toolbar. 
The main change here is to prevent the default rendering of a select list for the page
selector, so that it looks more consistent with the rest of the toolbar on different
browsers/os combinations.

This is done with some vendor specific css rules targeting webkit, mozilla and ie.

There are also some minor tweaks to vertically align the images in the buttons and reduce the padding
above and below the toolbar.
 2013-10-24 13:22:39 +08:00
Dan Poltawski
459dbd4362 Merge branch 'MDL-42030-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-10-24 10:19:47 +08:00
Davo Smith
60b8708076 MDL-42355 assignfeedback_editpdf - do not start a new comment immediately when deselecting the old comment 2013-10-22 18:46:45 +01:00
Davo Smith
6e67d80d50 MDL-42482 assignfeedback_editpdf - prevent blank comments from disappearing when the menu is opened 2013-10-22 18:26:44 +01:00
Davo Smith
114913e31f MDL-42352 assignfeedback_editpdf - prevent scrolling when clicking on buttons 2013-10-22 15:09:15 +01:00
Jody Steele
add50b5ab0 MDL-38628 mod_assign: Allow a user to specify "No Grade" when grading an assignment submission 2013-10-21 16:47:05 +11:00
Dan Poltawski
fb032ccb3f Merge branch 'wip-mdl-31405-new' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/upgrade.txt
    mod/upgrade.txt
 2013-10-21 10:57:44 +08:00
Petr Škoda
b2858b916a MDL-42148 new overview of 3rd party libraries 
Includes:
* each plugin has own thirdpartylibs.xml file
* added missing libraries
* fixed existing library infos
* new Site administration / Development / Third party libraries page
 2013-10-16 14:48:29 +08:00
Damyon Wiese
fc69508f01 Merge branch 'MDL-42029-master-nomerge' of git://github.com/mouneyrac/moodle 
Conflicts:
	mod/assign/feedback/editpdf/lang/en/assignfeedback_editpdf.php
 2013-10-16 12:45:07 +08:00
Jerome Mouneyrac
ea6d86743f MDL-42029 Editpdf: Page selector should indicate what page you are on 2013-10-16 11:55:30 +08:00
Eloy Lafuente (stronk7)
77631383f0 Merge branch 'MDL-42240' of git://github.com/danpoltawski/moodle 2013-10-16 01:04:36 +02:00
rwijaya
f159ad7302 MDL-41131 assign module: remove setting for submission comments and edipdf plugins' setting. 2013-10-14 12:43:26 +08:00
Rajesh Taneja
e63515ba93 MDL-31405 Assignment: Fixed date in reset to be called for every assignment 2013-10-14 12:34:55 +08:00
Dan Poltawski
9092378ddb MDL-42240 assignfeedback_editpdf: improve ghostscript debugging 2013-10-10 13:55:46 +08:00
Marina Glancy
0965a9be10 Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle 2013-10-10 12:52:28 +11:00
Marina Glancy
9c5d6183d5 Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle 2013-10-10 11:12:35 +11:00
Dan Poltawski
f57053fc2a Merge branch 'wip-mdl-42222' of git://github.com/rajeshtaneja/moodle 2013-10-09 17:23:44 +08:00
Rajesh Taneja
9dbe0313ce MDL-42222 Assignment: Added type check before checking mimetype 
Online submission type pass string in files, so added check
to see if file is of type stored_file then check mimetype
 2013-10-09 16:53:46 +08:00
Sam Hemelryk
f18f96f767 Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2013-10-09 15:58:45 +13:00
Paul Nicholls
0d64c75fb2 MDL-37153 - assign: Obey grade display settings in submission status 
The assignment submission status screen was ignoring the grade item's
display setting, showing scores even if it's set to display letters only.
 2013-10-09 15:56:52 +13:00
Dan Poltawski
fa96fb0cea Merge branch 'MDL-42131-master' of git://github.com/damyon/moodle 2013-10-08 13:33:25 +08:00
Dan Poltawski
8431c290fd Merge branch 'MDL-42150-master' of git://github.com/damyon/moodle 2013-10-08 13:25:12 +08:00
Dan Poltawski
6cd7df4df1 Merge branch 'MDL-38655' of git://github.com/aolley/moodle 2013-10-08 13:21:30 +08:00
Damyon Wiese
944cfe1dec Merge branch 'MDL-40962-master' of git://github.com/ankitagarwal/moodle 2013-10-08 12:45:43 +08:00
Petr Škoda
e87214bda7 MDL-42078 multiple uninstall improvements and cleanup 
Includes:
* update checker refactored to \core\update\ namespace
* plugininfo classes refactored to \core\plugininfo\ namespace
* plugin_manager renamed to core_plugin_manager
* redirect back to original page after plugin uninstall
* fixed assign subplugin uninstall
* move assign subplugins under the assignment in admin tree
* fixed plugininfo for all question related plugin types
* auth uninstall support
* added missing block dependencies
* added theme uninstall
* subplugin types are following the plugin on plugin overview page
* several performance improvements in plugin manager
* new warnigns when plugininfo are outdated or missing
* multiple fixes and other improvements
 2013-10-07 13:10:36 +02:00
Jerome Mouneyrac
673c4ffe60 MDL-42030 EditPDF: when selecting stamp image the stamp tool is not selected 2013-10-07 12:13:08 +08:00
Marina Glancy
2a68ee0eb1 MDL-42016 files: Properly synchronise internal references 2013-10-06 18:05:05 +11:00
Damyon Wiese
1d45b0e469 MDL-42131 editpdf: Add missing require_login() to entry pages 
Also:
* change require_once(config) to require(config)
* always define AJAX_SCRIPT
* Add full crumb trail to navbar for testgs.php
 2013-10-04 15:20:34 +08:00
Damyon Wiese
c921825977 MDL-42150 Edit PDF: Fix error on saving annotations + comments. 
Everything is an instanceof stdClass - need to reverse the logic.
 2013-10-04 15:15:58 +08:00
Sam Hemelryk
cf8943779e NOBUG: Fixed file access permissions 2013-10-04 15:43:58 +13:00
Sam Hemelryk
9b70e68445 NOBUG: Fixed SVG browser compatibility 2013-10-04 15:43:53 +13:00
Dan Poltawski
6cebf2bd60 MDL-42143 editpdf: Convert gspath to proper setting 
This will ensure we get better validation/feedback of the path.
 2013-10-04 10:14:18 +08:00
Adam Olley
c447c03538 MDL-38655: mod_assign: Use correct ordering on cap checks for submission downloads 2013-10-04 09:27:32 +09:30
Damyon Wiese
9f5193a4b8 MDL-42023 Assign: Edit PDF plugin - fix unit tests 2013-10-03 14:05:28 +08:00
Damyon Wiese
5c3864723a MDL-42023 assign: Edit PDF plugin - Damyon's contributions 2013-10-03 09:30:32 +08:00
Barbara Ramiro
95dfde5549 MDL-42023 assign: Edit PDF plugin - Barbara's contributions 2013-10-03 09:29:54 +08:00
Jerome Mouneyrac
e0cc92c650 MDL-42023 assign: Edit PDF plugin - Jerome's contributions 2013-10-03 09:29:54 +08:00