Commit graph

19525 commits

Author SHA1 Message Date
Juan Leyva
6cf2ab7394 MDL-59627 mod_data: Fix totalcount calculation in search_entries
totalcount was incorrectly calculated for normal search.
For advanced search it was working as expected.
This was making searched entries pagination behave incorrectly.
2017-07-25 18:41:12 +02:00
Juan Leyva
be4bdab78a MDL-59624 mod_data: Return maxcount in WS mod_data_search_entries 2017-07-25 15:55:22 +02:00
Juan Leyva
84c2a87b80 MDL-59619 mod_data: Fix get_fields WS for databases without fields 2017-07-25 14:45:10 +02:00
David Monllao
10f9517c22 Merge branch 'MDL-59453-master' of git://github.com/jleyva/moodle 2017-07-25 11:53:00 +02:00
David Monllao
a2b326c232 Merge branch 'MDL-59544-master-filemanagervalidation' of git://github.com/mudrd8mz/moodle 2017-07-25 11:17:07 +02:00
David Monllao
6d6b35fd24 Merge branch 'MDL-59485' of https://github.com/IMSGlobal/moodle 2017-07-25 11:11:09 +02:00
Dan Poltawski
69340d49dc Merge branch 'MDL-59238-master' of git://github.com/jleyva/moodle 2017-07-25 09:52:03 +01:00
Dan Poltawski
a13277a740 Merge branch 'MDL-59268-master' of git://github.com/jleyva/moodle 2017-07-25 09:04:59 +01:00
Dan Poltawski
a1e094f9dd Merge branch 'MDL-59240-master' of git://github.com/jleyva/moodle 2017-07-25 07:31:34 +01:00
Juan Leyva
291645f760 MDL-59238 mod_workshop: New WS mod_workshop_view_workshop 2017-07-24 18:03:37 +02:00
Juan Leyva
31496ddeba MDL-59238 mod_workshop: Move event and completion to Workshop class
The completion set_module_viewed and the course_module_viewed event
code has been moved to the workshop class.
This change is consistent with other modules (like lesson, feedback or
quiz) and it is necessary to be able to use the new method via WS.
2017-07-24 18:03:36 +02:00
Juan Leyva
cd4950291f MDL-59268 mod_workshop: New WS mod_workshop_get_user_plan 2017-07-24 18:02:21 +02:00
Juan Leyva
977fdfa30b MDL-59240 mod_workshop: New WS mod_workshop_get_access_information 2017-07-24 17:59:41 +02:00
David Monllao
87d1c6134f Merge branch 'MDL-57945-master' of git://github.com/danpoltawski/moodle 2017-07-24 13:24:31 +02:00
Dan Poltawski
4364fdb537 Merge branch 'MDL-59237-master' of git://github.com/jleyva/moodle 2017-07-24 12:15:52 +01:00
Andrew Nicols
7b1c6374c9 Merge branch 'analytics-34' of git://github.com/dmonllao/moodle 2017-07-24 14:38:46 +08:00
David Monllao
413f19bc49 MDL-59211 analytics: Make cibot happy
Part of MDL-57791 epic.
2017-07-24 08:36:49 +02:00
David Monllao
0045726d78 MDL-59079 analytics: Restore low social breadth level
Until those activities have feedback_viewed (or friends) methods.

