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

7367 commits

Author SHA1 Message Date
Morris Jobke
3bf9503070 Merge pull request #4816 from nextcloud/Ardinis-quota-files_external 
Correctly calculate used space for quota with external storage
 2017-05-12 11:33:54 -05:00
Ardinis
40560ca98d Correctly calculate used space for quota with external storage 
issue #4348

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-12 11:32:12 -05:00
Lukas Reschke
48a9a4bd81 Merge pull request #4825 from nextcloud/add-timeout-appstore 
Add timeout for requests to appstore
 2017-05-12 12:37:18 +02:00
Morris Jobke
72943c99a4 Add timeout for requests to appstore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-11 17:49:03 -05:00
Morris Jobke
c90d832ce4 Log connectiong problems while fetching data from appstore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-11 17:46:41 -05:00
Morris Jobke
caa0ae94e8 Proper logging for appstore updates 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-11 13:35:17 -05:00
Morris Jobke
167013dbf9 Merge pull request #4783 from nextcloud/lite-application-classes 
Use automatic injection for appdata folders
 2017-05-10 17:31:05 -05:00
Morris Jobke
d73c8d0981 Use distributed cache for SCSS dependencies as well 
* followup to #3978 because with the proper setup of
  appdata we now are using the same data on all nodes

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-10 13:31:45 -05:00
Morris Jobke
74d742ba6d Setup root FS for multibucket object storage 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-10 13:21:35 -05:00
Joas Schilling
253057355c
Fix missing placeholder for doc link 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 11:45:08 +02:00
Joas Schilling
538d32fe87
Automatic injection into the Fetchers 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:56:38 +02:00
Joas Schilling
ca39940614
Automatic creation of Identity manager 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-10 09:45:11 +02:00
Roeland Jago Douma
5a61a794d4
Do not write and read rootcerts.crt at the same time 
(Possibly) fixes #3470

When updating the main file /files_external/rootcerts.crt we should not
read from /files_external/rootcerts.crt at the same time.

For 2 reasons: writing to a file and reading from it at the same time
can have non deterministic results

And we don't want all the certificates to appear 2 times in there.

This isn't caught by our standard file locking (that does not allow this
actually) because it is in a non locked path....

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-09 13:00:07 +02:00
Roeland Jago Douma
07fe15eea5 Merge pull request #4705 from nextcloud/htaccess-upload 
Proper exception for upload of .htaccess file via WebDAV
 2017-05-09 10:35:38 +02:00
Roeland Jago Douma
dfa3aaa0c6 Merge pull request #4753 from nextcloud/fix-links-on-error-page 
Fix escaped HTML on error pages
 2017-05-09 08:45:11 +02:00
Morris Jobke
9309217ecb Fix escaped HTML on error pages 
* fixes #4655

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 21:16:08 -05:00
Morris Jobke
f8044cbbce Proper exception for upload of .htaccess file via WebDAV 
* fixes #2860

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-08 20:03:41 -05:00
Lukas Reschke
ccd0ded812
Don't redirect requests to /core/img/manifest.json 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-09 00:02:37 +02:00
Lukas Reschke
099234cf12
Add function to request SVG or regular fallback image 
Fixes https://github.com/nextcloud/server/issues/4647

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-08 14:51:55 +02:00
Lukas Reschke
4d101ca2be Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detection 
Automatic mysql 4byte detection
 2017-05-08 12:18:40 +02:00
Robin Appelman
f12cd19c34
ensure theming app is loaded when showing an error page 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-06 17:50:48 +02:00
Robin Appelman
2b0da0f218
handle permissions errors when copying the skeleton for a read only user 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-05 14:44:51 +02:00
Morris Jobke
7f46898dad Compatibility with Redis and RedisCluster 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-04 12:42:58 -03:00
Morris Jobke
70a0e9c2d3 Revert "fix permissions of mountpoints" 2017-05-04 00:09:09 -03:00
Morris Jobke
aa39f9b8fc Merge pull request #4623 from nextcloud/fileinfo-mount-permissions 
fix permissions of mountpoints
 2017-05-02 17:28:33 -03:00
