| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #6670 from nextcloud/handle-encryption-state-in-web-interface | Tobias Kaminsky | 2017-12-06 | 9 | -12/+109 |
| |\ | | | | | Handle encryption state in web interface | ||||
| | * | show e2e folder icon on encrypted folders | Bjoern Schiessle | 2017-11-20 | 7 | -2/+46 |
| | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | Add data attribute to file list rows telling if the file is encrypted | Daniel Calviño Sánchez | 2017-11-20 | 2 | -7/+37 |
| | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| | * | adjust permissions in web view for encrypted folders | Bjoern Schiessle | 2017-11-20 | 1 | -1/+3 |
| | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | check for encryption state on propfind | Bjoern Schiessle | 2017-11-20 | 2 | -2/+23 |
| | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | Merge pull request #7385 from nextcloud/shared-delay-root | Morris Jobke | 2017-12-06 | 2 | -26/+41 |
| |\ \ | | | | | | | delay calculating the shared cache root until it's used | ||||
| | * | | delay calculating the shared cache root until it's used | Robin Appelman | 2017-12-04 | 2 | -26/+41 |
| | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | Merge pull request #7395 from nextcloud/remove-unused | Lukas Reschke | 2017-12-06 | 1 | -3/+0 |
| |\ \ \ | | | | | | | | | Remove unused variables | ||||
| | * | | | Remove unused variables | Morris Jobke | 2017-12-05 | 1 | -3/+0 |
| | |/ / | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Merge pull request #7348 from nextcloud/filterout_shares_of_nonexisting_users | Roeland Jago Douma | 2017-12-06 | 2 | -0/+7 |
| |\ \ \ | | | | | | | | | Check if the owner of a share exists | ||||
| | * | | | Fix tests | Roeland Jago Douma | 2017-12-04 | 2 | -1/+3 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| | * | | | A failed storage is a not available storage | Roeland Jago Douma | 2017-12-04 | 1 | -0/+5 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | We have to double check. Since getting the info of the root returns a generic entry. But actually the stroage is not available. Else we get very weird sync and web behavior. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #7351 from nextcloud/change-default-german-language | Roeland Jago Douma | 2017-12-06 | 3 | -4/+73 |
| |\ \ \ | | | | | | | | | use formal version of German by default | ||||
| | * | | | update documentation | Bjoern Schiessle | 2017-12-01 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | check if $defaultLanguage is a valid string before we move on | Bjoern Schiessle | 2017-12-01 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| | * | | | use formal version of German if default_language is set to 'de_DE' | Bjoern Schiessle | 2017-11-30 | 2 | -3/+67 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | | Merge pull request #7387 from nextcloud/swift-retry | Roeland Jago Douma | 2017-12-06 | 2 | -2/+4 |
| |\ \ \ \ | | | | | | | | | | | add retry wrapper when reading files from swift | ||||
| | * | | | | add retry wrapper when reading files from swift | Robin Appelman | 2017-12-04 | 2 | -2/+4 |
| | | |/ / | |/| | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-12-06 | 20 | -6/+88 |
| | | | | | |||||
| * | | | | Merge pull request #7391 from nextcloud/config-sample | John Molakvoæ | 2017-12-05 | 1 | -3/+2 |
| |\ \ \ \ | | | | | | | | | | | Fix typos in config.sample.php | ||||
| | * | | | | Fix typos in config.sample.php | Morris Jobke | 2017-12-04 | 1 | -3/+2 |
| | |/ / / | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-12-05 | 8 | -42/+66 |
| | | | | | |||||
| * | | | | Merge pull request #7319 from nextcloud/remove-svg-shadows | Morris Jobke | 2017-12-04 | 3 | -12/+36 |
| |\ \ \ \ | |/ / / |/| | | | Remove svg shadows | ||||
| | * | | | Fix syntax error | Morris Jobke | 2017-12-04 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| | * | | | Define icon-shadow only in context of icon-white | Marin Treselj | 2017-11-30 | 1 | -7/+2 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | * | | | Revert removing of deprecated icons | Marin Treselj | 2017-11-28 | 13 | -0/+13 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | * | | | Remove deprecated white, shaded icons | Marin Treselj | 2017-11-28 | 13 | -13/+0 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| | * | | | Add new .icon-white and .icon-shadow classes, add toggle-background icon | Marin Treselj | 2017-11-28 | 3 | -11/+39 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-12-04 | 10 | -0/+26 |
| | | | | | |||||
| * | | | | Merge pull request #7370 from nextcloud/fix-php-doc | Roeland Jago Douma | 2017-12-03 | 2 | -2/+2 |
| |\ \ \ \ | | | | | | | | | | | Fix PHP doc for API docs | ||||
| | * | | | | Fix PHP doc for API docs | Morris Jobke | 2017-12-03 | 2 | -2/+2 |
| |/ / / / | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-12-03 | 4 | -0/+16 |
| | | | | | |||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-12-02 | 14 | -10/+100 |
| | | | | | |||||
| * | | | | Merge pull request #7361 from nextcloud/cheap-check-first | Morris Jobke | 2017-12-01 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | check userExists later, saves lookups for appData_INSTANCEID userids | ||||
| | * | | | | check userExists later, saves lookups for appData_INSTANCEID userids | Arthur Schiwon | 2017-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | | Merge pull request #7347 from nextcloud/fix-3245 | Morris Jobke | 2017-12-01 | 2 | -1/+16 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Allow to skip data dir permission checks by config | ||||
| | * | | | | Allow to skip data dir permission checks by config | Arthur Schiwon | 2017-11-30 | 2 | -1/+16 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Enables installation on services that don't allow/support permission changes. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-12-01 | 202 | -0/+1282 |
| | | | | | |||||
| * | | | | Merge pull request #7346 from nextcloud/fix-federation-scope-menu-l10n | Joas Schilling | 2017-11-30 | 1 | -6/+6 |
| |\ \ \ \ | |/ / / |/| | | | Fix translation of federation scope menu | ||||
| | * | | | Fix translation of federation scope menu | Morris Jobke | 2017-11-30 | 1 | -6/+6 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | * l10n in Nextcloud works by extracting the values only passed on their location and not based on the first parameter * we need to change the translation pool from `core` to `settings` then * fixes #7345 Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-30 | 30 | -38/+128 |
| | | | | |||||
| * | | | Merge pull request #7343 from ↵ | Morris Jobke | 2017-11-29 | 4 | -0/+78 |
| |\ \ \ | | | | | | | | | | | | | | | | | nextcloud/fix_exception_on_unreachable_server_take2 Actually set the status so we don't cause another exception | ||||
| | * | | | Actually set the status so we don't cause another exception | Roeland Jago Douma | 2017-11-29 | 4 | -0/+78 |
| |/ / / | | | | | | | | | | | | | | | | * And add tests so I don't mess up again Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Merge pull request #7338 from nextcloud/fix_exception_on_unreachable_server | Roeland Jago Douma | 2017-11-29 | 2 | -0/+6 |
| |\ \ \ | | | | | | | | | Do not log Exception if a connection error occured | ||||
| | * | | | Do not log Exception if a connection error occured | Roeland Jago Douma | 2017-11-29 | 2 | -0/+6 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | | Merge pull request #7316 from ↵ | Roeland Jago Douma | 2017-11-29 | 1 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251 Fix silent conflicts due to merging #7256 after #7251 | ||||
| | * | | | | Fix silent conflicts due to merging #7256 after #7251 | Daniel Calviño Sánchez | 2017-11-28 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although #7256 was merged cleanly some of the changes really conflicted with those introduced by the last commit of #7251, and this broke the appearance of the author row of comments. This commit fixes those silent conflicts and restores the appearance of the author row. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com> | ||||
| * | | | | | Merge pull request #7333 from nextcloud/mario-readme-patch | Roeland Jago Douma | 2017-11-29 | 1 | -1/+1 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Update README.md | ||||
| | * | | | | Update README.md | Mario Đanić | 2017-11-29 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | authentification is not a real word :) | ||||
| * | | | | [tx-robot] updated from transifex | Nextcloud bot | 2017-11-29 | 24 | -0/+186 |
| | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |