20963 Commits

Author SHA1 Message Date
David Monllaó
03876f0b89 Merge branch 'MDL-65207-master' of git://github.com/lameze/moodle 2019-04-24 17:52:10 +02:00
Jun Pataleta
b3c8984c0e Merge branch 'MDL-65032-master' of git://github.com/peterRd/moodle 2019-04-24 16:18:06 +08:00
Peter
565cccfafa MDL-65032 mod_forum: Update existing function to include lock params 2019-04-24 15:52:21 +08:00
Peter
bdb4a87daa MDL-65032 mod_forum: Updates based on Jun's feedback 2019-04-24 12:49:41 +08:00
Peter
0547bed1a5 MDL-65032 mod_forum: Add locked column to the backup table. 2019-04-24 12:05:32 +08:00
Peter
cb28132dce MDL-65069 mod_forum: Remove unused code and additional dev docs.
Additional updates to setting default subscription value for discussions
2019-04-24 12:01:37 +08:00
Peter
c475fe410f MDL-65032 mod_forum: Pass the the entity factories into the vaults 2019-04-24 11:56:23 +08:00
Peter
f5b4320ec5 MDL-65032 mod_forum: Behat test for locking 2019-04-24 11:55:51 +08:00
Peter
2893812eb0 MDL-65032 mod_forum: Add discussion locking functionality 2019-04-24 11:55:37 +08:00
Peter
2aff2c19a9 MDL-65069 mod_forum: Behat test for the inline form 2019-04-24 10:29:30 +08:00
Peter
0d71eee8b5 MDL-65069 mod_forum: Pass the class to style the button 2019-04-24 10:29:30 +08:00
Peter
97babbf7d7 MDL-65069 mod_forum: Stripped out inpage form and advanced redirect
* Stripped out the form for the inpage on the discussion list page.
* Tweaked the 'Advanced' redirect to take into account a nosubmit button
 which populates the subject, message and any files used within it.
