Commit graph

76095 commits

Author SHA1 Message Date
Dani Palou
487f6471a0 MDL-51935 wiki: Add missing strings in wiki 2015-11-10 10:05:06 +01:00
John Okely
616dd1b594 MDL-52054 forum: Prevent error when clicking move without a destination 2015-11-10 16:43:19 +08:00
Ryan Wyllie
d26d0d9b7e MDL-51991 atto_table: simplify settings
Cleaned up the language strings on the Atto table settings page
and reduced the number of settings options for border styling.
2015-11-10 08:15:01 +00:00
John Okely
32b4161a3c MDL-52055 block_online_users: Only show users from current course 2015-11-10 08:13:41 +00:00
Rajesh Taneja
81676e84e6 MDL-52077 unittest: Fixed string typo 2015-11-10 13:53:47 +08:00
Rajesh Taneja
27c99f5007 MDL-52066 unittest: Use ics file from external repo 2015-11-10 13:27:00 +08:00
John Okely
d7f95392ac MDL-52054 forum: Revert MDL-46321. Add the "move" button back.
This reverts commit 5a699f25a2.
2015-11-10 10:46:37 +08:00
John Okely
cb658a4d04 MDL-52063 forum: Display message when moving forum 2015-11-10 10:24:06 +08:00
Eloy Lafuente (stronk7)
f62d6ffa3d Merge branch 'MDL-47979-master-blocks-config' of git://github.com/mudrd8mz/moodle 2015-11-09 23:42:26 +01:00
Eloy Lafuente (stronk7)
d1bd327454 Merge branch 'MDL-52045-master-block_tags_settings' of git://github.com/mudrd8mz/moodle 2015-11-09 23:39:33 +01:00
AMOS bot
381fdb96bf Automatically generated installer lang files 2015-11-10 00:04:06 +08:00
David Mudrák
8159f23e76 MDL-47979 blocks: Do not display link to legacy file admin/block.php
The deprecated file admin/block.php was removed in Moodle 2.6. Since
then, all blocks that declare has_config() must provide a settings.php
file.
2015-11-09 13:30:40 +01:00
Dan Poltawski
2f3e84c132 Merge branch 'MDL-51837-master' of git://github.com/junpataleta/moodle 2015-11-09 11:33:00 +00:00
Dan Poltawski
f46aa6bc42 Merge branch 'MDL-51628-master' of git://github.com/damyon/moodle 2015-11-09 11:01:21 +00:00
Dan Poltawski
f808f8f553 Merge branch 'wip-MDL-52039-master' of https://github.com/marinaglancy/moodle 2015-11-09 08:48:49 +00:00
David Mudrák
afb52b6f31 MDL-52045 block_tags: Fix invalid has_config() declaration
As the settings.php has been removed in MDL-51132, the block should no
longer declare it has global configuration.
2015-11-09 09:34:53 +01:00
David Monllao
0f1b3c69d8 Merge branch 'MDL-40245_master' of git://github.com/SWiT/moodle 2015-11-09 16:12:44 +08:00
David Monllao
a2bb9b8751 Merge branch 'MDL-49473-master' of git://github.com/danpoltawski/moodle 2015-11-09 15:12:30 +08:00
David Monllao
814809d59e Merge branch 'wip-MDL-52008-master' of git://github.com/abgreeve/moodle 2015-11-09 13:16:06 +08:00
AMOS bot
323e38c4a1 Automatically generated installer lang files 2015-11-08 00:04:45 +08:00
Marina Glancy
9390d02099 MDL-52039 block_tags: remove unused setting 2015-11-07 12:45:35 +08:00
Dan Poltawski
82467e580b MDL-50426 behat: Update non-contacts feature naming 2015-11-06 19:47:38 +01:00
Dan Poltawski
1533fca4b5 Moodle release 3.0rc2 2015-11-06 11:57:10 +00:00
Rajesh Taneja
7b4933db3a MDL-51685 unittest: Test functionality individually 2015-11-06 11:14:17 +01:00
Dan Poltawski
5208168e0c Merge branch 'MDL-51861' of https://github.com/stronk7/moodle 2015-11-06 10:04:02 +00:00
Eloy Lafuente (stronk7)
ed4e707577 MDL-51861 enrol: added missing external cleanup for formal compliance 2015-11-06 10:58:28 +01:00
Dan Poltawski
265ddbf30c MDL-51569 mod_choice: Fix use of hardcoded ids
(Previous approach of making up ids longer works now we are validating
them..)
2015-11-06 08:09:47 +00:00
Dani Palou
b036215acc MDL-51861 enrol: Don't get all parts in get_enrolled_users with groups 2015-11-06 15:07:24 +08:00
Andrew Nicols
af8472a91f Merge branch 'MDL-51861' of git://github.com/stronk7/moodle 2015-11-06 15:01:20 +08:00
John Okely
531bcb13f6 MDL-51569 mod_choice: Prevent users from updating choices with curl
And fix unit tests.
2015-11-06 14:52:26 +08:00
Dmitrii Metelkin
6d6e297b13 MDL-51314 mod_assign: cache group membership in can_edit_submission 2015-11-06 15:21:01 +11:00
Andrew Nicols
1d1f08a045 MDL-51685-master Fix unit tests following change
These unit tests were modifying the PAGE and other globals in the middle of
tests and were failing as a result.

