moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-10 03:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
72225 commits 37 branches 544 tags 1.3 GiB
Commit graph

1124 commits

Author SHA1 Message Date
Eric Merrill
98f52b7dc0 MDL-45761 assign Set inline comment format properly when plugin is empty 
If a plugin says it is empty, skip it for for building the inline
comment.

If not format was found in any plugins, set to FORMAT_HTML, which is
the default for feedback anyways.
 2014-06-05 08:56:24 -04:00
Frederic Massart
78f69e51fc MDL-45870 mod_assign: Outcomes are saved for each group member 2014-06-05 15:56:13 +08:00
Marina Glancy
0313897108 Merge branch 'wip-mdl-44839' of git://github.com/rajeshtaneja/moodle 
Conflicts:
	lib/phpunit/bootstrap.php
 2014-06-04 10:07:03 +08:00
Rajesh Taneja
1bce3a70d9 MDL-44839 admin: Moved all system executable paths to config 
AMOS BEGIN
 MOV ['gspath','assignfeedback_editpdf'],['pathtogs','admin']
 MOV ['gspath_help','assignfeedback_editpdf'],['pathtogs_help','admin']
AMOS END
 2014-06-03 17:33:49 +08:00
Damyon Wiese
96c9b2feb3 Merge branch 'MDL-45630_master' of https://github.com/markn86/moodle 2014-06-03 15:00:27 +08:00
Damyon Wiese
5d759c9563 Merge branch 'MDL-45677_master' of https://github.com/markn86/moodle 2014-06-03 14:37:55 +08:00
Gregory Faller
556483d47d MDL-44098: Late submissions with extension calculate period of lateness incorrectly 2014-06-03 12:40:36 +08:00
Mark Nelson
1ea5f1e2d3 MDL-45630 events: removed unnecessary 'the' from event descriptions 2014-05-31 15:27:11 -07:00
Eloy Lafuente (stronk7)
f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Marina Glancy
87c1a30b1f Merge branch 'MDL-45661-master' of git://github.com/damyon/moodle 2014-05-26 14:40:56 +08:00
Damyon Wiese
4e2bf2381f MDL-45661 Assign: Clean bad data from DB after MDL-42526 2014-05-26 12:36:21 +08:00
Marina Glancy
9e41209bba Merge branch 'MDL-45629_master' of git://github.com/markn86/moodle 2014-05-26 11:58:50 +08:00
Sam Hemelryk
1912b5aa92 Merge branch 'MDL-45192_master' of git://github.com/dmonllao/moodle 2014-05-26 13:23:02 +12:00
Sam Hemelryk
c5eef789b9 Merge branch 'MDL-42526-master' of git://github.com/jamiepratt/moodle 2014-05-26 09:02:39 +12:00
Mark Nelson
f5928e7893 MDL-45677 mod_assign: removed treatment of an array as an object 2014-05-22 22:16:57 -07:00
James Pratt
fdb6811224 MDL-42526 mod_assignment : fix record insert with assigment.id 0 2014-05-22 12:10:07 +07:00
Mark Nelson
9d4b3d42fc MDL-45629 mod_assign: removed use of '$this->objectid' in the submission_status_viewed event 2014-05-19 23:51:09 -07:00
Dan Poltawski
c1e3f99249 Merge branch 'MDL-45432-master' of https://github.com/lucisgit/moodle 2014-05-19 18:43:15 +08:00
Frederic Massart
2507b7e060 MDL-45537 mod_assign: Requiring locallib for class assign 2014-05-19 12:40:17 +08:00
David Monllao
b28b374f2e MDL-45192 behat: Replacing specific-selector steps by a generic one 
Having a I click on we can use all our selectors rather
than having multiple steps for the same purpose. This
step allow us to manage JS native dialogues without
having to fail a scenario.

Credit for Mohamed Alsharaf.
 2014-05-13 20:21:49 +07:00
Mohamed Alsharaf
bcad873102 MDL-45192 assign: added behat script & new definitions to handle alert dialog 
The behat script is to test the batch action to lock and unlock submissions.
The new definitions are to prevent the "unexpected alert open" error in Selenium.
 2014-05-13 20:10:53 +07:00
