mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-24 09:30:17 +01:00
Code Issues Projects Releases Wiki Activity
91,910 Commits 36 Branches 527 Tags
c1e15d20e0
Commit Graph

91910 Commits

Author SHA1 Message Date
Jake Dallimore
dd202b5e5a Merge branch 'MDL-62922-master' of git://github.com/junpataleta/moodle 2018-12-11 12:50:18 +08:00
Jun Pataleta
796a2d81f1 Merge branch 'MDL-64280-master' of https://github.com/lucaboesch/moodle 2018-12-11 09:54:03 +08:00
Luca Bösch
d388e8ecc2 MDL-64280 core_outcome: Add/remove outcome buttons style. 2018-12-10 17:55:35 +01:00
Jun Pataleta
9da570bde0 Merge branch 'MDL-64275-master' of git://github.com/ryanwyllie/moodle 2018-12-10 15:04:01 +08:00
Jun Pataleta
077f144293 Merge branch 'MDL-62061-master' of git://github.com/abgreeve/moodle 2018-12-10 14:47:17 +08:00
Mihail Geshoski
7fed7636a7 MDL-62624 lesson: Fix alignment in matching questions in boost 2018-12-10 13:46:50 +08:00
Jun Pataleta
0e15a4b92b Merge branch 'MDL-64332' of https://github.com/timhunt/moodle 2018-12-10 09:57:52 +08:00
Peter
fa729309c4 MDL-60019 mod_block: Redundant code in block_navigation.php 
Remove the redundant code as reported from the mentioned file.
 2018-12-10 09:48:00 +08:00
Jake Dallimore
44890bd738 weekly on-sync release 3.7dev 2018-12-10 08:10:39 +08:00
Jake Dallimore
ea260b8eb3 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2018-12-10 08:10:39 +08:00
Andrew Nicols
102d6ea352 MDL-64359 core: Respect shutdown handlers on SIG 2018-12-08 17:40:09 +08:00
Ryan Wyllie
9acc0bc6ec MDL-64134 message: hide empty sections in search results 2018-12-07 10:56:56 +08:00
Ryan Wyllie
e79a79ad83 MDL-64275 message: fix update unread conversation counts 2018-12-07 09:22:24 +08:00
AMOS bot
a25c3d3536 Automatically generated installer lang files 2018-12-07 00:09:20 +00:00
Tim Hunt
d6388d0acf MDL-64332 questions: idnumber should not prevent easy duplication 2018-12-06 14:41:28 +00:00
Davo Smith
67809990f6 MDL-63773 mod_assign: switch instance form to hideIf 2018-12-06 13:31:45 +00:00
Davo Smith
540a0e23f1 MDL-63773 assignfeedback_comments: switch instance form to hideIf 2018-12-06 13:31:45 +00:00
Davo Smith
a029b9aff5 MDL-63773 assignsubmission_file: switch instance form to hideIf 2018-12-06 13:31:45 +00:00
Davo Smith
f203fbf9b6 MDL-63773 assignsubmission_onlinetext: switch instance form to hideIf 2018-12-06 13:31:44 +00:00
Adrian Greeve
34adbfe0b1 MDL-62061 core_privacy: Stop directories being created. 
This stops directories being created in the root directory
while running unit tests.
 2018-12-06 11:25:32 +01:00
papillon326
43dcb956ba MDL-63887 auth_ldap: avoid infinite loop when search limit is reached 2018-12-06 15:39:35 +08:00
papillon326
8707682e3a MDL-63887 auth_ldap: changed variable names to be conform to core 2018-12-06 15:39:35 +08:00
Jun Pataleta
5fd1f89004 Merge branch 'MDL-64283-master' of git://github.com/damyon/moodle 2018-12-06 14:58:01 +08:00
Ryan Wyllie
f12864eb0e MDL-64043 message: stop group conversation header re-rendering 2018-12-06 14:51:20 +08:00
Damyon Wiese
3ea40cdb62 MDL-60008 assign: Button height fix 
The heights of the buttons to hide/show panels are arbitrarily big. There is not need to set them specifically.
 2018-12-06 13:33:21 +08:00
Damyon Wiese
3adea4e265 MDL-60008 assign: editpdf menus 
The edit pdf menus are all broken on small screen sizes. They consume 100% of the page with for no reason.
 2018-12-06 13:33:21 +08:00
Damyon Wiese
66c262777c MDL-60008 assign: Less z-index 
Remove the z-index values from the expand / collapse panels. They cause errors when mixed with dialogues.
 2018-12-06 13:33:21 +08:00
Damyon Wiese
e3511e7978 MDL-60008 assign: Info messages 
Better support for information messages from the conversion process.
 2018-12-06 13:33:12 +08:00
Damyon Wiese
86c577093b MDL-60008 assignfeedback_editpdf: Show warnings 
When not all files are available in the online pdf, display a warning to graders
that some files must be downloaded.
 2018-12-06 12:11:47 +08:00
