mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-07-23 15:22:05 +02:00
Code Issues Projects Releases Wiki Activity
79,654 Commits 37 Branches 540 Tags
a9b1af901b1acf032b9daa1c7b79b225a11f544b
Commit Graph

282 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
dffeff0a4b Merge branch 'MDL-55322-master' of https://github.com/snake/moodle 2016-08-03 00:12:10 +02:00
Dan Poltawski
307e63cb00 Merge branch 'MDL-55374-master' of git://github.com/damyon/moodle 2016-08-01 13:50:37 +01:00
Jake Dallimore
243ddbcf50 MDL-55322 assignfeedback_editpdf: Prevent scroll when moving comments 
Prevent the default scroll behaviour when using gestures to move
comments on the mobile site.
 2016-08-01 09:43:03 +08:00
Damyon Wiese
fca211bf05 MDL-55374 mod_assign: Force utf-8 for DOMDocument 
This prevents charset issues on some sites.
 2016-07-29 10:43:25 +08:00
Eloy Lafuente (stronk7)
ddf1d5c692 Merge branch 'MDL-55244-master' of git://github.com/danpoltawski/moodle 2016-07-27 00:19:40 +02:00
Dan Poltawski
3a0bc0fdc4 MDL-55244 js: build changes 
There should be no changes to minified code
 2016-07-25 07:58:05 +01:00
Dan Poltawski
bc8b6dc652 MDL-55244 js: fix various lint warnings in yui 
* Incorrect brace style
* Empty functions
* Multiple var statemnts
 2016-07-25 07:53:05 +01:00
Dan Poltawski
5bb4f444de MDL-55244 js: fix problems with eslint --fix 
eslint --fix '**/yui/src/**/*.js'
 2016-07-25 07:53:05 +01:00
Tony Butler
b37b6cd8ef MDL-55245 assignfeedback_editpdf: Enable text in comments to be selected 
Only move comment boxes if 'select' tool is selected, enabling users to
drag-select text within comments using the 'comment' tool.
 2016-07-22 16:39:48 +01:00
Jun Pataleta
667cec9ba1 MDL-55240 editpdf: Revert changes in MDL-54772 
* Revert rendering of annotations and comments back to the
  drawing region.
* Bind events to stamp annotation when editing only.
 2016-07-15 10:36:45 +08:00
Dan Poltawski
ad3f8cd18c MDL-54944 eslint: make the .eslintrc default stricter 
Instead of using the more rollup-tolerant config for all files, make the
configuration stricter by default but lower in grunt for yui modules.

This means that manual runs (prechecker) or editor integrations will
flag up the errors as well as grunt.

Also add ignore lines to the core files so that eslint isn't noisy when
not running with grunt.
 2016-07-11 12:44:34 +01:00
Pau Ferrer Ocaña
36f1d79ea2 MDL-54909 assign: Style editpdf background to differ from page bg 2016-06-23 15:06:59 +02:00
Eloy Lafuente (stronk7)
0f20bf7507 Merge branch 'wip-mdl-54589-mac' of https://github.com/rajeshtaneja/moodle 2016-06-22 01:42:15 +02:00
Rajesh Taneja
fba0ac63b8 MDL-54589 behat: Added hack for some OS/browsers 2016-06-20 16:03:36 +08:00
Dan Poltawski
4c62bdab0d MDL-54654 assignfeedback_editpdf: remove invalid CSS 
The 'left' positioing was invalid and conflicting with the
right definition anyway, so wasn't necessary.
 2016-06-16 20:52:04 +01:00
Dan Poltawski
0fd08fc7e5 Merge branch 'MDL-35628' of https://github.com/mr-russ/moodle 2016-06-16 09:04:12 +01:00
Eloy Lafuente (stronk7)
392c40467f Merge branch 'MDL-54890-master' of git://github.com/danpoltawski/moodle 2016-06-16 09:04:04 +01:00
Jun Pataleta
cdbdb2f9b7 MDL-54772 mod_assign: Fixes for PDF editor 
* Render the annotations and comments within the drawing canvas, not in
the drawing region.
* Remove edit-related event bindings for stamp annotations.
 2016-06-13 09:54:02 +08:00
Dan Poltawski
8b766dd1d8 MDL-54890 assignfeedback_editpdf: Fix missing semicolon 
Detected by eslint rule 'semi'
 2016-06-10 10:06:25 +01:00
Russell Smith
1fcf0ca8a5 MDL-35628 performance: Remove dirname() where possible. 
dirname() is a slow function compared with __DIR__ and using
'/../'.  Moodle has a large number of legacy files that are included
each time a page loads and is not able to use an autoloader as it is
functional code.  This allows those required includes to perform as
best as possible in this situation.
 2016-06-10 08:06:49 +10:00
Jun Pataleta
bb2281d53c MDL-54765 mod_assign: Use selectedIndex for setting page selection 
Set the 'selectedIndex' attribute of the page selection element instead of
the 'value' attribute since YUI is having trouble with this in IE.
 2016-06-03 14:55:43 +08:00
