Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix max length requirements for the throttler metadata | Christoph Wurst | 2018-08-13 | 1 | -1/+1 |
| | | | | | | | | | If a failed login is logged, we save the username as metadata in the bruteforce throttler. To prevent database error due to very long strings, this truncates the username at 64 bytes in the assumption that no real username is longer than that.long strings, Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | Merge pull request #10592 from nextcloud/allow-external-actions-userslist | Roeland Jago Douma | 2018-08-13 | 5 | -8/+39 |
|\ | | | | | Allow external actions to users list | ||||
| * | Allow external actions to users list | John Molakvoæ (skjnldsv) | 2018-08-13 | 5 | -8/+39 |
| | | | | | | | | | | | | + Created fix Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | Merge pull request #10659 from danielkesselberg/feature/noid/remove-xcache | Roeland Jago Douma | 2018-08-13 | 6 | -170/+0 |
|\ \ | |/ |/| | Drop support for xcache | ||||
| * | Update autoloader | Daniel Kesselberg | 2018-08-12 | 2 | -2/+0 |
| | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> | ||||
| * | Drop support for xcache | Daniel Kesselberg | 2018-08-12 | 4 | -168/+0 |
| | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de> | ||||
* | | Merge pull request #10666 from nextcloud/update/crl2 | Roeland Jago Douma | 2018-08-13 | 1 | -10/+10 |
|\ \ | | | | | | | Another CRL bump | ||||
| * | | Another CRL bump | Roeland Jago Douma | 2018-08-13 | 1 | -10/+10 |
|/ / | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Merge pull request #10664 from nextcloud/update/crl | Roeland Jago Douma | 2018-08-13 | 1 | -10/+11 |
|\ \ | | | | | | | Update CRL | ||||
| * | | Update CRL | Roeland Jago Douma | 2018-08-13 | 1 | -10/+11 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-13 | 50 | -38/+234 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-11 | 30 | -0/+52 |
| | | |||||
* | | Merge pull request #10610 from nextcloud/fix/noid/dontcountwithldap | Roeland Jago Douma | 2018-08-10 | 1 | -6/+11 |
|\ \ | |/ |/| | do not trigger counting on LDAP | ||||
| * | do not trigger counting on LDAP | Arthur Schiwon | 2018-08-10 | 1 | -6/+11 |
| | | | | | | | | | | | | it's probably too many, degregading performance Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | Merge pull request #10639 from nextcloud/bugfix/10607/appsettings-fixes | Roeland Jago Douma | 2018-08-10 | 4 | -10/+5 |
|\ \ | | | | | | | Fix apps management sorting and app removal | ||||
| * | | Recompile | Roeland Jago Douma | 2018-08-10 | 1 | -3800/+123 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Bump bundled javascript from settings | Julius Härtl | 2018-08-10 | 2 | -124/+3800 |
| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | Sort apps by a proper hierarchical order (active, update, name) | Julius Härtl | 2018-08-10 | 1 | -7/+3 |
| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | Fix removeing apps in the sidebar | Julius Härtl | 2018-08-10 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | | Merge pull request #10642 from nextcloud/bump/autoloaders | Roeland Jago Douma | 2018-08-10 | 20 | -20/+20 |
|\ \ \ | | | | | | | | | Bump autoloaders | ||||
| * | | | Bump autoloaders | Roeland Jago Douma | 2018-08-10 | 20 | -20/+20 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #10615 from nextcloud/fix-trashbin-actions | Roeland Jago Douma | 2018-08-10 | 1 | -2/+0 |
|\ \ \ \ | |/ / / |/| | | | Fix trashbin file actions | ||||
| * | | | Fix trashbin file actions | Robin Appelman | 2018-08-09 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #10491 Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | Merge pull request #10543 from nextcloud/ignore-deactivated-users | Roeland Jago Douma | 2018-08-10 | 4 | -16/+43 |
|\ \ \ \ | | | | | | | | | | | Do not show deactivated users in sharees and contacts | ||||
| * | | | | Test sync service when user is deactivated | Thomas Citharel | 2018-08-06 | 1 | -5/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I feel like this could probably be handled better :/ Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | | | Ignore deactivated users in collaborators user search plugin | Thomas Citharel | 2018-08-06 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | | | Remove users from system addressbook when user deactivated | Thomas Citharel | 2018-08-06 | 2 | -10/+15 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | | | Merge pull request #10623 from nextcloud/bugfix/10622/mobile-header | Roeland Jago Douma | 2018-08-10 | 1 | -0/+2 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Apply flex-basis to right header | ||||
| * | | | | Apply flex-basis to right header | Julius Härtl | 2018-08-09 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | | | | Merge pull request #10619 from nextcloud/bugfix/4550/redirect-page-update | Roeland Jago Douma | 2018-08-10 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Redirect to the same page after an update | ||||
| * | | | | | Redirect to the same page after an update | Julius Härtl | 2018-08-09 | 1 | -1/+1 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | | | | Merge pull request #10636 from nextcloud/fix/2fa-enforced-backup-codes | blizzz | 2018-08-10 | 2 | -4/+35 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix 2FA being enforced if only backup codes provider is active | ||||
| * | | | | | Remove unused import | Christoph Wurst | 2018-08-10 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | | | Fix 2FA being enforced if only backup codes provider is active | Christoph Wurst | 2018-08-10 | 2 | -4/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/10634. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | | | | Merge pull request #10618 from nextcloud/mimetype-insert-if-not-exists | Roeland Jago Douma | 2018-08-10 | 1 | -14/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | use insertIfNotExists to store new mimetypes. | ||||
| * | | | | | | use insertIfNotExists to store new mimetypes. | Robin Appelman | 2018-08-09 | 1 | -14/+7 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also throw an error if we can't find the mimetype after insert Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | | | | | Merge pull request #10546 from nextcloud/popover-tokens | Christoph Wurst | 2018-08-10 | 3 | -44/+27 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Popovermenu fix and token settings design fixes | ||||
| * | | | | | POpovermenu fix and token settings design fixes | John Molakvoæ (skjnldsv) | 2018-08-06 | 3 | -44/+27 |
| | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | | | | [tx-robot] updated from transifex | Nextcloud bot | 2018-08-10 | 112 | -122/+122 |
| | | | | | |||||
* | | | | | Merge pull request #10614 from nextcloud/bugfix/noid/fix_including_invalid_file | Roeland Jago Douma | 2018-08-09 | 3 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Do not use file as template parameter | ||||
| * | | | | | Do not use file as template parameter | Roeland Jago Douma | 2018-08-09 | 3 | -3/+3 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using file will overwrite the $file parameter in the template base. Leading to trying to include a file that is the exception message. Which will of course fail. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | | Merge pull request #10626 from nextcloud/bugfix/noid/quickaccess-spaces | Roeland Jago Douma | 2018-08-09 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix quickaccess active indicator for folders with spaces | ||||
| * | | | | | Fix quickaccess active indicator for folders with spaces | Julius Härtl | 2018-08-09 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | | | | | Merge pull request #10598 from schoonc/patch-1 | Roeland Jago Douma | 2018-08-09 | 1 | -2/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Removed unused variable isFile | ||||
| * | | | | | Removed unused variable isFile | schoonc | 2018-08-09 | 1 | -2/+0 |
| |/ / / / | |||||
* | | | | | Merge pull request #10611 from nextcloud/fix/2fa-provider-user-dao-duplicate-key | Roeland Jago Douma | 2018-08-09 | 2 | -6/+38 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Fix duplicate key violation in 2FA provider registry DAO | ||||
| * | | | | Fix double-inserts of the same provider state | Christoph Wurst | 2018-08-09 | 2 | -8/+21 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
| * | | | | Add integration/unit test for the double-insert of same values | Christoph Wurst | 2018-08-09 | 1 | -0/+19 |
|/ / / / | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | | Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirect | Roeland Jago Douma | 2018-08-09 | 4 | -6/+36 |
|\ \ \ \ | | | | | | | | | | | Fix login redirection if only one 2FA provider is active | ||||
| * | | | | Rename providerset method to get primary providers | Christoph Wurst | 2018-08-08 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> |