5baf32c038
Merge branch 'MDL-51806_master' of https://github.com/snake/moodle
2016-05-30 10:51:33 +08:00
f747f5a0d5
MDL-51806 mod_workshop: Add locale support for grade values.
2016-05-30 10:25:26 +08:00
0196f0101c
Merge branch 'wip-MDL-45427-master' of git://github.com/abgreeve/moodle
2016-05-30 10:19:24 +08:00
f027922e4f
MDL-54605 quiz regrading: incorrect DB query
...
There were two issues. With groups, the $params array was wrong
due to PHP + vs array_merge sillyness.
Also, the first column in the SQL was not necessarily unique,
so we need to use a recordset rather than get_records.
2016-05-27 08:11:32 +01:00
0cf8082a8f
MDL-49852 mod_assign: Unit tests for activity completion.
2016-05-27 14:10:55 +08:00
7eafbbf7fa
MDL-53392 mod_assign: Remove old Grade Max warning string references
2016-05-26 17:16:53 +08:00
9569b01cc9
MDL-49852 mod_assign: Fix group assignment completion tracking
...
Fixes completion tracking for group assignments where either only
one student is required to click Submit when submitting the
assignment for grading, all students are required to submit,
or no students are required to click submit (meaning that simply
uploading submits for grading).
2016-05-26 16:03:03 +08:00
15a237cea6
MDL-37946 mod_choice: swap horizontal and vertical graphs
2016-05-25 21:31:36 +08:00
43c762ef10
MDL-45427 mod_data: Inserting tags into templates.
...
Allows tags to be inserted into the editor without
having to touch Atto at all.
2016-05-25 15:24:41 +08:00
4ca7fdd26e
MDL-46721 assign: Make blind marking participant numbers match
...
Previously emails were setting the "From" header to the incorrect
participant number.
2016-05-24 18:19:54 +08:00
4024b94d17
Merge branch 'MDL-54675-forum-highlight' of https://github.com/brendanheywood/moodle
2016-05-24 14:20:13 +08:00
d0d6902a72
MDL-54675 forum: Fixed bug with multiple adjacent hash anchors
2016-05-24 13:07:07 +10:00
e5fa1c5781
MDL-54562 mod_data: Add activities info to search
2016-05-23 16:06:00 +08:00
ec7ade95db
Merge branch 'MDL-54661-master' of git://github.com/junpataleta/moodle
2016-05-23 14:23:57 +08:00
4da854a68b
MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts
2016-05-23 01:31:34 +02:00
7af009633a
MDL-54661 mod_assign: Unescape course name in grading nav template
2016-05-20 15:28:37 +08:00
ee5c60c53a
Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle
2016-05-20 13:53:26 +08:00
920d3a95a1
MDL-54623 mod_assign: Fix for unit test
...
Fix mod_assign_external_testcase::test_list_participants_returns_user_property_types()
to avoid using hardcoded user properties.
2016-05-20 12:38:29 +08:00
e1e1aad183
MDL-53988 mod_lti: Remove popup for duplicate url
...
If creating a proxy fails, we will show an error using the
notification API. So we can remove the notification.exception call.
But modify the docs for ToolProxy.create so that future developers
will know they need to handle failures themselves.
2016-05-20 12:06:03 +08:00
2be707cb5e
Merge branch 'MDL-54623-master' of git://github.com/junpataleta/moodle
2016-05-20 10:36:07 +08:00
5684c89b93
MDL-54623 mod_assign: Fetch correct types for user properties
...
Utilising core_user_external::user_description() to fetch the correct
types for the user properties.
2016-05-20 10:30:29 +08:00
c14701a2ce
MDL-53988 behat: Fixed modified error string
2016-05-20 09:12:48 +08:00
c56d14be37
Merge branch 'MDL-54627_master' of git://github.com/dmonllao/moodle
2016-05-19 10:59:06 +01:00
71dadd6d26
MDL-53988 lti: build js
2016-05-19 10:57:47 +01:00
0450f5e081
MDL-53988 mod_lti: Improve error handling and user interface
...
Only show one, more helpful error instead of two non-helpful errors.
Don't show the 'no configured tools' message if there is a proxy there.
Return to the Tool configure page when editing a proxy if you came
from it.
2016-05-19 17:10:00 +08:00
7150323ecd
MDL-54623 mod_assign: Unit test for list_participants()
2016-05-19 15:36:44 +08:00
bff0a28894
MDL-54632 mod_lti: separate show as preconfigured and in activitychooser
2016-05-19 15:15:46 +08:00
ca7b16fa70
Merge branch 'MDL-54638' of git://github.com/stronk7/moodle
...
Conflicts:
mod/lti/version.php
2016-05-19 13:47:22 +08:00
505ce88467
MDL-54627 search: Ensure that all format_string strings are text.
...
All user input that is usually displayed through format_strings with
filters like mulitlang applied should be converted to text as well.
2016-05-19 13:16:01 +08:00
9dfee70f6b
Merge branch 'MDL-53988-master-fix' of https://github.com/xow/moodle
2016-05-19 11:58:16 +08:00
b1c8a860cb
MDL-53988 mod_lti: Add language string for unactivated proxies
2016-05-19 11:55:17 +08:00
367c85d78c
Merge branch 'MDL-53988-master' of https://github.com/xow/moodle
2016-05-19 11:43:27 +08:00
811d9ff941
MDL-53988 mod_lti: Fix followup up issues
...
Fix function naming
Fix param types
Fix error popping up twice with incorrect URL
Add confirm dialog when you delete a tool
Show orphaned tool proxies in list
Fix interface jumping up and down
Change to use notification stack
Change capabilities in db/services.php
Add loading animation after registering tool
Show loading animation until tools are rendered
2016-05-19 11:18:21 +08:00
1abca11e0a
MDL-54638 versions: bump all versions and requires near release
...
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
60941d4cb0
Merge branch 'MDL-54025' of https://github.com/stronk7/moodle
2016-05-18 19:20:23 +01:00
8728dbeecb
MDL-54025 mod_lti: Amend tests to observe the new behavior
2016-05-18 19:37:57 +02:00
cb5167df12
Merge branch 'MDL-54025_master' of https://github.com/snake/moodle
2016-05-18 11:38:30 +01:00
53b540c82a
Merge branch 'MDL-54027-master' of git://github.com/FMCorz/moodle
2016-05-18 11:05:06 +01:00
07eb3a0db7
Merge branch 'wip-mdl-53956' of https://github.com/rajeshtaneja/moodle
2016-05-18 10:45:22 +01:00
27bdd818f6
Merge branch 'MDL-54549-master-en_fix' of git://github.com/mudrd8mz/moodle
2016-05-18 10:28:08 +01:00
923b230c8e
Merge branch 'wip-MDL-54061-master' of git://github.com/abgreeve/moodle
2016-05-18 16:20:27 +08:00
759f61fe1c
MDL-54061 mod_assign: Added encoding and separator to upload form.
...
Added the fields of encoding and separator so that the user has
more control when uploading a csv assignment grading file.
2016-05-18 15:50:33 +08:00
d9e7af1d6a
Merge branch 'MDL-54594-master' of git://github.com/ryanwyllie/moodle
2016-05-18 14:02:00 +08:00
7d7e5a4cf0
MDL-54594 mod_assign: Fix editpdf toolbar breakpoints
...
Fixed the CSS media breakpoints for the editpdf toolbar after the
additional button was added.
2016-05-18 05:53:44 +00:00
98c3f736bb
Merge branch 'MDL-54595-master' of git://github.com/junpataleta/moodle
2016-05-18 11:30:25 +08:00
1ef6a5e30a
MDL-53956 behat: Avoid before and after step and switch
...
After pressing the button, if system is slow then
after step and before step might fail as the window
is closed by then. Execute steps one after other
2016-05-18 10:41:01 +08:00
50d083f07a
MDL-54549 lang: Fix changed strings in behat scenario files
2016-05-17 18:29:30 +02:00
75a22eb9fb
MDL-54549 lang: Merge English strings from the en_fix language pack
2016-05-17 18:26:15 +02:00
4741c3162e
MDL-54025 mod_lti: Use activity name when creating tool from cartridge.
2016-05-17 17:54:12 +08:00
897444d761
MDL-53923 mod_assign: Put messages into notifications.
...
The unoconv test page was before just outputting text to
page. Now it is wrapped in a nice notification. One of the
warnings has been improved as well.
2016-05-17 17:16:13 +08:00
David Monllao