mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-27 19:12:39 +01:00
Code Issues Projects Releases Wiki Activity
92,310 Commits 36 Branches 527 Tags
38dc5b9677
Commit Graph

92310 Commits

Author SHA1 Message Date
Helen Foster
38dc5b9677 MDL-64943 lang: Import fixed English strings (en_fix) 
Significant string changes:

* importgroups_help,core_group - Correcting optional fieldnames
  (removing picture, hidepicture and adding groupidnumber, groupingname
  and enablemessaging)

* penaltyforeachincorrecttry_help,core_question - additional paragraph
  about scoring logic

* resultdownloadready,tool_dataprivacy - wording corrected (no need to
  go to a download page)

* auth_dbfielduser,auth_db - varchar data type requirement
 2019-02-28 09:50:18 +01:00
Andrew Nicols
07203d34f1 weekly release 3.7dev 2019-02-22 10:51:13 +08:00
Andrew Nicols
c60b2b5a9f Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-02-22 10:51:09 +08:00
Adrian Greeve
de1f00fdbe Merge branch 'wip-MDL-64729-master' of https://github.com/Beedell/moodle 2019-02-21 12:20:48 +01:00
Adrian Greeve
df4a17c7ed Merge branch 'MDL-64093_master' of git://github.com/markn86/moodle 2019-02-21 09:46:54 +01:00
Andrew Nicols
d4495e8188 Merge branch 'MDL-64823_master' of https://github.com/marxjohnson/moodle 2019-02-21 10:32:29 +08:00
Andrew Nicols
414fa82e50 Merge branch 'MDL-64571-master' of git://github.com/cescobedo/moodle 2019-02-21 08:10:54 +08:00
Adrian Greeve
ff30f3f042 Merge branch 'MDL-64856_m37v1' of git://github.com/sbourget/moodle 2019-02-20 18:01:53 +01:00
Eloy Lafuente (stronk7)
cb8fc12489 Merge branch 'MDL-64749' of https://github.com/mkassaei/moodle 2019-02-20 17:01:56 +01:00
Adrian Greeve
064f3345f8 Merge branch 'MDL-64200-master' of git://github.com/damyon/moodle 2019-02-20 15:57:55 +01:00
M Kassaei
3e697596b4 MDL-64749 Question gapselect: Replace 'Choose...' with blank 2019-02-20 11:06:51 +00:00
Adrian Greeve
cafaa2d58f Merge branch 'MDL-64450-master' of git://github.com/peterRd/moodle 2019-02-20 11:35:14 +01:00
Eloy Lafuente (stronk7)
aff8ad46f2 Merge branch 'm37_MDL-64443_Ignore_More_Swap_File_Types' of https://github.com/scara/moodle 2019-02-20 10:21:46 +01:00
David Monllaó
84ca3ccce4 MDL-64500 tool_analytics: noanalysables negation better than analysables 2019-02-20 10:09:26 +01:00
Andrew Nicols
0f5b2a1782 Merge branch 'MDL-64570-master-fix1' of git://github.com/damyon/moodle 2019-02-20 10:52:22 +08:00
Damyon Wiese
145a10f7a9 MDL-64570 user: input field purpose 
Do not autocomplete the user fields when editing another user.
 2019-02-20 09:42:26 +08:00
Eloy Lafuente (stronk7)
4776098fe4 Merge branch 'MDL-64679_master' of git://github.com/dmonllao/moodle 2019-02-20 00:06:50 +01:00
Eloy Lafuente (stronk7)
31dc8b8320 Merge branch 'MDL-63134-master' of git://github.com/rezaies/moodle 2019-02-19 23:57:10 +01:00
Eloy Lafuente (stronk7)
ffd3185c63 Merge branch 'MDL-64806-master' of git://github.com/damyon/moodle 2019-02-19 23:34:38 +01:00
Eloy Lafuente (stronk7)
84dd2193c1 Merge branch 'MDL-64242' of git://github.com/timhunt/moodle 2019-02-19 23:22:52 +01:00
Eloy Lafuente (stronk7)
c8469a9757 Merge branch 'MDL-63938-master' of https://github.com/HuongNV13/moodle 2019-02-19 19:07:14 +01:00
Eloy Lafuente (stronk7)
bfaebeb754 Merge branch 'MDL-64791-master' of git://github.com/jleyva/moodle 2019-02-19 17:42:21 +01:00
Eloy Lafuente (stronk7)
88edfc77c1 Merge branch 'MDL-62008-master' of git://github.com/damyon/moodle 2019-02-19 17:23:41 +01:00
Eloy Lafuente (stronk7)
50564f27ca Merge branch 'MDL-64500_master' of git://github.com/dmonllao/moodle 2019-02-19 17:10:38 +01:00
Adrian Greeve
2fb695f8df Merge branch 'MDL-60459_master' of git://github.com/markn86/moodle 2019-02-19 11:48:14 +01:00
Huong Nguyen
1f00fdb0d2 MDL-63938 Enrolments: course_enrolment_manager method improvement 
course_enrolment_manager method should not always do a count_records and a get_records
 2019-02-19 13:57:48 +07:00
