moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 17:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
84030 commits 37 branches 540 tags 1.3 GiB
Commit graph

1758 commits

Author SHA1 Message Date
Dan Poltawski
aa96a20027 Merge branch 'MDL-49837-master' of git://github.com/jleyva/moodle 2015-04-16 10:32:14 +01:00
Juan Leyva
7f45111e36 MDL-49837 assign: Use correct assertions and fix return params cleaning 2015-04-15 12:21:38 +02:00
Juan Leyva
13e814bcb1 MDL-49837 assign: Fix external functions return declaration 
Incorrect use of external_warnings function
 2015-04-13 17:34:35 +02:00
Damyon Wiese
46a2fbc4b7 MDL-49412 Navigation: Remaining behat fixed for nav branch 
Behat is passing after this change.

Part of MDL-45774.
 2015-04-10 17:19:28 +08:00
Damyon Wiese
221210e9b2 MDL-49412 Behat: Fix behat tests for all of @mod 
This is after the navigation changes for 2.9.

Part of MDL-45774.
 2015-04-10 17:18:23 +08:00
Dave Cooper
81d7de1aa1 MDL-48936 lang: Changed "My Home" to "Dashboard". 
Part of MDL-45774
 2015-04-10 17:16:27 +08:00
Rajesh Taneja
bed022decb MDL-48159 mod_assign: Use proper step to navigate to homepage 2015-04-09 11:13:33 +08:00
Rajesh Taneja
3072d006be MDL-48159 mod_assign: Fixed behat to pass on chrome 
Chrome driver doesn't support clicking on
link which wrap on multiple lines. In this
case link is wrapped in navigation block
and was failing on chrome.
 2015-04-09 11:07:34 +08:00
Eloy Lafuente (stronk7)
a7d5af2d82 Merge branch 'MDL-48159' of https://github.com/andrewhancox/moodle 2015-04-07 19:13:56 +02:00
Andrew Hancox
e528997a4a MDL-48159 mod_assign: Added setting preventsubmissionnotingroup 
If enabled a user will be unable to make a submission unless they are a
member of a group.
 2015-04-07 14:30:40 +01:00
Damyon Wiese
75ece778c5 Merge branch 'MDL-49101' of https://github.com/andrewhancox/moodle 
Conflicts:
	lib/db/upgrade.php
	version.php
 2015-04-07 17:27:17 +08:00
Andrew Hancox
6398ff5387 MDL-49101 core: Add a global admin setting config->requiremodintro 
Removed requiremodintro setting from all core activity plugins and replace
with a single global setting.
Deprecated moodleform_mod::add_intro_editor and replaced with
moodleform_mod::standard_intro_elements
 2015-04-07 10:11:53 +01:00
Andrew Nicols
df15759724 Merge branch 'wip-mdl-49513' of https://github.com/rajeshtaneja/moodle 2015-04-02 11:06:27 +02:00
Rajesh Taneja
bed97c39eb MDL-49513 behat: Set admin config using php api 
Added a new set to set config using set_config() api
to make steps faster and more efficient
 2015-04-01 14:25:23 +08:00
Dan Poltawski
f31c4f27f3 Merge branch 'MDL-49617-master' of git://github.com/jleyva/moodle 2015-03-31 20:10:27 +01:00
Rajesh Taneja
bf38226162 MDL-49708 behat: Resize window back to default 
Leaving window size to large fails in chrome
Reset it to default size works to ensure stamp
is visible by selenium driver
 2015-03-30 17:29:33 +08:00
Juan Leyva
0be81772f0 MDL-49617 webservices: Additional tests for the new function 2015-03-26 15:55:23 +01:00
Juan Leyva
4e2e3c9528 MDL-49617 webservices: Return additional fields in get_assignments WS 2015-03-26 15:55:22 +01:00
Rajesh Taneja
56159e91d7 MDL-49445 behat: Change selector as underline tr has same string 2015-03-19 12:24:49 +01:00
Tony Butler
f5ba1b93a2 MDL-45725 core_lib: Save user preferences for flexible tables 2015-03-16 10:41:11 +00:00
David Monllao
e967111644 MDL-48682 behat: Changing window size on specific tests 2015-03-06 11:02:45 +08:00
Tony Butler
5047b0ea8f MDL-49075 mod_assign: Add assertions to marking workflow unit test 
Make sure grades aren't pushed to gradebook for marking workflow
states other than 'released'.
 2015-02-26 11:52:46 +00:00