2019-04-24 10:29:30 +08:00
Peter
9ff7cae7c0 MDL-65069 mod_forum: inline 'add discussion' form 2019-04-24 10:29:30 +08:00
Adrian Greeve
4962446a44 Merge branch 'MDL-65308' of git://github.com/stronk7/moodle 2019-04-24 09:27:07 +08:00
Eloy Lafuente (stronk7)
fc8a72b4cb Merge branch 'MDL-65382-master' of git://github.com/junpataleta/moodle 2019-04-24 00:04:45 +02:00
Jun Pataleta
3eed2af1d1 MDL-65324 mod_forum: Fix tests for timed discussion settings 2019-04-23 14:00:41 +02:00
Jun Pataleta
72f7e3f198 Merge branch 'MDL-65324-master' of git://github.com/peterRd/moodle 2019-04-23 13:53:35 +02:00
Eloy Lafuente (stronk7)
1d75eb9bad Merge branch 'MDL-65275_master' of git://github.com/markn86/moodle 2019-04-22 00:58:37 +02:00
Jun Pataleta
83d4204ef1 MDL-65382 mod_lti: Fix appearance of status labels 2019-04-18 15:28:48 +08:00
Jun Pataleta
9f23a65e0c Merge branch 'MDL-64956-master2' of git://github.com/peterRd/moodle 2019-04-18 11:09:49 +08:00
Peter
a0c9b6afcc MDL-64956 mod_forum: Updates based on IR 2019-04-18 06:40:22 +08:00
Peter
9b4f09bad2 MDL-64956 mod_forum: Inpage reply
* Basic functionality for an inpage reply. With advanced link that takes you to the previous "Reply page".
* Updated behat function to handle the additional step
* Updated templates to have some identifiers on where one is storing the replies post
* Updated discussion_post to use the new vault functions to get the corresponding records
* Jumpto newly created post
2019-04-17 10:13:41 +08:00
Adrian Greeve
a251ed8be7 Merge branch 'MDL-65034-master' of git://github.com/ryanwyllie/moodle 2019-04-16 13:19:15 +08:00
Ryan Wyllie
8dbe769988 MDL-65034 mod_forum: fix author for single discussion forum 2019-04-16 10:51:43 +08:00
Eloy Lafuente (stronk7)
0b9d7d93f8 MDL-65308 core: change a couple of unsafe preg_quote() cases
With PHP 7.3, the hash (#) is being escaped by preg_quote().

While normally that doesnt have much impact and normal operations
continue working perfectly... when the results of the function are
used to match against the same string... they don't match anymore.

Have found a couple of there double-uses in core and this
commit fixes them. Covered with tests.
2019-04-16 01:40:47 +02:00
Mihail Geshoski
ee6b5ba343 MDL-65034 forum: Rename identifier to camel case 2019-04-15 14:51:03 +08:00
Ryan Wyllie
e564ae863d MDL-65034 forum: add aria keyboard nav to discussion 2019-04-15 14:51:03 +08:00
Ryan Wyllie
53d743741e MDL-65034 forum: add aria attributes to forum post 2019-04-15 14:51:03 +08:00
Eloy Lafuente (stronk7)
89a81629a7 MDL-65281 phpunit: Just check for existence if order is not guaranteed
Posible solutions explained in the issue, imply chaging the API
in various, alternative ways. For your consideration if that
should be done for a better API, able to sort under demand when
required (or, at very least guaranteeing a default consistent ordering).
2019-04-13 11:38:39 +02:00
Eloy Lafuente (stronk7)
66b4982135 MDL-64656 phpunit: Compare returned tags without any expected order 2019-04-12 17:28:21 +02:00
Sara Arjona
865d284410 MDL-39261 mod_lesson: get the existing attemptid when reviewing 2019-04-12 13:11:50 +02:00
Adrian Greeve
ac76ff1999 MDL-62974 mod_lesson: Minor update to html class. 2019-04-12 11:01:20 +08:00
Adrian Greeve
7ff3919dc2 Merge branch 'MDL-39261-master' of git://github.com/peterRd/moodle 2019-04-12 10:52:16 +08:00
Peter
814db56f4c MDL-65324 mod_forum: Fix the has_ended function and add unit tests
* Additional has_started unit tests
2019-04-12 10:20:18 +08:00
Peter
a4606b7efe MDL-39261 mod_lesson: Move essay answer files to new file area
* Moved answers to a different file area
* Added backup and restore calls
* Include privacy/reset related calls similar to essay responses
2019-04-12 07:27:12 +08:00
Eloy Lafuente (stronk7)
a45fa792df Merge branch 'MDL-62974-master' of https://github.com/jmvedrine/moodle 2019-04-11 23:49:55 +02:00
Eloy Lafuente (stronk7)
ff3c8c0e6c Merge branch 'MDL-64656-master' of git://github.com/jleyva/moodle 2019-04-11 20:12:13 +02:00
Eloy Lafuente (stronk7)
fd652de81f Merge branch 'MDL-31355-master' of git://github.com/rezaies/moodle 2019-04-11 17:17:07 +02:00
Shamim Rezaie
7a6b701a90 MDL-31355 mod_forum: Add drag and drop support to forum duedate events 2019-04-11 18:47:35 +10:00
Shamim Rezaie
82482e3d3e MDL-31355 mod_forum: different message when duedate has passed 2019-04-11 18:47:35 +10:00
Shamim Rezaie
cbf63d8efc MDL-31355 mod_forum: Prevent users from posting after cut-off date 2019-04-11 18:47:35 +10:00
Shamim Rezaie
99bcb31895 MDL-31355 mod_forum: WS should return duedate and cutoffdate. 2019-04-11 18:47:32 +10:00
Shamim Rezaie
bbbf182089 MDL-31355 mod_forum: Create, update and delete due date event 2019-04-11 18:33:35 +10:00
Juan Leyva
6c344ff282 MDL-64656 core_tag: Return tags in modules and blog 2019-04-11 10:20:44 +02:00
Peter
676eca7b9b MDL-39261 mod_lesson: Rewrite the answer URL for grading 2019-04-11 12:03:32 +08:00
Shamim Rezaie
0556f39373 MDL-31355 mod_forum: backup and restore of duedate and cutoffdate fields 2019-04-11 02:03:02 +10:00
Shamim Rezaie
ceea2d2618 MDL-31355 mod_forum: Add duedate and cutoffdate to form
AMOS BEGIN
CPY [availability,mod_assign],[availability,mod_forum]
CPY [cutoffdate,mod_assign],[cutoffdate,mod_forum]
CPY [cutoffdatevalidation,mod_assign],[cutoffdatevalidation,mod_forum]
CPY [duedate,mod_assign],[duedate,mod_forum]
AMOS END
2019-04-11 02:03:02 +10:00
Shamim Rezaie
f6b07fedde MDL-31355 mod_forum: new db field for due and cutoff date 2019-04-11 02:03:02 +10:00
David Monllaó
65c817ba21 MDL-59081 mod_lesson: Fix feature file indentation 2019-04-10 13:37:02 +02:00
David Monllaó
f7c77ea189 Merge branch 'MDL-59081-master' of git://github.com/abgreeve/moodle 2019-04-10 12:49:22 +02:00