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

22165 Commits

Author SHA1 Message Date
Claude Vervoort
80207a2ee1 MDL-57756 mod_lti: params change to text type 2020-10-01 17:37:29 -04:00
Sara Arjona
b1a2dd1681 Merge branch 'MDL-69695' of https://github.com/paulholden/moodle into master 2020-09-28 13:03:14 +02:00
Jun Pataleta
1d7781be53 Merge branch 'MDL-66587-master' of git://github.com/bmbrands/moodle 2020-09-24 11:11:20 +08:00
Eloy Lafuente (stronk7)
c43dac4e36 Merge branch 'MDL-69454-master' of git://github.com/bmbrands/moodle into master 2020-09-23 17:10:35 +02:00
Bas Brands
4c71e1d0d0 MDL-69454 core_search: consistent mod searches 2020-09-21 11:54:51 +02:00
Claude Vervoort
5b8c646e68 MDL-66934 mod_lti: support context history param 2020-09-18 14:11:34 -04:00
Eloy Lafuente (stronk7)
5e124b9040 Merge branch 'MDL-69664-master' of git://github.com/junpataleta/moodle into master 2020-09-17 08:43:51 +02:00
Bas Brands
d910726704 MDL-66587 mod_quiz: visible quiz timer 2020-09-16 15:21:27 +02:00
Eloy Lafuente (stronk7)
1ab5d74983 Merge branch 'MDL-69658' of https://github.com/paulholden/moodle into master 2020-09-14 22:56:11 +02:00
Paul Holden
2aa48515db MDL-69695 mod_folder: use forcedownload setting during inline display. 2020-09-14 21:38:35 +01:00
Jun Pataleta
46d4cf0c98 MDL-69664 mod_lti: Apply correct badge class to tool card 2020-09-09 23:34:04 +08:00
Sara Arjona
14bb6b5103 Merge branch 'MDL-69645-master' of git://github.com/lucaboesch/moodle into master 2020-09-09 11:00:40 +02:00
Sara Arjona
7c99f40d61 Merge branch 'MDL-69521' of https://github.com/stronk7/moodle into master 2020-09-09 08:08:06 +02:00
Paul Holden
416dd35832 MDL-69658 quizaccess_seb: progress bar on install only when necessary. 2020-09-08 19:31:36 +01:00
Eloy Lafuente (stronk7)
432b9a9075 MDL-69521 core: Move all comments in code from 4.3 to 4.1 2020-09-08 18:59:46 +02:00
Eloy Lafuente (stronk7)
74ee34fd87 MDL-69521 core: Move all comments in code from 4.1 to 3.11 2020-09-08 18:59:30 +02:00
Sara Arjona
683539696a Merge branch 'MDL-28501-master' of https://github.com/mackensen/moodle into master 2020-09-08 13:27:55 +02:00
Mihail Geshoski
630078eb4a MDL-69048 book: Sanitize previous chapter value in add new chapter page 2020-09-08 08:54:26 +02:00
Eloy Lafuente (stronk7)
5ce5c38a51 Merge branch 'MDL-69577-master' of git://github.com/crazyserver/moodle into master 2020-09-07 22:58:39 +02:00
Luca Bösch
5423b68b08 MDL-69645 quizaccess: Set allowPreferencesWindow to false in manual conf 
Signed-off-by: Luca Bösch <luca.boesch@bfh.ch>
 2020-09-07 21:26:23 +02:00
Charles Fulton
a0908df796 MDL-28501 mod_folder: make force downloading behavior configuable 2020-09-07 14:37:33 -04:00
Andrew Nicols
0d1e8aa711 Merge branch 'MDL-55340-master' of git://github.com/sarjona/moodle 2020-09-03 10:05:21 +08:00
Eloy Lafuente (stronk7)
d25b7ebd86 Merge branch 'MDL-69174-master' of git://github.com/sarjona/moodle into master 2020-09-02 13:11:33 +02:00
Sara Arjona
40f6a3a1d1 MDL-69174 mod_h5pactivity: component passed always 
The $component = 'mod_h5pactivity' will be passed always to the H5P
player because it's required for being able to call these activities
from outside using embed code. The xAPI implementation checks whether
the information should be tracked or not.
 2020-09-02 12:09:30 +02:00
Andrew Nicols
7f31497fb4 Merge branch 'MDL-68892-master' of git://github.com/ferranrecio/moodle 2020-09-02 09:44:26 +08:00
Pau Ferrer Ocaña
150913d3e1 MDL-69577 forum: Add courseid, forumid on get_discussion_posts response 2020-09-01 14:25:10 +02:00
Ferran Recio
bcea21d894 MDL-68892 mod_h5pactivity: add required to package 2020-08-28 17:44:38 +02:00
Marina Glancy
5889858cc5 MDL-55340 mod_feedback: export question labels 
This was present in export in 3.0 but got lost during export
refactoring in 3.1
 2020-08-28 12:24:28 +02:00