Part of MDL-57791 epic.
2017-07-24 08:36:47 +02:00
David Monllao
55c3845c23 MDL-59095 analytics: Update to use feedback_viewed API
Part of MDL-57791 epic.
2017-07-24 08:36:47 +02:00
David Monllao
9ad87761ef MDL-59117 quiz: Move quiz indicators to the correct location
Part of MDL-57791 epic.
2017-07-24 08:36:21 +02:00
Ankit Agarwal
5846c72c4d MDL-59117 core_analytics: Move all indicators to respective modules
Part of MDL-57791 epic.
2017-07-24 08:36:21 +02:00
Andrew Nicols
21b0554d00 Merge branch 'MDL-59490' of https://github.com/spvickers/moodle 2017-07-24 12:42:34 +08:00
Mark Nielsen
197e2bca5b MDL-59602 behat: make use of new course nav steps 2017-07-21 13:50:47 -07:00
Adrian Greeve
7b78154e39 MDL-57649 mod_lesson: Improvement to upgrade query.
We only need one record for each filearea that we
are removing.
2017-07-20 09:57:25 +08:00
Juan Leyva
9f1ab2db6d MDL-59237 mod_workshop: New WS get_workshops_by_courses 2017-07-19 16:35:59 +01:00
Dan Poltawski
0a023e5fc7 MDL-57945 stylelint: use csstree to replace some rules
Ironically we have to reverse the change from e63d89a5 because
this linter is more clever..
2017-07-19 14:29:56 +01:00
Adrian Greeve
23e2a9cb7c MDL-57649 mod_lesson: Additional refinement to upgrade script. 2017-07-19 15:44:42 +08:00
Juan Leyva
41860b7e9e MDL-59453 mod_lesson: Return lesson contents without html cleaning
This is consistent to what is done in the web interface.
2017-07-18 12:24:01 +01:00
David Monllao
95d8e61161 Merge branch 'MDL-59460_master' of git://github.com/dmonllao/moodle 2017-07-18 12:23:37 +02:00
David Monllao
3f6e42b611 MDL-59460 mod_forum: Ensure CFG->forum_subscription is set 2017-07-18 12:21:42 +02:00
Luca Bösch
58affdc80e MDL-59460 mod_forum: default setting for Subscription mode.
Allow to set a Subscription mode default.
2017-07-18 12:21:37 +02:00
David Monllao
f14987bc24 Merge branch 'wip-MDL-39471-master' of git://github.com/abgreeve/moodle 2017-07-18 10:48:37 +02:00
Dan Poltawski
df57a201c9 Merge branch 'm34_MDL-59109_Backup_Missing_AutoCommit' of https://github.com/scara/moodle 2017-07-18 09:47:56 +01:00
David Monllao
a0f12fcafc Merge branch 'master_MDL-58863' of https://github.com/danmarsden/moodle 2017-07-18 09:03:35 +02:00
Dan Poltawski
c899bfb088 Merge branch 'MDL-59548-master' of git://github.com/damyon/moodle 2017-07-17 11:21:56 +01:00
David Monllao
57f869c184 Merge branch 'wip-MDL-59377-master-3' of git://github.com/marinaglancy/moodle 2017-07-17 11:04:02 +02:00
David Monllao
2764cd594b Merge branch 'MDL-59068-master' of git://github.com/dpalou/moodle 2017-07-17 10:09:35 +02:00
Dan Poltawski
16c903acc0 Merge branch 'wip-MDL-57649-master' of git://github.com/abgreeve/moodle 2017-07-17 09:01:05 +01:00
David Monllao
05c616d0b1 Merge branch 'wip-MDL-55912-master' of git://github.com/abgreeve/moodle 2017-07-17 09:09:03 +02:00
Marina Glancy
1bc9ef82c9 MDL-59377 mod_label: set showdescription to be always 1 2017-07-17 13:43:51 +08:00
Andrew Nicols
5ee30c0fb4 Merge branch 'mdl55979-master' of https://github.com/tlock/moodle 2017-07-17 12:29:00 +08:00
Damyon Wiese
dda64b6f45 MDL-59548 behat: Helpers for autocomplete
Improve the helpers for autocomplete so that:
a) the set field for an auto complete will automatically close the suggestions list.
b) add a new helper to open the suggestions list
c) move the helper for clicking on an element in the suggestions list from tool_lp to core.
2017-07-17 11:10:15 +08:00
Adrian Greeve
c802d23dc8 MDL-39471 mod_assign: Comment visibility in blind marking.
Students can now see the identity of anyone making comments.
Markers on the otherhand can only see the identity of themselves
when making comments.
2017-07-17 09:25:04 +08:00
Adrian Greeve
0163e5d276 MDL-55912 mod_assign: Set grader details to the correct user. 2017-07-17 09:21:39 +08:00
Adrian Greeve
63cf03265b MDL-57649 mod_lesson: Delete answer files correctly.
The files associated with answers and responses were
not being deleted due to the fact that the wrong itemid
was being used.
2017-07-17 09:15:21 +08:00
Matteo Scaramuccia
746702c88d MDL-59109 scorm: Save autocommit setting in the backup. 2017-07-15 00:10:39 +02:00
David Mudrák
0fa2b2ee88 MDL-59544 workshop: Drop the custom validation of allowed file types
Now that the validation is provided directly by the filemanager, we do
not need to do the same here.

Note that existing Behat tests are left untouched to make sure there is
no regression.
2017-07-14 20:38:55 +02:00
Eloy Lafuente (stronk7)
1d52027e57 MDL-59534 feedback: avoid some randomness with behat test failures 2017-07-13 20:08:33 +02:00
Juan Leyva
56da66adb6 MDL-59532 mod_lesson: Fix check_updates_since with groups
There were a couple of incorrect SQL queries when the user calling the
function is a teacher and the activity uses separate groups.
2017-07-13 16:18:57 +01:00
Dan Poltawski
eff0303ad8 Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle 2017-07-12 12:22:32 +01:00