Damyon Wiese
0888ebc1f9 MDL-60008 assign: Best effort document conversion 
Basically we should produce a combined PDF from all the files that it was possible to convert.
If any one submission input file fails conversion, it should just be omitted in the result.
 2018-12-06 12:11:47 +08:00
Jake Dallimore
c7bd047d24 Merge branch 'MDL-63710-master' of https://github.com/ilya-catalyst/moodle 2018-12-06 11:34:09 +08:00
Jake Dallimore
4f9bb83472 Merge branch 'MDL-46783' of https://github.com/timhunt/moodle 2018-12-06 10:22:57 +08:00
Ilya Tregubov
f408e1f888 MDL-63710 repository: Delete orphaned file records. 2018-12-06 12:39:31 +11:00
Jun Pataleta
e96eb02e46 Merge branch 'master-MDL-64290-imscc-restore-temp-dir' of https://github.com/mspall/moodle 2018-12-06 08:57:32 +08:00
AMOS bot
2ef4d711e0 Automatically generated installer lang files 2018-12-06 00:07:49 +00:00
Michael Spall
f1a22c4a1b MDL-64290 backup imscc: Use correct tempdir for imscc restore 
Use configured temp directory $CFG->tempdir instead of hard coded
$CFG->dataroot . '/temp/backup/'
Remove unused variable, $CFG
 2018-12-05 10:44:14 -07:00
Tim Hunt
ab1272a0da MDL-46783 accesslib: add tests for MDL-63772 and MDL-63818 
MDL-46783, MDL-63772 and MDL-63818 were originally coded on the
assumption that MDL-46783 would get integrated first. However it wasn't.
Therefore, it was not easy to add unit tests for MDL-63772 and MDL-63818
at the time, but it is now, so here they are.
 2018-12-05 16:44:57 +00:00
Tim Hunt
939218c2b6 MDL-46783 permissions: let some moodle/ caps be overriden in all mods 
The capabilities changed ('contextlevel' => CONTEXT_COURSE changed to
'contextlevel' => CONTEXT_MODULE) are:

* moodle/site:accessallgroups
* moodle/site:viewfullnames
* moodle/site:trustcontent
* moodle/site:viewuseridentity

This list came from reviewing the _get_extra_capabilities functions in
all core activities. They were all somewhat inconsistent, but I think it
makes sense that these capabilities are consistently overridable in all
activities. E.g. moodle/site:accessallgroups affects conditional
availability even if there is no other user of groups, and
moodle/site:viewuseridentity and moodle/site:viewfullnames affect the
logs report, if nothing else.

As a result of this, several _get_extra_capabilities functions are no
longer needed, and all the rest have been simplified.
 2018-12-05 16:44:25 +00:00
Mark Nelson
0db6fd3603 MDL-64309 core_message: minor string changes to drawer 2018-12-05 18:18:46 +08:00
Jun Pataleta
eb1a477635 MDL-62922 core_user: Check auth mechanism before validating password 
* External authentication mechanisms (e.g. via oauth2, etc.) don't store
  password in the user table, so we shouldn't be requiring password in
  such case when creating users via the core_user_create_users WS
  function.
 2018-12-05 15:29:54 +08:00
Jun Pataleta
f8b5fcd304 Merge branch 'MDL-64274-master' of git://github.com/ryanwyllie/moodle 2018-12-05 14:56:21 +08:00
Ryan Wyllie
a2bce0d0d8 MDL-64274 message: deleteMessages in message_repository return promise 2018-12-05 14:43:21 +08:00
Jake Dallimore
ccf5f09103 Merge branch 'MDL-64198-master' of https://github.com/lucaboesch/moodle 2018-12-05 14:30:16 +08:00
Roger Barras
fcebc9b042 MDL-60267 user: Fix set default data for the user profile field 2018-12-05 14:15:48 +08:00
Eloy Lafuente (stronk7)
cb7f6a6f99 weekly on-sync release 3.7dev 
Amended to keep it on-sync with 3.6.1 emergency release
 2018-12-04 17:46:09 +01:00
Luca Bösch
c21b42e76a MDL-64198 course: set formatted modulename for togglecompletion js. 2018-12-04 14:35:06 +01:00
Michael Aherne
11361acfb5 MDL-64216 privacy: Split query to use indexes. 2018-12-04 13:01:07 +00:00
Eloy Lafuente (stronk7)
0465a942c3 weekly on-sync release 3.7dev 2018-12-04 13:06:15 +01:00
Jake Dallimore
8108bc0b5e Merge branch 'MDL-63223-master' of git://github.com/bmbrands/moodle 2018-12-04 12:06:13 +08:00
Jun Pataleta
a939ad80ba Merge branch 'MDL-64307_master' of git://github.com/markn86/moodle 2018-12-04 12:03:39 +08:00