mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-22 08:30:04 +01:00
Code Issues Projects Releases Wiki Activity
94,393 Commits 36 Branches 527 Tags
Commit Graph

94393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
1ccc9461aa Merge branch 'MDL-66192-master' of git://github.com/andrewnicols/moodle 2019-08-01 00:22:14 +02:00
Eloy Lafuente (stronk7)
d8b3c365ab Merge branch 'MDL-57342' of git://github.com/Chocolate-lightning/moodle 2019-07-31 18:49:21 +02:00
Eloy Lafuente (stronk7)
22c95e393a Merge branch 'MDL-65766-master' of git://github.com/mihailges/moodle 2019-07-31 18:38:39 +02:00
Jun Pataleta
3c84d36f94 Merge branch 'MDL-65831-master' of git://github.com/aanabit/moodle 2019-07-31 10:55:58 +08:00
Sara Arjona
408689d5ae Merge branch 'MDL-57208' of https://github.com/paulholden/moodle 2019-07-31 10:25:04 +08:00
Paul Holden
719f76313c MDL-57208 user: select default homepage from user preferences page. 2019-07-30 08:53:18 +01:00
Sara Arjona
fd59fa7494 Merge branch 'MDL-64860-38_block_myoverview_improve_pagination' of https://github.com/tomdickman/moodle 2019-07-30 14:52:20 +08:00
Sara Arjona
b5b11a1543 Merge branch 'MDL-63458' of https://github.com/rlorenzo/moodle 2019-07-30 11:59:18 +08:00
Adrian Greeve
647c6da2b8 Merge branch 'MDL-66174-master' of git://github.com/peterRd/moodle 2019-07-29 14:38:35 +08:00
Adrian Greeve
6aa6d5b113 Merge branch 'mdl-66119' of https://github.com/Peterburnett/moodle 2019-07-29 14:06:32 +08:00
Jake Dallimore
a12f9f93c4 Merge branch 'MDL-46267-master' of git://github.com/junpataleta/moodle 2019-07-29 11:37:56 +08:00
Adrian Greeve
9f236d63e6 Merge branch 'MDL-65093_master-deprecate' of git://github.com/markn86/moodle 2019-07-29 10:43:52 +08:00
Mark Nelson
386634bab3 MDL-65093 core_message: show 'OK' dialogue 2019-07-29 10:39:57 +08:00
Mark Nelson
66fffdbce5 MDL-65093 core_message: dont show users with cap as blocked 
It is possible that before this patch the user blocked a
teacher from messaging them, even though this would have
no effect. It is also possible for a user to block a user,
then that user gets 'promoted' to a teacher role and the
block becoming ineffective. In these cases we dont show the
user's status as blocked.
 2019-07-29 10:39:57 +08:00
Mark Nelson
90403c5d9d MDL-65093 core_message: users can't block any user they want 
If blocking will have no effect (ie. you are attempting to block
the admin) the 'Block' button will not be shown and instead a
message will be shown explaining why you can not block the user.
 2019-07-29 10:39:57 +08:00
Mark Nelson
06d046c1ff MDL-65093 core_message: deprecate can_post_message() 2019-07-29 10:39:57 +08:00
Adrian Greeve
dcc3f54e24 Merge branch 'MDL-64887-master-3' of git://github.com/bmbrands/moodle 2019-07-29 10:16:01 +08:00
Amaia Anabitarte
c9469fb488 MDL-65831 behat: New steps to switch offline mode for moodle app behats 2019-07-29 09:50:41 +08:00
Mihail Geshoski
3d980e5be7 MDL-65766 libraries: Upgrade WebRTC to 6.4.0 2019-07-29 09:05:01 +08:00
Tom Dickman
c0add7c713 MDL-64860 block_myoverview: added additional pagination options 
Added additional pagination options based on the amount of courses the user is enrolled in.
This will allow the user to display all courses on one page if they wish, and scale based on their total
courses up to pages of 96 courses, now defaults to `All` if they have less than 12 courses and hides the
dropdown menu as there is only one choice.
 2019-07-29 09:12:07 +10:00
Jake Dallimore
d4fc7d756a Merge branch 'MDL-35773_master' of git://github.com/markn86/moodle 2019-07-26 17:32:29 +08:00
Mark Nelson
56e28c3bf1 MDL-35773 core_backup: controller has full responsibility for files 2019-07-26 17:00:40 +08:00
Jake Dallimore
1f16f4115d Merge branch 'MDL-65219-master' of https://github.com/ryanwyllie/moodle 2019-07-26 15:20:10 +08:00
Mark Nelson
9bfdfbb389 MDL-35773 tool_recyclebin: ensure backups always contain files 2019-07-26 11:59:57 +08:00
Mark Nelson
2124100194 MDL-35773 core_backup: ensure we restore with new itemid 2019-07-26 11:59:57 +08:00
Mark Nelson
7c1a42adb4 MDL-35773 core_backup: only include files when necessary 2019-07-26 11:59:56 +08:00
Mark Nelson
420384ae36 MDL-35773 core_backup: removed unnecessary set_samesite_notification() 2019-07-26 11:59:56 +08:00
Mark Nelson
8e83e54815 MDL-35773 core_backup: removed introduction of 'set_mode' 2019-07-26 11:59:56 +08:00
Mark Nelson
94c71056a3 MDL-35773 core_backup: use existing API to recover files 2019-07-26 11:59:56 +08:00
Mark Nelson
88031d35de MDL-35773 core: revert introduction of new recover_file() method 
Also -

