eafcaa4e41
Merge branch 'MDL-59696-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE
2017-09-07 11:01:06 +02:00
8ae7ad0294
Merge branch 'MDL-59198-33' of git://github.com/ankitagarwal/moodle into MOODLE_33_STABLE
2017-09-07 11:01:05 +02:00
aed06e3b9d
MDL-59768 unittest: Remove references to unexisting method
2017-09-07 11:01:05 +02:00
064739b3df
Merge branch 'wip-MDL-59768-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE
2017-09-07 11:01:05 +02:00
e9e0083e30
Merge branch 'MOODLE_33_STABLE-MDL-59799' of https://github.com/jojoob/moodle into MOODLE_33_STABLE
2017-09-07 11:01:04 +02:00
69bcff98e2
Merge branch 'wip-MDL-59992-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE
2017-09-07 11:01:04 +02:00
35f2a315a0
Merge branch 'wip-MDL-59815-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE
2017-09-07 11:01:03 +02:00
cf6d37c10a
Merge branch 'MDL-59846-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE
2017-09-07 11:01:03 +02:00
1b9cafb3e8
Merge branch 'MOODLE_33_STABLE-MDL_59834-Indexing_of_personal_messages' of https://github.com/mattporritt/moodle into MOODLE_33_STABLE
2017-09-07 11:01:02 +02:00
42b8955e28
Merge branch 'wip-MDL-59898-33' of git://github.com/abgreeve/moodle into MOODLE_33_STABLE
2017-09-07 11:01:02 +02:00
3909dc6316
Merge branch 'MDL-59963_33-report-logs-origin-pagination' of https://github.com/lucaboesch/moodle into MOODLE_33_STABLE
2017-09-07 11:01:01 +02:00
26c37c0024
MDL-59696 theme_bootstrapbase: Set max-width for custom-select elements
...
* Set custom-select elements with a maximum width of 100% of their
container.
2017-09-04 10:12:06 +08:00
e3cd9de694
MDL-59696 templates: Remove form-group div for url-select template
...
* Removed the div with the class 'form-group' that's enclosing the
select element and friends. It's not needed since the urlselect template
is an inline form.
* Also, for completeness, I added the helpicon data for the template's
context.
2017-09-04 10:12:06 +08:00
29786b259a
MDL-59898 access: Added Icon references.
2017-09-04 09:55:59 +08:00
2fb9bb8eac
MDL-59846 core_calendar: add styling to action link
2017-09-04 08:40:22 +08:00
e396e62df5
MDL-59834 Global Search: Indexing user messages
...
Make indexing of user messages tolerant to user deletion.
When creating the search document for user messages,
add a check to see if the user has been deleted in the
system. If they have been deleted abort creating the search
document.
This is to avoid rasining an error when trying to get the
user context for a deleted user.
2017-09-04 09:18:34 +10:00
55a0d1d09a
MDL-59799 course: Include course/lib.php before using move_courses().
2017-09-01 16:45:49 +02:00
e024daa740
MDL-59963 reports: origin parameter looked at in log reports
2017-09-01 11:50:03 +02:00
8c08dca80e
MDL-53936 reports: State default index page explicitly in pagination url
2017-09-01 11:49:25 +02:00
77a6a09950
weekly release 3.3.1+
2017-09-01 13:27:03 +08:00
458f8d8d63
Merge branch 'install_33_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_33_STABLE
2017-09-01 13:27:01 +08:00
c7b53f80a6
Merge branch 'MDL-56646-33-fix' of https://github.com/xow/moodle into MOODLE_33_STABLE
2017-08-31 15:00:39 +08: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
fceada2c4e
MDL-59768 tasks: schedule task only if it is not scheduled
2017-08-31 14:34:59 +08:00
a13ecae829
MDL-59992 webservice: fix debugging message event context already set
2017-08-31 12:14:13 +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
84dc1b0d17
MDL-59815 access: Fix definition of risks for user:delete.
2017-08-30 11:38:21 +08: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
733222c626
Merge branch 'MDL-59908-33' of git://github.com/ankitagarwal/moodle into MOODLE_33_STABLE
2017-08-29 17:42:05 +08: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
23a2f3eaac
Merge branch 'MDL-59820-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE
2017-08-29 15:27:26 +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
bd90cb526f
Merge branch 'MDL-35290-33' of https://github.com/snake/moodle into MOODLE_33_STABLE
2017-08-29 13:15:01 +08:00
7d753e1403
Merge branch 'MDL-59855-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE
2017-08-29 11:45:42 +08:00
8ab8763d47
MDL-59855 oauth2: More PHPDocs fixes
...
* Fix PHPDoc return type for api::get_system_account()
* Fix PHPDoc for the $contenttype parameter in \core\oauth2\rest::call()
2017-08-29 11:19:32 +08:00
c9e2c1b44c
MDL-59855 oauth2: Fix PHPDoc type hints
2017-08-29 11:19:32 +08:00
67fa4b55b9
MDL-35290 files: File manager reports files which can't be read
2017-08-29 11:14:46 +08:00
6223245206
Merge branch 'MDL-59869-33' of git://github.com/Dagefoerde/moodle into MOODLE_33_STABLE
2017-08-29 10:43:29 +08:00
f668ffe97a
Merge branch 'MDL-59887-33' of git://github.com/lameze/moodle into MOODLE_33_STABLE
2017-08-29 01:37:01 +02:00
888a005fa4
Merge branch 'MDL-59870_33-participants-th-top-vertical-aligned' of http://github.com/lucaboesch/moodle into MOODLE_33_STABLE
2017-08-29 00:54:39 +02:00
ee0f446169
Automatically generated installer lang files
2017-08-29 00:07:56 +08:00
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
41c4762440
Merge branch 'wip-MDL-59708-33' of git://github.com/marinaglancy/moodle into MOODLE_33_STABLE
2017-08-28 15:02:11 +08:00
924290eb14
Automatically generated installer lang files
2017-08-28 00:09:31 +08:00
Eloy Lafuente (stronk7)