Frederic Massart
42c28b0874
MDL-53937 core_competency: False negative with duedate on plan reopen
2016-04-29 12:19:43 +01:00
Dan Poltawski
02f504729a
MDL-52154 lti: fix string errors
...
Thanks to Helen
2016-04-29 12:19:42 +01:00
David Monllao
d4a41aa252
Merge branch 'MDL-53943-master' of git://github.com/junpataleta/moodle
...
Conflicts:
admin/tool/cohortroles/settings.php
2016-04-29 12:19:39 +01:00
Dan Poltawski
f6ab2b87e6
Merge branch 'MDL-53879-master' of git://github.com/FMCorz/moodle
2016-04-29 12:18:05 +01:00
Dan Poltawski
89ef883129
Merge branch 'MDL-53716-master' of git://github.com/FMCorz/moodle
2016-04-29 12:18:04 +01:00
Jun Pataleta
0bb7552429
MDL-53494 tool_lp: Set correct competency and user ID attributes
...
Sets the correct competency and user ID data attributes for the list of
user competencies in the plan.
2016-04-29 12:18:04 +01:00
Eloy Lafuente (stronk7)
eb98b1395d
Merge branch 'wip-MDL-53638-fix' of https://github.com/marinaglancy/moodle
2016-04-29 12:18:03 +01:00
David Monllao
faeca20d43
MDL-49414 externallib: Cleaning tabs
2016-04-29 12:18:02 +01:00
Marina Glancy
bc73c64071
MDL-53638 mod_feedback: fix to responsetime in non-anon answer
2016-04-29 12:18:02 +01:00
David Monllao
537e08ac03
MDL-49414 user: Fixing unmanaged conflict
2016-04-29 12:18:01 +01:00
Andrew Nicols
3dca0b120a
Merge branch 'MDL-37753-feedback-name' of https://github.com/brendanheywood/moodle
2016-04-29 12:18:00 +01:00
David Monllao
7cbb29e264
Merge branch 'MDL-49414-master' of git://github.com/cameron1729/moodle
2016-04-29 12:18:00 +01:00
Brendan Heywood
97909332eb
MDL-37753 mod_feedback: Use activity name for export filename
2016-04-29 12:17:59 +01:00
Andrew Nicols
9f17263557
Merge branch 'MDL-53973-tablelib-worksheet-name' of https://github.com/brendanheywood/moodle
2016-04-29 12:17:58 +01:00
Brendan Heywood
dae21986aa
MDL-37753 dataformat: Only set worksheet name where implemented
2016-04-29 12:17:58 +01:00
Brendan Heywood
c32bcfe751
MDL-53973 tablelib: Fixed bug with worksheetname being ignored
2016-04-29 12:17:58 +01:00
Andrew Nicols
df89940e5d
MDL-53858 quiz accessibility: Correct aria-labelledby attribute
2016-04-29 12:17:57 +01:00
Andrew Nicols
4fdc9fbe20
Merge branch 'MDL-53858' of git://github.com/timhunt/moodle
2016-04-29 12:17:56 +01:00
David Monllao
eca318d937
Merge branch 'MDL-52035_master' of git://github.com/markn86/moodle
2016-04-29 12:17:56 +01:00
Mark Nelson
3bc7252389
MDL-52035 enrol_lti: added fix for oracle
...
Also added another unit test for \enrol_lti\helper::count_lti_tools();
2016-04-29 12:17:55 +01:00
David Monllao
1f491b60c3
Merge branch 'MDL-53791-master-fix' of git://github.com/andrewnicols/moodle
2016-04-29 12:17:54 +01:00
Andrew Nicols
7c53378bc7
MDL-53791 mod_wiki: Bump version for new WS
2016-04-29 12:17:54 +01:00
Eloy Lafuente (stronk7)
efd0d992d5
MDL-53638 mod_feedback: rebuild css
2016-04-29 12:17:53 +01:00
David Monllao
21ed46132d
Merge branch 'MDL-53921-master' of git://github.com/ryanwyllie/moodle
2016-04-29 12:17:53 +01:00
Eloy Lafuente (stronk7)
a2e6df5ede
MDL-51603 flexitable: Document the deletion of get_download_menu()
2016-04-29 12:17:52 +01:00
Eloy Lafuente (stronk7)
28ee220a36
Merge branch 'wip-MDL-53638-master' of https://github.com/marinaglancy/moodle
2016-04-29 12:17:52 +01:00
Eric Merrill
861de101a9
MDL-53758 search: Fix unittest error
2016-04-29 12:17:51 +01:00
Dan Poltawski
5ea0c56236
Merge branch 'MDL-52154-master-wip2' of https://github.com/xow/moodle
2016-04-29 12:17:50 +01:00
Dan Poltawski
48715140a3
Merge branch 'MDL-53915-master' of git://github.com/junpataleta/moodle
2016-04-29 12:17:50 +01:00
Dan Poltawski
e71c9ebfd3
Merge branch 'MDL-53919_master' of git://github.com/markn86/moodle
2016-04-29 12:17:49 +01:00
Skylar Kelty
216b7f7577
MDL-53967 caching: Ensure getAllKeys returns a valid array
2016-04-29 12:14:34 +01:00
Jun Pataleta
d238016e0d
MDL-53918 tool_cohortroles: Assign role on non-empty user and cohort IDs
2016-04-29 15:43:56 +08:00
Jun Pataleta
e9b4bca0f8
MDL-53917 tool_lp: Show course competency notice appropriately
...
Show course competency notice only if the user has a
moodle/competency:competencygrade capability.
2016-04-29 15:23:44 +08:00
David Mudrák
c1d44340a5
MDL-53980 lang: Fix the reworded strings in Behat tests
2016-04-28 18:39:59 +02:00
Helen Foster
a5061bf7b7
MDL-53980 lang: Merge English strings from the en_fix language pack
2016-04-28 18:32:03 +02:00
Frederic Massart
56e1d9bada
MDL-53716 competency: Do not restore competencies when disabled
2016-04-28 18:41:30 +08:00
Frederic Massart
e9114a9ed4
MDL-53716 competency: Backup and restore course competency user data
2016-04-28 18:41:30 +08:00
Jun Pataleta
782fc43bd8
MDL-53943 tool_cohortroles: Require 'moodle/cohort:view' capability
...
tool_cohortroles not just needs the 'moodle/role:manage' capability,
but the 'moodle/cohort:view' capability as well since the cohorts
selector field will not work without it.
2016-04-28 16:47:56 +08:00
Frederic Massart
8ea0f17ae9
MDL-53879 competency: Remove limit on framework depth
2016-04-28 16:41:24 +08:00
Jun Pataleta
9031371211
MDL-53955 tool_lp: Remove the use of chained steps in tool_lp
2016-04-28 14:57:54 +08:00
Ryan Wyllie
7a6346429b
MDL-53921 gradingform: Destroy frequently used comment dialog on hide
2016-04-28 01:21:44 +00:00
Jun Pataleta
60a9993bce
MDL-53494 tool_lp: Fix dialogue display when plan is completed
2016-04-27 09:09:52 +01:00
Marina Glancy
0a0632cee6
MDL-53638 mod_feedback: corrections during rebase:
...
1. make query in upgrade cross-DB
2. rebase on top of MDL-51603
2016-04-27 16:04:44 +08:00
Marina Glancy
c04dc3ca13
MDL-53638 mod_feedback: JS confirmation of deleting item
2016-04-27 16:04:44 +08:00
Marina Glancy
094c57dd4f
MDL-53638 mod_feedback: JS confirmation on delete entry and template
2016-04-27 16:04:43 +08:00
Marina Glancy
3fdba72902
MDL-53638 mod_feedback: download responses
2016-04-27 16:04:40 +08:00
Marina Glancy
f6b9b6b71b
MDL-53904 course: apply default completion when approving request
2016-04-27 15:55:30 +08:00
Cameron Ball
f23e9b6ba4
MDL-49414 webservices: Remove deprecated functions
2016-04-27 15:54:38 +08:00
Dan Poltawski
2170a2563b
Merge branch 'MDL-53791-master' of git://github.com/crazyserver/moodle
2016-04-27 08:51:43 +01:00
Jun Pataleta
26e8311287
MDL-52035 enrol_lti: Fixed default mail display setting
2016-04-27 14:12:29 +08:00