1. Reverted recover_file() in file_system_filedir back to its
   original state.
2. Removed no longer needed method create_recovery_record().
 2019-07-26 11:59:56 +08:00
Mark Nelson
8490a4ab7b MDL-35773 core: move 'backup_auto_files' for consistency 2019-07-26 11:59:56 +08:00
Matt Porritt
d7e4481e98 MDL-35773 Backup: API should have option to not backup files 
Allow both UI and automated backups to be created without
including files.  Instead include only file references.
This is essentially implementing "SAMESITE" to backup files
instead of only for import and export functionality.
A new backup setting to include files (defaults to yes)
has been included.

The restore process will also look for and attempt to
restore files from the trashdir as part of restoring
backups.  Additionally to support this process the
ammount of time files are kept in trashdir before they
are cleaned up via cron is also adjustable via admin
setting.
 2019-07-26 11:59:56 +08:00
Jake Dallimore
795baec988 Merge branch 'MDL-65918-master' of git://github.com/junpataleta/moodle 2019-07-26 10:57:01 +08:00
[Peter Burnett]
442eeac33c MDL-66119 core: Add check for uninstalling plugins from the admin gui 2019-07-26 09:27:32 +10:00
Andrew Nicols
9ea892d216 MDL-66192 javascript: Allow subdirs in AMD module names 2019-07-26 07:04:08 +08:00
Bas Brands
9f08292f4f MDL-64887 theme_boost: prevent drop downs from flipping up 2019-07-25 15:24:03 +02:00
Eloy Lafuente (stronk7)
f622ee97e3 weekly release 3.8dev 2019-07-25 13:44:42 +02:00
Jake Dallimore
506fc5178b Merge branch 'MDL-65858_master' of git://github.com/markn86/moodle 2019-07-25 14:51:54 +08:00
Adrian Greeve
852bf8fa58 Merge branch 'MDL-65078-master' of git://github.com/peterRd/moodle 2019-07-25 14:49:40 +08:00
Eloy Lafuente (stronk7)
8b9c0616b3 Merge branch 'MDL-65994-master' of git://github.com/junpataleta/moodle 2019-07-25 14:49:12 +08:00
Eloy Lafuente (stronk7)
857431ed72 Merge branch 'MDL-65946-master' of git://github.com/junpataleta/moodle 2019-07-25 14:41:15 +08:00
Eloy Lafuente (stronk7)
2db07ee59c Merge branch 'MDL-65938-master' of git://github.com/junpataleta/moodle 2019-07-25 14:41:15 +08:00
Adrian Greeve
57d42d0598 Merge branch 'MDL-65633_master' of git://github.com/dmonllao/moodle 2019-07-25 14:41:15 +08:00
Adrian Greeve
700baa8409 Merge branch 'MDL-65740-master' of git://github.com/peterRd/moodle 2019-07-25 14:41:14 +08:00
Adrian Greeve
a35b6a775a Merge branch 'MDL-66021-master' of git://github.com/peterRd/moodle 2019-07-25 14:41:14 +08:00
Damyon Wiese
bde97497ef MDL-65078 competencies: webservices 
The webservice list_course_module_competencies calls a function that does not exist and
is not exposed as a webservice.
 2019-07-24 09:14:28 +08:00
Mathew May
0c18745424 MDL-57342 admin: confightml will check if returned data is empty 2019-07-23 13:35:14 +08:00
Ryan Wyllie
5d61b3b331 MDL-65219 message: default disable contact request notifications for web 
Set the default state to disabled for message contact request
notifications for the web process. The user is notified about contact
requests in the message drawer so it's unnecessary to also generate
a notification in the notification popover for them.
 2019-07-23 13:24:09 +08:00
Ryan Wyllie
6cb33ce774 MDL-65219 message: add message/pendingcontactrequests.php page back 
We previously had this page when contact requests were first introduced
and unfortunately we created a bunch of notifications that reference
this URL directly which now won't work because the page has been removed.

I've added it back but set it to redirect to the message/index.php page
and load the contact requests page there.
 2019-07-23 11:37:55 +08:00
Jun Pataleta
09267294bd MDL-65918 auth_oauth2: Require profile library once 
Thanks to Jason Grimes for the bug report and fix suggestion!
 2019-07-23 10:11:17 +08:00