74410 Commits

Author SHA1 Message Date
Mark Nelson
ab2d8946cd MDL-50516 mod_lesson: changes to existing behat tests 2015-09-09 15:27:24 +08:00
Mark Nelson
ecaff8f042 MDL-50516 mod_lesson: added behat tests 2015-09-09 15:27:23 +08:00
Mark Nelson
051b45f864 MDL-50516 core_behat: added ability to go back, forward and reload the browser 2015-09-09 15:27:23 +08:00
Mark Nelson
139645d4a7 MDL-50516 mod_lesson: fixed issue with grade not using minquestions
It's possible to reach the end of the lesson, get your result,
click back until you get to the last question, answer it correctly
and then be awarded a result of 100%. This was because the grade
calculation would only include the questions answered, rather than
all of them in the lesson. However, you can not fix this by always
grading by the amount of questions in the lesson as some lessons
bypass certain questions depending on the answer to previous ones.
The minquestion setting can now successfully be used to prevent this
behaviour by rewording the misleading string and adding logic.
2015-09-09 15:27:23 +08:00
Mark Nelson
d60350ddac MDL-50516 mod_lesson: prevented deletion of previous attempts
The 'startlastseen' flag was removing any previous attempts
the user had from the DB. This meant that the user could
simply re-answer the question, regardless of the number
of attempts allowed.
2015-09-09 15:27:23 +08:00
Mark Nelson
0dea8ed76a MDL-50516 mod_lesson: prevented user from repeating question
It was possible in the lesson module for a user to
answer a question, get the result, then click back
in the browser and re-answer it, even if they exceeded
the number of attempts allowed per question.
2015-09-09 15:27:23 +08:00
Eloy Lafuente (stronk7)
b8b323d6a9 Merge branch 'wip-mdl-51322' of https://github.com/rajeshtaneja/moodle 2015-09-09 08:21:45 +02:00
Eloy Lafuente (stronk7)
5c6c4a986a Merge branch 'wip-MDL-51357-master' of git://github.com/marinaglancy/moodle 2015-09-09 08:00:46 +02:00
Marina Glancy
2ff1f05183 MDL-51357 roles: fix table layout after MDL-38763 2015-09-09 13:07:11 +08:00
Ankit Agarwal
731c2712e7 MDL-50173 ratings: Use proper checks to ensure ratings are viewable.
Mainly to verify groups visibility this new callback has been created.

