4f3d1b0ec6
MDL-52457 mod_scorm: Fix return types definitions in SCORM WS
...
Incorrect return types definitions in external function
mod_scorm_external::get_scorm_by_courses (hidetoc, displayattemptstatus
and skipview)
2015-12-09 14:02:37 +01:00
c3c5e30930
Merge branch 'MDL-51097_m31v1' of https://github.com/sbourget/moodle
2015-12-08 10:34:44 +00:00
c7bba4e5af
Merge branch 'MDL-52165-master' of git://github.com/jleyva/moodle
2015-12-08 08:51:34 +00:00
3f2c229b53
Merge branch 'MDL-50550-master' of git://github.com/dpalou/moodle
...
Conflicts:
lib/db/services.php
version.php
2015-12-08 11:32:39 +08:00
a6c11677a8
MDL-52429 mod_scorm: Fix SCORM completion checking in nested SCOs
2015-12-07 11:28:22 +01:00
c319e44954
MDL-52312 assignfeedback_editpdf: changes to files after FPDI update
...
1) Change the fpdi_bridge class so that it extends the pdf class,
rather than the TCPDF class.
2) Updated the editpdf/fpdi/readme_moodle.txt file to document the changes.
3) Updated the editpdf/thirdpartylibs.xml to reflect the update to the
FPDI library.
2015-12-07 17:39:30 +08:00
bf5bbe0127
MDL-50540 mod_glossary: Final clean up of new external function
2015-12-07 13:42:37 +08:00
8e09010f39
MDL-50540 glossary: Unit test for mod_glossary_get_glossaries_by_courses
2015-12-07 12:48:28 +08:00
23da998fad
MDL-50540 glossary: New WS mod_glossary_get_glossaries_by_courses
2015-12-07 12:48:27 +08:00
f970013b16
MDL-52312 assignfeedback_editpdf: updated the FPDI libary to 1.6.1
2015-12-07 10:57:51 +08:00
b73aed311e
MDL-52402 backup, quiz: Fix attempt token and add missing rule.
2015-12-05 10:08:07 +11:00
04cd8ae3c0
MDL-52165 mod_forum: New Web Service mod_forum_can_add_discussion
2015-12-04 15:30:16 +01:00
4a5acec2b7
MDL-50550 wiki: Added unit tests for mod_wiki_get_wikis_by_courses
2015-12-04 13:52:41 +01:00
23cbaefb24
MDL-50550 wiki: New WS mod_wiki_get_wikis_by_courses
2015-12-04 13:52:41 +01:00
50901a53bc
Merge branch 'MDL-51664-master' of git://github.com/FMCorz/moodle
2015-12-03 11:16:30 +01:00
b7f54e5c79
Merge branch 'MDL-51706_master' of https://github.com/jinhofer/moodle
2015-12-03 11:11:06 +01:00
3c2f70aeb6
Merge branch 'master_MDL-51757' of git://github.com/danmarsden/moodle
2015-12-03 11:11:04 +01:00
67efc377f4
MDL-52335 mod_data: php7 compatibility in variable syntax
2015-12-03 09:31:25 +08:00
ccfd168a6d
MDL-52335 mod_lti: php7 compatibility in variable syntax
2015-12-03 09:31:20 +08:00
e070165f57
Merge branch 'MDL-52219-master' of git://github.com/danpoltawski/moodle
2015-12-01 00:50:10 +01:00
71a2aaabd4
Merge branch 'MDL-44598_master' of https://github.com/jonof/moodle
2015-11-30 23:52:45 +01:00
fbbb33a20e
MDL-51706 mod/assign: Moved plagiarism links to top of online text
2015-11-27 11:13:56 -06:00
acf9e30086
MDL-51693 mod/assign: Added plagiarism links to full text
2015-11-27 11:13:47 -06:00
bba1a4a6e3
MDL-51916 mod_scorm: allow html5 scorm content fullscreen
2015-11-27 21:27:38 +13:00
72797e6845
MDL-52013 assign: Allow subplugins to add calendar events
2015-11-26 14:28:53 +00:00
aa306e7bc8
MDL-52219 behat: remove steps which turn on avaibility/completion
...
Now its the default, we can reduce test time by relying on the default
state rather than going around turning it on
2015-11-26 14:07:17 +00:00
72af939f6e
MDL-51757 mod_scorm: Remove duplicate function param
...
convert invalid break calls to exceptions for PHP 7
2015-11-25 14:06:02 +13:00
c506af7786
Merge branch 'MDL-44330' of git://github.com/NeillM/moodle
2015-11-24 17:03:06 +08:00
3fca693751
MDL-44330 Assign: Assignment grading may not display expected student
...
Before this patch it was possible for the student displayed on the grading page to
not be the student that the user selected to grade. This would occur if:
1) The user had the table ordered by a value that could be modified,
for example Last modified (submission), Grade, Last modified (grade)
2) Another user performed an action that was recorded in Moodle in the time
between the user generating the table and clicking on a grade link.
If a user did not notice a different user had been loaded it could result in them giving
a grade to the incorrect user.
This patch ensures that the state of the table is cached every time it is viewed by a user
who has the capability to grade.
2015-11-24 08:42:00 +00:00
14248189b7
Merge branch 'wip-mdl-50163' of https://github.com/rajeshtaneja/moodle
2015-11-23 11:33:55 +00:00
6f77b910ee
Merge branch 'MDL-49490-master' of git://github.com/danpoltawski/moodle
2015-11-23 13:56:06 +08:00
6a82d5d04e
Merge branch 'MDL-43069-master' of git://github.com/danpoltawski/moodle
2015-11-23 13:32:35 +08:00
b58d059525
MDL-37834 assign: avoid newlines in status column of csv
...
Previously we were generating a CSV file with newlines in it, which
seems to cause problems importing into some versions of MS Excel.
Instead seperate status lines by '-' - this column is only used to
provide context to the teacher in the spreadsheet.
2015-11-20 18:36:30 +00:00
c181efe978
MDL-42571 editpdf: Fix search comments
...
They are also hidden instead of destroyed.
2015-11-19 14:59:03 +08:00
402f4a1f53
MDL-42571 editpdf: Fix comments search and multiple views drawing
2015-11-19 12:29:20 +08:00
83f3ac5207
MDL-51097 Lesson: allow resume from within a cluster
2015-11-18 23:03:42 -05:00
4dab33b586
MDL-43069 assign: prevent JS error on grading table
...
Previously submission comments failed to expand if you hid
the file submissions column.
2015-11-18 15:41:42 +00:00
a49fca44e0
MDL-49490 assign: can't export to portfolio on non-submission
2015-11-18 09:10:20 +00:00
6d29c4acdd
MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts
2015-11-17 17:08:56 +01:00
131d4ac2b0
MDL-50163 behat: Restart session after scenario with switch_window
...
Restart session after a scenario with switch window
is finished. This will close all open browser windows
and open a new browser window
2015-11-17 12:12:03 +08:00
f2b28f8130
Merge branch 'MDL-46049-master' of git://github.com/danpoltawski/moodle
2015-11-17 08:54:50 +08:00
f9cccec39f
Merge branch 'MDL-41643-master' of git://github.com/jojoob/moodle
2015-11-16 14:54:19 +08:00
09083ab0a8
Merge branch 'MDL-42571' of git://github.com/blaky/moodle
...
Conflicts:
mod/assign/feedback/editpdf/version.php
2015-11-16 13:39:59 +08:00
9dbbdcb40a
MDL-52126 forum: Verify forum mailout contents
...
New unit test able to verify mail contents
configured by provider do match all expectations defined.
2015-11-15 13:29:31 +01:00
593aaa5366
MDL-52126 forum: Correct over-escaping of html-based emails
2015-11-15 13:16:42 +01:00
f98345b976
MDL-52126 forum: Correct over-escaping of text-based emails
2015-11-14 22:35:09 +01:00
64b9afa6a5
MDL-41643 datafield_checkbox: Add line breaks behind checkbox options.
...
Add line a break behind each checkbox option in advanced search.
2015-11-14 13:48:20 +01:00
da91de7821
MDL-42571 assignfeedback_editpdf: Fixed second PDF view
2015-11-12 14:16:17 +00:00
9e9754b7aa
Merge branch 'MDL-51515-master' of git://github.com/junpataleta/moodle
2015-11-11 23:14:47 +01:00
6c2cfe281f
MDL-51515 assign: Fix typo setting url in nav tree.
...
Thanks to Nelson Moller and Tyler Bannister.
2015-11-11 11:14:03 -06:00
Juan Leyva