mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 15:40:17 +01:00
Code Issues Projects Releases Wiki Activity
95,277 Commits 36 Branches 527 Tags
Commit Graph

21479 Commits

Author SHA1 Message Date
Jake Dallimore
95852a343d Merge branch 'MDL-66960-master' of https://github.com/lucaboesch/moodle 2019-10-21 10:41:10 +08:00
Luca Bösch
55c75f91e9 MDL-66960 questions: Top align all question bank titles exc "select all" 2019-10-18 16:32:43 +02:00
Tim Hunt
701ae1eb4b MDL-66816 question bank: replace row of edit icons with an Edit menu 2019-10-18 14:27:50 +01:00
Andrew Nicols
2265397db6 Merge branch 'MDL-66767' of https://github.com/Chocolate-lightning/moodle_forum-project 2019-10-18 12:37:50 +08:00
Michael Hawkins
a575ab1516 MDL-66767 forumreport_summary: Improved groups only SQL 2019-10-18 12:35:53 +08:00
Michael Hawkins
2970b8fa2e MDL-66767 forumreport_summary: Control groups filter content 
Control the groups filter options based on forum groups mode and groups
visible to the user viewing the report.
 2019-10-18 12:23:49 +08:00
Michael Hawkins
5e43937c7f MDL-66767 forumreport_summary: Updated groups filter to apply to data 
Previously, the groups filter was only filtering by user, it now
filters the data by group, as well as limiting the users displayed
to those with access to the relevant combination.
 2019-10-18 12:23:49 +08:00
Jun Pataleta
36a8ae571a Merge branch 'MDL-66625-master' of git://github.com/rezaies/moodle 2019-10-18 06:39:01 +08:00
Shamim Rezaie
f54cb5a708 MDL-66625 forumreport_summary: Adding behat 2019-10-18 05:46:39 +11:00
Jun Pataleta
8b2b47f733 Merge branch 'MDL-66694-master' of git://github.com/junpataleta/moodle 2019-10-17 22:48:16 +08:00
Jun Pataleta
10cc5e8100 MDL-66694 mod_forum: Fix unit test 
* Set $forum1's displaywordcount to true in
  test_mod_forum_get_discussion_posts() so that the word and char counts
  will be returned.
* Use count_words() and count_letters() instead of hard coding the
  expected values for the word and char counts.
 2019-10-17 22:39:36 +08:00
Michael Hawkins
97aeba56ba MDL-66694 mod_forum: Refactored post counts scheduled task 2019-10-17 17:07:05 +08:00
Michael Hawkins
d21d6baac6 MDL-66694 mod_forum: Word/char count tidy ups & add task config option 
The chunk size used by the existing post word/char count calculation
ad-hoc task can now be set as a $CFG parameter. Also improved the way
the ad-hoc task is re-queued and tidied up some redundant code.
 2019-10-17 16:13:23 +08:00
Michael Hawkins
3c36cdb150 MDL-66694 mod_forum: Updated adhoc task to requeue until completion 
The adhoc task run during upgrade will now be requeued until no more
word/char counts require updating. Previously it was only run once,
so only the first 5000 posts would be updated.
 2019-10-17 15:05:57 +08:00
David Monllaó
7d8f604b3c MDL-66694 mod_forum: Upgrade forum post word and char counts 2019-10-17 15:05:57 +08:00
Michael Hawkins
3eb0a82fef MDL-66694 mod_forum: Word & char count update consistency fixes 
Charcount logic is now consistent with wordcount in the post exporter.
Counts update now called in forum_udpate_instance since it is updating
the data.
 2019-10-17 15:05:57 +08:00
David Monllaó
591dd68790 MDL-66694 mod_forum: Update word & char counts on db save 2019-10-17 15:05:57 +08:00
Michael Hawkins
68f2d677ae MDL-66694 forumreport_summary: String update and method tidy up 
Replaced 'Char' with full word 'Character' in the charcount string.
Also tidied up show_word_char_counts code and set to protected instead
of private.
 2019-10-17 15:05:57 +08:00
David Monllaó
74f94dfc26 MDL-66694 mod_forum: Word count and char count columns 2019-10-17 15:05:57 +08:00
Andrew Nicols
bcce0270fe MDL-66496 mod_data: Fixes during integration 2019-10-17 12:20:54 +08:00
Andrew Nicols
a7139f7600 Merge branch 'MDL-66496-master' of git://github.com/tobiasreischmann/moodle 2019-10-17 11:05:34 +08:00
Shamim Rezaie
354cbf48b8 MDL-66625 forumreport_summary: Handling private replies 2019-10-16 12:00:51 +11:00
Eloy Lafuente (stronk7)
d1729ce196 Merge branch 'MDL-66790-master' of git://github.com/junpataleta/moodle 2019-10-16 00:55:48 +02:00
Jun Pataleta
80d7651534 MDL-66790 quizreport: Prevent sorting for checkbox column 2019-10-15 17:25:16 +08:00
Jun Pataleta
d75eb57daa Merge branch 'MDL-66821' of https://github.com/timhunt/moodle 2019-10-15 07:35:36 +08:00
Eloy Lafuente (stronk7)
82d71a5c83 Merge branch 'MDL-66335' of https://github.com/timhunt/moodle 2019-10-14 18:53:44 +02:00
Sara Arjona
5b91deed2c Merge branch 'MDL-63349-Master' of github.com:tuanngocnguyen/moodle 2019-10-14 13:58:09 +02:00
Tim Hunt
9c14b28d0b MDL-66821 question behat: new step for acting on questions in the bank 
There is a proposed change MDL-66816 which will change the question
bank UI. This will break any Behat tests which uses low-level steps
like

    When I click on "Duplicate" "link" in the "Test question" "table_row"

