Commit graph

92464 commits

Author SHA1 Message Date
Jun Pataleta
e63084ec1b Merge branch 'MDL-60474-master' of git://github.com/damyon/moodle 2018-12-19 10:14:13 +08:00
Damyon Wiese
064f15033f MDL-60474 assign: Consistent user filters
Use the current filters and sorting on the user grading table in the single
page grading app when it is possible.

This replaces the popover used to configure the filters to one that closely matches the
one from the grading table. It supports standard filters, workflow filters and allocated marker filters.

It will also support group filtering and suspended user filtering but we don't show the controls for those in
the single grading page.
2018-12-19 10:10:23 +08:00
Andrew Nicols
54fbe39ee1 Merge branch 'MDL-63512-master' of git://github.com/peterRd/moodle 2018-12-19 09:48:46 +08:00
Andrew Nicols
0ab2d87c50 Merge branch 'MDL-64061-master-amdload' of git://github.com/mudrd8mz/moodle 2018-12-19 09:10:09 +08:00
Peter
6afbdf2778 MDL-59954 mod_course: Remove file size restriction on D&D on course page
Remove file size restrictions for teachers on course page.
Use user_max_upload_file_size instead of the max_file_size
2018-12-19 08:36:45 +08:00
AMOS bot
c80d033f66 Automatically generated installer lang files 2018-12-19 00:08:52 +00:00
Adrian Greeve
c6f2f4a64c Merge branch 'MDL-63844-master' of git://github.com/aanabit/moodle 2018-12-18 18:11:38 +01:00
Amaia Anabitarte
26b34c30d3 MDL-63844 enrol: Reordering status_field constructor parameters 2018-12-18 17:57:57 +01:00
Rohan Khajuria
6676f20214 MDL-63844 enrolmentdetails: add time-enrolled field 2018-12-18 17:06:49 +01:00
Adrian Greeve
648afe76f8 Merge branch 'MDL-64025-master' of https://github.com/christianwolters/moodle 2018-12-18 15:58:06 +01:00
Adrian Greeve
1ccaa71b04 Merge branch 'MDL-63794-master-2' of git://github.com/mihailges/moodle 2018-12-18 12:13:35 +01:00
Bas Brands
eecff277da MDL-64171 block_myoverview: change course summary view image size
Size reduced from 7rem to 5rem for smaller devices
and for courses without a description.
2018-12-18 10:38:00 +01:00
Stefan Erlachner
b1f2b4fdfc MDL-64414 lib/evalmath: add AND, OR functions to evalmath 2018-12-18 09:40:29 +01:00
Michael Hawkins
418831e096 MDL-64240 mod_forum: Clean forum post text before storing
Previously only edited messages were cleaned, so longer strings could
be stored in the database, which would never be displayed.
This update takes into account trusted text before cleaning (as editing does).
2018-12-18 14:10:43 +08:00
Michael Hawkins
b6995c29ec MDL-64240 mod_forum: Update word count to use current message length
Previously this used the length of the message stored in the database,
before scripts etc are cleaned to display the content. That resulted
in cases where the count would seem much larger than the message size.
2018-12-18 14:10:43 +08:00
Shamim Rezaie
8e93e515ed MDL-63809 question: handling bad questions in question_has_capability_on 2018-12-18 15:05:37 +11:00
Tim Hunt
b195523758 MDL-63809 question bank: ensure question_has_capability_on can be called 2018-12-18 14:54:28 +11:00
Damyon Wiese
1879a74ed7 MDL-60082 assign: Grading worksheet with no grade
If the grade type is NONE - do not include the maxgrade column.
2018-12-18 11:12:17 +08:00
Jake Dallimore
1c30321e7f Merge branch 'MDL-64309_master' of git://github.com/markn86/moodle 2018-12-18 11:11:23 +08:00
Jake Dallimore
78f8d05e1c Merge branch 'master_MDL-49673' of git://github.com/danmarsden/moodle 2018-12-18 10:51:37 +08:00
Simey Lameze
a6243b09f3 MDL-64425 block_timeline: fix incorrect get_string parameter 2018-12-18 10:23:12 +08:00
Andrew Nicols
df9f6cbb29 Merge branch 'MDL-63773_assign_hideif' of git://github.com/davosmith/moodle 2018-12-18 09:38:33 +08:00
Dan Marsden
91a2215eea MDL-49673 mod_assign: Tidy up hidegrader patch 2018-12-18 14:33:42 +13:00
Damyon Wiese
fd25c7d5f8 MDL-64004 webservice: Do not update accesstime
Do not update the automatically update the course access time when a
course is accessed via a webservice or ajax.
2018-12-18 09:06:07 +08:00
Bas Brands
aeb5664d5f MDL-64419 core_message: fix user info in bootstrapbase message drawer
* updated the bootstrapbase template for the messaging conversation menu
info option to match the menu in
"/core_message/message_drawer_view_conversation_header_content_type_private.mustache"
2018-12-17 15:50:27 +01:00
Sara Cenni
607a6ca9d6 MDL-64345 core: Make FB logo upgrade cross-DB compatible 2018-12-17 11:48:30 +01:00
Jun Pataleta
6776651372 Merge branch 'MDL-59629-master' of git://github.com/peterRd/moodle 2018-12-17 15:57:52 +08:00
Andrew Nicols
58049e0a36 MDL-63607 behat: Remove theme from config whitelist 2018-12-17 15:53:53 +08:00
Damyon Wiese
56fb4e81df MDL-62963 boost: Increase contrast btn-secondary
The background colour of these buttons is too light, so they don't look like buttons.
2018-12-17 15:45:49 +08:00
Andrew Nicols
8f65d27593 Merge branch 'MDL-52966_static_cache_core_filetypes_get_types' of https://github.com/enovation/moodle 2018-12-17 15:38:09 +08:00
Andrew Nicols
4542981969 Merge branch 'MDL-60019-master' of git://github.com/peterRd/moodle 2018-12-17 15:34:50 +08:00
Andrew Nicols
05bbf5ab39 Merge branch 'MDL-61633-master' of https://github.com/lucisgit/moodle 2018-12-17 15:28:29 +08:00
Andrew Nicols
a59064f60a Merge branch 'MDL-60518-master' of git://github.com/aanabit/moodle 2018-12-17 14:59:22 +08:00
Jun Pataleta
4aa3939581 Merge branch 'MDL-63260' of https://github.com/timhunt/moodle 2018-12-17 14:10:21 +08:00
Damyon Wiese
20e6ece866 MDL-63378 theme_boost: Contrast of menu items
Enforce the :active menu text colour during a mouse click on an action menu.
2018-12-17 14:01:42 +08:00
Mihail Geshoski
6c52667722 MDL-63794 block_myoverview: Display the course category name in block 2018-12-17 13:21:55 +08:00
Mihail Geshoski
d657d80db0 MDL-63794 block_myoverview: Add behat tests 2018-12-17 13:21:55 +08:00
Damyon Wiese
22b8fe5eb7 MDL-64107 questions: Increase highlight contrast
When a question has just been edited, it is highlighted. We need to ensure
the colour contrast of text on background is accessible.
2018-12-17 12:35:26 +08:00
Jun Pataleta
31a111b981 Merge branch 'MDL-60008-master' of git://github.com/damyon/moodle 2018-12-17 11:48:45 +08:00
Jake Dallimore
4813015e11 Merge branch 'MDL-62756_master' of https://github.com/miotto/moodle 2018-12-17 11:20:01 +08:00
Andrew Nicols
fbde034e29 Merge branch 'MDL-64388-master' of git://github.com/bmbrands/moodle 2018-12-17 09:12:58 +08:00
Christian Wolters
d596f5ca6d MDL-64025 admin_bookmarks: Enable bookmarking of admin categories 2018-12-16 15:43:49 +01:00
John Beedell
410a088a91 MDL-64404 qtype: gapselect currency like options dont show 2018-12-14 16:24:43 +00:00
Bas Brands
02955a84d1 MDL-64392 core_question: flexbox compatible separator for question types
* the br tag does not work well in a flexbox context, a 100% with div
works in both clean and boost.
2018-12-14 16:28:36 +01:00
Bas Brands
442f142522 MDL-64038 core_message: add default group image
add default group image to improve the alignment
of group names in the message drawer group messages section
2018-12-14 14:09:28 +01:00
Bas Brands
fed67b6784 MDL-64388 core_themes: update docs on new required output method
* Method standard_after_main_region_html was added to the core_renderer
used by the messaging ui to message drawer
2018-12-14 11:25:44 +01:00
Amaia Anabitarte
45cc006c91 MDL-60518 core_competency: Set $USER global variable for tests 2018-12-14 10:28:34 +01:00
Frédéric Massart
b91ddd160e MDL-60518 core_user: A user with ID 0 is never a real user 2018-12-14 10:28:34 +01:00
Mirko Otto
5cfd7a7286 MDL-62756 form: Remove any click handler first.
The handler has the old state variable. Remove any click handler first.
2018-12-14 10:26:58 +01:00
Andrew Nicols
3b017210d3 MDL-60432 auth_cas: Update with PR changes 2018-12-14 13:27:14 +08:00