Commit graph

13585 commits

Author SHA1 Message Date
Camila Ayres
f9947334f6
Merge pull request #1366 from nextcloud/fix/client_side_cert
Add proper CA to client side certificate connection
2019-08-02 18:38:27 +02:00
Camila Ayres
9b6b14b374
Merge branch 'master' into fix/client_side_cert 2019-08-02 14:40:20 +02:00
Roeland Jago Douma
4c8da1a3e7
Add proper CA
If the cert has a chain of certs we should send them all properly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-08-02 14:19:37 +02:00
Nextcloud bot
9e7868b3de
[tx-robot] updated from transifex 2019-08-02 03:05:09 +00:00
Nextcloud bot
8fad2acc36
[tx-robot] updated from transifex 2019-08-01 03:08:11 +00:00
Nextcloud bot
4befda1eab
[tx-robot] updated from transifex 2019-07-31 03:08:42 +00:00
István Váradi
29218158c0
Merge pull request #1360 from ivaradi/ubuntu-eoan
Remove Ubuntu Cosmic and add Eoan package
2019-07-30 07:07:53 +02:00
István Váradi
40753860cf
Merge branch 'master' into ubuntu-eoan 2019-07-30 06:50:19 +02:00
István Váradi
5142cf026f
Merge pull request #1359 from ivaradi/qt55-update
Update Qt 5.5 compatibility patch for Xenial
2019-07-30 06:49:59 +02:00
István Váradi
d64b477280
Merge branch 'master' into ubuntu-eoan 2019-07-30 06:36:44 +02:00
István Váradi
d0cf21d355
Merge branch 'master' into qt55-update 2019-07-30 06:36:24 +02:00
Nextcloud bot
4257f70d2e
[tx-robot] updated from transifex 2019-07-30 03:05:57 +00:00
István Váradi
d000328700
Merge branch 'master' into ubuntu-eoan 2019-07-29 19:05:13 +02:00
István Váradi
b5e45711fc
Merge branch 'master' into qt55-update 2019-07-29 19:04:43 +02:00
Nextcloud bot
9f94f412ef
[tx-robot] updated from transifex 2019-07-29 03:03:27 +00:00
Nextcloud bot
c13d4ca40e
[tx-robot] updated from transifex 2019-07-28 03:05:54 +00:00
István Váradi
04d825f4b6 Remove Ubuntu Cosmic and add Eoan package
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-07-27 11:21:39 +02:00
Nextcloud bot
b448e215ad
[tx-robot] updated from transifex 2019-07-27 03:03:03 +00:00
István Váradi
2d2c1ef29e Update Qt 5.5 compatibility patch for Xenial
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-07-26 21:08:23 +02:00
Nextcloud bot
d654a65ac7
[tx-robot] updated from transifex 2019-07-26 03:03:02 +00:00
István Váradi
f462bfc7c5
Merge pull request #1222 from ivaradi/new-drone-debian
Reinstate Debian build in the new Drone config
2019-07-25 18:58:29 +02:00
István Váradi
d6ab7920d9 Fix the Debian changelog generator
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-07-25 16:48:24 +02:00
István Váradi
ec359d0e6b Reinstate Debian build in the new Drone config
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu>
2019-07-25 16:48:17 +02:00
Nextcloud bot
be3713a535
[tx-robot] updated from transifex 2019-07-25 03:03:32 +00:00
Camila Ayres
a21258487f
Merge pull request #1354 from nextcloud/minorchange/link-to-help-text
Minor text change in the link to help in the tab 'General'.
2019-07-24 19:07:10 +02:00
Camila San
3ea472d9f2
Minor text change in the link to help in the tab 'General'.
Also uses helpUrl() retrieve the correct APPLICATION_HELP_URL
instead of APPLICATION_DOMAIN.

Signed-off-by: Camila San <hello@camila.codes>
2019-07-24 16:39:21 +02:00
Nextcloud bot
a0587f3cde
[tx-robot] updated from transifex 2019-07-24 03:05:55 +00:00
Nextcloud bot
96c35a9410
[tx-robot] updated from transifex 2019-07-23 03:09:01 +00:00
Camila Ayres
41900140df
Merge pull request #1342 from gt-h6k/fixes-1187
Fixes issue #1187
2019-07-22 22:04:14 +02:00
Camila Ayres
a47dd69a71
Merge branch 'master' into fixes-1187 2019-07-22 20:45:50 +02:00
Camila Ayres
0539e34c69
Merge pull request #1275 from ivyclare/pr/607
Fixes #607
2019-07-22 20:45:28 +02:00
Camila Ayres
5d30f4b1eb
Merge branch 'master' into pr/607 2019-07-22 19:38:56 +02:00
Camila Ayres
4559965abf
Merge pull request #1278 from ivyclare/pr/878
Fixes issue #878
2019-07-22 19:38:36 +02:00
Camila Ayres
4801bd5818
Merge branch 'master' into pr/607 2019-07-22 16:46:45 +02:00
Camila Ayres
9411a34a2b
Merge branch 'master' into pr/878 2019-07-22 16:09:52 +02:00
Camila Ayres
94bff61c45
Merge branch 'master' into fixes-1187 2019-07-22 16:09:40 +02:00
Camila Ayres
cf3dd53e12
Merge pull request #1347 from caugner/965-file-folder-ignored-as-info
Displays FileIgnored activities with an info icon
2019-07-22 16:09:27 +02:00
Camila Ayres
0ae72cd68a
Merge branch 'master' into pr/878 2019-07-22 15:45:56 +02:00
Camila Ayres
88624f055d
Merge branch 'master' into 965-file-folder-ignored-as-info 2019-07-22 15:44:10 +02:00
Nextcloud bot
50be2e067c
[tx-robot] updated from transifex 2019-07-22 03:06:58 +00:00
Claas Augner
116c5b361f Displays FileIgnored activities with an info icon
See: https://github.com/nextcloud/desktop/issues/965
Signed-off-by: Claas Augner <git@caugner.de>
2019-07-21 22:02:15 +02:00
Nextcloud bot
ae28be4a10
[tx-robot] updated from transifex 2019-07-21 03:07:35 +00:00
Nextcloud bot
fa2f52b551
[tx-robot] updated from transifex 2019-07-20 03:03:51 +00:00
Nextcloud bot
658f6817ce
[tx-robot] updated from transifex 2019-07-19 03:16:29 +00:00
Nextcloud bot
28c401236b
[tx-robot] updated from transifex 2019-07-17 03:03:58 +00:00
Hiroki Goto
57ca82e620
Merge branch 'master' into fixes-1187 2019-07-15 20:08:47 +09:00
Nextcloud bot
7d700a3c84
[tx-robot] updated from transifex 2019-07-15 03:00:34 +00:00
Nextcloud bot
2c2cc5c23e
[tx-robot] updated from transifex 2019-07-14 03:03:06 +00:00
gt-h6k
1763504b4e Fixes issue #1187
Signed-off-by: Hiroki Goto <git@gt-h6k.net>
2019-07-13 16:39:30 +09:00
Nextcloud bot
94db2f82a2
[tx-robot] updated from transifex 2019-07-13 03:06:30 +00:00