summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-10-1140-2/+172
|
* Merge pull request #17493 from nextcloud/fix/tooltips/hide-on-sidebar-closeRoeland Jago Douma2019-10-098-6/+8
|\ | | | | Force hide tooltips on sidebar close
| * Force hide tooltips on sidebar closeJohn Molakvoæ (skjnldsv)2019-10-098-6/+8
|/ | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* [tx-robot] updated from transifexNextcloud bot2019-10-0924-22/+118
|
* Merge pull request #17457 from nextcloud/backport/17454/stable17Roeland Jago Douma2019-10-081-55/+0
|\ | | | | [stable17] Kill ui-regression ci job
| * Kill ui-regression ci jobRoeland Jago Douma2019-10-081-55/+0
|/ | | | | | | Since we do not use it at the moment anyway it seems like a waste of resources to actually run it. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Build stable17 JS (#17452)John Molakvoæ2019-10-086-6/+6
|\ | | | | Build stable17 JS
| * Build stable17 JSRoeland Jago Douma2019-10-086-6/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #17444 from nextcloud/backport/17359/stable17Roeland Jago Douma2019-10-081-1/+1
|\ \ | | | | | | [stable17] Don't call basename on null
| * | Don't call basename on nullJoas Schilling2019-10-071-1/+1
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #17438 from nextcloud/backport/17411/stable17Roeland Jago Douma2019-10-082-3/+12
|\ \ | | | | | | [stable17] Fix oauth client redirect
| * | fix oauth client redirectSergej Nikolaev2019-10-072-3/+12
| |/ | | | | | | Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
* / [tx-robot] updated from transifexNextcloud bot2019-10-0818-10/+44
|/
* Merge pull request #17418 from nextcloud/backport/17387/stable17Roeland Jago Douma2019-10-071-0/+5
|\ | | | | [stable17] Allow removing federated shares of locally reshared files
| * Allow removing federated shares of locally reshared filesRoeland Jago Douma2019-10-051-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | * UserA shares a folder to UserB * UserB does a federated share to userC@serverC * UserB now tries to revoke the federated share Before we always tried to notify the remote cloud. The case that the file was reshared locally was not considered. This patch makes sure not to try to notify a federated server if both users are local users. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-10-0720-22/+88
| |
* | [tx-robot] updated from transifexNextcloud bot2019-10-0610-34/+122
|/
* Merge pull request #17415 from nextcloud/backport/17397/stable17Roeland Jago Douma2019-10-052-2/+51
|\ | | | | [stable17] Fix updating and deleting authtokens
| * fix updating and deleting authtokensSergej Nikolaev2019-10-052-2/+51
|/ | | | Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2019-10-05122-216/+352
|
* [stable17] Append / to data(path) for folder content request (#17311)John Molakvoæ2019-10-041-3/+3
|\ | | | | [stable17] Append / to data(path) for folder content request
| * Append / to data(path) for folder content requestJohn Molakvoæ (skjnldsv)2019-09-281-3/+3
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #17351 from nextcloud/backport/17001/stable17Roeland Jago Douma2019-10-043-6/+7
|\ \ | | | | | | [stable17] reduce adressbook change events and handling
| * | adjust test expectationsArthur Schiwon2019-10-011-2/+1
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | reduce adressbook change events and handlingArthur Schiwon2019-10-012-4/+6
| | | | | | | | | | | | | | | | | | ... from four to one on avatar updates Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | [stable17] Don't use an undefined index if not needed (#17393)John Molakvoæ2019-10-041-2/+0
|\ \ \ | | | | | | | | [stable17] Don't use an undefined index if not needed
| * | | Don't use an undefined index if not neededRoeland Jago Douma2019-10-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | It is not set. And not used. Just some copy paste leftover. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-04134-1076/+1092
|/ / /
* | | [stable17] Don't process known avatars from LDAP (#17372)John Molakvoæ2019-10-032-2/+113
|\ \ \ | | | | | | | | [stable17] Don't process known avatars from LDAP
| * | | Don't process known avatars from LDAPArthur Schiwon2019-10-022-2/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * avoids useless FS operation * avoids useless DB writes * avoids useless addressbook updates * addendum to #17001 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | [tx-robot] updated from transifexNextcloud bot2019-10-0324-4/+28
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2019-10-02204-4216/+4346
| | |
* | | Merge pull request #17358 from nextcloud/backport/17353/stable17Roeland Jago Douma2019-10-011-1/+1
|\ \ \ | | | | | | | | [stable17] Fix typo in "which"
| * | | Fix typo in "which"Joas Schilling2019-10-011-1/+1
|/ / / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / [tx-robot] updated from transifexNextcloud bot2019-10-01174-15854/+16144
|/ /
* | Merge pull request #17298 from nextcloud/backport/17258/stable17Roeland Jago Douma2019-10-012-1/+11
|\ \ | | | | | | [stable17] add (hidden) option to configure smb timeout
| * | Update apps/files_external/lib/Lib/Backend/SMB.phpRobin Appelman2019-09-271-1/+1
| | | | | | | | | Co-Authored-By: Daniel Kesselberg <mail@danielkesselberg.de>
| * | add (hidden) option to configure smb timeoutRobin Appelman2019-09-272-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | hidden from ui to prevent clutter ```occ files_external:config <mount> timeout 30``` Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #17348 from nextcloud/backport/stable17fix/hbs-compile-scriptRoeland Jago Douma2019-10-012-7/+7
|\ \ \ | | | | | | | | [stable17] Use handlebars from node_modules (on CI)
| * | | Use handlebars from node_modules (on CI)Christoph Wurst2019-10-012-7/+7
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #17295 from nextcloud/backport/17286/stable17Roeland Jago Douma2019-09-301-1/+1
|\ \ \ | | | | | | | | [stable17] Correctly detect the mimetype from uploads
| * | | Correctly detect the mimetype from uploadsJoas Schilling2019-09-271-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #17273 from nextcloud/backport/14913/stable17Roeland Jago Douma2019-09-301-4/+51
|\ \ \ \ | | | | | | | | | | [stable17] Fix directory detection for s3
| * | | | Use local variable for directory nameDaniel Kesselberg2019-09-261-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Don't strip path from directory prefixDaniel Kesselberg2019-09-261-1/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Fill directory cache from opendirDaniel Kesselberg2019-09-261-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Change visibility to private (from protected)Daniel Kesselberg2019-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Rename $location to $pathDaniel Kesselberg2019-09-261-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | Add method to check if directory existsDaniel Kesselberg2019-09-261-2/+41
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Revert "[stable17] Bring the default font size up to 15px" (#17330)John Molakvoæ2019-09-302-4/+2
|\ \ \ \ \ | | | | | | | | | | | | Revert "[stable17] Bring the default font size up to 15px"