mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-16 05:30:06 +01:00
Code Issues Projects Releases Wiki Activity
85,891 Commits 36 Branches 527 Tags
Commit Graph

19553 Commits

Author SHA1 Message Date
Helen Foster
7698619bc6 MDL-59983 lang: Merge English strings from the en_fix language pack 
Significant string changes:

* mobileappenabled, setuplink and setuplink_desc in tool_mobile -
  improved wording
* getmoodleonyourmobile and custommenuitems_desc in tool_mobile -
  improved wording
 2017-09-05 11:01:09 +02:00
John Okely
8812040612 MDL-56646 mod_assign: Improve grade fix strings 2017-08-31 14:39:54 +08:00
John Okely
5ded13e65a MDL-56646 mod_assign: Make rescale behat more specific 2017-08-31 14:39:54 +08:00
Eloy Lafuente (stronk7)
9533cf3419 Merge branch 'MDL-59779_master' of git://github.com/dmonllao/moodle 2017-08-30 01:09:20 +02:00
Dan Poltawski
08220d64f6 Merge branch 'MDL-59195_assign_comment_permissions' of git://github.com/davosmith/moodle 2017-08-29 11:54:07 +01:00
Andrew Nicols
350ef63246 Merge branch 'MDL-56646-master' of https://github.com/xow/moodle 2017-08-29 15:51:01 +08:00
John Okely
465b75ed1f MDL-56646 assign: Fix negative grades in restore 2017-08-29 07:23:01 +00:00
John Okely
7323c473cc MDL-56646 assign: Add ability to fix errant grades 2017-08-29 07:23:01 +00:00
Jun Pataleta
33b46e54bb Merge branch 'MDL-59885-master' of git://github.com/cameron1729/moodle 2017-08-29 14:48:04 +08:00
David Monllao
edee629d1a MDL-59030 analytics: Expand community of inquiry mods public API 2017-08-29 06:19:37 +02:00
John Okely
2d1075e321 MDL-56646 assign: use ASSIGN_GRADE_NOT_SET constant 2017-08-28 06:58:44 +00:00
John Okely
e04be435e0 MDL-56646 assign: Don't rescale any negative grades 2017-08-28 06:58:43 +00:00
John Okely
64b52095e5 MDL-56646 assign: Behat test rescaling after viewing student 2017-08-28 06:58:43 +00:00
Andrew Nicols
8cb6a55147 Merge branch 'MDL-53848_form_hideif' of git://github.com/davosmith/moodle 2017-08-23 09:56:00 +08:00
Andrew Nicols
474c7ee757 Merge branch 'MDL-36985-master' of https://github.com/snake/moodle 2017-08-22 14:37:55 +08:00
Andrew Nicols
8df7bfff0d Merge branch 'MDL-59893-master' of https://github.com/snake/moodle 2017-08-22 13:32:53 +08:00
Jake Dallimore
f3c2afd0e8 MDL-36985 core_files: added option to remove draft files on save 
text areas can now specify $options['removeorphaneddrafts'] when saving
their data using file_postupdate_standard_editor(). If set to true,
this option clears all user drafts which are not referenced in the text
 2017-08-22 13:15:30 +08:00
Jake Dallimore
859e62e7fa MDL-59893 assign: don't prefix file links when downloading as folders 
Change to download_rewrite_pluginfile_urls() ensuring prefix isn't
added to file links when downloading with the  downloadasfolders
user preference set to true. Links to files in onlinetext now work
when downloading as folders.
 2017-08-22 12:56:45 +08:00
Jake Dallimore
a15dfc6682 MDL-59893 assign: fixes for groupname prefix when downloading 
assign->download_submissions():
- groupname now only added to zip file name if not empty, fixing a
double hyphen bug in the file name.
assign->download_rewrite_pluginfile_urls():
- groupname is now correctly determined using get_submission_group()
instead of using groups_get_activity_group() which fails when there
is no active activity group set. Uses the same logic that
download_submission() uses to prefix file names. Fixes a bug where an
empty groupname prefix was generated, resulting in broken links.
 2017-08-22 12:56:28 +08:00