Note this was originally 3 commits but for amending purposes they have
been squashed.
2015-09-09 04:07:21 +02:00
Andrew Nicols
050bfb3302 Merge branch 'wip-MDL-34938-master' of git://github.com/marinaglancy/moodle 2015-09-09 09:00:27 +08:00
Dan Poltawski
760e38d0f4 Merge branch 'MDL-50013-master' of git://github.com/jleyva/moodle 2015-09-08 15:21:27 +01:00
Dan Poltawski
e90783958c Merge branch 'MDL-50853-master' of git://github.com/jleyva/moodle 2015-09-08 13:37:35 +01:00
Dan Poltawski
7e0488ea54 Merge branch 'MDL-51194' of git://github.com/lazydaisy/moodle 2015-09-08 13:27:37 +01:00
Dan Poltawski
33001202d6 MDL-51132 course: add tag require 2015-09-08 13:22:54 +01:00
John Okely
fa5a3cdedc MDL-50709 groups: Prevent XSS in grouping description 2015-09-08 12:47:54 +02:00
Dan Poltawski
9e66dff06c Merge branch 'wip-MDL-51132-master' of https://github.com/marinaglancy/moodle 2015-09-08 10:46:38 +01:00
Dan Poltawski
0c05ec3b96 Merge branch 'wip-MDL-50323-master' of git://github.com/abgreeve/moodle 2015-09-08 09:14:14 +01:00
Dan Poltawski
07cc2db61b Merge branch 'MDL-51307-master' of git://github.com/cameron1729/moodle 2015-09-08 09:11:57 +01:00
Andrew Nicols
e5728db829 Merge branch 'MDL-51281-master' of git://github.com/jleyva/moodle 2015-09-08 14:07:27 +08:00
Andrew Nicols
1147c5a3d4 Merge branch 'MDL-51325-master' of git://github.com/jleyva/moodle 2015-09-08 12:51:30 +08:00
Cameron Ball
e683771623 MDL-51307 navigation: hide message button 2015-09-08 12:10:07 +08:00
Marina Glancy
5723dcdd85 MDL-34938 enrol_meta: sync enrolment start/end dates 2015-09-08 10:28:54 +08:00
Andrew Nicols
fd23f8e7b2 Merge branch 'MDL-51245' of git://github.com/stronk7/moodle 2015-09-08 09:24:00 +08:00
Adrian Greeve
4c607947b2 MDL-50323 themes: Course unordered lists correctly styled.
Thank you to Ann Adamcik for providing this patch.
2015-09-08 09:23:40 +08:00
Eloy Lafuente (stronk7)
48657a6713 MDL-51245 sqlsrv: Diagnose missing READ_COMMITTED_SNAPSHOT mode
Without it, transactions are executed in standard READ_COMMITED
mode, without snapshoting/row versioning, leading to update
conflicts under high concurrency.
2015-09-08 02:55:53 +02:00
Eloy Lafuente (stronk7)
a9daab4927 MDL-51245 mssql: Diagnose missing READ_COMMITTED_SNAPSHOT mode
Without it, transactions are executed in standard READ_COMMITED
mode, without snapshoting/row versioning, leading to update conflicts
under high concurrency.
2015-09-08 02:55:45 +02:00
Andrew Nicols
ebdfde7664 Merge branch 'MDL-50287-master' of git://github.com/danpoltawski/moodle 2015-09-08 08:18:03 +08:00
Petr Skoda
e4ac3879c2 MDL-50860 core: improve creation of random strings 2015-09-08 01:07:37 +02:00
Tim Lock
d89dc6daa5 MDL-42670 mod_assign: Fix recent activity block when blind marking is on 2015-09-07 22:41:41 +02:00
Marina Glancy
f06d8d94a1 MDL-50744 enrol_meta: fix incorrect role assign 2015-09-07 10:29:02 +01:00
Adrian Greeve
40a154551f MDL-48371 editors: Option for removing managefiles
We want to remove the managefiles button from the
editors in the wiki so that students don't delete
each others files.
2015-09-07 09:59:35 +01:00
Marina Glancy
0d1e545612 MDL-51132 tags: do not use user tags for tagging courses 2015-09-05 11:21:15 +08:00
lazydaisy
3278fd77f2 MDL-51194 theme_bootstrapbase: Move CSS classes from /less/moodle.less 2015-09-04 22:46:59 +01:00
Juan Leyva
6c9b2bb5fe MDL-50013 mod_book: New WS mod_book_view_book 2015-09-04 11:18:10 +02:00
Juan Leyva
1af52267d3 MDL-50013 mod_book: Move logging and completion to new API 2015-09-04 11:17:39 +02:00
Juan Leyva
edf6db6547 MDL-51281 completion: Fixed incorrect returned parameter type
Parameter status in external function get_course_completion_status
2015-09-04 11:14:03 +02:00
Juan Leyva
c7697399d1 MDL-51325 notes: Fix external get_course_notes to return site notes 2015-09-04 11:05:08 +02:00
rajesh Taneja
58fad4b873 MDL-51322 behat: ensure the window is properly closed
This is to ensure we have other window closed
so there is no race-around condition
2015-09-04 16:40:14 +08:00
Dan Poltawski
1dabedeedf weekly release 3.0dev 2015-09-03 12:31:49 +01:00
Dan Poltawski
4837c7e472 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2015-09-03 12:31:47 +01:00
rajesh Taneja
58031eea30 MDL-51090 behat: switch to main window 2015-09-03 10:26:33 +01:00
Damyon Wiese
7cf70b0d97 MDL-38763 roles: Fix example context for mustache templates. 2015-09-03 10:19:21 +02:00
Ryan Wyllie
c47f3803f1 MDL-49536 theme_clean: update help text for logo
Updated the help text on the theme settings page to
mention that the theme logo will only be displayed on
the front page and login page.

Conflicts:
	theme/upgrade.txt
2015-09-03 10:19:20 +02:00
Marina Glancy
e6acf72970 MDL-50919 behat: temporary fix until behat learns to wait for JQuery 2015-09-03 10:19:20 +02:00
Eloy Lafuente (stronk7)
e45f622b8e Merge branch 'MDL-29801_master' of git://github.com/markn86/moodle 2015-09-02 19:19:27 +02:00
Juan Leyva
cdb5d405c1 MDL-50853 mod_chat: Unit tests for the external lib 2015-09-02 17:26:05 +02:00
Juan Leyva
5841b9d5d3 MDL-50853 mod_chat: New Web Service mod_chat_view_chat 2015-09-02 17:23:43 +02:00
Juan Leyva
8380bc7fc0 MDL-50853 mod_chat: New Web Service mod_chat_get_chat_latest_messages 2015-09-02 17:23:42 +02:00
Juan Leyva
874aa80f67 MDL-50853 mod_chat: New Web Service mod_chat_send_chat_message 2015-09-02 17:23:41 +02:00