Tomaz Canabrava
1c85f94b00
[cse] Use server capabilities to query for cse
2017-10-18 21:51:36 +02:00
Tomaz Canabrava
920047fa70
[CSE] Remove uneeded includes
2017-10-18 21:51:36 +02:00
Tomaz Canabrava
f7e74f520b
[CSE] Call encrypt and unencrypt from the GUI
...
If the server allows client side encryption, show
the user the menu with the encrypt and unencrupt options
2017-10-18 21:51:36 +02:00
Tomaz Canabrava
5b51346e83
[CSE] New Network Job: DeleteApiJob
...
This network job does a DELETE http request on a URL. It's the
second class that does basically the same, but this one returns
the http return code, and it's set to do a api call.
2017-10-18 21:51:36 +02:00
Tomaz Canabrava
e2091bb0a3
[CSE] Add FileIdRole for the FolderStatusModel
...
This way we can actually request the id from outside of the model.
2017-10-18 21:51:36 +02:00
Tomaz Canabrava
9870f39dcb
[CSE] Fetch file-id for subfolders
...
File id is a must if we want to call any API.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2017-10-18 21:51:36 +02:00
Tomaz Canabrava
9318c487b9
[CSE] Display menu for encrytp / decryot folders
...
If the server supports client syde encryption, display
a menu on right click that should display encrypt and decrypt.
ideally it would show the encrypt if the folder is decrypted, and
decrypt if the folder is encrypted but currently there's no way
for the client to know that.
2017-10-18 21:51:36 +02:00
Tomaz Canabrava
1c32f6bb2e
[CSE] Check the server for client side encryption
...
Call the apps api and check if the response has
the client_side_encryption key.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
2017-10-18 21:51:36 +02:00
Roeland Jago Douma
f9b1c724d6
Merge pull request #19 from nextcloud/no_5.6_drone
...
Our 5.6 container is to old. Lets focus on the others for now
2017-10-18 21:29:47 +02:00
Roeland Jago Douma
4946848d08
Out 5.6 container is to old. Lets focus on the others for now
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-18 21:14:19 +02:00
Roeland Jago Douma
f56e1d167d
Merge pull request #18 from nextcloud/up_mas
...
Update to oC master
2017-10-18 21:13:24 +02:00
Roeland Jago Douma
bc7e65b395
Merge branch 'master' of https://github.com/owncloud/client
2017-10-18 21:03:15 +02:00
Dominik Schmidt
7f51803d04
Only use $(MAKE) in doc target if make is used as generator
...
The old behavior broke builds with other CMake generators like Ninja as it obviously has no concept of $(MAKE)
2017-10-17 12:50:34 +02:00
Jenkins for ownCloud
30957479a3
[tx-robot] updated from transifex
2017-10-17 02:18:34 +02:00
Jenkins for ownCloud
b4ab53dd32
[tx-robot] updated from transifex
2017-10-16 02:18:33 +02:00
Jenkins for ownCloud
a314eeb892
[tx-robot] updated from transifex
2017-10-15 02:18:35 +02:00
Jenkins for ownCloud
644ddf318c
[tx-robot] updated from transifex
2017-10-14 02:18:36 +02:00
Jenkins for ownCloud
104c6edcde
[tx-robot] updated from transifex
2017-10-13 02:18:37 +02:00
Jenkins for ownCloud
94b673dc8e
[tx-robot] updated from transifex
2017-10-12 02:18:38 +02:00
Jenkins for ownCloud
0a4370236d
[tx-robot] updated from transifex
2017-10-11 02:18:35 +02:00
Jenkins for ownCloud
fe8d2b397e
[tx-robot] updated from transifex
2017-10-10 02:18:44 +02:00
Christian Kamm
92e90f9c55
Context menu: More detailed status messages
...
Previously it could only display synchronization progress or "up to
date". Now it also communicates the same overall state that the icon
shows.
See owncloud/enterprise#2134
2017-10-09 14:14:31 +02:00
Roeland Jago Douma
9eabd2a32a
Merge pull request #6 from nextcloud/mergeWithOrigin
...
Update master from current owncloud master
2017-10-09 08:50:13 +02:00
Jenkins for ownCloud
3eb2642b11
[tx-robot] updated from transifex
2017-10-09 02:18:35 +02:00
Jenkins for ownCloud
99192a6dec
[tx-robot] updated from transifex
2017-10-08 02:18:36 +02:00
Jenkins for ownCloud
cffc1fd1c4
[tx-robot] updated from transifex
2017-10-07 02:18:37 +02:00
Olivier Goffart
b8f7c6daae
CMakeLists.txt: Put -pie as a linker flag were it belongs
...
Fixes warning introduced by PR #6040
2017-10-06 14:35:56 +02:00
Markus Goetz
cd07865da6
Settings Dialog: Fix display name compilation for macOS #6078
2017-10-06 13:34:40 +02:00
Thomas Müller
315e38e814
Use display-name from the ocs call in the settings dialog
2017-10-06 10:59:20 +02:00
Jenkins for ownCloud
95b90271b6
[tx-robot] updated from transifex
2017-10-06 02:18:35 +02:00
Christian Kamm
19c6757a0f
Rename detection: File size must be equal
...
Comparison of file sizes for potential conflicts was added in
0eb9401c62
2017-10-05 22:01:42 +02:00
Christian Kamm
3636a59830
t9.pl: Make more reliable
...
Sometimes the 'touch' didn't change the mtime since too little time had
passed!
2017-10-05 22:01:42 +02:00
Markus Goetz
548302c367
ChangeLog: Re-format and re-order
2017-10-05 22:01:42 +02:00
Markus Goetz
a64a33c589
ChangeLog: More 2.4.0 changes
2017-10-05 22:01:42 +02:00
Christian Kamm
01bbbb7d08
Excludes: Fix bug with escapes in the regex, add tests
2017-10-05 22:01:42 +02:00
Christian Kamm
f609ea3bef
Excludes: optimize csync_is_windows_reserved_word
2017-10-05 22:01:42 +02:00
Markus Goetz
91223b1a3d
Excludes: During directory traversal, use QRegularExpression
...
On Mac, this halves the time spent in csync_excluded_traversal
when using check_csync_excluded_performance. A similar performance
increase is seen on linux.
2017-10-05 22:01:42 +02:00
Jenkins for ownCloud
ca0f9825ce
[tx-robot] updated from transifex
2017-10-05 22:01:42 +02:00
Markus Goetz
f202593ce4
sqlite: Update bundled version to 3.20.1
...
For OS X and Windows.
2017-10-05 22:01:42 +02:00
Jürgen Weigert
d8ed9e5bde
use IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin
...
We need to test presence of admin folder using ${CMAKE_SOURCE_DIR}, or it is always false. Bad for ox, (good for everything else)
2017-10-05 22:01:39 +02:00
Jenkins for ownCloud
c436b36b89
[tx-robot] updated from transifex
2017-10-05 22:01:39 +02:00
Jenkins for ownCloud
980bab422a
[tx-robot] updated from transifex
2017-10-05 22:01:39 +02:00
Jenkins for ownCloud
6fbd3cf61a
[tx-robot] updated from transifex
2017-10-05 22:01:39 +02:00
Jenkins for ownCloud
e6e1f765bd
[tx-robot] updated from transifex
2017-10-05 22:01:39 +02:00
Jenkins for ownCloud
b2fe501706
[tx-robot] updated from transifex
2017-10-05 22:01:38 +02:00
rockihack
2bfd85e3c7
Linux Hardening
...
see: https://wiki.debian.org/Hardening#User_Space
2017-10-05 22:01:38 +02:00
Jenkins for ownCloud
e1eb374ac3
[tx-robot] updated from transifex
2017-10-05 22:01:38 +02:00
Jürgen Weigert
ea2c3828cb
Update clean_tarball.sh
...
warning against removing sqlite. it is used with Linux with cmake switch on CentOS6
USE_OUR_OWN_SQLITE3=TRUE
2017-10-05 22:01:38 +02:00
Jürgen Weigert
c1e2bdc3d2
Update CMakeLists.txt
...
Make admin folder optional. It is needed for osx, but it is deleted from Linux builds for the sake of easier license review as discussed in https://github.com/owncloud/client/issues/6005
2017-10-05 22:01:38 +02:00
Jürgen Weigert
09c3043c85
support old sqlite before 3.7.7
...
quickfix: define the symbol for backwards compat
or FIXME: better solution #ifdef SQLITE_IOERR_SHMMAP where needed...
2017-10-05 22:01:38 +02:00
