summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix OC_Image new resize functionsRoeland Jago Douma2020-05-021-0/+9
| | | | | | | Else the wrong mimetype might be set. Resulting in continious regeneration of previews when browsing. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #20767 from nextcloud/enh/argon2id-optionsRoeland Jago Douma2020-05-011-1/+1
|\ | | | | Apply Argon2 options for Argon2id hashing as well
| * Apply Argon2 options for Argon2id hashing as wellMichaIng2020-05-011-1/+1
| | | | | | Signed-off-by: MichaIng <micha@dietpi.com>
* | Update education bundleRoeland Jago Douma2020-05-011-2/+0
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #20380 from nextcloud/design/notification-mailsRoeland Jago Douma2020-05-011-55/+49
|\ | | | | Fix design and layout of notification mails
| * Fix notification mail testsJan-Christoph Borchardt2020-05-011-1/+2
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Notification mails: Fix some alignment details and remove shadowJan-Christoph Borchardt2020-04-301-4/+4
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Notification mails: Change font to native font stackJan-Christoph Borchardt2020-04-301-42/+42
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Notification mails: Logo bar/box to circle so it stands nicely on its ownJan-Christoph Borchardt2020-04-301-6/+6
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Notification mails: Adjust vertical spacingJan-Christoph Borchardt2020-04-301-8/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Fix notification mails height issue in Nextcloud MailJan-Christoph Borchardt2020-04-301-1/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2020-05-012-0/+4
| |
* | Fix getDirectoryContent implementation for Jail wrapperRobin Appelman2020-04-302-3/+3
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #20710 from nextcloud/fix/argon2-options-checksRoeland Jago Douma2020-04-301-10/+5
|\ \ | | | | | | Fix Argon2 options checks
| * | Fix Argon2 options checksMichaIng2020-04-301-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The minimum for memory cost is 8 KiB per thread. Threads must be checked and set first to allow checking against the correct memory cost mimimum. Options are now applied the following way: - If config.php contains the setting with an integer higher or equal to the minimum, it is applied. - If config.php contains the setting with an integer lower than the minimum, the minimum is applied. - If config.php does not contain the setting or with no integer value, the PHP default is applied. Signed-off-by: MichaIng <micha@dietpi.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20742 from nextcloud/fix/csRoeland Jago Douma2020-04-301-6/+0
|\ \ \ | | | | | | | | Run the cs fixer for green ci
| * | | Run the cs fixer for green ciRoeland Jago Douma2020-04-301-6/+0
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20677 from ↵Joas Schilling2020-04-301-11/+25
|\ \ \ | |/ / |/| | | | | | | | nextcloud/followup/17718/scaling-user-provisioning Scaling user provisioning for subadmins with many groups
| * | Don't loop over all groups to check for subadminsJoas Schilling2020-04-271-11/+24
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Patch to optimize for large installations (>5000 users >20000 groups) where ↵Mikael Hammarin2020-04-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subadmins have access to many of groups (>250) - UsersController:editUser() calls isUserAccessible() even if the user is admin This fix reduces API calls to editUser (ex change locale/display name) from >2 minutes (!) to ~3 seconds per call in average. Signed-off-by: Mikael Hammarin <mikael@try2.se>
* | | Merge pull request #19039 from nextcloud/dav-activity-provide-links-to-calendarRoeland Jago Douma2020-04-301-0/+6
|\ \ \ | |_|/ |/| | Provide links to calendar in event creation/update activities
| * | Provide links to calendar in event creation/update activitiesThomas Citharel2020-04-261-0/+6
| |/ | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #18883 from adrb/optimize_swift_14116Roeland Jago Douma2020-04-302-18/+48
|\ \ | | | | | | Optimize Openstack Swift files download
| * | It's a fix for issue #14116,Adrian Brzezinski2020-04-272-18/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves efficiency when downloading files from Swift storage. Before, files were downloaded and then pushed back to user. That behaevior causes all kinds of performance problems. Now, files are streamed directly to user. Signed-off-by: Adrian Brzezinski <adrian.brzezinski@eo.pl>
* | | Merge pull request #20717 from nextcloud/fix/getconfig-param-definitionsRoeland Jago Douma2020-04-301-3/+3
|\ \ \ | | | | | | | | Define getSystemValueBool/Int/String function default parameter with correct type
| * | | Define getSystemValueBool/Int/String function default parameter with correct ↵MichaIng2020-04-291-3/+3
| |/ / | | | | | | | | | | | | type Signed-off-by: MichaIng <micha@dietpi.com>
* | | [tx-robot] updated from transifexNextcloud bot2020-04-304-0/+14
| | |
* | | Update license headers for 19Christoph Wurst2020-04-29299-52/+314
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #20650 from tekhnee/patch-1Morris Jobke2020-04-271-1/+1
|\ \ | | | | | | Adhere to EMailTemplate interface in constructor call.
| * | Adhere to EMailTemplate interface in constructor call.Tekhnee2020-04-251-1/+1
| |/ | | | | | | | | Email creation appears to have been refactored lately but it looks like custom template-based emails were left out. Signed-off-by: Tekhnee <info@tekhnee.org>
* | Merge pull request #19929 from nextcloud/bugfix/user-delete-avatarMorris Jobke2020-04-272-0/+21
|\ \ | | | | | | Delete avatar if a user is deleted
| * | Delete avatar if a user is deletedJulius Härtl2020-04-242-0/+21
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #19793 from nextcloud/bugfix/noid/link-to-federated-reshareMorris Jobke2020-04-271-5/+0
|\ \ \ | |_|/ |/| | Fix resharing of federated shares that were created out of links
| * | Link shares have reshare permission if outgoing federated shares are enabledJulius Härtl2020-04-211-5/+0
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2020-04-252-2/+2
| | |
* | | Allow specifying a default expiration dateRoeland Jago Douma2020-04-241-2/+12
| | | | | | | | | | | | | | | | | | This overrides the max expiration date. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20627 from ↵Morris Jobke2020-04-245-195/+0
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/cleanup/noid/remove-obsolete-repair-steps Remove obsolete repair steps for logo and updater channel
| * | | Remove obsolete repair steps for logo and updater channelMorris Jobke2020-04-245-195/+0
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #20298 from nextcloud/enh/noid/auto-logoutblizzz2020-04-243-26/+43
|\ \ \ \ | |_|_|/ |/| | | Allow to configure auto logout after browser inactivity
| * | | Do not create remember me cookieJulius Härtl2020-04-231-2/+6
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Provide config though initial state serviceJulius Härtl2020-04-232-24/+37
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2020-04-242-2/+2
| | | |
* | | | Merge pull request #18816 from nextcloud/bugfix/noid/paginate-contacts-searchblizzz2020-04-235-4/+8
|\ \ \ \ | |/ / / |/| | | Use paginated search for contacts
| * | | Use paginated search for contactsJulius Härtl2020-04-235-4/+8
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* / / filter out blacklisted files in getDirectoryContentRobin Appelman2020-04-231-1/+1
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Fix new routing in settings etcRoeland Jago Douma2020-04-221-52/+44
| | | | | | | | | | | | | | | | | | Also prefix resources Unify the prefix handling Handle urls with and without slash Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2020-04-222-2/+2
| |
* | Merge pull request #20114 from ↵Roeland Jago Douma2020-04-213-82/+78
|\ \ | |/ |/| | | | | nextcloud/techdebt/noid/allow-some-apps-to-have-root-urls Allow some apps to have root URLs in their own routing file
| * Extend tests for root urlJoas Schilling2020-04-181-2/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * PHP CS fixesJoas Schilling2020-04-181-3/+2
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>