David Monllaó
7677a86cc0 Merge branch 'MDL-64570-master' of git://github.com/damyon/moodle 2019-02-19 06:45:21 +01:00
David Monllaó
4f3f8fba67 Merge branch 'MDL-45151-master' of git://github.com/damyon/moodle 2019-02-19 06:39:24 +01:00
Damyon Wiese
3d97770365 MDL-64570 user: coding style 
Fix cibot warnings on line length.
 2019-02-19 09:44:20 +08:00
Damyon Wiese
2159983aff MDL-64570 accessibility: autocomplete user profile fields 
Only if editing your own user details and not logged in as someone else.
 2019-02-19 09:44:15 +08:00
Eloy Lafuente (stronk7)
53bc11dd78 Merge branch 'MDL-53346-master' of git://github.com/damyon/moodle 2019-02-19 00:23:21 +01:00
Eloy Lafuente (stronk7)
b7b914fbdc Merge branch 'MDL-64314-master-upgrade-fix' of git://github.com/abgreeve/moodle 2019-02-18 16:49:50 +01:00
Adrian Greeve
6d6a83e91d MDL-64314 messaging: Quick fix for empty insights configuration. 2019-02-18 16:30:19 +01:00
Adrian Greeve
33f070f1f6 Merge branch 'MDL-64452-master-cachesession' of git://github.com/mudrd8mz/moodle 2019-02-18 15:51:30 +01:00
Adrian Greeve
45dc542a40 Merge branch 'MDL-64314_master' of git://github.com/dmonllao/moodle 2019-02-18 14:50:59 +01:00
David Monllaó
0a828b592d Merge branch 'MDL-64587-master' of https://github.com/junpataleta/moodle 2019-02-18 10:25:35 +01:00
Adrian Greeve
ceea116626 Merge branch 'MDL-55211-master' of git://github.com/damyon/moodle 2019-02-18 09:34:43 +01:00
Jun Pataleta
b0e8a833f9 MDL-64587 tool_xmldb: Change Continue to Back link for consistency 
* For consistency with the rest of navigation links in the tool, change
the Continue button to a Back link.
 2019-02-18 16:09:50 +08:00
Michael Aherne
495b4b412d MDL-64587 xmldb: XMLDB option to add mandatory persistent fields. 2019-02-18 15:38:23 +08:00
Jun Pataleta
2baf5722ab Merge branch 'MDL-62142-master' of git://github.com/damyon/moodle 2019-02-18 14:28:09 +08:00
Damyon Wiese
9df03b1940 MDL-62142 navigation: accessibility 
Set unique meaningful labels on all nav components rendered in the "boost" theme.
 2019-02-18 14:09:48 +08:00
Andrew Nicols
8b7c3b97d0 Merge branch 'MDL-62728-locale_5' of https://github.com/DSI-Universite-Rennes2/moodle 2019-02-18 12:27:40 +08:00
Andrew Nicols
3127feeb74 Merge branch 'MDL-61575-master' of git://github.com/cescobedo/moodle 2019-02-18 08:34:46 +08:00
Matteo Scaramuccia
8812534837 MDL-64443 git: Excluded vim swap files 
Vim swap filenames are deterministic someway.
Refs:
- http://vimdoc.sourceforge.net/htmldoc/recover.html#swap-file
- 4efe73b478/src/memline.c (L4683)
- https://unix.stackexchange.com/a/326737
- https://github.com/github/gitignore/blob/master/Global/Vim.gitignore
 2019-02-16 22:20:05 +01:00
AMOS bot
a531837689 Automatically generated installer lang files 2019-02-16 00:13:20 +00:00
John Beedell
af00998f74 MDL-64729 mod_glossary: glossary_get_entries_search case sensitivity 2019-02-15 16:53:20 +00:00
Julien Boulen
1a549472fa MDL-62728 lang: display a warning when missing some locales on server 2019-02-15 09:53:00 +01:00
David Mudrák
ea43f6c1c8 MDL-64452 cache: Add tests for key prefix based on session id 
Unfortunately, we can't simply use session_id() to regenerate the
session id in unit tests. Starting from PHP 7.2, it would trigger
"session_id(): Cannot change session id when headers already sent",
refer to MDL-60978 and PHP bug  for more details.

As a workaround, we use a static property allowing us to inject the
value that we then use as a session identifier. This is reasonably
enough to make sure that the identifier is used as a part of the key
prefix.
 2019-02-15 09:36:43 +01:00
David Mudrák
0ea0dfde6d MDL-64452 cache: Always use the current session id in the key prefix 
The current logic in the cache_session::check_tracked_user() is not
right. We must always set the current session id. A typical use case is
when the cache instance is instantiated for a not logged in user. We
can't let the sessionid property null in that case as it forms an
important part of the parsed key.

Similarly, even if we have the same user currently loaded, we must still
set the sessionid to make sure the data will be associated with the
current PHP session. Same user (including visitors or guest users) can
access the site from different browsers and each must end up with its
own key prefix.
 2019-02-15 09:36:43 +01:00
Jun Pataleta
53d1a16828 Merge branch 'MDL-63944-master' of https://github.com/lethevinh/moodle 2019-02-15 16:27:02 +08:00