mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
95,079 Commits 36 Branches 523 Tags
Commit Graph

95079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
a31719f91a on-demand release 3.8dev+ 2019-10-08 10:43:51 +02:00
Eloy Lafuente (stronk7)
796db6cbc8 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-10-08 10:43:45 +02:00
AMOS bot
d63e8ee703 Automatically generated installer lang files 2019-10-08 00:09:56 +00:00
Eloy Lafuente (stronk7)
38417fa421 Merge branch 'MDL-66801' of https://github.com/timhunt/moodle 2019-10-08 01:16:46 +02:00
Eloy Lafuente (stronk7)
af59994f4f Merge branch 'MDL-66628_master' of git://github.com/dmonllao/moodle 2019-10-08 00:54:03 +02:00
Eloy Lafuente (stronk7)
10ab0770ab Merge branch 'MDL-66764' of https://github.com/timhunt/moodle 2019-10-07 22:50:57 +02:00
Eloy Lafuente (stronk7)
9c5796a3f0 Merge branch 'MDL-66754' of https://github.com/timhunt/moodle 2019-10-07 22:33:02 +02:00
Eloy Lafuente (stronk7)
c29715f3d7 Merge branch 'MDL-66743' of https://github.com/timhunt/moodle 2019-10-07 22:26:53 +02:00
Eloy Lafuente (stronk7)
ec829c6070 Merge branch 'MDL-66709' of https://github.com/timhunt/moodle 2019-10-07 22:25:12 +02:00
Eloy Lafuente (stronk7)
f3bb36720b Merge branch 'MDL-66749-master' of git://github.com/bmbrands/moodle 2019-10-07 22:03:08 +02:00
Eloy Lafuente (stronk7)
d4f52fc831 Merge branch 'MDL-66750' of https://github.com/timhunt/moodle 2019-10-07 21:55:32 +02:00
Sara Arjona
9ee83d1d98 Merge branch 'MDL-66775-master' of git://github.com/jleyva/moodle 2019-10-07 16:14:43 +02:00
Adrian Greeve
1b70f4c1d5 Merge branch 'master-MDL-66794' of https://github.com/golenkovm/moodle 2019-10-07 14:28:59 +08:00
Adrian Greeve
3ae7d678fa Merge branch 'MDL-65187-master' of git://github.com/marinaglancy/moodle 2019-10-07 11:12:21 +08:00
Eloy Lafuente (stronk7)
6ec1078469 on-demand release 3.8dev+ 2019-10-04 16:02:03 +02:00
Eloy Lafuente (stronk7)
f7b87e1a79 NOBUG: Fixed file access permissions 2019-10-04 16:02:02 +02:00
Eloy Lafuente (stronk7)
2aa5e7e892 NOBUG: Fixed SVG browser compatibility 2019-10-04 16:01:57 +02:00
Ryan Wyllie
f9d76e4905 MDL-66477 core: only render region main settings if no settings block 
We added a change to allow the region main settings menu to be
rendered in the header rather that the top of the body however
this also meant that the settings were shown on themes (e.g. Classic)
that didn't otherwise show the region main settings.

The simplest solution seems to be to not render the region main
settings in the header if the settings block is on the page.
 2019-10-04 11:31:14 +08:00
Jun Pataleta
e5277f0a7f Merge branch 'MDL-65315-master' of git://github.com/peterRd/moodle 2019-10-04 10:25:16 +08:00
Eloy Lafuente (stronk7)
c41f4e56d3 Merge branch 'MDL-66476_master' of git://github.com/dmonllao/moodle 2019-10-04 01:59:14 +02:00
Eloy Lafuente (stronk7)
04c0050dcc Merge branch 'MDL-66397-master-embed' of git://github.com/vmdef/moodle 2019-10-03 23:25:21 +02:00
David Monllaó
f5c65ba37f MDL-66476 mlbackend: Use F1 as the main accuracy metric 2019-10-04 05:20:49 +08:00
David Monllaó
ebec727cd3 MDL-66004 mlbackend_python: Purge testing output dirs properly 2019-10-04 05:19:45 +08:00
Eloy Lafuente (stronk7)
ef7aded996 Merge branch 'MDL-56649-master' of git://github.com/bmbrands/moodle 2019-10-03 19:37:05 +02:00
Eloy Lafuente (stronk7)
40763810d9 Merge branch 'MDL-65327_master' of https://github.com/marxjohnson/moodle 2019-10-03 19:27:49 +02:00
Eloy Lafuente (stronk7)
0036173459 Merge branch 'MDL-66004_master-delete_fix' of git://github.com/dmonllao/moodle 2019-10-03 18:41:36 +02:00
Adrian Greeve
8515fbfbaa Merge branch 'MDL-65919-master' of git://github.com/marinaglancy/moodle 2019-10-03 15:59:03 +08:00
Jun Pataleta
27c648a095 Merge branch 'MDL-61450-master' of git://github.com/lameze/moodle 2019-10-03 15:42:19 +08:00
Jun Pataleta
ec720611d5 MDL-61450 calendar: Unit test for calendar_view_event_allowed() 
* Unit test for calendar_view_event_allowed() when dealing with course
events.
 2019-10-03 15:38:43 +08:00
