19677 Commits

Author SHA1 Message Date
Jun Pataleta
177c0a36ec Merge branch 'MDL-60124-master' of https://github.com/snake/moodle 2017-10-16 14:33:53 +08:00
Damyon Wiese
6dc633fd93 Merge branch 'MDL-60058-master-4' of git://github.com/ryanwyllie/moodle 2017-10-16 12:28:59 +08:00
Jake Dallimore
6b76e041f4 Merge branch 'MDL-57455_master' of git://github.com/markn86/moodle 2017-10-16 10:34:01 +08:00
Jake Dallimore
ee9d4a77ea MDL-60124 assign: comment annotation now auto reduces in size on delete 2017-10-16 08:49:36 +08:00
Ryan Wyllie
7ec6d873e1 MDL-60058 assign: stop teacher from seeing due date event on dashboard
Thanks to Damyon Wiese for the patch.
2017-10-13 06:38:03 +00:00
Andrew Nicols
028fa14436 MDL-60058 assign: Updating gradingduedate on drag/drop 2017-10-13 06:38:02 +00:00
Ryan Wyllie
8c4b939cfe MDL-60058 choice: implement timestart range callback for calendar UI 2017-10-13 06:38:02 +00:00
Jake Dallimore
20b5ea16b7 NOBUG: Fixed file access permissions 2017-10-13 14:33:08 +08:00
Ryan Wyllie
f4c2156189 MDL-60058 assign: allow update of assign calendar action events 2017-10-13 06:18:43 +00:00
Mark Nelson
0f09368cbb MDL-57455 mod_data: extended Behat test to cover searching names
Merged two Behat files that were doing similar things.
2017-10-13 11:01:42 +08:00
Jake Dallimore
41be91c00b MDL-60002 assign: Fixed validation on save and save and show next. 2017-10-13 09:04:08 +08:00
Mark Nelson
822b3346ce MDL-57455 mod_data: added 'Manage standard tags' link 2017-10-12 16:59:16 +08:00
Mark Nelson
80effa0faa MDL-57455 mod_data: added reset tags functionality 2017-10-12 16:59:16 +08:00
Mark Nelson
5623d18784 MDL-57455 mod_data: performance improvement for tags backup/restore 2017-10-12 16:59:16 +08:00
Mark Nelson
a783cf701c MDL-57455 mod_data: allow tags to be removed from search criteria 2017-10-12 16:59:16 +08:00
Mark Nelson
f7a12344cb MDL-57455 mod_data: added missing accessibility check 2017-10-12 16:59:15 +08:00
Andrew Hancox
ee9a2706b3 MDL-57455 mod_data: Added PHPUnit tests 2017-10-12 16:59:15 +08:00
Andrew Hancox
f4c5328c2b MDL-57455 mod_data: Added Behat tests to cover tagging 2017-10-12 16:59:15 +08:00
Andrew Hancox
04f7b079bc MDL-57455 mod_data: Import and export tags 2017-10-12 16:59:15 +08:00
Andrew Hancox
d45c7a6823 MDL-57455 mod_data: Extend advanced search to cover tags
Also removed redundant code as $advtables, $advwhere etc.
are only used below when constructing $fromsql which is
only used if advanced is empty.
2017-10-12 16:59:15 +08:00
Andrew Hancox
ca5f3e0a2e MDL-57455 mod_data: Implement tagging 2017-10-12 16:59:14 +08:00
Jun Pataleta
458d9e084f Merge branch 'MDL-59854-master' of git://github.com/junpataleta/moodle 2017-10-12 12:27:34 +08:00
Tobias Reischmann
05f9380cbc MDL-59854 forum: Created unique db key for forum_subscriptions
Due to race conditions in the function subscribe_user
it was possible to create duplicate forum subscriptions.
This lead to error messages, when displaying the list of
all subscriptions.
This patch removes all existing duplicate entries and
creates a unique db key to prevent this from happening in
the future.
2017-10-12 12:24:03 +08:00
Andrew Nicols
e61ad18e70 Merge branch 'MDL-55356-master' of https://github.com/sammarshallou/moodle 2017-10-12 11:28:04 +08:00
Eloy Lafuente (stronk7)
ae2ae5f46f Merge branch 'MDL-60301-master' of git://github.com/ankitagarwal/moodle 2017-10-12 00:37:11 +02:00
sam marshall
66e3702680 MDL-55356 core_search: Change existing search areas to new API
This change considers all existing search areas in Moodle and makes
necessary changes.

Custom change to course search, supported by helper in base.php:

* course/classes/search/mycourse.php

Custom change to message search:

* message/classes/search/message_received.php
* message/classes/search/message_sent.php

Custom change to user search:

* user/classes/search/user.php

Custom changes to module areas, supported by helper in base_mod.php:

* mod/book/classes/search/chapter.php
* mod/data/classes/search/entry.php
* mod/forum/classes/search/post.php
* mod/glossary/classes/search/entry.php
* mod/survey/classes/search/activity.php
* mod/wiki/classes/search/collaborative_page.php

(Note: the unit tests do not exhaustively check every context type
for these, given that's mainly handled by the helper function
which was already tested in the base_activity test.)

Handled by block base class (no change):

* blocks/html/classes/search/content.php

Handled by activity base class (no change):

