Commit graph

3020 commits

Author SHA1 Message Date
Juan Leyva
609a10739d MDL-58259 mod_forum: Check create attachment cap in forum_add_attachment
We should add the permission check there because this function is used
indirectly by the external API that is not checking for this capability.
2017-05-05 10:28:11 +08:00
Jun Pataleta
1e324a4a88 Merge branch 'MDL-58749-master-enfix' of git://github.com/mudrd8mz/moodle 2017-05-04 14:45:08 +08:00
David Monllao
bde7f06ce8 Merge branch 'MDL-58497-master' of git://github.com/ankitagarwal/moodle 2017-05-04 10:58:36 +08:00
Helen Foster
06d0aa4432 MDL-58749 lang: Merge English strings from the en_fix language pack
Significant string changes:

* errorinvalidbyhour,core_calendar - correcting number from 59 to 23
* cron_help,core_admin - updated recommendation to run cron every minute
* tour1_content_end, tour1_content_welcome, tour2_content_end,
  tour2_content_welcome all in tool_usertours - removing reference to
  3.2
* invalidsesskey,core_error and invalidsesskey,mod_wiki - more
  understandable error message
* pluginname_help and pluginnamesummary in qtype_essay - explaining that
  the question type can be used for file uploads
* formatnoinline, mustattach and mustrequire in qtype_essay - changing
  the word 'inline' to 'online'
2017-05-03 22:05:51 +02:00
Marina Glancy
50d845e3ed MDL-58665 dashboard: use bigger course object for completion
class completion_info will make an extra DB query to retrieve the course if course->enablecompletion is not present
2017-05-01 16:59:07 +08:00
Ankit Agarwal
bb40a28d9b MDL-58497 forum: Show correct itemcount on action events 2017-05-01 13:48:30 +05:30
Marina Glancy
438c01d0dd MDL-58731 modules: display intro on the course page
something that was forgotten when adding _get_coursemodule_info to activities in MDL-58190
2017-04-28 09:14:25 +08:00
Marina Glancy
23e5104ae2 MDL-58666 course: add module name to cache
without it there will be an extra db read in get_array_of_activities() to retrieve it for each activity
2017-04-21 13:00:28 +08:00
Andrew Nicols
442908a100 Merge branch 'MDL-58138-master-v2' of git://github.com/snake/moodle 2017-04-19 11:53:40 +08:00
Jake Dallimore
273d310601 MDL-58138 completion: Fixes for a number of small issues. 2017-04-19 11:41:57 +08:00
David Monllao
ac0553aa64 Merge branch 'MDL-54901' of git://github.com/stronk7/moodle 2017-04-19 11:30:03 +08:00
Jake Dallimore
8db355c58f MDL-58138 tests: unit and behat tests covering bulk and default tabs
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Marina Glancy
7f53e8aa22 MDL-58267 completion: allow to set default activity completion
Part of MDL-58138 epic
2017-04-19 08:54:35 +08:00
Marina Glancy
06cdda468a MDL-58139 completion: bulk update completion
Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Jake Dallimore
b54bcddda4 MDL-58190 completion: callbacks to get completion rule descriptions
- Activities can have their custom completion rules added to cm_info
through the get_coursemodule_info callback.
- Descriptions of a modules active completion rules can be fetched using
the component callback mod_xxx_get_completion_active_rule_descriptions
which takes in a cm_info object and returns an array of strings.

Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Eloy Lafuente (stronk7)
55946a892a MDL-54901 phpunit: Change phpunit wwwroot to HTTPS and fix tests
This includes:

- Changing PHPUnit's bootstrap to use https://www...
- Modify all existing expectations to the new wwwroot.
- Amend some tests now with different defaults because of is_https()
- Added a note to main upgrade.php about the change.
2017-04-18 03:40:17 +02:00
Dan Poltawski
9556d5ec52 Merge branch 'MDL-46929' of https://github.com/stronk7/moodle 2017-04-17 10:53:42 +01:00
Eloy Lafuente (stronk7)
43bb3b77a5 MDL-46929 mod_forum: behat fixes
- Keep old scenarios being non-javascript.
- Move the tags stuff to recently added scenario.
- Change some "my" by "your" to avoid problems detecting results
  while keeping previous tests (based on "subject") working.
