15951 Commits

Author SHA1 Message Date
Marina Glancy
9f1088d482 MDL-47543 core_grades: behat changes, also MDL-47541 2014-10-08 15:03:37 +08:00
Dan Poltawski
c5d4fd7ddf MDL-38106 lesson: fix tests introduced in MDL-32870 2014-10-08 11:51:21 +08:00
Damyon Wiese
0d474cb2b4 Merge branch 'MDL-28484-master' of https://github.com/lucisgit/moodle 2014-10-08 09:53:53 +08:00
Sam Hemelryk
ba2f9a9695 Merge branch 'MDL-47132' of git://github.com/timhunt/moodle 2014-10-08 12:01:42 +13:00
Sam Hemelryk
e90a0396e1 MDL-3714 mod_forum: pre-integration clean up 2014-10-08 09:39:44 +13:00
Sam Hemelryk
82d9aebc7d Merge branch 'MDL-3714-master' of git://github.com/andrewnicols/moodle 2014-10-08 09:39:01 +13:00
Marina Glancy
850ac50a87 Merge branch 'MDL-32870' of git://github.com/jmvedrine/moodle 2014-10-07 17:16:56 +08:00
Marina Glancy
8dfd73e04a Merge branch 'MDL-38106-master' of git://github.com/danpoltawski/moodle 2014-10-07 10:25:29 +08:00
Sam Hemelryk
002ee6faab Merge branch 'MDL-36460-master' of git://github.com/andrewnicols/moodle 2014-10-07 15:16:54 +13:00
Marina Glancy
4e45c0319c MDL-31936 workshop: version bump 2014-10-07 10:15:54 +08:00
Marina Glancy
ae66542027 Merge branch 'MDL-31936-master-workshop-reset' of git://github.com/mudrd8mz/moodle 2014-10-07 10:08:48 +08:00
Andrew Nicols
91223df61b MDL-3714 mod_forum: Add an inbound message handler
This issue is a part of the MDL-47194 Task.
This issue is a part of the MDL-39707 Epic.
2014-10-07 09:58:36 +08:00
David Mudrák
16d364b560 MDL-31936 workshop: Improve unit tests for the course reset support 2014-10-06 23:32:32 +02:00
Dan Poltawski
f5bacd6539 Merge branch 'wip-MDL-46576-master' of git://github.com/abgreeve/moodle
Conflicts:
	lib/upgrade.txt
    lib/db/upgrade.php
	version.php
2014-10-06 18:06:13 +01:00
Dan Poltawski
fb991204a9 Merge branch 'MDL-46054-master' of git://github.com/jleyva/moodle 2014-10-06 16:01:26 +01:00
Tim Hunt
4d1fcfdf8a MDL-47547 quiz editing: minor fixes following MDL-47547
* Remove unnecessary skip links.
* Disable shortforms for form in pop-ups.
* Remove some CSS that was hurting display of the add menu.
2014-10-06 15:44:21 +01:00
Dan Poltawski
106486c7ad MDL-38106 lesson: don't require intro when upgraded 2014-10-06 14:54:53 +01:00
Dan Poltawski
816d082241 MDL-43089 question: fix shifter build issues 2014-10-06 13:53:26 +01:00
Dan Poltawski
2eb24eb85a Merge branch 'MDL-43089' of git://github.com/mkassaei/moodle 2014-10-06 12:11:33 +01:00
Sam Hemelryk
7b08f6e888 Merge branch 'master_MDL-47316' of git://git.catalyst.net.nz/moodle-r2 2014-10-06 11:15:44 +13:00
Dan Poltawski
5b17d81dce MDL-38106 lesson: behat now sets introduction 2014-10-05 14:12:59 +01:00
Jean-Michel Vedrine
0abc18cf4d MDL-32870 Lesson: No HTML editor for questions answers and responses 2014-10-04 15:13:01 +02:00
Daniel Neis Araujo
d83891729a MDL-38106 mod_lesson: Add introduction field 2014-10-03 14:38:03 +01:00
Tony Butler
1e31f11852 MDL-28484 core_lib: Add function for https detection
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
2014-10-03 13:02:29 +01:00
David Mudrák
6073131713 MDL-31936 workshop: Generator able to create submissions and assessments
This is a basic implementation of the actual content generation in the workshop
generator. Note the we do not generate actual grading form data (which is what
the grading strategy plugins would do), just their results.
2014-10-03 10:49:06 +02:00
David Mudrák
f2639dca1d MDL-31936 workshop: Add more options to the course reset form
This is built upon original work by Michael Hughes. We now have separate
settings for deleting workshop submissions, assessments and for resetting the
workshop phase.
2014-10-03 10:48:38 +02:00
David Mudrák
4a44c660e5 MDL-31936 workshop: Delete attachments on record removal
The methods workshop::delete_submission() and workshop::delete_assessment() did
not delete files (embedded and attachments) associated with the given
submission or assessment. This is fixed now.

