Commit graph

77441 commits

Author SHA1 Message Date
Dan Poltawski
61c8abfb1e Merge branch 'MDL-51715_master_invalidweights' of https://github.com/colin-umn/moodle 2016-01-19 10:39:48 +00:00
Luca Bösch
2c13bbba2b MDL-37739 mod_wiki: Wiki ToC header href remove square double brackets.
When H1, H2 and H3 links in wiki act themselves as hyperlinks, they
were displayed in double brackets. This patch removes [[ and ]] out of
the table of content displayed header hyperlinks.
2016-01-19 09:00:56 +01:00
Andrew Nicols
6c99c1e777 Merge branch 'MDL-48621_master' of git://github.com/dmonllao/moodle 2016-01-19 15:47:12 +08:00
David Monllao
923589d759 MDL-52825 atto: Ignore out of bounds event targets 2016-01-19 15:37:00 +08:00
David Monllao
356e235459 MDL-48621 admin: Warning about events 1 API deprecation 2016-01-19 15:19:13 +08:00
David Monllao
20ff2fba25 MDL-48621 events: Adapting unit tests to debugging messages
- A new assertDebuggingCalledCount has been introduced, as multiple debugging messages
  may be called in some cases, for example when calling events_cron with queued events
  that need to be dispatched.
- events_update_definition has been moved out of setUp as debugging messages are only
  caught by our phpunit custom stuff when they are called inside tests.
2016-01-19 15:19:10 +08:00
David Monllao
32f8bbd8dc MDL-48621 events: Adding debugging messages
Debugging messages triggered once it is confirmed that the events 1 api handlers
are being used.
2016-01-19 15:12:15 +08:00
Eloy Lafuente (stronk7)
cf003b48bc Merge branch 'MDL-46091' of git://github.com/timhunt/moodle 2016-01-19 07:32:09 +01:00
Andrew Nicols
77ee47bdb2 Merge branch 'MDL-48985_m31v1' of https://github.com/sbourget/moodle 2016-01-19 12:56:26 +08:00
Andrew Nicols
62d0d0b46d Merge branch 'MDL-52673-master' of https://github.com/pauln/moodle 2016-01-19 10:23:53 +08:00
Andrew Nicols
cd21909554 Merge branch 'MDL-52519' of https://github.com/rushi963/moodle 2016-01-19 10:18:41 +08:00
Andrew Nicols
f87d633bec Merge branch 'MDL-52773-master' of https://github.com/pauln/moodle 2016-01-19 09:13:30 +08:00
Andrew Nicols
f3d23df572 Merge branch 'MDL-52784' of git://github.com/timhunt/moodle 2016-01-19 08:54:55 +08:00
Andrew Nicols
9dd33a288e Merge branch 'MDL-52269_master' of https://github.com/dmonllao/moodle 2016-01-19 08:45:42 +08:00
Andrew Nicols
fe99a27859 Merge branch 'MDL-52270_master' of https://github.com/dmonllao/moodle 2016-01-19 08:35:23 +08:00
Andrew Nicols
441ffe514e Merge branch 'MDL-49291_master' of git://github.com/markn86/moodle 2016-01-19 08:04:59 +08:00
Andrew Nicols
223c4add23 Merge branch 'MDL-50268-master' of git://github.com/lameze/moodle 2016-01-19 07:56:41 +08:00
Eloy Lafuente (stronk7)
b9103d358d Merge branch 'MDL-52615_master' of https://github.com/nadavkav/moodle 2016-01-19 00:29:26 +01:00
Tim Hunt
1f0f413187 MDL-46091 quiz start attempt: rationalise confirmations.
1. Don't show a warning if there are a limited number of attempts, only
   if there is a time limit.
2. Merge that time-limit warning into the same form that is used for
   entering a password, etc.
3. Make that form an JavaScript dialogue when you click the start attempt
   button.

AMOS BEGIN
  MOV ['confirmstarttimelimit', 'mod_quiz'], ['confirmstart', 'quizaccess_timelimit']