2017-04-17 11:44:00 +02:00
Dan Poltawski
6a346ab440 Merge branch 'MDL-58507_master' of git://github.com/markn86/moodle 2017-04-17 10:42:48 +01:00
Andrew Nicols
e4a090c105 Merge branch 'MDL-58501_master' of git://github.com/markn86/moodle 2017-04-13 13:21:42 +08:00
Andrew Nicols
270d5c1cc5 Merge branch 'MDL-46929' of https://github.com/andrewhancox/moodle 2017-04-13 10:00:58 +08:00
Mark Nelson
59391e80ad MDL-58501 mod_*: improved docs for new calendar callbacks 2017-04-12 17:43:52 +08:00
Mark Nelson
063b7ee647 MDL-58507 core: link functions with final deprecation issue 2017-04-12 12:38:51 +08:00
Jun Pataleta
8168bfd3e4 Merge branch 'MDL-58576-master' of git://github.com/andrewnicols/moodle 2017-04-12 10:06:13 +08:00
Andrew Nicols
0c0f3fdc1e MDL-58576 mod_forum: Fix behat failures after string change 2017-04-12 09:32:05 +08:00
Andrew Hancox
32a96916a6 MDL-46929 mod_forum: Improve behat tests 2017-04-11 13:34:22 +01:00
Andrew Hancox
e9c46768b5 MDL-46929 mod_forum: Fix for edge cases when searching 2017-04-11 08:30:09 +01:00
Marina Glancy
151113f93a MDL-46929 mod_forum: performance improvement for tags backup/restore 2017-04-11 08:30:09 +01:00
Marina Glancy
34c8585d83 MDL-46929 mod_forum: small fixes for post tagging 2017-04-11 08:30:09 +01:00
Andrew Hancox
d2ba493cfe MDL-46929 mod_forum: Implement tagging 2017-04-11 08:30:09 +01:00
Mark Nelson
01f96180ff MDL-58504 mod_*: fixed PHPDoc return type for *_provide_event_action 2017-04-06 15:00:02 +08:00
Andrew Nicols
941cb7ce3c Merge branch 'MDL-58399-master' of git://github.com/jleyva/moodle 2017-04-05 14:22:39 +08:00
Andrew Nicols
038db9734f Merge branch 'MDL-58444-master' of git://github.com/jleyva/moodle 2017-04-05 12:29:13 +08:00
Mark Nelson
90b735b169 MDL-12689 core: fixed incorrect use of the term 'depreciated' 2017-04-05 11:12:07 +08:00
Andrew Nicols
04056e715b Merge branch 'MDL-51998_master' of https://github.com/nadavkav/moodle 2017-04-05 09:56:29 +08:00
Eloy Lafuente (stronk7)
fc96fac29e Merge branch 'MDL-55499-master' of git://github.com/andrewnicols/moodle 2017-04-04 18:23:02 +02:00
Dan Poltawski
1e4e5c52d7 Merge branch 'MDL-55611-master' of git://github.com/danpoltawski/moodle 2017-04-04 17:07:41 +01:00
Mark Nelson
e1cd93ce20 MDL-58423 core_calendar: moved \core_calendar\event class
Part of MDL-55611 epic.
2017-04-04 11:01:49 +01:00
Jun Pataleta
197b6d9e5a MDL-58386 mod_forum: Fixed CI issues
Part of MDL-55611 epic.
2017-04-04 11:01:47 +01:00
Damyon Wiese
739de5fefe MDL-58087 mod_forum: Fix fragile test
This test was dependant on the randomly generated group names coming back in a
specific order.

Part of MDL-55611 epic.
2017-04-04 11:01:42 +01:00
Marina Glancy
125c4c4cb8 MDL-57961 course: change wording of module availability
renamed Visible to Availability and added help strings

AMOS BEGIN
 CPY [availability,core_moodle],[modvisible,core_moodle]
 CPY [availability,core_moodle],[modvisiblewithstealth,core_moodle]
 CPY [availability,core_moodle],[modvisiblehiddensection,core_moodle]
 CPY [show,core_moodle],[modshow,core_moodle]
 CPY [hide,core_moodle],[modhide,core_moodle]
AMOS END
2017-04-04 17:05:57 +08:00
Daniel Thee Roperto
589c8eb61b MDL-57246 forum: Fixed mod/forum/view.php redirection.
Fixed: Trying to view a forum without the capability may lead you to a broken page.
2017-04-04 16:16:54 +10:00
Damyon Wiese
141ee541ca MDL-58219 repository: Change how controlled links work
Files are copied to the system user as soon as they are uploaded. Write access is then controlled when
serving links to the file.

Part of MDL-58220
2017-04-03 13:41:19 +08:00
Damyon Wiese
151b0f9409 MDL-58132 repositories: Controlled link file type
This introduces a new "controlled link" file type where the file is not
stored in Moodle - but Moodle will control the access permissions on the file.

Plugins can "freeze" a filearea which means Moodle will take ownership of all the remote
files of this type.

When accessing a file, if the "filebrowser" infomation indicates the current user can write to the file, they
will be granted temporary write access.

Part of MDL-58220
2017-04-03 13:40:13 +08:00
Mark Nelson
6c83e65928 MDL-57878 mod_*: added unit tests for event decoration
Part of MDL-55611 epic.
2017-04-03 11:37:09 +08:00
Mark Nelson
b3bd7a66a0 MDL-57878 mod_*: added inclusion of completion event and callbacks
Part of MDL-55611 epic.
2017-04-03 11:37:09 +08:00
Jun Pataleta
12a0c74a29 MDL-58102 mod: Behat fixes
Part of MDL-55611 epic.
2017-04-03 11:37:08 +08:00
Jun Pataleta
e44d71a6ee MDL-58102 mod: Set sensible defaults for additional completion fields
Part of MDL-55611 epic.
2017-04-03 11:37:08 +08:00
Simey Lameze
fdeeaff954 MDL-58265 core_test: replace I turn editing on steps
Also remove few more unnecessary steps that redirects behat to
site home page to actually get to the course.

Part of MDL-55611 epic.
2017-04-03 11:37:07 +08:00
Simey Lameze
93be3f730c MDL-58265 core_test: remove unnecessary steps
This commmit removes steps that take behat to site home page
to actually get to a course page.

Part of MDL-55611 epic.
2017-04-03 11:37:07 +08:00