8ae7ad0294
Merge branch 'MDL-59198-33' of git://github.com/ankitagarwal/moodle into MOODLE_33_STABLE
2017-09-07 11:01:05 +02:00
0fe8062c08
MDL-56646 mod_assign: Improve grade fix strings
2017-08-31 14:46:47 +08:00
41982ebc63
MDL-56646 mod_assign: Make rescale behat more specific
2017-08-31 14:46:38 +08:00
2261278338
Merge branch 'MDL-59927-33-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_33_STABLE
2017-08-30 11:06:03 +02:00
b7799e2da3
MDL-59927 lang: Merge English strings from the en_fix language pack
...
Significant string changes:
- firstpagetitle_help,mod_wiki - improved wording
- completionicons_help,core_completion - removing confusing sentence
about the tick being optional
2017-08-29 15:42:22 +02:00
b3abfa22e0
Merge branch 'MDL-59195_assign_comment_permissions_33' of git://github.com/davosmith/moodle into MOODLE_33_STABLE
2017-08-29 11:55:15 +01:00
f26fc77aac
Merge branch 'MDL-56646-33' of https://github.com/xow/moodle into MOODLE_33_STABLE
2017-08-29 15:51:44 +08:00
127992bfaf
MDL-56646 assign: Fix negative grades in restore
2017-08-29 07:15:08 +00:00
76eefdded3
MDL-56646 assign: Add ability to fix errant grades
2017-08-29 07:15:08 +00:00
c71370fe69
Merge branch 'MDL-59885-33' of git://github.com/cameron1729/moodle into MOODLE_33_STABLE
2017-08-29 14:48:15 +08:00
3458f178a9
MDL-59198 lti: Make params LTI2 compatible
...
LTI2 recommends to include both upper case and lower case of custom params.
This patch makes our implementation confer to that standard.
2017-08-29 11:43:38 +05:30
ef2c635fdc
MDL-56646 assign: Don't rescale any negative grades
2017-08-28 07:28:21 +00:00
f847ce94c9
MDL-56646 assign: Behat test rescaling after viewing student
2017-08-28 07:28:21 +00:00
22b3c71aa3
Merge branch 'MDL-59893-33' of https://github.com/snake/moodle into MOODLE_33_STABLE
2017-08-22 14:32:05 +08:00
9bae6bc2d6
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:58:14 +08:00
cb7cf012f6
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:58:07 +08:00
030923e487
Merge branch 'MDL-57246-33-forumredirect' of git://github.com/roperto/moodle into MOODLE_33_STABLE
2017-08-22 12:29:24 +08:00
2cb47a734f
Merge branch 'MDL-55937-33' of git://github.com/ankitagarwal/moodle into MOODLE_33_STABLE
2017-08-21 23:21:47 +02:00
0d5f10d1ff
MDL-59195 mod_assign: add behat tests for comments error
2017-08-21 10:25:31 +01:00
0ef74b27be
MDL-59195 assignsubmission_comments: fix permission checks
2017-08-21 10:25:31 +01:00
345d2486fc
MDL-59885 assignfeedback_editpdf: Correctly report combination status
2017-08-21 16:23:19 +08:00
9bece224f9
MDL-55937 assign: Check for group submission caps when userid=0
2017-08-15 11:15:43 +05:30
7f1e907a7e
MDL-59785 mod_book: all navigation styles must mark as completed
2017-08-14 11:43:50 +08:00
d95b923ed3
MDL-59666 mod_assign: Disable remind to grade by field in override tests
2017-08-08 12:38:35 +08:00
587a8af21c
Merge branch 'MDL-59172-33' of https://github.com/snake/moodle into MOODLE_33_STABLE
2017-08-07 16:20:14 +01:00
e16710f3c5
Merge branch 'MDL-59666-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE
2017-08-07 09:32:08 +01:00
a33d238648
Merge branch 'MDL-59532-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
2017-08-07 09:42:17 +02:00
b7acf0aaf7
MDL-51745 mod_lesson: Use format_text in response feedback
2017-08-07 15:48:40 +09:30
89e7d6eb7a
MDL-59172 user: user_can_view_profile() now checks viewalldetails cap
2017-08-07 09:28:50 +08:00
63b096ccb7
MDL-59666 mod_assign: Add validation for grading due date
2017-08-04 14:43:03 +08:00
4a99cae69d
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-08-03 12:11:16 +02:00
58215dcf07
MDL-55364 forum: Combine user picture and user name rows
2017-08-02 10:30:46 +08:00
b29ffd3629
Merge branch 'MDL-55364-33' of https://github.com/xow/moodle into MOODLE_33_STABLE
2017-08-01 11:36:31 +01:00
dcde4768c9
MDL-59627 mod_data: fix incorrect use of sortorder
2017-07-31 14:28:53 +01:00
3d92d04aee
Merge branch 'MDL-59619-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
2017-07-31 11:48:54 +01:00
9646369c9a
Merge branch 'MDL-59627-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
2017-07-31 11:44:56 +01:00
3ebca8165d
Merge branch 'MDL-58196-33' of git://github.com/ankitagarwal/moodle into MOODLE_33_STABLE
2017-07-31 15:28:06 +08:00
ac4c870148
Merge branch 'MDL-59649-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
2017-07-31 09:00:50 +02:00
b198bfbfe9
MDL-58196 availability: Add appropriate dependencies in mform
2017-07-31 11:56:21 +05:30
638bae2e6c
MDL-55364 forum: fix overlapping columns in the table at low resolutions
2017-07-31 11:24:24 +08:00
e81dc75977
MDL-59649 mod_data: Fix content exporter
...
The content3 and content4 fields should be type PARAM_RAW
2017-07-28 14:03:16 +02:00
957b5180db
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 19:04:36 +02:00
5a55f2049a
MDL-59619 mod_data: Fix get_fields WS for databases without fields
2017-07-25 14:45:49 +02:00
db52eda16f
Merge branch 'MDL-59453-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
2017-07-25 11:43:36 +02:00
ae5b1611ff
Merge branch 'MDL-59485-33' of https://github.com/IMSGlobal/moodle into MOODLE_33_STABLE
2017-07-25 11:11:16 +02:00
875ea2a421
Merge branch 'MDL-59490-33' of https://github.com/spvickers/moodle into MOODLE_33_STABLE
2017-07-24 12:51:32 +08:00
ede53ca719
MDL-57649 mod_lesson: Improvement to upgrade query.
...
We only need one record for each filearea that we
are removing.
2017-07-20 09:59:42 +08:00
8c69d94957
MDL-57649 mod_lesson: Additional refinement to upgrade script.
2017-07-19 15:47:46 +08:00
8388f22e60
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:40:48 +01:00
cab4f7efcb
Merge branch 'wip-MDL-39471-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE
2017-07-18 10:49:25 +02:00
Eloy Lafuente (stronk7)