Jun Pataleta
f8de8cb314 Merge branch 'MDL-59204_master_v2' of git://github.com/markn86/moodle 2017-08-22 12:46:23 +08:00
Andrew Nicols
51483e4a4e Merge branch 'MDL-57246-33-forumredirect' of git://github.com/roperto/moodle 2017-08-22 12:26:42 +08:00
Andrew Nicols
ea8b25c51f Merge branch 'MDL-59702' of https://github.com/andrewhancox/moodle 2017-08-22 11:01:30 +08:00
Eloy Lafuente (stronk7)
eb2e291716 Merge branch 'MDL-55937-master' of git://github.com/ankitagarwal/moodle 2017-08-21 23:17:24 +02:00
Davo Smith
910b02734c MDL-59195 mod_assign: add behat tests for comments error 2017-08-21 10:23:01 +01:00
Davo Smith
ec0ecdaf6e MDL-59195 assignsubmission_comments: fix permission checks 2017-08-21 10:23:01 +01:00
Cameron Ball
5e6a36f845
MDL-59885 assignfeedback_editpdf: Correctly report combination status 2017-08-21 15:32:02 +08:00
Jun Pataleta
3a3530a863 Merge branch 'MDL-59733-master' of https://github.com/xow/moodle 2017-08-21 10:40:27 +08:00
Mark Nelson
b94814fa91 MDL-59204 analytics: added corresponding name '_help' strings 
Strings are intentionally left blank as they will be done later by
AMOS.
 2017-08-18 18:02:38 +08:00
Mark Nelson
7e00aa725a MDL-59204 analytics: changed get_name so that it returns a lang_string 
This was done for indicators, targets and time splitting methods so that we
can get the string identifier and component in order to display a help_icon.

The functions were also made abstract, removing the default implementation.
Indicators, targets and time splitting methods should define this function.
 2017-08-18 18:02:38 +08:00
Davo Smith
527459a4c7 MDL-53848 mod_assign, formslib: add hideIf to real form and adapt behat tests to use this 2017-08-17 14:52:11 +01:00
Mark Nelson
952cbce293 MDL-59204 mod_*: removed redundant activity name from string index 
Also fixed references to incorrect strings.
 2017-08-15 16:55:28 +08:00
John Okely
a18b4799f2 MDL-59733 assignsubmission_file: Use click interface in behat 2017-08-15 13:29:14 +08:00
Ankit Agarwal
2ba3ce9829 MDL-55937 assign: Check for group submission caps when userid=0 2017-08-15 10:58:00 +05:30
Eloy Lafuente (stronk7)
0982255fa8 Merge branch 'wip-MDL-59736-master' of git://github.com/marinaglancy/moodle 2017-08-14 12:10:36 +02:00
Jun Pataleta
993ccc7268 Merge branch 'MDL-59785-master' of git://github.com/lameze/moodle 2017-08-14 16:56:08 +08:00
David Monllao
fbc889a268 MDL-59779 analytics: Reduce community of inquiry indicators db queries 2017-08-10 11:07:23 +02:00
Simey Lameze
1c729ff624 MDL-59785 mod_book: all navigation styles must mark as completed 2017-08-10 16:11:33 +08:00
Jun Pataleta
10994cbc4a MDL-59666 mod_assign: Disable remind to grade by field in override tests 2017-08-08 12:28:39 +08:00
Andrew Nicols
a72e7d4974 Merge branch 'MDL-59725-master' of https://github.com/xow/moodle 2017-08-08 08:30:33 +08:00
Dan Poltawski
9ebc67f4a2 Merge branch 'MDL-59172-master' of https://github.com/snake/moodle 2017-08-07 16:20:11 +01:00
Dan Poltawski
7cb60527f4 Merge branch 'MDL-59666-master' of git://github.com/junpataleta/moodle 2017-08-07 09:31:34 +01:00
David Monllao
db208667a3 Merge branch 'MDL-59532-master' of git://github.com/jleyva/moodle 2017-08-07 09:42:08 +02:00
Andrew Nicols
2101612b10 Merge branch 'MDL-51745-master' of https://github.com/jebarviabb/moodle 2017-08-07 14:47:31 +08:00
Josh Ebarvia
79189e975c MDL-51745 mod_lesson: Use format_text in response feedback 2017-08-07 15:53:11 +09:30
Marina Glancy
8f725c12e8 MDL-59736 mod_forum: show discussionlocked as notification 2017-08-07 09:32:31 +08:00
Jake Dallimore
4d068a6708 MDL-59172 user: user_can_view_profile() now checks viewalldetails cap 2017-08-07 09:27:04 +08:00
John Okely
5d9e7abbaf MDL-59725 assignsubmission_file: Don't use click interface in behat 2017-08-07 09:25:46 +08:00
John Okely
29b31865d7 MDL-59725 assignsubmission_file: Improve accepted types string 2017-08-07 09:25:20 +08:00
Jun Pataleta
b5ede848ce MDL-59666 mod_assign: Add validation for grading due date 2017-08-04 14:42:01 +08:00
Andrew Hancox
6a8e25ef18 MDL-59702 mod_lesson: Use showuseridentity setting on overview report 2017-08-03 10:29:36 +01:00