7d529c081a
[tx-robot] updated from transifex
2017-12-07 01:10:37 +00:00
430f60db21
Merge pull request #6670 from nextcloud/handle-encryption-state-in-web-interface
...
Handle encryption state in web interface
2017-12-06 16:19:17 +01:00
c32cb6b4b7
Merge pull request #7385 from nextcloud/shared-delay-root
...
delay calculating the shared cache root until it's used
2017-12-06 15:14:48 +01:00
de8fefeb18
Merge pull request #7395 from nextcloud/remove-unused
...
Remove unused variables
2017-12-06 13:09:01 +01:00
1287da8a38
Merge pull request #7348 from nextcloud/filterout_shares_of_nonexisting_users
...
Check if the owner of a share exists
2017-12-06 09:13:53 +01:00
6e45034745
Merge pull request #7351 from nextcloud/change-default-german-language
...
use formal version of German by default
2017-12-06 08:30:14 +01:00
cde58610b4
Merge pull request #7387 from nextcloud/swift-retry
...
add retry wrapper when reading files from swift
2017-12-06 08:28:20 +01:00
9505c56447
[tx-robot] updated from transifex
2017-12-06 01:10:23 +00:00
a73f86912f
Remove unused variables
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-05 09:58:15 +01:00
cb951b42b2
Merge pull request #7391 from nextcloud/config-sample
...
Fix typos in config.sample.php
2017-12-05 07:29:30 +01:00
f25d55c972
[tx-robot] updated from transifex
2017-12-05 01:10:20 +00:00
041dc6b3e8
Fix typos in config.sample.php
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-04 23:13:23 +01:00
41c1f862f1
Merge pull request #7319 from nextcloud/remove-svg-shadows
...
Remove svg shadows
2017-12-04 22:40:07 +01:00
a62cc27058
Fix syntax error
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-04 22:39:06 +01:00
046eb0c635
add retry wrapper when reading files from swift
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 16:34:53 +01:00
d2fe30d464
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-04 15:23:20 +01:00
c8a29ec942
A failed storage is a not available storage
...
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>
2017-12-04 15:23:11 +01:00
c87d689253
delay calculating the shared cache root until it's used
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-12-04 15:16:39 +01:00
567757c793
[tx-robot] updated from transifex
2017-12-04 01:10:30 +00:00
ca8d149e29
Merge pull request #7370 from nextcloud/fix-php-doc
...
Fix PHP doc for API docs
2017-12-03 20:18:01 +01:00
72bb7c3074
Fix PHP doc for API docs
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-12-03 12:02:29 +01:00
bd1e357eef
[tx-robot] updated from transifex
2017-12-03 01:10:22 +00:00
cec236f0af
[tx-robot] updated from transifex
2017-12-02 01:10:32 +00:00
3578acb144
update documentation
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-01 16:15:44 +01:00
2c3d97cc8f
check if $defaultLanguage is a valid string before we move on
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-12-01 16:14:51 +01:00
dc10a31a4a
Merge pull request #7361 from nextcloud/cheap-check-first
...
check userExists later, saves lookups for appData_INSTANCEID userids
2017-12-01 12:28:56 +01:00
007fba6fd9
Merge pull request #7347 from nextcloud/fix-3245
...
Allow to skip data dir permission checks by config
2017-12-01 11:53:12 +01:00
65d7468bf3
check userExists later, saves lookups for appData_INSTANCEID userids
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-01 11:47:56 +01:00
ffc627e18e
[tx-robot] updated from transifex
2017-12-01 01:10:20 +00:00
314bfeb6b8
Define icon-shadow only in context of icon-white
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-30 18:26:26 +01:00
8b734347b1
use formal version of German if default_language is set to 'de_DE'
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-11-30 17:29:08 +01:00
288f50bdc7
Merge pull request #7346 from nextcloud/fix-federation-scope-menu-l10n
...
Fix translation of federation scope menu
2017-11-30 12:29:16 +01:00
1b7dfd73af
Allow to skip data dir permission checks by config
...
Enables installation on services that don't allow/support permission
changes.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-30 11:16:00 +01:00
3b390ef430
Fix translation of federation scope menu
...
* 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>
2017-11-30 11:13:16 +01:00
49ec86a81f
[tx-robot] updated from transifex
2017-11-30 01:13:19 +00:00
87aa0723f8
Merge pull request #7343 from nextcloud/fix_exception_on_unreachable_server_take2
...
Actually set the status so we don't cause another exception
2017-11-29 21:13:55 +01:00
d24b6866b1
Actually set the status so we don't cause another exception
...
* And add tests so I don't mess up again
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 16:37:54 +01:00
a9eb0d4a40
Merge pull request #7338 from nextcloud/fix_exception_on_unreachable_server
...
Do not log Exception if a connection error occured
2017-11-29 16:03:23 +01:00
f03aa0480a
Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251
...
Fix silent conflicts due to merging #7256 after #7251
2017-11-29 15:38:24 +01:00
6097b74970
Merge pull request #7333 from nextcloud/mario-readme-patch
...
Update README.md
2017-11-29 14:19:09 +01:00
79554a29e0
Do not log Exception if a connection error occured
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-29 13:06:32 +01:00
3c0d6ccbed
Update README.md
...
authentification is not a real word :)
2017-11-29 09:09:11 +01:00
095eba0aa3
[tx-robot] updated from transifex
2017-11-29 01:10:12 +00:00
0597cca596
Merge pull request #7327 from nextcloud/bugfix/7325/access-list-regression-for-not-current-accesss
...
Only in case of $currentAccess the array uses the user id as index
2017-11-28 17:57:44 +01:00
80b34f5f7d
Only in case of $currentAccess the array uses the id as index
...
Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.
Regression from 3820d6883d
2017-11-28 17:17:51 +01:00
2a01c0f3f6
Fix current access list test and add one for $currentAccess === false
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-11-28 17:17:34 +01:00
54878d753a
Revert removing of deprecated icons
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-28 14:30:02 +01:00
dd8bfe5d36
Remove deprecated white, shaded icons
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-28 10:59:22 +01:00
70953fa788
Add new .icon-white and .icon-shadow classes, add toggle-background icon
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-11-28 10:56:28 +01:00
0c45778219
Fix silent conflicts due to merging #7256 after #7251
...
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>
2017-11-28 02:35:39 +01:00
Nextcloud bot
Tobias Kaminsky
Morris Jobke
Lukas Reschke
Roeland Jago Douma
John Molakvoæ
Robin Appelman
Roeland Jago Douma
Bjoern Schiessle
Arthur Schiwon
Marin Treselj
Joas Schilling
Mario Đanić
Daniel Calviño Sánchez