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

91710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Hawkins
b6995c29ec MDL-64240 mod_forum: Update word count to use current message length 
Previously this used the length of the message stored in the database,
before scripts etc are cleaned to display the content. That resulted
in cases where the count would seem much larger than the message size.
 2018-12-18 14:10:43 +08:00
Jake Dallimore
33a388eff7 weekly release 3.7dev 2018-12-14 07:51:42 +08:00
Jake Dallimore
3ec018067a Merge branch 'MDL-62624-master' of git://github.com/mihailges/moodle 2018-12-12 16:13:28 +08:00
Jun Pataleta
ca6824e284 Merge branch 'MDL-41507-master' of git://github.com/rezaies/moodle 2018-12-12 11:18:02 +08:00
Shamim Rezaie
ea191cf1b4 MDL-41507 core_group: Consistent default value for FEATURE_GROUPS 2018-12-12 14:03:45 +11:00
Jake Dallimore
bf4205ea78 Merge branch 'MDL-64003-master' of https://github.com/aanabit/moodle 2018-12-12 10:02:55 +08:00
Jake Dallimore
39ac02f424 MDL-63887 auth_ldap: fix unclean exit from sync when users not found 
We should return, not exit, and we should clean up before we do.
 2018-12-12 09:42:13 +08:00
Jake Dallimore
84e8e17820 Merge branch 'MDL-63887_master' of git://github.com/markn86/moodle 2018-12-12 09:41:34 +08:00
Jake Dallimore
f9479eb8ca Merge branch 'MDL-63150-master' of git://github.com/peterRd/moodle 2018-12-12 08:32:16 +08:00
Jake Dallimore
909654806f Merge branch 'MDL-63145-master' of git://github.com/peterRd/moodle 2018-12-12 08:29:40 +08:00
Jake Dallimore
fb029c996b Merge branch 'MDL-63147-master' of git://github.com/peterRd/moodle 2018-12-12 08:25:02 +08:00
Peter
73a8110d3a MDL-63145 mod_page: Accept userid param as override 
Accept a userid as an override in the lib function instead of
relying on $USER
 2018-12-12 07:25:35 +08:00
Peter
dcb7662ee7 MDL-63150 mod_url: Accept a userid override in event action 
Accept a userid in the event action instead of depending on $USER
 2018-12-12 07:13:09 +08:00
Peter
3ff8068fc5 MDL-63147 mod_resource: Accept userid in resource event_action 2018-12-12 07:06:53 +08:00
Amaia Anabitarte
f8b46dabe8 MDL-64003 core_message: Use sql_like_escape() in message_search_users 2018-12-11 11:52:18 +01:00
Jake Dallimore
85b0a914f0 Merge branch 'MDL-64357_master' of git://github.com/markn86/moodle 2018-12-11 17:43:59 +08:00
Mark Nelson
e56eb26aec MDL-64357 ltiservice_gradebookservices: updated unit tests 2018-12-11 17:02:40 +08:00
Claude Vervoort
9d6f9d1d47 MDL-64357 ltiservice_gradebookservices: fix cleanup deleting lineitems 2018-12-11 14:22:49 +08:00
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
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
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
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
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
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
Eloy Lafuente (stronk7)
0465a942c3 weekly on-sync release 3.7dev 2018-12-04 13:06:15 +01:00