* mod/assign/classes/search/activity.php
* mod/book/classes/search/activity.php
* mod/chat/classes/search/activity.php
* mod/choice/classes/search/activity.php
* mod/data/classes/search/activity.php
* mod/feedback/classes/search/activity.php
* mod/folder/classes/search/activity.php
* mod/forum/classes/search/activity.php
* mod/glossary/classes/search/activity.php
* mod/imscp/classes/search/activity.php
* mod/label/classes/search/activity.php
* mod/lesson/classes/search/activity.php
* mod/lti/classes/search/activity.php
* mod/page/classes/search/activity.php
* mod/quiz/classes/search/activity.php
* mod/resource/classes/search/activity.php
* mod/scorm/classes/search/activity.php
* mod/url/classes/search/activity.php
* mod/wiki/classes/search/activity.php
* mod/workshop/classes/search/activity.php
2017-10-11 17:17:09 +01:00
Andrew Nicols
544321235d Merge branch 'master_MDL-60276' of https://github.com/CengageEng/moodle 2017-10-11 09:38:47 +08:00
Eloy Lafuente (stronk7)
0a073e9d42 Merge branch 'MDL-60300' of https://github.com/NeillM/moodle 2017-10-11 01:39:55 +02:00
Eloy Lafuente (stronk7)
f8a86c157d Merge branch 'MDL-55358-master' of https://github.com/davidknu/moodle 2017-10-11 00:00:10 +02:00
Eloy Lafuente (stronk7)
70aeddcaf4 Merge branch 'MDL-60002-save-and-show-next' of https://github.com/abalbanyan/moodle 2017-10-10 20:14:42 +02:00
Juan Leyva
011c5ae476 MDL-60396 mod_workshop: Add checks for maximum gradeover 2017-10-10 17:04:57 +02:00
Ryan Wyllie
4c1145009a MDL-60058 assign: show due date calendar event for teachers 2017-10-10 03:51:18 +00:00
Andrew Nicols
1e7ed737d2 Merge branch 'MDL-45366' of git://github.com/stronk7/moodle 2017-10-10 08:40:01 +08:00
Eloy Lafuente (stronk7)
6d170ad508 Merge branch 'MDL-60129_master-v2' of git://github.com/markn86/moodle 2017-10-09 23:17:36 +02:00
Andrew Nicols
7da1dd651a Merge branch 'MDL-60317' of git://github.com/timhunt/moodle 2017-10-09 14:05:57 +08:00
Neill Magill
078484f2e2 MDL-60300 Quiz: Offline update time not set correctly 2017-10-06 13:43:42 +01:00
Eloy Lafuente (stronk7)
bbc8116c53 Merge branch 'MDL-60130_master' of git://github.com/markn86/moodle 2017-10-04 23:47:07 +02:00
Abdullah Albanyan
b56dc2a109 MDL-60002 js: Added a 'Save and show next' button to grading interface. 2017-10-04 13:39:33 -07:00
Juan Leyva
4c2a2bd7ce MDL-59241 mod_workshop: Fix testing found issues
- totalfilesize counting all submissions
- Improved function documentation
2017-10-04 20:23:02 +02:00
Juan Leyva
2973f64318 MDL-59248 mod_workshop: Fix permissions checks 2017-10-04 20:15:14 +02:00
Jake Dallimore
32c369818c Merge branch 'MDL-57228' of git://github.com/timhunt/moodle 2017-10-04 13:42:51 +08:00
Ankit Agarwal
d041a0b71f MDL-60301 libraries: PHP7.2 compatibility fix 2017-10-04 08:02:51 +05:30
Ankit Agarwal
61cef46120 MDL-60301 assignfeedback_editpdf: changes to files after FPDI update
1) Change the fpdi_bridge class so that it extends the pdf class,
rather than the TCPDF class.
2) Empty class check that was implemented before
3) Updated the editpdf/fpdi/readme_moodle.txt file to document the changes.
4) Updated the editpdf/thirdpartylibs.xml to reflect the update to the
FPDI library.
2017-10-04 08:02:48 +05:30
Juan Leyva
012c2b84b5 MDL-60144 mod_workshop: New WS mod_workshop_evaluate_submission 2017-10-03 19:28:56 +02:00
Juan Leyva
2c89c7c120 MDL-60144 mod_workshop: Move submission evaluation code to API 2017-10-03 19:28:44 +02:00
Juan Leyva
27fa248236 MDL-59239 mod_workshop: Move submission event trigger
The submission viewed event was being triggered at the beginning of the
script (before doing all the validation/safety checks).
I’ve moved the triggering to a better place so the event it is only
triggered when is verified that the user has permissions to view
the submission.
2017-10-03 19:26:40 +02:00
Juan Leyva
b99070b9d8 MDL-59239 mod_workshop: New WS mod_workshop_view_submission 2017-10-03 19:25:32 +02:00
Juan Leyva
4d201b824d MDL-59253 mod_workshop: New WS mod_workshop_get_grades_report 2017-10-03 19:22:09 +02:00
Juan Leyva
9e58617a7f MDL-59252 mod_workshop: New WS mod_workshop_evaluate_assessment 2017-10-03 19:16:43 +02:00
Juan Leyva
981f511a14 MDL-59252 mod_workshop: Move assessment evaluation code to API 2017-10-03 19:16:31 +02:00