mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-06 00:42:44 +02:00
Code Issues Projects Releases Wiki Activity
97,705 Commits 36 Branches 529 Tags
Commit Graph

97705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Nicols
1a3a864a4a Merge branch 'MDL-68270-master' of git://github.com/bmbrands/moodle 2020-05-26 08:02:50 +08:00
Victor Deniz Falcon
a735d4d1d4 Merge branch 'MDL-68252' of https://github.com/timhunt/moodle 2020-05-26 00:55:02 +01:00
Adrian Greeve
ef17275726 Merge branch 'MDL-68348-master-6' of git://github.com/mickhawkins/moodle 2020-05-26 07:48:53 +08:00
Sara Arjona
a706f7161f Merge branch 'MDL-67386-master-fix' of github.com:sarjona/moodle 2020-05-25 17:58:39 +02:00
Sara Arjona
36e2a9af84 MDL-67386 theme_boost: update latest CSS changes 2020-05-25 17:57:34 +02:00
Sara Arjona
028d43b37d Merge branch 'MDL-67386-master' of git://github.com/bmbrands/moodle 2020-05-25 17:46:41 +02:00
Sara Arjona
16b55f1cad Merge branch 'MDL-68177-master_course_renderer_split_methods' of https://github.com/roland04/moodle 2020-05-25 17:11:03 +02:00
Mikel Martín
ebd08abce8 MDL-68177 course: split course_info_box into different methods 2020-05-25 16:14:37 +02:00
Bas Brands
f0947b944c MDL-68270 core_output: prevent blurring of navbar logo 2020-05-25 15:48:52 +02:00
Bas Brands
6a4ce7b0a3 MDL-67386 theme_boost: upgrade bootstrap to version 4.5.0 2020-05-25 15:48:17 +02:00
Sara Arjona
1b88f7567a Merge branch 'MDL-68819-master' of git://github.com/lucaboesch/moodle 2020-05-25 15:47:44 +02:00
Andrew Nicols
b5b9166831 Merge branch 'MDL-68103-master' of git://github.com/bmbrands/moodle 2020-05-25 19:55:11 +08:00
Bas Brands
9d2d2c2beb MDL-68103 theme_classic: show content full width when printing 2020-05-25 13:48:42 +02:00
Andrew Nicols
35f5bf4abc Merge branch 'MDL-68549' of https://github.com/HuongNV13/moodle 2020-05-25 19:10:21 +08:00
Michael Hawkins
d26b3ad524 MDL-68348 user: Added filterset joins unit testing 2020-05-25 18:35:08 +08:00
Michael Hawkins
4fa636330f MDL-68348 user: Added other logical operators to filter unit tests 2020-05-25 18:35:08 +08:00
Michael Hawkins
6a54e58a8c MDL-68348 user: User filter match types support - enrol method & status 
Completed support for all join types (any/all/none) for enrolment
method and status filtering. This includes handling forced status
filtering where a user does not have the capability to view suspended
users, as well as handling front page (whole site) participants page.
 2020-05-25 18:35:08 +08:00
Michael Hawkins
03397c817b MDL-68348 lib: User filter match types support - groups 
Updated groups_get_members_join to support different filter match types
 2020-05-25 18:35:08 +08:00
Michael Hawkins
25d9dabdcf MDL-68348 user: User filter match types support - keywords/last access 
The last access implementation also fixes an existing bug,
where it was assumed never accessed would be 0, when it also needed to
handle null to return correct results. Related userlib unit tests also
updated to reflect this, as well as some incorrect comment wording.
 2020-05-25 18:35:08 +08:00
Michael Hawkins
4157e2d4f3 MDL-68348 lib: Added create_user_course_lastaccess generator 
This creates a last access record for a user within a course.
It is requires for testing accesssince participants filtering.
 2020-05-25 18:10:53 +08:00
Michael Hawkins
25d5be444f MDL-68348 user: User filter match types support - filterset and roles 2020-05-25 18:10:53 +08:00
Michael Hawkins
3f069a2c48 MDL-68348 lib: Default filters to match ALL for backwards compatibility 
Temporarily defaulting filtersets and their filters to join type ALL
for backwards compatibility, so the existing participants unified
filter continues to function consistently. This will be reverted once
the new participants filter UI replaces the existing unified filter.
 2020-05-25 18:10:53 +08:00