Dan Poltawski
a5fd1a13c8 Merge branch 'MDL-45486' of git://github.com/stronk7/moodle 2014-05-09 10:50:26 +08:00
John Okely
6d90ef2b4a MDL-45296 mod_assign: Revert changes to lock_submission and unlock_submission events 2014-05-09 09:58:55 +08:00
Eloy Lafuente (stronk7)
538bf99ece MDL-45486 Bump all versions to planned release 
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
 2014-05-09 02:12:28 +02:00
Eloy Lafuente (stronk7)
2fe085b284 MDL-45296 tests: ensure all submissions exist 
The changes performed with the change from
create_from_user() to create_from_submission()
in practice enforce a new restriction about
submissions having to exist in order to fire
their lock/unlock events.

This did not exist before the change and, also,
it seems that the assign api itself, submission->lock() ...
also accepts non existing submissions.

So I was not 100% sure about how to fix these events:

1) enforcing submission to exist.
2) firing them only if the submission exist.

I've gone with 1) for now, making tests to pass. But will
raise the question in the Tracker, just in case we have
to move to the 2) approach for any reason.
 2014-05-08 20:03:34 +02:00
Eloy Lafuente (stronk7)
b8f0ec297d Merge branch 'MDL-45296' of git://github.com/stronk7/moodle 2014-05-08 15:58:46 +02:00
Eloy Lafuente (stronk7)
b8ac973a21 MDL-45296 phpdoc: add some missing params 2014-05-08 15:52:07 +02:00
John Okely
9c94ca5843 MDL-45296 events: Fix objecttable and ids 
Various events had them incorrectly set or missing:
  - submission_locked
  - submission_unlocked
  - subscription_created
  - subscription_deleted
 2014-05-08 15:30:03 +02:00
Tony Butler
b887c262bc MDL-45432 mod_assign Declare character encoding in onlinetext export 
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
 2014-05-07 13:07:04 +01:00
Dan Poltawski
fb3f578f41 Merge branch 'MDL-45410-en_fix' of git://github.com/mudrd8mz/moodle 2014-05-07 16:38:00 +08:00
Damyon Wiese
0cd720fe51 MDL-44606 assign: disable sesskey protection for unit test. 2014-05-07 14:06:08 +08:00
Damyon Wiese
46b56588ae MDL-44606 Assign: Some grading functions are missing sesskey protection 2014-05-07 12:36:38 +08:00
Helen Foster
f15fa7a281 MDL-45410 Merge English strings from the en_fix language pack 2014-05-07 00:16:51 +02:00
Andrew Nicols
02915dfc23 MDL-45357 events: Remove unnecessary the before 'id' in event descriptions 2014-05-06 16:45:05 +08:00
Mark Nelson
c5cfb3ca98 MDL-45357 events: changed event descriptions to ensure consistency in core 2014-05-05 00:55:50 -07:00
Damyon Wiese
954e15bf27 Merge branch 'mdl44575-master' of https://github.com/tlock/moodle 2014-04-30 16:31:41 +08:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00
Mark Nelson
e692f58558 MDL-43557 events: removed underscores from event string keys 
AMOS START
 MOV [event_legacy_logged, logstore_legacy],[eventlegacylogged,logstore_legacy]
 MOV [event_cohort_created,cohort],[eventcohortcreated,cohort]
 MOV [event_cohort_deleted,cohort],[eventcohortdeleted,cohort]
 MOV [event_cohort_member_added,cohort],[eventcohortmemberadded,cohort]
 MOV [event_cohort_member_removed,cohort],[eventcohortmemberremoved,cohort]
 MOV [event_cohort_updated,cohort],[eventcohortupdated,cohort]
 MOV [event_group_created,group],[eventgroupcreated,group]
 MOV [event_group_deleted,group],[eventgroupdeleted,group]
 MOV [event_group_member_added,group],[eventgroupmemberadded,group]
 MOV [event_group_member_removed,group],[eventgroupmemberremoved,group]
 MOV [event_group_updated,group],[eventgroupupdated,group]
 MOV [event_grouping_created,group],[eventgroupingcreated,group]
 MOV [event_grouping_deleted,group],[eventgroupingdeleted,group]
 MOV [event_grouping_updated,group],[eventgroupingupdated,group]
 MOV [event_webservice_function_called,webservice],[eventwebservicefunctioncalled,webservice]
 MOV [event_webservice_login_failed,webservice],[eventwebserviceloginfailed,webservice]
 MOV [event_webservice_service_created,webservice],[eventwebserviceservicecreated,webservice]
 MOV [event_webservice_service_deleted,webservice],[eventwebserviceservicedeleted,webservice]
 MOV [event_webservice_service_updated,webservice],[eventwebserviceserviceupdated,webservice]
 MOV [event_webservice_service_user_added,webservice],[eventwebserviceserviceuseradded,webservice]
 MOV [event_webservice_service_user_removed,webservice],[eventwebserviceserviceuserremoved,webservice]
 MOV [event_webservice_token_created,webservice],[eventwebservicetokencreated,webservice]
 MOV [event_webservice_token_sent,webservice],[eventwebservicetokensent,webservice]
 MOV [event_user_loggedin,auth],[eventuserloggedin,auth]
 MOV [event_assessable_uploaded,assignsubmission_file],[eventassessableuploaded,assignsubmission_file]
 MOV [event_assessable_uploaded,assignsubmission_onlinetext],[eventassessableuploaded,assignsubmission_onlinetext]
 MOV [event_chapter_created,mod_book],[eventchaptercreated,mod_book]
 MOV [event_chapter_deleted,mod_book],[eventchapterdeleted,mod_book]
 MOV [event_chapter_updated,mod_book],[eventchapterupdated,mod_book]
 MOV [event_chapter_viewed,mod_book],[eventchapterviewed,mod_book]
 MOV [event_book_exported,booktool_exportimscp],[eventbookexported,booktool_exportimscp]
 MOV [event_book_printed,booktool_print],[eventbookprinted,booktool_print]
 MOV [event_chapter_printed,booktool_print],[eventchapterprinted,booktool_print]
 MOV [event_message_sent,mod_chat],[eventmessagesent,mod_chat]
 MOV [event_sessions_viewed,mod_chat],[eventsessionsviewed,mod_chat]
 MOV [event_answer_created,mod_choice],[eventanswercreated,mod_choice]
 MOV [event_answer_updated,mod_choice],[eventanswerupdated,mod_choice]
 MOV [event_report_viewed,mod_choice],[eventreportviewed,mod_choice]
 MOV [event_assessable_uploaded,mod_forum],[eventassessableuploaded,mod_forum]
 MOV [event_assessable_uploaded,mod_workshop],[eventassessableuploaded,mod_workshop]