Juan Leyva
12a289c7a4 MDL-66775 tool_mobile: Return additional app data 
We need this information for creating a link to the app store listing for updating.
 2019-10-03 09:29:38 +02:00
Juan Leyva
4bf08f5b4d MDL-66775 tool_mobile: New force minimum app version setting 2019-10-03 09:29:38 +02:00
Simey Lameze
ec482557a8 MDL-61450 calendar: fix course event type permissions 2019-10-03 13:20:33 +08:00
David Monllaó
63c15f6c58 MDL-66004 mlbackend_python: Purge testing output dirs properly 2019-10-03 09:45:57 +08:00
Eloy Lafuente (stronk7)
aab2b2103e Merge branch 'MDL-66774-master-macedonia' of git://github.com/mudrd8mz/moodle 2019-10-03 00:57:21 +02:00
Eloy Lafuente (stronk7)
846521d817 Merge branch 'MDL-63453-38_media_videojs_upgrade' of https://github.com/mattporritt/moodle 2019-10-03 00:48:56 +02:00
Eloy Lafuente (stronk7)
5260feb506 Merge branch 'MDL-66197-master' of git://github.com/marinaglancy/moodle 2019-10-03 00:45:31 +02:00
Eloy Lafuente (stronk7)
20502fa30c Merge branch 'MDL-66004_master' of git://github.com/dmonllao/moodle 2019-10-02 20:53:24 +02:00
Eloy Lafuente (stronk7)
35da660ab0 Merge branch 'MDL-66254_master' of git://github.com/dmonllao/moodle 2019-10-02 17:00:39 +02:00
Eloy Lafuente (stronk7)
d25ece5ed9 Merge branch 'MDL-65957-master' of git://github.com/mihailges/moodle 2019-10-02 16:49:30 +02:00
Eloy Lafuente (stronk7)
637707bcb0 Merge branch 'MDL-64588-master-2' of git://github.com/snake/moodle 2019-10-02 16:39:44 +02:00
Jun Pataleta
31b4ff1db3 Merge branch 'MDL-62191_master' of git://github.com/dmonllao/moodle 2019-10-02 16:35:50 +08:00
Adrian Greeve
8fec1626d0 Merge branch 'MDL-66477-master' of git://github.com/junpataleta/moodle 2019-10-02 16:15:13 +08:00
Jun Pataleta
83e1b0e7f1 MDL-66477 mod_forum: Enclose setting switch in div 2019-10-02 16:12:44 +08:00
Jake Dallimore
0c3eaf9ee6 MDL-64588 core_comment: fix unnecessary type check in add_comments 
We should rely on the return type, else an exception with be thrown.
 2019-10-02 09:23:43 +08:00
Jake Dallimore
93ea6612bd MDL-64588 core_comment: make external test code use helper method 
Instead of using setUp to create testing objects, use a helper.
 2019-10-02 09:23:43 +08:00
Jake Dallimore
ae94d477a6 MDL-64588 core_comment: fix get_comment ordering when timestamps match 
Include id in the sorting, to be sure that we always get the correct
record in cases where the comment timestamps are the same.
 2019-10-02 09:23:43 +08:00
Jake Dallimore
6cd3d398a9 MDL-64588 core_comment: use comment structure in external get_comments 
Other minor changes include:
- added the since tag to newly added external functions
- Changed 'web service' to 'external function' in comment/upgrade.txt
 2019-10-02 09:23:33 +08:00
David Monllaó
463b63db2a MDL-66004 analytics: mlbackend_python tested just once 
Either running locally from the web server or using a server if
TEST_MLBACKEND_* vars are set. The tests will still be skipped if
the python backend is not available in the web server.
 2019-10-02 08:41:14 +08:00
David Monllaó
fea66a0854 MDL-66004 mlbackend_python: Bump the required python package version 2019-10-02 08:41:14 +08:00
David Monllaó
aa5b705607 MDL-66004 mlbackend_python: Package installed on a separate server 2019-10-02 08:41:14 +08:00