summaryrefslogtreecommitdiffstats
path: root/apps/files
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2496 from nextcloud/add-activities-for-favorite-managemetMorris Jobke2016-12-059-23/+605
|\ | | | | Add an activity when managing favorites
| * Add tests for favorite actionJoas Schilling2016-12-041-8/+55
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Add some generic testsJoas Schilling2016-12-043-0/+248
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Add an activity when managing favoritesJoas Schilling2016-12-045-15/+302
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | fix conflict dialog styling in firefoxRobin Appelman2016-12-051-7/+5
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* [tx-robot] updated from transifexNextcloud bot2016-12-042-0/+14
|
* [tx-robot] updated from transifexNextcloud bot2016-12-034-2/+86
|
* Merge pull request #2475 from nextcloud/fix-filename-local-linkMorris Jobke2016-12-021-6/+1
|\ | | | | fix width of filename in sidebar to accommodate local link
| * properly calculate the width of the name in the sidebarMorris Jobke2016-12-021-6/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * fix width of filename in sidebar to accommodate local linkJan-Christoph Borchardt2016-12-021-1/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Increase width of new menuMorris Jobke2016-12-021-1/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | fix vertical sizing change of popover in new folder flowJan-Christoph Borchardt2016-12-021-0/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | Fix input field for new folder - fixes #2245Morris Jobke2016-12-021-1/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #2432 from nextcloud/activity-mail-languageMorris Jobke2016-12-011-4/+11
|\ | | | | Make sure the activity emails can be sent in the users language
| * Adjust all implementations in the server repoJoas Schilling2016-12-011-4/+11
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2444 from nextcloud/detect-also-a-400-statusChristoph Wurst2016-12-012-1/+6
|\ \ | | | | | | Catch status code 400
| * | Catch status code 400Lukas Reschke2016-12-012-1/+6
| | | | | | | | | | | | | | | | | | In case the server returns a statuscode 400 we should also gracefully return to the home directory. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2435 from nextcloud/sidebar-preview-non-previewRoeland Jago Douma2016-12-011-3/+12
|\ \ \ | |/ / |/| | allow registering sidebar preview handlers for mimetypes that dont co…
| * | allow registering sidebar preview handlers for mimetypes that dont come with ↵Robin Appelman2016-12-011-3/+12
| | | | | | | | | | | | | | | | | | server side previews Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | We should always show permanent actionsRoeland Jago Douma2016-12-011-7/+3
| |/ |/| | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2016-12-012-0/+38
| |
* | Merge pull request #2422 from nextcloud/text-preview-debugRobin Appelman2016-11-301-5/+1
|\ \ | | | | | | remove js debug statements in sidebar text preview generator
| * | remove js debug statements in sidebar text preview generatorRobin Appelman2016-11-301-5/+1
| |/ | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* / [tx-robot] updated from transifexNextcloud bot2016-11-306-0/+138
|/
* [tx-robot] updated from transifexNextcloud bot2016-11-306-0/+96
|
* [tx-robot] updated from transifexNextcloud bot2016-11-296-2/+116
|
* Fix mobile viewJohn Molakvoæ (skjnldsv)2016-11-291-5/+0
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2016-11-2956-1252/+730
|
* Merge pull request #2335 from nextcloud/grouping-for-activitiesMorris Jobke2016-11-281-109/+84
|\ | | | | Bring back grouping for activities
| * Add an event merger and use it for the files activitiesJoas Schilling2016-11-251-1/+16
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Working towards groupsJoas Schilling2016-11-251-108/+68
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | bring back permissions for mail sharesBjoern Schiessle2016-11-281-0/+1
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | [tx-robot] updated from transifexNextcloud bot2016-11-282-2/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-282-0/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-266-0/+74
|/
* improved style of shared entryMorris Jobke2016-11-231-3/+8
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* make the share icon in the filelist visible againRobin Appelman2016-11-231-0/+1
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* document new variableMorris Jobke2016-11-221-0/+3
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Use the display name for files activities againJoas Schilling2016-11-221-4/+28
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #2154 from nextcloud/comments-activities-updateMorris Jobke2016-11-221-10/+9
|\ | | | | Move comments activities to the new API
| * Fix wrong copyright headersJoas Schilling2016-11-161-10/+9
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Fix popover layout fix for files and globalJohn Molakvoæ (skjnldsv)2016-11-211-18/+2
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2016-11-214-0/+70
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-204-2/+48
| |
* | [tx-robot] updated from transifexNextcloud bot2016-11-196-0/+80
| |
* | Merge pull request #2109 from nextcloud/oc_26533Morris Jobke2016-11-181-0/+5
|\ \ | | | | | | Transfer ownership only analyze home storage
| * | Test on storageRoeland Jago Douma2016-11-151-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Transfer ownership only analyze home storageVincent Petry2016-11-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When transferring ownership, only the local files will be transferred during the rename operation. This means that the analyzing code doesn't need to recurse into any mount points. Furthermore this fixes issues where FailedStorage might appear as mount points as a result of inaccessible external storages or shares. So this makes it more robust.
* | | Merge pull request #768 from nextcloud/s3-objectstoreRobin Appelman2016-11-181-1/+1
|\ \ \ | | | | | | | | Add S3 objectstore backend
| * | | add comment for non empty text fileRobin Appelman2016-11-161-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>