Dan Poltawski
2a2f7b6493
Merge branch 'MDL-55364-master' of https://github.com/xow/moodle
2017-08-01 11:34:18 +01:00
Andrew Nicols
3ccd1965f3
Merge branch 'MDL-59523-master' of git://github.com/ankitagarwal/moodle
2017-08-01 13:43:04 +08:00
Andrew Nicols
77c5325f81
Merge branch 'MDL-9367-master' of git://github.com/ankitagarwal/moodle
2017-08-01 13:39:38 +08:00
Ankit Agarwal
0d14fcbc60
MDL-9367 restore: Roll only configuration dates
...
It was decided to roll only configuration dates and any date related to user content
such as 'timecreated' , 'timemodified' etc should not be rolled forward.
2017-08-01 10:46:37 +05:30
Ankit Agarwal
cb416dbf7d
MDL-59523 course_reset: Roll dates when needed
2017-08-01 10:07:48 +05:30
David Monllao
85a9c0b1e5
Merge branch 'MDL-59299-master' of https://github.com/xow/moodle
2017-08-01 04:56:09 +02:00
Dan Poltawski
f4ba6def50
Merge branch 'MDL-59624-master' of git://github.com/jleyva/moodle
2017-07-31 15:54:32 +01:00
Dan Poltawski
c2c941b6f2
MDL-59627 mod_data: fix incorrect use of sortorder
2017-07-31 14:28:39 +01:00
David Monllao
707f9beae1
Merge branch 'MDL-59612-master' of git://github.com/junpataleta/moodle
2017-07-31 13:59:55 +02:00
David Monllao
7190f330b4
Merge branch 'MDL-59602_coursenav' of https://github.com/mrmark/moodle
2017-07-31 13:21:09 +02:00
Dan Poltawski
9ee4ab6330
Merge branch 'MDL-59619-master' of git://github.com/jleyva/moodle
2017-07-31 11:48:55 +01:00
Dan Poltawski
396b97b2fb
Merge branch 'MDL-59627-master' of git://github.com/jleyva/moodle
2017-07-31 11:44:56 +01:00
Andrew Nicols
63615f6116
Merge branch 'MDL-58196-master' of git://github.com/ankitagarwal/moodle
2017-07-31 15:17:49 +08:00
David Monllao
a3cb377374
Merge branch 'MDL-59649-master' of git://github.com/jleyva/moodle
2017-07-31 08:58:56 +02:00
Ankit Agarwal
0b3326b50e
MDL-58196 availability: Add appropriate dependencies in mform
2017-07-31 11:56:11 +05:30
Mark Nelson
1678181a56
MDL-59612 core: removed hard-coded check for referer in modules
...
See mod/upgrade.txt for explanation.
Part of MDL-59313.
2017-07-31 12:03:28 +08:00
Daniel Materka
0433d36de3
MDL-55364 forum: fix overlapping columns in the table at low resolutions
2017-07-31 11:23:50 +08:00
John Okely
320889c02b
MDL-59299 filemanager: Display what filetypes are accepted
2017-07-31 09:58:21 +08:00
John Okely
847a4e219a
MDL-59299 assignsubmission_file: Use filetypes library functions
2017-07-31 09:58:21 +08:00
John Okely
e54d059d64
MDL-59299 assignsubmission_file: Improve accepted filetypes help
2017-07-31 09:58:21 +08:00
John Okely
3b77a0d06b
MDL-59299 assignsubmission_file: Use filetype element in behat tests
2017-07-31 09:58:20 +08:00
Jake Dallimore
9069c66e42
MDL-59299 mod_assign: use new filetypes element for accepted file types
2017-07-31 09:58:20 +08:00
Juan Leyva
4f5dbd38fb
MDL-59649 mod_data: Fix content exporter
...
The content3 and content4 fields should be type PARAM_RAW
2017-07-28 14:02:26 +02:00
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