Roeland Jago Douma
f0ef2c27a3
Merge pull request #553 from ivaradi/libssl
...
LibSSL versions
2018-08-13 21:47:53 +02:00
Camila Ayres
b50db09b01
Merge pull request #554 from nextcloud/feature/noid/enable_providers_by_default
...
Enable providers by default
2018-08-13 20:24:27 +02:00
Roeland Jago Douma
86991b9996
Enable providers by default
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-13 19:59:34 +02:00
István Váradi
c27943b46d
Merge branch 'master' into libssl
2018-08-13 19:15:57 +02:00
Camila Ayres
ef71e6b0f7
Merge pull request #551 from nextcloud/issues/494
...
Issue #494 : removes close button from the settings.
2018-08-13 18:25:20 +02:00
Camila Ayres
8e8a619ee1
Merge branch 'master' into issues/494
2018-08-13 17:42:53 +02:00
Camila Ayres
27076c0f28
Merge pull request #552 from nextcloud/removes-notificationwidget
...
Removes unused NotificationWidget class.
2018-08-13 17:42:38 +02:00
István Váradi
fc6e6149e5
Require libssl 1.1 on distributions other than Xenial
2018-08-13 16:24:44 +02:00
István Váradi
13e2bb099b
Require libssl 1.0 on Xenial
2018-08-13 16:24:18 +02:00
Camila San
8fd0ca4587
Removes unused NotificationWidget class.
...
Since the new activities/notifications list UI this class is not used
anymore.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-13 15:17:40 +02:00
Camila San
2aa942e4b8
Issue #494 : removes close button from the settings.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-08-13 14:24:10 +02:00
Camila Ayres
92aaa09643
Merge pull request #541 from nextcloud/bugfix/noid/wizard-external-links
...
Make links open in an external browser
2018-08-13 12:03:31 +02:00
Roeland Jago Douma
0e2cd30ea1
Merge branch 'master' into bugfix/noid/wizard-external-links
2018-08-13 11:43:42 +02:00
Roeland Jago Douma
bc44c62471
Merge pull request #524 from ivaradi/ubuntu-compat
...
Some Ubuntu compilation fixes
2018-08-13 11:43:26 +02:00
Roeland Jago Douma
2434523f33
Merge pull request #532 from ShinjiLE/master
...
rearange CMake find_package OpenSSL
2018-08-13 11:42:35 +02:00
Camila Ayres
534a92b709
Merge branch 'master' into bugfix/noid/wizard-external-links
2018-08-13 11:40:45 +02:00
Roeland Jago Douma
233e10ecb1
Merge branch 'master' into master
2018-08-13 11:21:05 +02:00
Roeland Jago Douma
cefc6b531c
Merge pull request #549 from nextcloud/ci/noid/bump_imagesx
...
Bump ci images
2018-08-13 11:20:50 +02:00
Roeland Jago Douma
5c7c92157f
Bump images
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-13 10:56:18 +02:00
Camila Ayres
176a2e6f84
Merge branch 'master' into ubuntu-compat
2018-08-13 09:03:26 +02:00
Camila Ayres
647d16c792
Merge branch 'master' into bugfix/noid/wizard-external-links
2018-08-13 09:02:21 +02:00
Camila Ayres
3ad33a368a
Merge branch 'master' into master
2018-08-13 08:58:26 +02:00
Nextcloud bot
951096f569
[tx-robot] updated from transifex
2018-08-13 00:49:31 +00:00
Nextcloud bot
489c0529c4
[tx-robot] updated from transifex
2018-08-12 00:48:32 +00:00
Julius Härtl
3576fbb2a5
Remove unused subclass of QWebEngineView
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-11 17:47:40 +02:00
Julius Härtl
8dedb9084e
Make links open in an external browser
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-11 17:38:08 +02:00
Nextcloud bot
f6ef11a5c9
[tx-robot] updated from transifex
2018-08-11 00:47:25 +00:00
Nextcloud bot
1d868eb809
[tx-robot] updated from transifex
2018-08-09 00:48:49 +00:00
Julius Härtl
c3aafa722a
Merge pull request #536 from nextcloud/3rdpart/remove_uneeded
...
Remove nlohmann/json.hpp
2018-08-08 21:34:48 +02:00
Roeland Jago Douma
b85bad0566
Remove nlohmann/json.hpp
...
Not used so no need to have it lying around
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-08 20:03:04 +02:00
Nextcloud bot
a4507db31a
[tx-robot] updated from transifex
2018-08-08 00:50:18 +00:00
Nextcloud bot
e551b89ba7
[tx-robot] updated from transifex
2018-08-07 00:46:53 +00:00
Ronny
7cbca28eb7
Merge branch 'master' into master
2018-08-05 11:35:53 +02:00
Nextcloud bot
a1967d551d
[tx-robot] updated from transifex
2018-08-05 00:49:39 +00:00
Ronny Kunze
2b825a1748
rearange CMake find_package OpenSSL
...
the command seems to be malformed . The keyword VERSION is not valid .
And the version should follow direct after the packagename.
2018-08-04 16:53:06 +02:00
Nextcloud bot
5110f9618a
[tx-robot] updated from transifex
2018-08-04 00:47:26 +00:00
István Váradi
d30f8b9094
Merge branch 'master' into ubuntu-compat
2018-08-03 17:16:20 +02:00
Camila Ayres
e0f49971f9
Merge pull request #525 from nextcloud/feature/132/about_dialog
...
Add legal notice button to about dialog
2018-08-02 22:32:56 +02:00
Roeland Jago Douma
c4d7f97e00
Add legal notice button to about dialog
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-02 22:17:11 +02:00
Roeland Jago Douma
30fc87daea
Merge pull request #344 from nextcloud/fix-share-dialog
...
Fix share dialog
2018-08-02 22:13:30 +02:00
Roeland Jago Douma
aa4ff0c083
Fix include order
...
Because why not :S
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-02 21:19:57 +02:00
István Váradi
758c2ad9ac
Merge branch 'master' into ubuntu-compat
2018-08-02 21:08:54 +02:00
Camila San
9d087b920b
Inserts ShareDialogStartPage in the correct position in the share dialog.
...
- With the new UI this had to be adapted.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 20:23:26 +02:00
Camila San
2cd32261a2
Checks if share link exists before settings password.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 20:22:37 +02:00
Camila San
8e0398426d
Replaces 'more' (3 dots) png icon for svg in buttons of the share
...
dialog.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 20:21:11 +02:00
Camila San
44865e0107
Adjustes sizes and margins in the share dialog and its widgets.
...
- Adds TODO's in commented out code.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
c2c2fe3ce3
Changes Share User/Group widget UI to match the server share UI.
...
- Display list of permissions in the tool button menu.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
25ff932a0b
Fixes edit permission on share link for files and folders.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
5b7970fed7
Updates client.qrc with new icon 'copy' for share link menu options.
...
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:17 +02:00
Camila San
b14aa11c29
Changes share link layout so it looks like the UI on the server.
...
- Adds icons to Share link and to save password on share dialog.
- Changes wording of the menu options for sharing link.
- Adds functionality to the new menu (mostly permissions).
- More widget size and size policy adjustments.
Signed-off-by: Camila San <hello@camila.codes>
2018-08-02 19:57:16 +02:00