Eloy Lafuente (stronk7)
4da854a68b MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:31:34 +02:00
Eloy Lafuente (stronk7)
1abca11e0a MDL-54638 versions: bump all versions and requires near release 
version = 2016052300 release version
requires= 2016051900 current rc1 version
 2016-05-19 02:16:15 +02:00
David Monllao
923b230c8e Merge branch 'wip-MDL-54061-master' of git://github.com/abgreeve/moodle 2016-05-18 16:20:27 +08:00
Adrian Greeve
759f61fe1c MDL-54061 mod_assign: Added encoding and separator to upload form. 
Added the fields of encoding and separator so that the user has
more control when uploading a csv assignment grading file.
 2016-05-18 15:50:33 +08:00
Ryan Wyllie
7d7e5a4cf0 MDL-54594 mod_assign: Fix editpdf toolbar breakpoints 
Fixed the CSS media breakpoints for the editpdf toolbar after the
additional button was added.
 2016-05-18 05:53:44 +00:00
Adrian Greeve
897444d761 MDL-53923 mod_assign: Put messages into notifications. 
The unoconv test page was before just outputting text to
page. Now it is wrapped in a nice notification. One of the
warnings has been improved as well.
 2016-05-17 17:16:13 +08:00
Adrian Greeve
0eecf87687 MDL-53923 mod_assign: Movement of functions to file_storage. 2016-05-16 14:32:54 +08:00
Simey Lameze
c4d692285f MDL-53923 mod_assign: test unoconv path 2016-05-16 14:08:09 +08:00
David Monllao
60152a2828 NOBUG: Fixed SVG browser compatibility 2016-05-13 18:33:22 +08:00
Barbara Ramiro
378733a4c3 MDL-53822 editpdf: Much nicer icons for new drag-to-scroll feature 2016-05-13 18:11:28 +08:00
Damyon Wiese
ab4d78ea82 MDL-53822 editpdf: Show different cursors for select and move 2016-05-11 14:54:38 +08:00
Damyon Wiese
55907a738a MDL-53822 editpdf: Add a new tool for scrolling 
I added a new tool to the toolbar to allow click and drag scrolling (especially useful for touchscreens).
 2016-05-06 16:33:31 +08:00
Rajesh Taneja
8ade0df755 MDL-53601 behat: Fixed wrong behat steps 2016-05-03 17:26:31 +08:00
Adrian Greeve
1beb95af48 MDL-53601 mod_assign: Behat test for group feedback. 2016-05-02 15:54:53 +08:00
Adrian Greeve
181c20bc52 MDL-53601 mod_assign: Feedback files are sent to all group members. 2016-05-02 15:54:53 +08:00
Mark Nelson
fcc9218fb8 MDL-53811 mod_assign: fixed error in convert submissions task 2016-04-19 13:08:27 +08:00
Eloy Lafuente (stronk7)
cd9e057be3 NOBUG: Fixed file access permissions 2016-04-15 10:19:04 +02:00
Dan Poltawski
728da02780 MDL-52954 editpdf: fix phpdoc 2016-04-11 09:55:38 +01:00
Damyon Wiese
6853cd5ed4 MDL-52954 assign: Fix the reasonable cibot warnings. 2016-03-30 14:07:28 +08:00
Damyon Wiese
bb690849c9 MDL-52954 assign: Rebuild the assignment single grade page. 2016-03-30 13:47:21 +08:00
Damyon Wiese
1356d85151 MDL-52954 core: Change from pandoc to unoconv - it gives better results 
Most importantly it retains formatting better, and supports different charsets far better than pandoc.
 2016-03-30 11:48:39 +08:00
Damyon Wiese
2e76c14e11 MDL-52954 core: Add a document converter to file_storage 
This lets us convert between common office formats. E.g. docx -> pdf
html -> pdf, html -> ods.

This commit also updates assignment editpdf plugin to use this converter
on all compatible submission files.
 2016-03-30 11:48:39 +08:00
David Monllao
b756bd551a Merge branch 'MDL-52924-master' of git://github.com/jleyva/moodle 
Conflicts:
	version.php
 2016-03-21 09:25:19 +08:00
Juan Leyva
2fa6c632c2 MDL-52924 mod_assign: Return editpdf subplugin file areas 2016-03-14 09:53:40 +01:00
Rajesh Taneja
e01012e96d MDL-46891 behat: Driver specific fixes. 
1. Browserkit doesn't handle [] in name
2. Grades are not visible in viewport and might fail
   with few drivers, increasing size of window to ensure
   grades are visible and can be modified.
3. Click edit first to see grade link
4. Expand fields before setting value
5. Updated xpath, as crawler update it.
6. Hover fails to show icon
 2016-03-11 10:51:16 +08:00
Rajesh Taneja
42ad096fdb MDL-46891 Behat: Added support for behat 3 2016-03-11 10:51:15 +08:00
David Monllao
b97356f215 MDL-52397 behat: Another behat fix, there is no student2 grade 2016-03-02 11:03:01 +08:00
Andrew Nicols
121a0d12fb Merge branch 'MDL-52489_master' of git://github.com/markn86/moodle 2016-03-02 09:08:29 +08:00
Andrew Nicols
37f39924b5 Merge branch 'MDL-52397_fix-behat' of git://github.com/dmonllao/moodle 2016-03-01 14:35:54 +08:00