Commit graph

887 commits

Author SHA1 Message Date
Ankit Agarwal
9638600bbb MDL-45035 events: Fix @package and @since tags in Moodle 2.6 events 2014-04-11 13:32:33 +08:00
Damyon Wiese
f1dce5734e MDL-44268 Assign: Fix behat test for assigned marker filter 2014-04-09 14:29:46 +08:00
Damyon Wiese
d6a3f559db MDL-44268 Assign: Improve the "not submitted" filter 2014-04-09 14:29:46 +08:00
Jonathon Fowler
c80d59f269 MDL-44268 assign: add 'not submitted' and 'no marker' filter options 2014-04-09 14:29:46 +08:00
Damyon Wiese
43968c9f10 Merge branch 'mdl44669-master' of https://github.com/tlock/moodle 2014-04-09 13:05:46 +08:00
Sam Hemelryk
6ef3728805 Merge branch 'wip-MDL-44971-2.7-submission_reopen_hook' of https://github.com/catalyst/moodle 2014-04-09 10:15:50 +12:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
2014-04-08 13:30:41 +08:00
sam marshall
8270f0d0bd MDL-44070 Conditional availability enhancements (9): wider changes
Changes to arbitrary areas of code that are necessary after the new
API (mostly to replace deprecated function calls).
2014-04-07 20:11:59 +01:00
Henning Bostelmann
af904bd75b MDL-44629 Assignment: add facility for displaying plugin-specific headers 2014-04-07 11:34:26 +01:00
Aaron Wells
d54404e5bb MDL-44971 Add hook to "add_attempt" for mod/assign/submission plugins 2014-04-07 10:52:48 +12:00
Marina Glancy
e19c086c36 MDL-40843 recent_activity: corrections to grouping and user fields 2014-04-04 16:52:01 +08:00
Marina Glancy
d6f418cb77 MDL-40872 Restore functionality of showrecentsubmissions setting 2014-04-04 15:11:13 +08:00
Rajesh Taneja
ae8c220fd5 MDL-44832 behat: Fixed behat test 2014-04-03 10:59:58 +08:00
Sam Hemelryk
3ed2a4b2cc Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle 2014-04-02 13:04:46 +13:00
Sam Hemelryk
067573bd02 Merge branch 'MDL-44832-master' of git://github.com/damyon/moodle 2014-04-02 09:54:33 +13:00
Sam Hemelryk
4b92f2b79b Merge branch 'MDL-44745-master' of git://github.com/damyon/moodle 2014-04-01 21:20:05 +13:00
Ankit Agarwal
b63f773296 MDL-44717 events: Fix multiple issues in events
Fix various incorrect urls
Fix incorrect phpdocs and other minor code style issues
Fix missing/incorrect strings

AMOS BEGIN
 MOV [eventblogassociationcreated, core_blog],[eventblogassociationadded, core_blog]
AMOS END
2014-04-01 15:08:34 +08:00
Marina Glancy
0b1afc71bb Merge branch 'w14_MDL-44715_m27_eventval' of git://github.com/skodak/moodle 2014-04-01 13:45:59 +08:00
Damyon Wiese
c70de965aa MDL-44583 Assign: performance fixes 2014-03-31 12:53:02 +08:00
Marina Glancy
7e1288f847 Merge branch 'MDL-44822' of git://github.com/aolley/moodle 2014-03-31 12:46:21 +08:00
Petr Škoda
578645aadf MDL-44715 use parent::validate_data() consistently in all events
Includes some minor PHPDocs typo fixes.
2014-03-28 14:09:31 +08:00
Damyon Wiese
e9ddbae9c0 MDL-44832 Assign: Convert grading menu to a moodle action-menu
This is required because YUI broke something.
2014-03-28 12:56:46 +08:00
Petr Škoda
f805fd1203 MDL-44824 add missing subplugin type names 2014-03-27 11:46:20 +08:00
Adam Olley
9f7674bddc MDL-44822 assignfeedback_editpdf: Stop test generation in is_enabled()
This change also moves one of the checks in test_gs_path. If
generateimage is false, there's no need to stat for the fixture file.
2014-03-27 10:16:53 +10:30
Andrew Nicols
1f777e5c6c MDL-41987 Javascript: Tidy up YUI documentation 2014-03-25 17:01:37 +08:00
Marina Glancy
d43556a63f Merge branch 'mdl44573-master' of git://github.com/tlock/moodle 2014-03-25 16:20:37 +08:00
Damyon Wiese
4309255896 MDL-44745 Assign: Fix typo in assign->fullname function
This is a new function on master only.
2014-03-25 12:49:36 +08:00
Damyon Wiese
d63e7470a9 MDL-44745 Assign: Make the grading table use the fullname function from the assign class.
This will take blind marking into account when displaying student names.
2014-03-25 12:45:36 +08:00
Damyon Wiese
b5196badcd MDL-43960 assign: Add missing include
There was a report of mod_assign_save_grade webservice failing because of this.
I couldn't reproduce it, but grepping the code found one place where this include
should be added.
2014-03-25 12:38:09 +13:00
Marina Glancy
ef3bffdec4 MDL-42025 behat: changed behat tag _only_local to _file_upload 2014-03-19 21:22:24 +01:00
Marina Glancy
7019e15e60 MDL-42025 behat: renamed deprecated method 2014-03-18 17:15:36 +08:00
Jerome Mouneyrac
9e103d6e15 MDL-42025 assignfeedback_editpdf: add behat tests 2014-03-18 17:14:31 +08:00
Juan Leyva
2e1eda559e MDL-44444 Add fileurl to mod_assign_get_submissions webservice response parameters 2014-03-18 13:46:16 +08:00
Tim Lock
754e2efd0f MDL-44669: mod/assign: fix batchoperations JS when using select all checkboxes. 2014-03-18 11:09:57 +10:30
Tim Lock
6b7aa837c9 MDL-44573: Remove HTML tags in outputs column in offline grading worksheet 2014-03-17 12:43:41 +10:30
Sam Hemelryk
2710ad2b52 Merge branch 'MDL-43721-master' of git://github.com/damyon/moodle 2014-03-11 09:19:44 +13:00
David Monllao
759b323e0e MDL-43236 behat: Updating references to deprecated methods 2014-03-07 16:05:21 +08:00
Damyon Wiese
c46db93c28 MDL-43721 Assign + groups: Improve performance of assign grading table
Add a function to the groups lib to filter a list of users down
to the ones who can see the module. Required because calling
groups_course_module_visible() for a list of users is too slow
and we shouldn't spread group logic outside of grouplib.php.

