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

13901 commits

Author SHA1 Message Date
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
Lukas Reschke
62f2610129 Merge pull request #4736 from nextcloud/richdef-opengraph 
open-graph
 2017-05-09 11:15:55 +02:00
Joas Schilling
a089e08411
Add circle as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-05-09 10:45:10 +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
Maxence Lange
90b1c73e81 my name as author 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-05-09 07:14:52 -01:00
Maxence Lange
93e4bd3495 using title as name 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-05-09 07:10:16 -01: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
Roeland Jago Douma
888e719671 Merge pull request #4750 from nextcloud/allow-requests-to-manifest-json 
Don't redirect requests to /core/img/manifest.json
 2017-05-09 08:43:35 +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
Nextcloud bot
f6a4028fad
[tx-robot] updated from transifex 2017-05-09 00:07:51 +00: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
Nextcloud bot
9d8e9b1efb
[tx-robot] updated from transifex 2017-05-08 20:49:06 +00:00
Lukas Reschke
c28fe270b6 Merge pull request #4727 from stffabi/IncreaseDeviceEntropy 
Increase device password entropy.
 2017-05-08 17:49:52 +02:00
Maxence Lange
ce2afca0e4 open-graph 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-05-08 11:57:41 -01: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
Fabrizio Steiner
f2a2b34e46 Increase device password entropy. Use lower- and upper-case characters and digits, but exclude ambiguous characters. The number of digits has also been increased to 25. 
Signed-off-by: Fabrizio Steiner <fabrizio.steiner@gmail.com>
 2017-05-08 14:04:40 +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
Lukas Reschke
69c5bcd804 Merge pull request #4719 from nextcloud/error-page-theming 
ensure theming app is loaded when showing an error page
 2017-05-08 11:51:34 +02:00
Nextcloud bot
6109afc14d
[tx-robot] updated from transifex 2017-05-08 00:07:37 +00:00
Nextcloud bot
56bb8745df
[tx-robot] updated from transifex 2017-05-07 00:07:31 +00: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
Nextcloud bot
59ee22101f
[tx-robot] updated from transifex 2017-05-06 00:07:33 +00: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
Nextcloud bot
619d09529c
[tx-robot] updated from transifex 2017-05-05 00:07:28 +00: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
Julius Härtl
d72706861d
IGroup::getDisplayName is available version 12, not 11 (9.2) 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-05-04 12:06:03 +02:00
Morris Jobke
70a0e9c2d3 Revert "fix permissions of mountpoints" 2017-05-04 00:09:09 -03:00
Nextcloud bot
806aeae71d
[tx-robot] updated from transifex 2017-05-04 00:07:29 +00:00
Nextcloud bot
3dbf30c220
[tx-robot] updated from transifex 2017-05-03 00:07:31 +00: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
Nextcloud bot
f27d382c47
[tx-robot] updated from transifex 2017-05-02 00:07:20 +00: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
Nextcloud bot
2152d5f1f6
[tx-robot] updated from transifex 2017-05-01 00:07:32 +00:00
Nextcloud bot
4518f6dc64
[tx-robot] updated from transifex 2017-04-30 00:07:21 +00: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