Eloy Lafuente (stronk7)
6f01090159
Merge branch 'MDL-56448-master' of git://github.com/danpoltawski/moodle
2016-10-26 16:11:44 +02:00
Dan Poltawski
f07cb88c57
MDL-56448 mustache: fix json errors in example context
2016-10-26 12:35:45 +01:00
Damyon Wiese
33cb7031de
MDL-55074 behat: Fix zoom in/out dom insertion
2016-10-26 10:18:52 +08:00
Helen Foster
c9636ddd51
MDL-56542 lang: Merge English strings from the en_fix language pack
2016-10-25 20:12:52 +02:00
David Monllao
26aa08b2f8
Merge branch 'MDL-56307-master' of git://github.com/jleyva/moodle
2016-10-25 17:33:08 +08:00
Juan Leyva
65b2669d98
MDL-56307 course: Return time updated and times updated
2016-10-25 10:10:55 +01:00
Juan Leyva
02a73d767c
MDL-56307 course: New course_check_module_updates_since method
2016-10-25 10:10:52 +01:00
Dan Poltawski
76a6dc685d
Merge branch 'MDL-56534-master' of git://github.com/crazyserver/moodle
2016-10-25 06:08:48 +01:00
Dan Poltawski
b5c5d741c4
Merge branch 'MDL-56538-master' of git://github.com/crazyserver/moodle
2016-10-24 15:50:55 +01:00
Pau Ferrer Ocaña
8845688ce4
MDL-56534 assign: Add grading status on get_submissions WS
2016-10-24 13:24:18 +02:00
Juan Leyva
a18cb9d84f
MDL-29795 assign: Apply overrides to get_assignments
...
This commit also fix a problem in the previous commit
2016-10-24 11:24:40 +01:00
Damyon Wiese
6b8e798db1
MDL-29795 assign: Apply overrides before saving a submission
...
From the webservice.
2016-10-24 11:04:10 +01:00
Ilya Tregubov
d685b95935
MDL-29795 mod_assign: Add user/group override assignment module
2016-10-24 11:03:49 +01:00
David Monllao
3ea1fa18cc
Merge branch 'mdl56466-master' of https://github.com/tlock/moodle
2016-10-24 15:23:51 +08:00
David Monllao
c10cd185a9
Merge branch 'MDL-55981-master' of git://github.com/andrewnicols/moodle
2016-10-24 13:20:42 +08:00
Pau Ferrer Ocaña
896b6e3cb0
MDL-56538 assign: Fix new grading interface UI popouts
2016-10-21 12:29:20 +02:00
Juan Leyva
6492401d1c
MDL-56307 mod: Add missing FEATURE_COMMENT in modules
2016-10-21 09:21:28 +01:00
Damyon Wiese
ba5c5083c5
MDL-55074 theme_boost: Behat fixes for latest theme changes
...
Fix I edit profile steps
Apply fixed header in css
Remove transitions from menus for behat
Be more specific about some "I follow" steps
Navigation path changes
"Current course" node removed from nav tree
Adapt tests because there are no default blocks
Force some space between action menu items
2016-10-21 16:06:54 +08:00
Andrew Nicols
4ceed4dfa6
MDL-55981 core: Remove site:accessallgroups from teacher
2016-10-21 08:55:58 +08:00
Dan Poltawski
d98ab2a585
Merge branch 'MDL-56062-master' of https://github.com/lucisgit/moodle
2016-10-18 12:06:27 +01:00
Eloy Lafuente (stronk7)
5dea1f12fc
Merge branch 'MDL-56345-master' of https://github.com/lucisgit/moodle
2016-10-18 09:37:47 +02:00
Tim Lock
65b4dce6f8
MDL-56466 assign: fix database error with team submissions
...
This fixes the error when viewing the Grading summary with Blind Marking and Team submission is enabled:
ERROR: Incorrect number of query parameters. Expected 32, got 31.
2016-10-18 12:11:45 +10:30
Eloy Lafuente (stronk7)
a14edb9fbb
Merge branch 'MDL-56022_m32v3' of https://github.com/sbourget/moodle
2016-10-18 00:07:17 +02:00
Stephen Bourget
1b467cb8cf
MDL-56022 Assign: Make folders structure in the downloaded zip optional
...
Special thanks to Matt McDermott for the contributing the Javascript
code to fix this issue.
2016-10-17 16:19:28 -04:00
Eloy Lafuente (stronk7)
b705cefa18
Merge branch 'MDL-56300_master' of git://github.com/reskit/moodle
2016-10-17 18:50:07 +02:00
Dan Poltawski
6578ffe4e0
Merge branch 'MDL-55630-master' of https://github.com/StudiUM/moodle
2016-10-17 10:23:35 +01:00
Matthew Switlik
f6beb73bdc
MDL-43796 assign: Reset revealidentities on restore
...
Set revealidentities to 0 when restoring with blindmarking and no user data.
2016-10-14 14:10:29 -04:00
Jean-Philippe Gaudreau
6399ecd743
MDL-55630 mod_assign: Exclude users courses from user details
...
Exclude users' enrolled courses for performance reason.
A new 'includeenrolments' parameter was added
to mod_assign::list_particpants.
2016-10-14 09:28:18 -04:00
Marc Català
260713fc8e
MDL-56300 mod_assign: Filtering students throws a javascript error
2016-10-14 09:28:20 +02:00
Tony Butler
23f2f64452
MDL-56062 mod_assign: Use $gradeitem->get_decimals() for grade display
2016-10-12 17:33:23 +01:00
Tony Butler
88d309d947
MDL-56324 assignfeedback_editpdf: Use correct page in save_current_page
2016-10-12 14:17:48 +01:00
Tony Butler
c156b7b76d
MDL-56345 assignfeedback_editpdf: Use correct strings for tool alt text
2016-10-10 16:13:37 +01:00
Tony Butler
3cd718e859
MDL-56324 assignfeedback_editpdf: Get current page no from page selector
...
When navigating to next/previous page or jumping to a comment
2016-10-10 09:52:19 +01:00
Dan Poltawski
e43bab742d
Merge branch 'MDL-55129-master' of git://github.com/jleyva/moodle
2016-10-05 08:08:11 +01:00
David Monllao
c7fc66f2ac
Merge branch 'MDL-45969-master' of git://github.com/damyon/moodle
2016-10-05 09:42:17 +08:00
Juan Leyva
30cdddb017
MDL-55129 mod_assign: Allow plugins to handle configs for external
...
Until now in the get_assignments WS all the settings for assignment
plugins (submission and feedback) are returned, this was bad because:
- It was returning settings for plugins that may not be enabled
- It was returning settings that would be a security risk (a third
party plugin including a password or credentials for connecting a
remote site)
- Some values was returned "raw" without further processing, for
example, maxsubmissionsizebytes returned 0 when using the plugin
default value instead a valid size
- Assignment plugins implemented an API for communication with the
external API, see for example: get_external_parameters, it didn’t make
sense had an API for the received parameters and not the returned data.
2016-10-04 20:28:38 +01:00
Andrew Nicols
c8379882b8
Merge branch 'MDL-56198' of git://github.com/timhunt/moodle
2016-10-04 09:01:25 +08:00
Tim Hunt
9bee35d5ad
MDL-56198 assignment: improve grading info responsiveness
2016-10-03 16:09:21 +01:00
Dan Poltawski
5e0e9f3674
MDL-55740 mod_assign: bump version
2016-10-03 11:18:43 +01:00
Dan Poltawski
b885488c02
Merge branch 'MDL-55740-master' of git://github.com/jleyva/moodle
2016-10-03 11:16:09 +01:00
Dan Poltawski
e63d89a51d
MDL-55168 assign: fix some incorrectly defined css transitions
...
The lint error suggests as though we were waiting 0s to do a
transiition of duration of 0s (i.e. nothing), but thats not actually
the case.
2016-09-30 09:25:30 +01:00
Dan Poltawski
693652b78d
MDL-55168 css: fix various errors detected by stylelint
...
Ignored properties, invalid propertiies, duplicates, invalid selectors..
Detected by stylelint rules:
http://stylelint.io/user-guide/rules/declaration-block-no-ignored-properties
http://stylelint.io/user-guide/rules/selector-type-no-unknown
http://stylelint.io/user-guide/rules/declaration-block-no-duplicate-properties
http://stylelint.io/user-guide/rules/max-line-length
http://stylelint.io/user-guide/rules/no-browser-hacks
2016-09-30 09:25:25 +01:00
Dan Poltawski
99fe296eb2
MDL-55168 css: remove 0-length units
2016-09-30 09:25:25 +01:00
Dan Poltawski
aea8eaecde
MDL-55168 css: use shorthand colour props when possible
2016-09-30 09:25:24 +01:00
Dan Poltawski
e90cef839c
MDL-55168 css: ignore some stylelint complains
...
1) Legacy css where it would not be a good use of time to
update.
2) Ignored some long lines and added todo
3) Fixed some line length issues
2016-09-30 09:25:24 +01:00
Dan Poltawski
bc33e9bd3f
MDL-55168 css: reformat plain css with stylefmt
2016-09-30 09:25:23 +01:00
Damyon Wiese
f5ba9ac995
MDL-45969 editpdf: The logic for showing a previous attempt is wrong
...
It originally was only ever going to show static pdfs for older versions,
but this doesn't make sense in the UI for 3.1.
2016-09-30 13:15:00 +08:00
Dan Poltawski
6e181725ca
Merge branch 'MDL-55472-assign-extend-ignored-validation' of https://github.com/ilya-catalyst/moodle
2016-09-26 15:31:30 +01:00
Ilya Tregubov
ffcfffbe64
MDL-55472 assign: Show userlist on extension form error page
2016-09-25 11:29:43 +10:00
Damyon Wiese
890c260307
MDL-55071 phpunit: Fix failing tests due to changes in default output
...
Part of MDL-55071
2016-09-23 10:57:13 +01:00