Roeland Jago Douma
24ff230f93 Merge pull request #4620 from nextcloud/preview-error-handling 
better handling of preview generation errors
 2017-05-02 21:49:14 +02:00
Lukas Reschke
121cb4bcfc Merge pull request #4659 from nextcloud/fix/ignore-empty-email-contacts-menu 
Do not show an email action for contacts with emtpy email addresses
 2017-05-02 17:02:16 +02:00
Morris Jobke
705483e712 Merge pull request #4651 from nextcloud/fix_appfetcher_update 
Make sure the AppFetcher fetches the new applist from the appstore
 2017-05-02 10:45:04 -03:00
Christoph Wurst
b13c741cb3
Do not show an email action for contacts with emtpy email addresses 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-05-02 14:12:04 +02:00
Morris Jobke
6aac094091
Add PHPDoc 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-05-02 13:43:47 +02:00
Robin Appelman
4dfd90abc4
better handling of preview generation errors 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-02 13:43:47 +02:00
Roeland Jago Douma
e79424932a
Make sure the AppFetcher fetches the new applist from the appstore 
When in the upgrade process the version in the config is still the old
version. (Since we only upgrade it after the upgrade is complete).
However the app list fetched from the appstore must be the new list.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 10:24:10 +02:00
Lukas Reschke
d4217830c6 Merge pull request #4649 from nextcloud/update-links-to-12 
Update documentation go.php URL to 12
 2017-05-02 10:09:57 +02:00
Roeland Jago Douma
095463d568
Do not do ETag caching when the version is updated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-05-02 08:44:20 +02:00
Lukas Reschke
6458875dc1
Update documentation go.php URL to 12 
Fixes https://github.com/nextcloud/server/issues/4646

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-02 08:17:59 +02:00
Lukas Reschke
a5ccb31e85
Mark IP as whitelisted if brute force protection is disabled 
Currently, when disabling the brute force protection no new brute force attempts are logged. However, the ones logged within the last 24 hours will still be used for throttling.

This is quite an unexpected behaviour and caused some support issues. With this change when the brute force protection is disabled also the existing attempts within the last 24 hours will be disregarded.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-05-01 18:31:45 +02:00
Robin Appelman
75b3b72d89
fix permissions of mountpoints 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-05-01 15:37:02 +02:00
Marius Blüm
f26764c790
Rename “Server settings” to “Basic settings” 
* fixes #4587

Signed-off-by: Marius Blüm <marius@lineone.io>
 2017-04-29 17:13:21 +02:00
Jan-Christoph Borchardt
fabaf09d4f Merge pull request #4583 from nextcloud/theming-fixes-admin 
Theming admin section fixes
 2017-04-29 17:05:11 +02:00
Arthur Schiwon
668fe7df51
UserManager can now count disabled users 
Users page takes advantage of that

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-04-29 00:59:09 -03:00
Julius Härtl
b436e43d68
Make sure that ThemingDefaults uses the correct default values from \OC_Defaults 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-04-29 00:40:15 -03:00
Bjoern Schiessle
5fa0e6df39
fix email verification status 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:37 -03:00
Bjoern Schiessle
9a366dbe2e
add missing translation and other small fixes 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Bjoern Schiessle
06265fe770
make use of verification buttons 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Bjoern Schiessle
391a989a91
make sure that every data set has a 'verified' status 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Bjoern Schiessle
7c309c253b
ask lookup server if email address was verified by the user 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Bjoern Schiessle
86701dce7b
make sure that we don't lose previous verification status 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Bjoern Schiessle
6f41a3edc0
store verification status in accounts table and update lookup server 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-04-28 23:41:36 -03:00
Roeland Jago Douma
3e8c5441f7 Merge pull request #4521 from nextcloud/custom-mount-types 
allow apps to set custom mount types
 2017-04-28 12:50:38 +02:00
Lukas Reschke
9e7f7ba7f6
Add sharing types for guests 
Fixes https://github.com/nextcloud/guests/issues/4

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-04-28 09:56:57 +02:00