aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix max length requirements for the throttler metadataChristoph Wurst2018-08-131-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-userslistRoeland Jago Douma2018-08-135-8/+39
|\ | | | | Allow external actions to users list
| * Allow external actions to users listJohn Molakvoæ (skjnldsv)2018-08-135-8/+39
| | | | | | | | | | | | + Created fix Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #10659 from danielkesselberg/feature/noid/remove-xcacheRoeland Jago Douma2018-08-136-170/+0
|\ \ | |/ |/| Drop support for xcache
| * Update autoloaderDaniel Kesselberg2018-08-122-2/+0
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * Drop support for xcacheDaniel Kesselberg2018-08-124-168/+0
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #10666 from nextcloud/update/crl2Roeland Jago Douma2018-08-131-10/+10
|\ \ | | | | | | Another CRL bump
| * | Another CRL bumpRoeland Jago Douma2018-08-131-10/+10
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10664 from nextcloud/update/crlRoeland Jago Douma2018-08-131-10/+11
|\ \ | | | | | | Update CRL
| * | Update CRLRoeland Jago Douma2018-08-131-10/+11
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-08-1350-38/+234
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2018-08-1130-0/+52
| |
* | Merge pull request #10610 from nextcloud/fix/noid/dontcountwithldapRoeland Jago Douma2018-08-101-6/+11
|\ \ | |/ |/| do not trigger counting on LDAP
| * do not trigger counting on LDAPArthur Schiwon2018-08-101-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-fixesRoeland Jago Douma2018-08-104-10/+5
|\ \ | | | | | | Fix apps management sorting and app removal
| * | RecompileRoeland Jago Douma2018-08-101-3800/+123
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Bump bundled javascript from settingsJulius Härtl2018-08-102-124/+3800
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Sort apps by a proper hierarchical order (active, update, name)Julius Härtl2018-08-101-7/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix removeing apps in the sidebarJulius Härtl2018-08-101-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #10642 from nextcloud/bump/autoloadersRoeland Jago Douma2018-08-1020-20/+20
|\ \ \ | | | | | | | | Bump autoloaders
| * | | Bump autoloadersRoeland Jago Douma2018-08-1020-20/+20
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #10615 from nextcloud/fix-trashbin-actionsRoeland Jago Douma2018-08-101-2/+0
|\ \ \ \ | |/ / / |/| | | Fix trashbin file actions
| * | | Fix trashbin file actionsRobin Appelman2018-08-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #10491 Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #10543 from nextcloud/ignore-deactivated-usersRoeland Jago Douma2018-08-104-16/+43
|\ \ \ \ | | | | | | | | | | Do not show deactivated users in sharees and contacts
| * | | | Test sync service when user is deactivatedThomas Citharel2018-08-061-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 pluginThomas Citharel2018-08-062-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * | | | Remove users from system addressbook when user deactivatedThomas Citharel2018-08-062-10/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | | | Merge pull request #10623 from nextcloud/bugfix/10622/mobile-headerRoeland Jago Douma2018-08-101-0/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Apply flex-basis to right header
| * | | | Apply flex-basis to right headerJulius Härtl2018-08-091-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #10619 from nextcloud/bugfix/4550/redirect-page-updateRoeland Jago Douma2018-08-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Redirect to the same page after an update
| * | | | | Redirect to the same page after an updateJulius Härtl2018-08-091-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #10636 from nextcloud/fix/2fa-enforced-backup-codesblizzz2018-08-102-4/+35
|\ \ \ \ \ | | | | | | | | | | | | Fix 2FA being enforced if only backup codes provider is active
| * | | | | Remove unused importChristoph Wurst2018-08-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | Fix 2FA being enforced if only backup codes provider is activeChristoph Wurst2018-08-102-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-existsRoeland Jago Douma2018-08-101-14/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | use insertIfNotExists to store new mimetypes.
| * | | | | | use insertIfNotExists to store new mimetypes.Robin Appelman2018-08-091-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-tokensChristoph Wurst2018-08-103-44/+27
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Popovermenu fix and token settings design fixes
| * | | | | POpovermenu fix and token settings design fixesJohn Molakvoæ (skjnldsv)2018-08-063-44/+27
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-08-10112-122/+122
| | | | |
* | | | | Merge pull request #10614 from nextcloud/bugfix/noid/fix_including_invalid_fileRoeland Jago Douma2018-08-093-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Do not use file as template parameter
| * | | | | Do not use file as template parameterRoeland Jago Douma2018-08-093-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-spacesRoeland Jago Douma2018-08-091-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix quickaccess active indicator for folders with spaces
| * | | | | Fix quickaccess active indicator for folders with spacesJulius Härtl2018-08-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #10598 from schoonc/patch-1Roeland Jago Douma2018-08-091-2/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Removed unused variable isFile
| * | | | | Removed unused variable isFileschoonc2018-08-091-2/+0
| |/ / / /
* | | | | Merge pull request #10611 from nextcloud/fix/2fa-provider-user-dao-duplicate-keyRoeland Jago Douma2018-08-092-6/+38
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix duplicate key violation in 2FA provider registry DAO
| * | | | Fix double-inserts of the same provider stateChristoph Wurst2018-08-092-8/+21
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | Add integration/unit test for the double-insert of same valuesChristoph Wurst2018-08-091-0/+19
|/ / / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirectRoeland Jago Douma2018-08-094-6/+36
|\ \ \ \ | | | | | | | | | | Fix login redirection if only one 2FA provider is active
| * | | | Rename providerset method to get primary providersChristoph Wurst2018-08-083-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>