to perform an action on a question in the question bank. This commit
introduces a new step:

    When I choose "Duplicate" action for "Test question" in the question bank

This commit also converts all core Behat tests to use the new step.
 2019-10-14 11:36:12 +01:00
Tim Hunt
4e1ebf8cde MDL-66335 quiz behat: using the new generic navigation steps 
This converts all the navigation to quiz pages when that is not
the thing under test. Also, I decided that the Quiz settings form
belonged to the course, so did not do that here.
 2019-10-14 11:21:22 +01:00
Eloy Lafuente (stronk7)
70d33bc399 Merge branch 'MDL-66874-master' of git://github.com/junpataleta/moodle 2019-10-14 10:05:27 +02:00
Jun Pataleta
5a85b7fc13 MDL-66874 mod_feedback: Use correct option attribute 'classes' 2019-10-14 11:27:19 +08:00
Jun Pataleta
4f71255e61 MDL-66874 mod_data: Explicitly add btn-secondary class to select all 
* Plus use correct option attribute 'classes' for the slave
  checkboxes
 2019-10-14 11:27:19 +08:00
Jun Pataleta
bc003428bc MDL-66874 mod_choice: Explicitly add btn-secondary class to select all 2019-10-14 11:27:19 +08:00
Jake Dallimore
e7ac8db8a1 Merge branch 'MDL-66768-master' of git://github.com/rezaies/moodle 2019-10-14 11:21:03 +08:00
Shamim Rezaie
bf2e1bec4e MDL-66768 forumreport_summary: remove the select column when downloading 2019-10-14 13:07:17 +11:00
Shamim Rezaie
a90b8056ba MDL-66768 forumreport_summary: move back bulk action menu to the bottom 2019-10-14 13:07:16 +11:00
Simey Lameze
850ce97425 MDL-66768 forumreport_summary: add ability to download report 2019-10-14 13:05:04 +11:00
Jun Pataleta
75c49ad291 Merge branch 'MDL-66553' of https://github.com/timhunt/moodle 2019-10-14 09:42:03 +08:00
Tim Hunt
c2200bd5dc MDL-66553 quiz/questions: show idnumber and tags when adding from qbank 2019-10-11 13:59:26 +01:00
Tim Hunt
61cc1e6494 MDL-66553 question bank: show tags and idnumbers in question list 2019-10-11 13:59:26 +01:00
Nathan Nguyen
4a6edc5767 MDL-63349 assignfeedback_editpdf: Rotate submitted image automatically 2019-10-11 15:26:53 +11:00
Jun Pataleta
ad01d8bed5 Merge branch 'MDL-66076-master-2' of git://github.com/junpataleta/moodle 2019-10-11 11:16:37 +08:00
Jun Pataleta
ce8a2d11d8 MDL-66076 forumreport_summary: filter JS and template optimisations 2019-10-11 11:09:50 +08:00
Michael Hawkins
aa4b62baac MDL-66076 forumreport_summary: Filter styles update 2019-10-11 11:09:50 +08:00
Michael Hawkins
9523f0e040 MDL-66076 forumreport_summary: Added missing SQL group by fields 
Also removed a redundant variable declaration.
 2019-10-11 11:09:50 +08:00
Michael Hawkins
d4d9b8c67c MDL-66076 forumreport_summary: Template example context fixes 2019-10-11 11:09:50 +08:00
Michael Hawkins
b9669dd319 MDL-66076 forumreport_summary: Always show viewcount column 
Previously this was hidden if filtering by groups, but will now be
visible, along with a disclaimer that the data is not filtered
(since the groups cannot be determined from the logs used).
 2019-10-11 11:09:50 +08:00
Michael Hawkins
cc15134c7b MDL-66076 forumreport_summary: Groups filter made accessible 2019-10-11 11:09:50 +08:00
Shamim Rezaie
14f92164f1 MDL-66076 forumreport_summary: Minor cleanup of report code 
Removed some unnecessary code and added the current page to breadcrumbs
 2019-10-11 11:09:50 +08:00
Shamim Rezaie
0942e58c91 MDL-66298 forumreport_summary: Added ability to bulk message users 
Part of MDL-66076.
 2019-10-11 11:09:50 +08:00