summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-11-08144-146/+270
|
* Merge pull request #17830 from nextcloud/global-quota-return-quotaRoeland Jago Douma2019-11-071-2/+7
|\ | | | | actually return the quote when getting global storage info
| * actually return the quote when getting global storage infoRobin Appelman2019-11-061-2/+7
| | | | | | | | | | | | prevents 'undefined' index errors when 'include external storage in quota' is enabled Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #17822 from nextcloud/fix/noid/tip-download-to-node-apiblizzz2019-11-071-4/+15
|\ \ | | | | | | switch to Files Node API for zip generation
| * | switch to Files Node API for zip generationArthur Schiwon2019-11-071-4/+15
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Prompt on destructive user actions (#17785)John Molakvoæ2019-11-0715-98/+254
|\ \ \ | | | | | | | | Prompt on destructive user actions
| * | | Prompt on destructive user actionsGary Kim2019-11-0515-98/+254
| | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | Merge pull request #17835 from nextcloud/fix-background-scan-testsRobin Appelman2019-11-071-3/+18
|\ \ \ \ | | | | | | | | | | fix tests for background file scan job
| * | | | fix tests for background file scan jobRobin Appelman2019-11-061-3/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #17696 from nextcloud/enh/17659/hide-objectstore-credentialsRoeland Jago Douma2019-11-071-2/+13
|\ \ \ \ \ | | | | | | | | | | | | Remove objectstore credentials
| * | | | | Add information about credentialsDaniel Kesselberg2019-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | Remove objectstore credentialsDaniel Kesselberg2019-10-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove the username for Swift v2 and add todo for unclear keys. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | Remove objectstore credentialsDaniel Kesselberg2019-10-271-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S3: key and secret Swift v3: user.name and user.password Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-11-07138-8814/+8992
| |/ / / / |/| | | |
* | | | | Create .editorconfig (#17782)John Molakvoæ2019-11-061-0/+17
|\ \ \ \ \ | | | | | | | | | | | | Create .editorconfig
| * | | | | Create .editorconfigChristian Oliff2019-11-021-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #9059 It'd be good to add a .editorconfig file so that anyone contributing to Nextcloud can follow the same rules for tabs/spaces, newlines, charsets etc. Editorconfig (http://editorconfig.org/) is very popular and it's become standard for open-source projects to include one. I based the rules on the current code-base.
* | | | | | Update locales with transifex data (#17222)John Molakvoæ2019-11-062-435/+1116
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update locales with transifex data
| * | | | | | Update locales with transifex dataJohn Molakvoæ (skjnldsv)2019-09-202-435/+1116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Fix files_versions app LoadSidebar event (#17829)John Molakvoæ2019-11-067-30/+149
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix files_versions app LoadSidebar event
| * | | | | | | Fix files_versions app LoadSidebar eventJohn Molakvoæ (skjnldsv)2019-11-067-30/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | Merge pull request #17817 from nextcloud/disable-background-scan-optionRoeland Jago Douma2019-11-061-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add option to disable background scanning of files
| * | | | | | | | add option to disable background scanning of filesRobin Appelman2019-11-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when using (only) object store this job doesn't do any scanning anyway, but all the setup can still be expensive on large setups Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | | Merge pull request #17753 from nextcloud/clean/old-sharingRoeland Jago Douma2019-11-0649-13027/+275
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Cleanup sharing leftovers
| * | | | | | | | Fix sharing breadcrumbsJohn Molakvoæ (skjnldsv)2019-11-0615-7032/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | Cleanup sharing leftoversJohn Molakvoæ (skjnldsv)2019-11-0537-6000/+116
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* / | | | | | | [tx-robot] updated from transifexNextcloud bot2019-11-0640-4/+254
|/ / / / / / /
* | | | | | | Merge pull request #17806 from nextcloud/design/icon-more-whiteRoeland Jago Douma2019-11-051-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove unneeded more-white icon
| * | | | | | | Remove unneeded more-white iconJan-Christoph Borchardt2019-11-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | Fix comments app init and LoadSidebar event (#17803)John Molakvoæ2019-11-056-9/+67
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fix comments app init and LoadSidebar event
| * | | | | | | Fix comments app init and LoadSidebar eventJohn Molakvoæ (skjnldsv)2019-11-046-9/+67
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | [tx-robot] updated from transifexNextcloud bot2019-11-05130-188/+182
| | | | | | |
* | | | | | | Merge pull request #17727 from nextcloud/enh/share_expiration_notificationRoeland Jago Douma2019-11-046-0/+206
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Enh/share expiration notification
| * | | | | | | Add notification for shares about to expireRoeland Jago Douma2019-11-016-0/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces a new command that will create notifications for users if they have shares that will expire the next day. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #17735 from tcoupin/fix-reshare-circleChristoph Wurst2019-11-041-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix reshare with circle
| * | | | | | | | Fix reshare with circleThibault Coupin2019-10-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thibault Coupin <thibault.coupin@gmail.com>
* | | | | | | | | Merge pull request #17805 from nextcloud/more-application-instanceRoeland Jago Douma2019-11-0413-14/+69
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | remove more cases of manual Application instance creation
| * | | | | | | | remove missed manual Application instance constructionsRobin Appelman2019-11-0412-14/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | | mark getAppContainer as a valid way to construct app containersRobin Appelman2019-11-041-0/+8
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is triggerd (and not cought by the query arm) if an item from an app is queried before the app queries it's own Application instance Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #17509 from nextcloud/fix/application-singletonJohn Molakvoæ2019-11-0420-74/+95
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | Fix Application instances created multiple times
| * | | | | | | set retention obligation on existing `expiration` in testsRobin Appelman2019-11-044-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | fixup! fix tests?Roeland Jago Douma2019-10-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | fix tests?Roeland Jago Douma2019-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | fixup! Do not create Application instances directlyRoeland Jago Douma2019-10-142-45/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Do not create Application instances directlyChristoph Wurst2019-10-1114-17/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | | Make sure we create an app's Application class just onceChristoph Wurst2019-10-113-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #17506 from nextcloud/bugfix/12790/workflow-frontendblizzz2019-11-0425-277/+301
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Workflow frontend polishing
| * | | | | | | | bump bundlesArthur Schiwon2019-10-292-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | do not break on Checkers that do not need specific context infoArthur Schiwon2019-10-292-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request time, for example Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | | | Design fixesJulius Härtl2019-10-296-34/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | | | Move delete/cancel button to the bottomJulius Härtl2019-10-291-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>