Tony Butler
251d85c013 MDL-49075 mod_assign: Keep unreleased assign grades out of gradebook 2015-02-26 11:52:46 +00:00
Dan Poltawski
4a3b900698 Merge branch 'MDL-49241-master-enfix' of git://github.com/mudrd8mz/moodle 2015-02-24 16:50:12 +00:00
Dan Poltawski
73d8a50d73 Merge branch 'master-18177' of https://github.com/timpricecatalyst/moodle-1 2015-02-24 11:18:37 +00:00
Helen Foster
428330da1c MDL-49241 lang: Merge English strings from the en_fix language pack 2015-02-24 11:15:15 +01:00
Zachary Durber
3547f186a8 MDL-35392 mod_assign: Push feedback to gradebook when releasing grades 
When bulk changing workflow status a mismatch in variable
names meant that feedback wasn't being sent to the gradebook.
 2015-02-23 09:14:05 +08:00
Tim Price
e1de40f7f7 MDL-18177 backup: adding PHPdocs blocks 2015-02-20 11:45:23 +11:00
Tim Price
d7891c83dd MDL-18177 backup: addressing coding standards 2015-02-20 11:45:23 +11:00
Matt Sammarco
868b086c4a MDL-18177 backup: Add backup option to include groups and groupings 2015-02-20 11:45:22 +11:00
Rajesh Taneja
6628ea3f0c MDL-47172 print_overview: Fixed behat for overview changes 2015-02-18 11:37:50 +08:00
David Monllao
02838257f3 Merge branch 'MDL-48884_master' of git://github.com/markn86/moodle 2015-02-17 14:43:49 +08:00
David Monllao
608132d7e4 MDL-47172 print_overview: Fixing indentation 2015-02-16 09:38:05 +08:00
Ankit Agarwal
81251186e7 MDL-47172 print_overview: Add more unit tests 2015-02-13 11:12:13 +05:30
Ankit Agarwal
a7366bc858 MDL-47172 print_overview: Show assignments only when needed 
The intended behaviour is not to display this notification when:-
1) The assignment is closed.
2) User is a student and has a valid submission in place.
3) User is a teacher and there is nothing to grade.

Beisdes the above changes the patch also includes minor other fixes such as:-
1) Fixed phpdocs
2) Fixed inconsistent return value.
3) Fixed unit tests that had arguments in wrong order.
 2015-02-13 11:12:12 +05:30
Mark Nelson
0b1df17129 MDL-48884 mod_assign: prevented setting gradebook feedback unnecessarily 2015-02-02 23:34:54 -08:00
Andrew Nicols
6ef9a63bcd Merge branch 'MDL-48608_master' of git://github.com/markn86/moodle 2015-02-03 12:30:29 +08:00
Mark Nelson
d838640e4c MDL-48608 mod_assign: correctly display grades for group assignments 2015-02-02 20:13:24 -08:00
Zachary Durber
75d08f0291 MDL-31036 mod_assign: Don't strip quickgrading feedback of special chars 2015-01-30 14:43:35 +08:00
Eloy Lafuente (stronk7)
8181ab5865 Merge branch 'MDL-48620-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/undo/yui/build/moodle-atto_undo-button/moodle-atto_undo-button-min.js
 2015-01-28 01:02:54 +01:00
Mark Nelson
d2e1c5f5fc MDL-40285 mod_assign: added extra group submissions behat scenario 
Thanks a lot to Jody Steele for providing the basis for the scenario.
 2015-01-27 00:36:49 -08:00
Mark Nelson
e43f1d514c MDL-40285 mod_assign: show details for all default group members 2015-01-27 00:36:49 -08:00
Andrew Nicols
557f44d970 MDL-48620 JavaScript: Updated shifted files to comply with coding style 2015-01-23 14:51:24 +08:00
Andrew Nicols
2a43613b73 Merge branch 'master_MDL-48418' of https://github.com/greg-or/moodle-mod_assign 2015-01-15 08:35:02 +00:00
Eloy Lafuente (stronk7)
ccb722b76c Merge branch 'MDL-48574_workflow_state_updated_batch_single' of https://github.com/Dave-B/moodle 2015-01-15 08:35:01 +00:00
Eloy Lafuente (stronk7)
639910a75d Merge branch 'MDL-41166-master' of git://github.com/danpoltawski/moodle 2015-01-15 08:35:01 +00:00
Gregory Faller
b351e4460a MDL-48418 mod/assign: Fix text in 'late submission' row 2015-01-12 09:00:44 +10:30
David Balch
73f419ea43 MDL-48574 assign: Test workflow_state_updated fired on batch and single. 2015-01-09 15:18:05 +00:00
Eloy Lafuente (stronk7)
ae3663a082 Merge branch 'MDL-48748-master-enfix' of git://github.com/mudrd8mz/moodle 2015-01-07 17:15:52 +01:00
David Balch
5bd9cdec1d MDL-48574 assign: Fire workflow_state_updated event on batch and single. 
This change adds the workflow_state_updated event when changing workflow
state using the single grading page and the quick grading mechanisms.
Previously, it only fired for batch updates using
process_set_batch_marking_workflow_state().
 2015-01-07 13:57:03 +00:00