AMOS END
 2014-04-29 19:15:47 -07:00
Marina Glancy
3f0a5f287a Merge branch 'MDL-45257-master-2nd' of git://github.com/FMCorz/moodle 2014-04-30 10:05:11 +08:00
David Monllao
d2e6b3b26b MDL-44614 behat: Added missing @_file_upload 2014-04-29 09:55:47 +07:00
Frederic Massart
abf3a51e29 MDL-45257 mod_assign: Removing wonky feedback_updated event 2014-04-28 15:13:55 +08:00
Marina Glancy
f6db769eb2 Merge branch 'MDL-44614_master' of git://github.com/dmonllao/moodle 2014-04-28 13:03:39 +08:00
David Monllao
23102c3e2e MDL-44614 behat: Automate MDLQA-61 
In an Offline activity assignment, a teacher can
grade and give comments on an assignment completed
offline.
 2014-04-28 10:01:01 +07:00
David Monllao
6f9f05a06e MDL-44614 behat: Automate MDLQA-60 
A teacher can provide feedback
comments and files for an assignment.
 2014-04-28 10:00:41 +07:00
Marina Glancy
3a0edd1fcd Merge branch 'MDL-45052-master' of git://github.com/ankitagarwal/moodle 2014-04-28 10:44:36 +08:00
Ankit Agarwal
c4652889f1 MDL-45052 events: Cleanup db/events.php 2014-04-28 10:33:18 +08:00
Sam Hemelryk
6ce786cbe7 Merge branch 'MDL-45164_master' of git://github.com/dmonllao/moodle 2014-04-28 14:09:27 +12:00
David Monllao
2353a68fa8 MDL-45164 behat: Add a wait to avoid random failures 
It may fail in fast systems as the JS animation
to remove the delete comment may be slower than
the following steps where we check that the element
is not there anymore.
 2014-04-27 07:44:15 +07:00
Frederic Massart
5730debbb9 MDL-45194 assign_feedback: Cache was never set and used in is_enabled 2014-04-22 15:32:25 +08:00
Damyon Wiese
186f092ee8 Merge branch 'MDL-45119-master' of git://github.com/andrewnicols/moodle 2014-04-17 16:17:12 +08:00