95cc9d3b53
Merge branch 'wip-mdl-55329-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE
2016-08-09 14:28:19 +08:00
c8c910b1bd
MDL-55274 mod_chat: Add unit tests for special commands
2016-08-09 10:49:53 +08:00
6c0deebbd9
Merge branch 'MDL-55274-30' of git://github.com/lameze/moodle into MOODLE_30_STABLE
2016-08-09 10:49:47 +08:00
771f142254
Merge branch 'MDL-55398_m30v1' of https://github.com/sbourget/moodle into MOODLE_30_STABLE
2016-08-08 10:40:50 +01:00
06c9734dc8
MDL-55274 mod_chat: regain beep and / command in mod_chat.
...
format_text cannot be called on the whole input text, but must be
called on user-supplied text that will be output into chats. This
means it cannot simply be called in one place, but must instead be
called on the relevant parts of text once commands have been matched.
2016-08-08 12:29:32 +08:00
2cfeebee65
Merge branch 'MDL-55454_30' of git://github.com/timhunt/moodle into MOODLE_30_STABLE
2016-08-08 10:04:18 +08:00
0944b1641a
MDL-54656 behat: Skip test if db family is not mysql or postgres
2016-08-04 08:47:42 +08:00
f19f239c98
MDL-55454 quiz: loses shufflequestion setting restoring old backups
2016-08-03 18:43:28 +01:00
b7f6ea3578
Merge branch 'MDL-54656_m30v3' of https://github.com/sbourget/moodle into MOODLE_30_STABLE
2016-08-03 00:51:52 +02:00
4847d73829
MDL-55376 mod_assign: Update behat test
2016-08-02 10:43:37 +08:00
8ecd647160
MDL-55398 mod_feedback: prevent direct script access to lib files.
2016-08-01 20:56:14 -04:00
79598473d2
Merge branch 'MDL-55360-30-workshopgradepass' of git://github.com/mudrd8mz/moodle into MOODLE_30_STABLE
2016-08-01 18:57:22 +01:00
32949a75a7
MDL-55376 assign: trailing whitespace
2016-08-01 16:08:02 +01:00
2e9332b85d
Merge branch 'MDL-55376-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE
2016-08-01 16:06:58 +01:00
b61059dbd2
MDL-55376 mod_assign: Fix bug stopping admin from editing submissions
2016-07-29 19:09:07 +08:00
4d5707a128
MDL-55360 workshop: Add tests for setting grades to pass via mod form
...
These scenarios should cover common cases of defining the grades to pass
pass via the workshop settings form. Note that behaviour of the fields
in terms of locale-specific decimals input (MDL-51806) is not covered
with these tests as I want to avoid installation of additional language
pack. Instead, I assume that functionality of unformat_float() is tested
separately in the core.
2016-07-28 09:54:46 +02:00
2510fae394
MDL-55360 workshop: Emptying grades to pass should set them to zero
...
When editing existing workshop with a grade to pass defined, when the
field is emptied, it should be interpreted as setting it to zero. This
was not happening because unformat_float replaces the field with null,
therefore effectively unsetting it.
By casting to float, we interpret all empty values (including null) as
zeros. This behaviour is consistent with how gradebook setup UI works.
2016-07-28 09:54:46 +02:00
cd830f4e2c
MDL-55360 workshop: Allow creating workshops with empty grades to pass
...
As a regression of MDL-55360, it was not possible to create new
workshops if the field "Submission grade to pass" or "Assessment grade
to pass" was left empty. The validation failed with "You must enter a
number here".
The fields submissiongradepass and gradinggradepass are always present
as we explicitly define them in the mod form. So the isset() condition
in the validation was useless and it did not allow to submit the form
with these fields empty.
Additionally, the unformat_float() returns null only if it receives
empty value on the input. Which can't happen in our case so I am
removing this condition to improve the readability of the code.
2016-07-28 09:54:46 +02:00
7c74b0aeb8
MDL-55329 behat: PyStrings should end with : (colon)
2016-07-27 07:02:34 +08:00
d574272a0c
MDL-55337 behat: After posting click to redirect page
2016-07-27 06:39:40 +08:00
8d5deef79e
Merge branch 'wip-MDL-51735-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE
2016-07-26 20:17:50 +02:00
89a02c4370
Merge branch 'wip-mdl-55337-m30' of https://github.com/rajeshtaneja/moodle into MOODLE_30_STABLE
2016-07-26 13:27:20 +02:00
22f3ebaad9
MDL-55337 behat: Added 1 sec delay between post
...
Ensure post is created at different timestamp, else
returned posts will be different and test fails.
This will happen on a fast machine.
2016-07-26 19:01:59 +08:00
e1fe3532a0
MDL-55252 mod_chat: prevent direct script access to lib files.
2016-07-25 09:42:39 +01:00
149ae1248e
MDL-55253 mod_choice: prevent direct script access to lib files.
2016-07-25 09:40:48 +01:00
485f8744a4
MDL-55255 mod_data: prevent direct script access to lib files.
2016-07-25 09:40:20 +01:00
c43e0956d5
MDL-51735 mod_lesson: A lesson with no content shows a message.
...
Before it would show an error.
2016-07-25 10:55:50 +08:00
44ce1facbc
Merge branch 'MDL-55220-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE
2016-07-19 13:22:43 +02:00
1e56841201
Merge branch 'MDL-55157_m30v6' of https://github.com/sbourget/moodle into MOODLE_30_STABLE
2016-07-19 08:42:24 +02:00
ad097b6fbd
MDL-55157 mod_feedback: Course reset should update dates
2016-07-18 22:11:39 -04:00
da0d992d20
Merge branch 'MDL-51410_m30v2' of https://github.com/sbourget/moodle into MOODLE_30_STABLE
2016-07-19 02:31:40 +02:00
32d225deab
Merge branch 'MDL-55161-m30' of https://github.com/micaherne/moodle into MOODLE_30_STABLE
2016-07-18 20:02:32 +02:00
a4de0bbd59
Merge branch 'MDL-55163-30' of git://github.com/jleyva/moodle into MOODLE_30_STABLE
2016-07-18 19:45:23 +02:00
8e6d1ac1d6
MDL-55240 editpdf: Revert changes in MDL-54772
...
* Revert rendering of annotations and comments back to the
drawing region.
* Bind events to stamp annotation when editing only.
2016-07-15 10:39:38 +08:00
c7ae332304
MDL-55220 forum: Add string filtering in WS
...
The following external functions now filter the discussion and post
name and subject.
- get_forum_discussions_paginated
- get_forum_discussion_posts
2016-07-14 09:14:59 +01:00
4063900e2b
MDL-55161 assign: Check for existence of gradebook feedback plugin
2016-07-13 09:03:44 +01:00
bcfca5e67d
MDL-47371 mod_book: Fix out of scope $unescapedtitle
2016-07-13 10:28:54 +08:00
27f6cc4519
MDL-51410 mod_survey: fix notifications when saving analysis
2016-07-12 20:09:26 -04:00
9251dcc986
MDL-53803 mod_choice: fix trailing whitespace
2016-07-12 18:06:29 +02:00
970a714e13
Merge branch 'MDL-53803_m30v1' of https://github.com/sbourget/moodle into MOODLE_30_STABLE
2016-07-12 18:02:52 +02:00
726051dcf9
MDL-37250 mod_lesson: Move conditions to queries for better performance
...
While this ony seems to affect MySQL, better put the filter/conditions
on every query so the temporary view/table does not need to handle
thousands of potentially unrelated records.
2016-07-12 13:33:18 +02:00
cd172ea20e
Merge branch 'wip-MDL-37250-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE
2016-07-12 13:21:15 +02:00
68adc36911
Merge branch 'MDL-47371-30' of git://github.com/cameron1729/moodle into MOODLE_30_STABLE
2016-07-12 10:14:30 +01:00
bc63d5bc06
MDL-47371 mod_book: Don't double escape book titles
2016-07-12 10:34:43 +08:00
16d219ac90
Merge branch 'wip-MDL-54962-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE
2016-07-11 16:16:07 +02:00
069cc7b961
Merge branch 'MDL-55112-30' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE
2016-07-11 14:42:15 +01:00
01a64e03ad
Merge branch 'wip-MDL-55154-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE
2016-07-11 13:31:26 +01:00
39e110d145
MDL-55163 mod_assign: Fix mod_assign_copy_previous_attempts
...
- Not exposed via WS
- Have a bug when calling the api function
2016-07-11 10:30:51 +01:00
eb0ac9cbe8
Merge branch 'MDL-54832-30' of https://github.com/nashtechdev01/moodle into MOODLE_30_STABLE
2016-07-11 06:47:47 +02:00
c77ade8587
MDL-37250 mod_lesson: All actual attempts on the lesson are displayed.
...
The lesson overview report now shows all attempts made including hitting
the page and immediately navigating away.
2016-07-11 08:21:23 +08:00
Andrew Nicols