Sara Arjona
71dbe42c64 Merge branch 'MDL-68248-master' of https://github.com/DinhHien0307/moodle 2020-05-25 11:59:24 +02:00
Nick Phillips
7a2baafc96 MDL-68103 theme_classic: hidden-print => d-print-none for BS4. 2020-05-25 11:40:14 +02:00
Sara Arjona
9073ed9355 Merge branch 'MDL-68448-master-fix' of github.com:sarjona/moodle 2020-05-25 11:37:41 +02:00
Sara Arjona
0a7c9b9d63 MDL-68448 h5pactivity: remove illegal whitespaces 2020-05-25 11:35:15 +02:00
Sara Arjona
51b3feb2e9 Merge branch 'MDL-68448-master' of git://github.com/cescobedo/moodle 2020-05-25 10:56:18 +02:00
Adrian Greeve
e1f4258906 Merge branch 'MDL-68629_master' of https://github.com/t-schroeder/moodle 2020-05-25 16:14:54 +08:00
Jake Dallimore
33294da864 Merge branch 'MDL-62853' of https://github.com/paulholden/moodle 2020-05-25 16:11:55 +08:00
Andrew Nicols
d3503c76b4 Merge branch 'MDL-68658' of https://github.com/stronk7/moodle 2020-05-25 15:23:37 +08:00
cescobedo
9fa0e253ae MDL-68448 mod_h5pactivity: Add new ws get_h5pactivities_by_courses 
This WS is required by the Moodle app in order to fetch
the activity information for displaying it to app users.
 2020-05-25 09:12:20 +02:00
cescobedo
14b463c92a MDL-68448 core_h5p: Add get export information to helper 
Create a new method in the helper to use in the player,
in the external WS and in the API. Also, add a
new method in API to help to get export information
by other WS.
 2020-05-25 09:12:06 +02:00
Adrian Greeve
d602189874 Merge branch 'MDL-63812' of https://github.com/timhunt/moodle 2020-05-25 14:40:14 +08:00
Jake Dallimore
4404ced7f7 Merge branch 'MDL-68567-master' of git://github.com/sarjona/moodle 2020-05-25 11:36:48 +08:00
Luca Bösch
937c7e5f0c MDL-68819 core_contentbank: "Upload" button is not localized. 2020-05-24 21:52:43 +02:00
Sara Arjona
968016a38d Merge branch 'MDL-68592-master' of https://github.com/kabalin/moodle 2020-05-22 17:55:23 +02:00
Sara Arjona
4955d9279f Merge branch 'MDL-68619-master' of git://github.com/ferranrecio/moodle 2020-05-22 17:49:32 +02:00
Eloy Lafuente (stronk7)
200570558d MDL-68658 phpunit: Ensure that the configured proxy is applied always 
Previously, if the RSS feed (extests) was being served locally,
CFG->proxybypass was applied and causing the test to fail (proxy
ignored).

In that exact test we need the configured proxy to be applied
always, because the test is exaclty about detecting the problem
when a wrong proxy is used.
 2020-05-22 17:07:05 +02:00
Victor Deniz Falcon
71965a8572 weekly release 3.9dev+ 2020-05-22 14:21:37 +01:00
Victor Deniz Falcon
bbd1b742ef Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2020-05-22 14:21:32 +01:00
Jake Dallimore
0facda5eaa Merge branch 'MDL-68367-master-fix' of git://github.com/junpataleta/moodle 2020-05-22 15:10:04 +08:00
Sara Arjona
a80541ea90 MDL-68567 badges: add/remove site backpacks 2020-05-22 09:01:59 +02:00
Jun Pataleta
20a660f864 MDL-68367 qtype_multichoice: Decrease minimum expected export file size 
* Exporting via Oracle trims trailing zeroes in floating numbers which
results to a smaller file size for the exported file. Better to reduce
the minimum expected export file size from 4000 bytes to 3900 bytes.
 2020-05-22 14:45:05 +08:00
Andrew Nicols
cc29e04f27 Merge branch '68137-master-prevent-removing-all-dots-in-filename' of https://github.com/DSI-Universite-Rennes2/moodle 2020-05-22 11:53:22 +08:00
Jake Dallimore
3f99406350 Merge branch 'MDL-68143-master' of https://github.com/HuongNV13/moodle 2020-05-22 11:52:31 +08:00
Jun Pataleta
87decf6e00 Merge branch 'MDL-65796' of https://github.com/paulholden/moodle 2020-05-22 11:50:53 +08:00
Andrew Nicols
4e9641c2d1 Merge branch 'MDL-57240' of https://github.com/timhunt/moodle 2020-05-22 11:37:38 +08:00
Andrew Nicols
a15175eab4 Merge branch 'MDL-68446' of https://github.com/timhunt/moodle 2020-05-22 11:32:01 +08:00
Andrew Nicols
6c0ffdd7ff Merge branch 'MDL-68783-master' of git://github.com/junpataleta/moodle 2020-05-22 11:21:47 +08:00
Andrew Nicols
e1657e3c07 Merge branch 'MDL-68661-rebase' of https://github.com/Chocolate-lightning/moodle 2020-05-22 11:12:46 +08:00