Roeland Jago Douma
|
106756624a
|
Merge pull request #448 from nextcloud/ci/clang
Add clang build to CI
|
2018-06-26 17:44:23 +02:00 |
|
Camila Ayres
|
e3815608ab
|
Merge branch 'master' into ci/clang
|
2018-06-26 17:26:54 +02:00 |
|
Camila Ayres
|
959318adf0
|
Merge pull request #450 from nextcloud/deps/openssl
We require openssl 1.1
|
2018-06-26 17:26:16 +02:00 |
|
Roeland Jago Douma
|
c1bebd1253
|
We require openssl 1.1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2018-06-26 16:37:44 +02:00 |
|
Roeland Jago Douma
|
64255f8f09
|
Add clang build to CI
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2018-06-26 15:41:23 +02:00 |
|
Julius Härtl
|
84b7ed04e6
|
Merge pull request #446 from nextcloud/ci/qt510-qt511
Add Qt-5.10 and Qt-5.11 drone builds
|
2018-06-26 15:08:51 +02:00 |
|
Roeland Jago Douma
|
0a9185b88c
|
Add Qt-5.10 and Qt-5.11 drone builds
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2018-06-26 13:08:34 +02:00 |
|
Nextcloud bot
|
5d96a0e6b6
|
[tx-robot] updated from transifex
|
2018-06-25 00:46:38 +00:00 |
|
Nextcloud bot
|
e290b1c353
|
[tx-robot] updated from transifex
|
2018-06-24 00:46:16 +00:00 |
|
Roeland Jago Douma
|
1235652cde
|
Merge pull request #442 from nextcloud/fix/noid/appimage_webview
Fix webview appimage
|
2018-06-23 21:36:47 +02:00 |
|
Roeland Jago Douma
|
2c5e559df6
|
Bundle NSS because else 💥
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2018-06-23 21:29:16 +02:00 |
|
Roeland Jago Douma
|
e79591e52c
|
Bump drone images
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2018-06-23 21:29:16 +02:00 |
|
Roeland Jago Douma
|
9eb950bdcf
|
Merge pull request #438 from nextcloud/bugfix/413/hide-decrypt-option
Hide decrypt option since it does only work for empty folders
|
2018-06-23 21:20:46 +02:00 |
|
Julius Härtl
|
92480ec8fb
|
Hide decrypt option since it does only work for empty folders
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2018-06-22 12:13:04 +02:00 |
|
Roeland Jago Douma
|
aff749da12
|
Merge pull request #437 from nextcloud/feature/150/e2e-indicator
Add indicator to e2e folders
|
2018-06-22 11:32:22 +02:00 |
|
Julius Härtl
|
e42f5648bd
|
Add indicator to e2e folders
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2018-06-22 11:21:30 +02:00 |
|
Camila Ayres
|
73969e2515
|
Merge pull request #436 from nextcloud/feature/noid/e2e-mnemonic-dialog
Use custom mnemonic dialog.
|
2018-06-22 11:09:54 +02:00 |
|
Julius Härtl
|
655a43db10
|
Use custom mnemonic dialog
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2018-06-22 10:42:01 +02:00 |
|
Roeland Jago Douma
|
cf93b74028
|
Merge pull request #432 from nextcloud/feature/157/show_mnemonic
Add a button to E2E accounts to show the mnemonic
|
2018-06-22 10:15:07 +02:00 |
|
Roeland Jago Douma
|
48a6ef37b2
|
Add a button to E2E accounts to show the mnemonic
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2018-06-21 19:52:27 +02:00 |
|
Roeland Jago Douma
|
a742cbcdce
|
Merge pull request #409 from nextcloud/upstream/pr/6556
Fix make doc-man in shadow build
|
2018-06-21 19:50:48 +02:00 |
|
Roeland Jago Douma
|
652dd8c812
|
Merge pull request #410 from nextcloud/upstream/windows-shell-integration
Windows Shell extention: Fix clicking on the menu entries
|
2018-06-21 19:42:04 +02:00 |
|
Olivier Goffart
|
0d0bff4bf5
|
Windows Shell extention: Fix clicking on the menu entries
Issue #6553
|
2018-06-21 19:21:07 +02:00 |
|
Camila Ayres
|
4d60dd6516
|
Merge pull request #431 from nextcloud/fix/webkit-osx
More fixes for the OSX daily builds.
|
2018-06-21 15:37:56 +02:00 |
|
Roeland Jago Douma
|
30b211381f
|
More fixes for the OSX daily builds
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2018-06-21 15:22:53 +02:00 |
|
Nextcloud bot
|
9bfdb057cd
|
[tx-robot] updated from transifex
|
2018-06-21 00:50:29 +00:00 |
|
Jan-Christoph Borchardt
|
ae6483862e
|
Merge pull request #416 from nextcloud/bugfix/16/sync-state-icons
Add new sync state icons
|
2018-06-20 17:36:38 +02:00 |
|
Julius Härtl
|
b4306884c8
|
Update theme file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2018-06-20 16:27:17 +02:00 |
|
Julius Härtl
|
539823e64a
|
Add new icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2018-06-20 16:06:20 +02:00 |
|
Julius Härtl
|
0e1302cca5
|
Remove icons from qrc file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2018-06-20 16:06:20 +02:00 |
|
Julius Härtl
|
4ba40a6ce1
|
Move information icon to warning icon
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2018-06-20 16:06:19 +02:00 |
|
Julius Härtl
|
38b4febde6
|
Remove unused icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
|
2018-06-20 16:06:19 +02:00 |
|
Roeland Jago Douma
|
81d8a1ec6b
|
Merge pull request #419 from nextcloud/fix/osx/no_thead_local
Thread local storage don't work properly on OSX
|
2018-06-20 15:15:15 +02:00 |
|
Roeland Jago Douma
|
9fe77ed7bf
|
Merge pull request #430 from nextcloud/update_mac_deploy-at
Fix macdeployqt
|
2018-06-20 15:14:43 +02:00 |
|
Roeland Jago Douma
|
cbf3725814
|
Fix macdeployqt
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2018-06-20 13:05:41 +02:00 |
|
Nextcloud bot
|
bb480061e5
|
[tx-robot] updated from transifex
|
2018-06-20 00:48:25 +00:00 |
|
Nextcloud bot
|
a0ad05fb90
|
[tx-robot] updated from transifex
|
2018-06-19 00:48:37 +00:00 |
|
Nextcloud bot
|
10f08159bd
|
[tx-robot] updated from transifex
|
2018-06-17 00:52:06 +00:00 |
|
Nextcloud bot
|
57657ae119
|
[tx-robot] updated from transifex
|
2018-06-16 00:52:48 +00:00 |
|
Camila Ayres
|
4aeec032fe
|
Merge branch 'master' into fix/osx/no_thead_local
|
2018-06-15 10:29:24 +02:00 |
|
Nextcloud bot
|
990af6be2f
|
[tx-robot] updated from transifex
|
2018-06-15 00:49:45 +00:00 |
|
Roeland Jago Douma
|
f7bf8c7577
|
Thread local storage don't work properly on OSX
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2018-06-14 21:26:07 +02:00 |
|
Roeland Jago Douma
|
f71c74e5aa
|
Merge pull request #418 from nextcloud/fix/nextcloud_sparkle_key
Add our own dsa_pub.pem
|
2018-06-14 21:06:17 +02:00 |
|
Roeland Jago Douma
|
8b96ef53b9
|
Add our own dsa_pub.pem
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
|
2018-06-14 20:59:27 +02:00 |
|
Roeland Jago Douma
|
2ce79717b2
|
Merge pull request #412 from nextcloud/upstream/nsis
NSIS: SVG imageformats plugin DLL
|
2018-06-13 19:52:40 +02:00 |
|
Markus Goetz
|
c04ae70cf5
|
NSIS: SVG imageformats plugin DLL #6515
|
2018-06-13 14:57:31 +02:00 |
|
Markus Goetz
|
ae36f36d56
|
NSIS: SVG DLL #6515
|
2018-06-13 14:57:30 +02:00 |
|
Nextcloud bot
|
4ad2955a75
|
[tx-robot] updated from transifex
|
2018-06-12 00:55:30 +00:00 |
|
Roeland Jago Douma
|
26bf407d62
|
Merge pull request #400 from nextcloud/upstream/pr/6481
SocketAPI: Allow opening share dialog if contents still syncing #4608
|
2018-06-11 19:43:01 +02:00 |
|
Christian Kamm
|
ca8f569371
|
SocketAPI: Remove SHARE_STATUS
It was never used by a shell integration.
|
2018-06-11 19:35:17 +02:00 |
|