wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
41756 commits 157 branches 562 tags 714 MiB
Commit graph

41756 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
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
Roeland Jago Douma
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
Nextcloud bot
9505c56447
[tx-robot] updated from transifex 2017-12-06 01:10:23 +00:00
Morris Jobke
a73f86912f
Remove unused variables 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-05 09:58:15 +01:00
John Molakvoæ
cb951b42b2
Merge pull request #7391 from nextcloud/config-sample 
Fix typos in config.sample.php
 2017-12-05 07:29:30 +01:00
Nextcloud bot
f25d55c972
[tx-robot] updated from transifex 2017-12-05 01:10:20 +00:00
Morris Jobke
041dc6b3e8
Fix typos in config.sample.php 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-04 23:13:23 +01:00
Morris Jobke
41c1f862f1
Merge pull request #7319 from nextcloud/remove-svg-shadows 
Remove svg shadows
 2017-12-04 22:40:07 +01:00
Morris Jobke
a62cc27058
Fix syntax error 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-04 22:39:06 +01:00
Robin Appelman
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
Roeland Jago Douma
d2fe30d464
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-12-04 15:23:20 +01:00
Roeland Jago Douma
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
Robin Appelman
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
Nextcloud bot
567757c793
[tx-robot] updated from transifex 2017-12-04 01:10:30 +00:00
Roeland Jago Douma
ca8d149e29
Merge pull request #7370 from nextcloud/fix-php-doc 
Fix PHP doc for API docs
 2017-12-03 20:18:01 +01:00
Morris Jobke
72bb7c3074
Fix PHP doc for API docs 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-12-03 12:02:29 +01:00
Nextcloud bot
bd1e357eef
[tx-robot] updated from transifex 2017-12-03 01:10:22 +00:00
Nextcloud bot
cec236f0af
[tx-robot] updated from transifex 2017-12-02 01:10:32 +00:00
Bjoern Schiessle
3578acb144
update documentation 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-12-01 16:15:44 +01:00
Bjoern Schiessle
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
Morris Jobke
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
Morris Jobke
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
Arthur Schiwon
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
Nextcloud bot
ffc627e18e
[tx-robot] updated from transifex 2017-12-01 01:10:20 +00:00
Daniel Calviño Sánchez
c43f64d56b Add unit tests for posting comments with enter key 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-30 19:30:27 +01:00
Daniel Calviño Sánchez
d03fcbca77 Set text only in the message div of the new comment form 
When finding ".message" elements on "view.$el" the message area for the
new comment form and all the comments were matched. Now the selector was
restricted to match only the message area for the new comment form.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2017-11-30 19:29:19 +01:00
Marin Treselj
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
Bjoern Schiessle
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
Joas Schilling
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
Arthur Schiwon
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
Morris Jobke
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
Nextcloud bot
49ec86a81f
[tx-robot] updated from transifex 2017-11-30 01:13:19 +00:00
Morris Jobke
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
8e8fe6b8eb
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Roeland Jago Douma
d5496dc435
Since we update the avatar in the sync service remove the generated file 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Roeland Jago Douma
03d9e7e963
Sinc we use AppData the regex is not needed anymore 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Roeland Jago Douma
ba648eecdf
Move avatar code to Avatar Class 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Roeland Jago Douma
604596ec16
Always generate avatar 
Even if no avatar is set we should just generate the image. This to not
duplicate the code on all the clients. And only server images from the
avtar endpoint.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-11-29 14:23:15 +01:00
Roeland Jago Douma
6097b74970
Merge pull request #7333 from nextcloud/mario-readme-patch 
Update README.md
 2017-11-29 14:19:09 +01:00
Roeland Jago Douma
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
Joas Schilling
8e684f76e5
Allow {lang} as a placeholder in the skeleton directory 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-11-29 10:04:53 +01:00
Mario Đanić
3c0d6ccbed
Update README.md 
authentification is not a real word :)
 2017-11-29 09:09:11 +01:00
Nextcloud bot
095eba0aa3
[tx-robot] updated from transifex 2017-11-29 01:10:12 +00:00
blizzz
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
Joas Schilling
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

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-11-28 17:17:51 +01:00
Joas Schilling
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
Marin Treselj
54878d753a Revert removing of deprecated icons 
Signed-off-by: Marin Treselj <marin@pixelipo.com>
 2017-11-28 14:30:02 +01:00