Additionally, the delete_assessment() method now cleans-up records from the
table workshop_grades, too. This internal workshop API still does not give
workshop subplugins a chance to clean up their data, should they store them in
their own tables instead of the workshop_grades one. This should be improved in
the future yet.
2014-10-03 10:47:19 +02:00
David Mudrák
84f8b00166 MDL-31936 workshop: Fix overall feedback content processing order
This is unrelated to the issue but was spotted while testing it. The order of
format_text() and file_rewrite_pluginfile_urls() was incorrect and threw
debugging message. Fixed now.
2014-10-03 10:46:32 +02:00
Michael Hughes
9c3b03f415 MDL-31936 workshop: Add unit tests for the workshop reset 2014-10-03 10:45:06 +02:00
Michael Hughes
6f760e0107 MDL-31936 workshop: Initial implementation of the course reset support 2014-10-03 10:44:40 +02:00
David Mudrák
5c29cc6e85 MDL-44536 workshop: Fix missing phpDoc for user report callbacks 2014-10-03 09:56:46 +02:00
Tim Hunt
16fa272e29 MDL-47132 quiz: move the remains of editlib.php to locallib.php 2014-10-03 07:54:47 +01:00
Tim Hunt
8aa5e0cf58 MDL-47132 quiz: move question bank extensions to classes/question/bank
While doing this code clean-up, I noticed that the question bank pop-up was
only showing the question name, whereas it should have been showing the
question name and the start of the question text, so I fixed that.
2014-10-03 07:54:46 +01:00
Marina Glancy
8faa560ca9 MDL-47146 core_grades: merge simple and full view in setup
Part of: MDL-46576
2014-10-03 13:54:38 +08:00
Andrew Nicols
c87b87e62f MDL-36460 mod_forum: Restrict forum subsription list based on availability info 2014-10-03 08:20:24 +08:00
Colin Chambers
e1a2d0d92d MDL-43089 quiz: improved interface for building quizzes
This commit is actually the joint work of Mahmoud Kassaei, Colin
Chambers and Tim Hunt from The Open University. We could only use one
persons name for the commit, and this time Colin gets the credit/blame.

The goal of this work was to increase usability, and also clean up
the page enough that it will be possible to add new features in future.

Display of mod/quiz/edit.php is now entirely generated by
mod_quiz\output\edit_renderer. This uses a helper class
mod_quiz\structure to provide details of the structure of the quiz, and
mod_quiz\repaginate to alter that structure. (Acutally, there are still
some modification methods on mod_quiz\structure. Expect that to be
cleaned up in future.)

The new code uses much more ajax, and there are new scripts
mod/quiz/edit_rest.php and mod/quiz/repaginate.php to handle this.
(Again, don't be surprised if those two scripts get merged in future.)
Also questionbank.ajax.php (which may, in future, be made more generic,
and moved into the core question bank code.)

Most of the new JavaScript code has intentionally copied the way things
are done when editing activities on the course page.

As a result of this, mod/quiz/editlib.php is now much shorter than it
was. (In future, expect the remaining code in here to move into
mod/quiz/classes.)
2014-10-02 17:22:23 +01:00
Dan Poltawski
9438c6412e NOBUG: Fixed file access permissions 2014-10-02 15:18:51 +01:00
Dan Poltawski
7e704313d2 Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle 2014-10-02 09:48:25 +01:00
Dan Poltawski
be6779d0c4 Revert "MDL-32870 mod_lesson: added support for files to question answers and responses"
This reverts commit d92f768baab86e95cafdfdbee1b54e5d2dbd055b.
2014-10-02 09:09:16 +01:00
Frederic Massart
6849d15df5 MDL-37707 mod_assign: Prevent user from changing grouping in team submissions 2014-10-01 11:27:44 +08:00
Dan Poltawski
6315aa24f9 Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle 2014-09-30 16:02:09 +01:00
Damyon Wiese
93c51a1d0a MDL-46171 assign: Fix for the update script on MySQL. 2014-09-30 21:16:24 +08:00
Dan Poltawski
f736c1b394 Merge branch '3034-28' of https://github.com/samhemelryk/moodle 2014-09-30 14:04:24 +01:00
Dan Poltawski
0645eb6866 Merge branch 'MDL-46171-master' of git://github.com/damyon/moodle 2014-09-30 08:03:40 +01:00
Marina Glancy
dc14212b61 MDL-46054 web_services: bug fix in core_user_get_users
Thanks to Mikko Rantanen for the patch
2014-09-29 16:03:17 +02:00
Sam Hemelryk
525b6ebeb9 Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges 2014-09-29 15:18:03 +13:00
Sam Hemelryk
b87711a0dc Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle 2014-09-29 14:21:39 +13:00
Sam Hemelryk
e0533f2633 Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle 2014-09-29 11:35:23 +13:00
Sam Hemelryk
51606b8e63 Merge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle 2014-09-29 11:19:06 +13:00
Jean-Michel Vedrine
d92f768baa MDL-32870 mod_lesson: added support for files to question answers and responses 2014-09-29 11:00:28 +13:00