Andrew Nicols
3d7fd2f42f Merge branch 'MDL-69112-master' of git://github.com/merrill-oakland/moodle 2020-08-28 13:25:27 +08:00
Andrew Nicols
4ac58f8810 Merge branch 'MDL-69501-master-enfix' of git://github.com/mudrd8mz/moodle 2020-08-27 11:30:32 +08:00
Justin Hunt
107a0c9874 MDL-66810 mod_lti: Reinstate deprecated default permissions on iframe 
microphone, webcam, camera, midi, encrypted-media, geolocation
 2020-08-27 09:43:26 +08:00
Helen Foster
383d080b17 MDL-69501 lang: Import fixed English strings (en_fix) 2020-08-24 09:35:41 +02:00
Andrew Nicols
b0a28f3bbb MDL-66818 mod_forum: Use cap manager to check exportability 2020-08-21 11:33:30 +08:00
Andrew Nicols
70deb22747 MDL-42434 chat: Disable stylelint important check 2020-08-21 11:25:26 +08:00
Sara Arjona
a42143da3d MDL-42434 mod_chat: styles for chat themes to view help-icon properly 
The styles for the bubble and the compact themes have been reviewed
because there weren't enough contrast for the help icon.
 2020-08-20 23:45:56 +01:00
Sara Arjona
69846652f1 MDL-42434 mod_chat: display the whole help text 
When testing this issue was raised that the help text was cut-off.
This patch should fix this issue changing the placement from
right/left to top.
 2020-08-20 23:45:56 +01:00
Andrew Nicols
56e89da101 Merge branch 'MDL-69375' of https://github.com/Cvmcosta/moodle 2020-08-20 11:50:28 +08:00
Adrian Greeve
84d2d98c63 Merge branch 'MDL-68964-master' of git://github.com/ferranrecio/moodle 2020-08-20 11:37:32 +08:00
Adrian Greeve
528c73e050 Merge branch 'MDL-42434-master' of git://github.com/sarjona/moodle 2020-08-20 11:21:53 +08:00
Andrew Nicols
5c617d81e6 Merge branch 'MDL-66818-master' of git://github.com/lameze/moodle 2020-08-20 08:16:07 +08:00
Simey Lameze
7235771927 MDL-66818 mod_forum: remove unnecessary behat steps 2020-08-20 08:03:53 +08:00
gthomas2
4224b8e541 MDL-66818 mod_forum: hide portfolio export button based on caps 2020-08-20 07:46:09 +08:00
Andrew Nicols
575e4d3efd Merge branch 'MDL-69401-master' of git://github.com/mihailges/moodle 2020-08-20 07:00:55 +08:00
Victor Deniz Falcon
ffbf74eeb3 Merge branch 'MDL-69297-master' of git://github.com/peterRd/moodle 2020-08-19 23:28:34 +01:00
Adrian Greeve
fe7ef8a59d Merge branch 'MDL-66665-master-POC2' of git://github.com/peterRd/moodle 2020-08-19 14:26:50 +08:00
Peter Dias
0c6b705719 MDL-66665 assign: Check whether a modified user could actually grade 2020-08-19 13:39:18 +08:00
Peter Dias
6de93d2f29 MDL-69297 assign: Check whether there is content for a submission 
Confirm there is some content to be submitted for an assignment when processing it.
 2020-08-19 12:07:52 +08:00
Andrew Nicols
f24aae4cad Merge branch 'MDL-67735-master' of git://github.com/bmbrands/moodle 2020-08-19 08:28:49 +08:00
Eloy Lafuente (stronk7)
44c8fe38c7 Merge branch 'MDL-63375-master' of https://github.com/syxton/moodle into master 2020-08-19 00:13:02 +02:00
Eloy Lafuente (stronk7)
fbb0767536 MDL-69475 versions: bump all versions and requires in master 
version = 2021052500 release version
requires= 2021052500 same than version

Why 20210525? (25th May 2021) ?

Because master is going to be Moodle 4.0, to be released
on November 2021. And, until then, we are going to have
a couple of "intermediate" releases:

- Moodle 3.10 to be released 9th November 2020. (2020110900)

  This version will be using versions from today to 2020110900
  (once it's released the YYYYMMDD part stops advancing).

- Moodle 3.11 to be released 10th May 2021. (2021051000)

  This version will be using versions from 3.10 release to 2021051000
  (once it's released the YYYYMMDD part stops advancing).

That means that all versions from today to 2021051000 are going
to be used by those 2 "intermediate" releases (3.10 and 3.11).

And we cannot use them in master, because it's forbidden to have
any overlapping of versions between branches (or different upgrade
paths will fail).

So, get that 2021051000, let's add it a couple of weeks to cover
the on-sync period (or a 2 weeks delay max!) and, the first version
that master can "own" in exclusive (without any overlap) is, exactly,
25th May 2021, hence our 20210525.
 2020-08-18 00:47:15 +02:00