Using it in the assign grading table reduces DB queries from 6198/1 to 256/3.

This is 12secs down to 2.5secs.
2014-03-06 15:50:13 +08:00
Damyon Wiese
a9e634afa6 MDL-43721 Assign: Static cache for plugin is_enabled and is_visible because they get used alot 2014-03-06 15:15:57 +08:00
Damyon Wiese
67eb36413a MDL-43930 Assign: Fix unit tests.
The tests were expecting exact log data to match, I changed the data
but missed updating the test.
2014-03-05 12:21:27 +08:00
Dan Poltawski
baa1c69408 Merge branch 'MDL-43930-master' of git://github.com/damyon/moodle 2014-03-05 11:22:35 +08:00
Frederic Massart
695a18b6aa MDL-43468 mod_assign: Webservice parameters were not safely cleaned 2014-03-04 14:49:20 +08:00
David Monllao
f083d6145e MDL-43738 behat: Updating features files
The following used steps were replaced by the ones
added in this issue:
- I fill the moodle form with
- I fill in with
- I select from
- I select radio button
- I check
- I uncheck
- the field should match

Also removing test for deprecated steps:
- the ASD checkbox should be checked
- the ASD checkbox should not be checked
2014-02-27 18:22:05 +08:00
David Monllao
becb7e5118 MDL-43738 behat: Functional tests for fields management
We are cheating with this .feature file as this
is not a behaviour and we are just testing the
framework, but in this case I think that everybody
will agree on the need of doing it, as every browser
behaves differently and minor changes in the getters
and setters can easily end up breaking the behaviours.

All credit goes to Eloy Lafuente (stronk7).
2014-02-27 18:21:43 +08:00
Sam Hemelryk
2ef8ff9e05 MDL-44315 phpdoc: fixed up typos and made up tags 2014-02-24 09:13:31 +13:00
Damyon Wiese
666abe6ecb MDL-43930 assign: Do not log when user is logged in as someone else.
I do not agree with this behaviour - but this makes it consistent with other modules.
2014-02-20 12:30:37 +08:00
Sam Hemelryk
87643ff599 Merge branch 'MDL-44079-master' of git://github.com/andrewnicols/moodle
Conflicts:
	lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
2014-02-17 08:48:39 +13:00
Andrew Nicols
aebc768f94 MDL-44079 Javascript: EditPDF editor should be modal 2014-02-11 12:18:52 +08:00
Adrian Greeve
d7f05ad40c MDL-43289 mod_assign: Creation of new submission events.
New events have been created for submission plugins. This is
part of the consistancy move by adding the same type of event through
all of the modules.

AMOS BEGIN
 MOV [event_submission_updated,mod_assign],[eventsubmissionupdated,mod_assign]
AMOS END
2014-02-10 12:36:01 +08:00
Marina Glancy
a76edd4961 MDL-42425 assign: bumping version for new web services to take effect 2014-02-05 14:32:27 +08:00