AMOS END
2016-01-18 22:12:41 +00:00
Tim Hunt
fdd629667e MDL-52791 quiz editing: handle unknown question types 2016-01-18 17:35:50 +00:00
AMOS bot
87c93de584 Automatically generated installer lang files 2016-01-19 00:04:29 +08:00
Dan Poltawski
0f97fc6c3f Merge branch 'MDL-52750' of git://github.com/timhunt/moodle 2016-01-18 15:50:11 +00:00
Dan Poltawski
5d5db1030f Merge branch 'MDL-52738' of git://github.com/timhunt/moodle 2016-01-18 14:47:45 +00:00
Dan Poltawski
e34710c7fe Merge branch 'wip-mdl-52721' of https://github.com/rajeshtaneja/moodle 2016-01-18 14:39:46 +00:00
Dan Poltawski
574b76ace1 Merge branch 'MDL-52218_master_alt' of git://github.com/markn86/moodle 2016-01-18 14:03:54 +00:00
Dan Poltawski
0ff8d34f2f Merge branch 'MDL-52486-master' of git://github.com/cameron1729/moodle 2016-01-18 11:19:55 +00:00
Dan Poltawski
26e45019c8 Merge branch 'MDL-36404-master' of git://github.com/junpataleta/moodle 2016-01-18 10:24:04 +00:00
Kevin Bruton
cfd8c0fe09 MDL-52568 core_cohort: added ability to return all cohorts in WS 2016-01-18 11:00:20 +01:00
Michael Aherne
5e43eea080 MDL-52702 plagiarism: Improvements to base plugin class 2016-01-18 09:39:54 +00:00
Rajesh Taneja
28dab6408c MDL-52799 unittest: Removed empty if statement 2016-01-18 15:47:07 +08:00
Andrew Nicols
45f167bd2b Merge branch 'MDL-45265-master' of git://github.com/danpoltawski/moodle 2016-01-18 14:54:54 +08:00
Andrew Nicols
ae4cc740be Merge branch 'MDL-52608-master' of https://github.com/xow/moodle 2016-01-18 14:47:52 +08:00
Andrew Nicols
2e6462f327 Merge branch 'MDL-52573-master' of git://github.com/danpoltawski/moodle 2016-01-18 14:32:41 +08:00
Mark Nelson
806905b59b MDL-49291 core: final deprecation of sql_*_reader interfaces 2016-01-18 14:24:34 +08:00
Andrew Nicols
36f0a3cb1d Merge branch 'MDL-50464-master' of https://github.com/hcpss-banderson/moodle 2016-01-18 14:24:23 +08:00
Rajesh Taneja
1226f3ca33 MDL-52799 phpunit: Truncate records for brokedmysql not empty. 2016-01-18 14:10:18 +08:00
Simey Lameze
11d4bea28b MDL-50268 core: proper deprecation of get_file_url() method 2016-01-18 13:44:22 +08:00
David Monllao
50e954163d MDL-52269 mod_assign: Display info message if blind marking active
Only for users with mod/assign:viewblinddetails capability, as other
users will quickly notice it.
2016-01-18 12:15:34 +08:00
Andrew Nicols
159d801362 MDL-50915 mod_lesson: Remove js dependencies from behat tests 2016-01-18 10:46:32 +08:00
Rajesh Taneja
60237c2ce2 MDL-52721 unittest: Exclude tests in vendor and node_modules 2016-01-18 10:25:02 +08:00
Andrew Nicols
d595468da5 Merge branch 'MDL-50915_m31v5' of https://github.com/sbourget/moodle 2016-01-18 10:18:31 +08:00
Andrew Nicols
e2789e6bc1 Merge branch 'MDL-52570-master' of git://github.com/jleyva/moodle 2016-01-18 09:49:22 +08:00
Andrew Nicols
324a43c51e MDL-52309 gradereport_history: Adjust comment 2016-01-18 09:37:29 +08:00
Andrew Nicols
8d9b6ec254 Merge branch 'MDL-52309' of https://github.com/smbader/moodle 2016-01-18 09:33:36 +08:00
Jun Pataleta
e9088e28ac MDL-36404 gradingform_rubric: Accessibility fixes rubric grading 2016-01-18 09:31:00 +08:00
Brendan Heywood
e9180351f9 MDL-52780 email: Added better script origin email header 2016-01-18 08:12:49 +11:00
Rushikesh
c2a21d928e MDL-52519 Idap tests: use consistent var name 2016-01-16 11:16:21 +05:30
Stephen Bourget
a721339193 MDL-52383 Calendar: Allow users to set lookahead to 1 year 2016-01-15 13:14:56 -05:00
Tim Hunt
c67ab86fa9 MDL-52738 quiz: Previous button during attempt review.
This is to be consistent with places like forum and book, where if we
have a next link, we also have a previous link.

At the same time I have amended the links/buttons from 'Previous'/'Next'
to 'Previous page'/'Next page' because I think that is clearer.

Also, on the last page of the quiz, I have changed 'Next' to 'Finish
attempt ...' for consistency with the link in the navigation block.

AMOS BEGIN
 CPY [navigatenext,mod_assignment],[navigatenext,mod_quiz]
 CPY [navigateprevious,mod_assignment],[navigateprevious,mod_quiz]
AMOS END
2016-01-15 14:25:25 +00:00
Tim Hunt
a4100d4de3 MDL-52750 quiz reviewQ/comment: add page title & student name 2016-01-15 11:10:43 +00:00