Broke the tests up into separate tests where the functionality is now
tested individually.
2015-11-06 10:36:06 +08:00
Adrian Greeve
9e8d0842ba MDL-52008 accessibility: Skip link works with chrome vox. 2015-11-06 09:47:51 +08:00
Eloy Lafuente (stronk7)
f076ce2834 MDL-51861 enrol: new unit test to verify all conditions and filters
This unit test does not verify contents, details, but only
that the returned users for every group mode, for every
filtering (active, groupid and withcapability) together
with permissions are correct.
2015-11-06 02:26:02 +01:00
Dan Poltawski
600b815279 MDL-46049 chat: update calendar times on repeating chat sessions
Previously were using the invalid chat id and the calendar entry was not
updated.

Thanks to Andy McGill who worked this out.
2015-11-05 16:02:08 +00:00
Dan Poltawski
1c2a11fcfa MDL-46049 chat: add missing closing parenthesis 2015-11-05 16:01:42 +00:00
Damyon Wiese
0bca129775 MDL-51569 mod_choice: Validate the submitted optionid
Make sure any submitted choice options actually belong to the current choice
module.
2015-11-05 10:48:40 +00:00
Dan Poltawski
2759c1218d Merge branch 'MDL-52036-master-resettable' of git://github.com/mudrd8mz/moodle 2015-11-05 09:03:20 +00:00
Juan Leyva
a7d13ecf2b MDL-50589 gradereport_user: Force regrade in external function 2015-11-05 09:40:38 +01:00
Ryan Wyllie
ceb689b9fc MDL-50426 message: post_message capability tests
Behat and unit tests to confirm the behaviour of the
messaging lib after the capability checks were added
to the post message function.
2015-11-05 08:20:39 +00:00
Ryan Wyllie
cd0c9ac87d MDL-50426 message: optional permission check on message
Changed the messaging API to allow you to provide a parameter
that will cause the code to check if the sender of the message
has the correct permissions before the message is sent.

The ajax messaging (message button on profile page) has been
updated to perform these permission checks. This brings it
inline with the existing private message page.
2015-11-05 08:20:39 +00:00
Ryan Wyllie
e24188c881 MDL-50426 behat: fix behat field manager
Thanks to Raj for the patch.
2015-11-05 08:20:39 +00:00
Damyon Wiese
85d0696dfa MDL-51720 assign: Always fallback on userid as a default sort
Even when the table has no userid column (this is normally the edit column).
2015-11-05 15:33:19 +08:00
Andrew Nicols
19f14de362 Merge branch 'MDL-51395-master' of git://github.com/junpataleta/moodle 2015-11-05 13:57:22 +08:00
Jun Pataleta
cefa583e71 MDL-51395 blog: Fix output of strings for blog comments 2015-11-04 23:46:31 -06:00
Andrew Nicols
c73acaa7ef Merge branch 'MDL-26429-master' of git://github.com/cameron1729/moodle 2015-11-05 12:12:43 +08:00
Andrew Nicols
8acf1ccd22 MDL-51899 mod_forum: Add test for allowing 0 grades 2015-11-05 12:07:27 +08:00
Cameron Ball
7062e7c6b3 MDL-26429 usability: Add course completion icons.
This patch adds a method to the course completion criteria classes
which allows them to specify an icon for display in the course
completion report table.

There is a default implementation which simply looks for an icon
in pix/i with a name matching the completion criteria type.
2015-11-05 11:40:58 +08:00
Andrew Nicols
da737c7201 Merge branch 'MDL-51899_master' of git://github.com/jacac/moodle 2015-11-05 11:24:43 +08:00
Andrew Nicols
f8e685af44 Merge branch 'MDL-51685-master' of git://github.com/dpalou/moodle 2015-11-05 10:41:43 +08:00