Nextcloud bot
58302e9fc0
[tx-robot] updated from transifex
2018-10-26 00:50:27 +00:00
Roeland Jago Douma
8acc5573ff
Merge pull request #667 from nextcloud/upstream/pr/6592
...
SettingsDialog: Show the page for the newly created account
2018-10-25 08:23:51 +02:00
Roeland Jago Douma
6224f6a1fa
Merge branch 'master' into upstream/pr/6592
2018-10-25 07:44:04 +02:00
Nextcloud bot
44bc637237
[tx-robot] updated from transifex
2018-10-25 00:49:57 +00:00
Julius Härtl
99d4f81892
Merge branch 'master' into upstream/pr/6592
2018-10-24 22:38:11 +02:00
Julius Härtl
98bedf1031
Merge pull request #659 from nextcloud/upstream/issues/6696-6610
...
Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY
2018-10-24 22:25:16 +02:00
Roeland Jago Douma
eb31e9205c
Merge branch 'master' into upstream/issues/6696-6610
2018-10-24 16:50:39 +02:00
Roeland Jago Douma
c8204f1725
Merge pull request #640 from nextcloud/upstream/pr/6617
...
OAuth: Remove the timeout
2018-10-24 16:49:59 +02:00
Roeland Jago Douma
174f99728f
Merge branch 'master' into upstream/pr/6617
2018-10-24 16:27:31 +02:00
Roeland Jago Douma
dcdf6d966d
Merge pull request #717 from tuxmaster5000/gitignore
...
Add cmake temporary stuff
2018-10-24 13:22:56 +02:00
Roeland Jago Douma
3e79ebed60
Merge pull request #661 from nextcloud/upstream/pr/6712
...
nautilus: Fix GET_MENU_ITEMS with utf8 filenames #6643
2018-10-24 13:22:22 +02:00
Roeland Jago Douma
5237a2c3e2
Merge branch 'master' into upstream/pr/6712
2018-10-24 08:59:29 +02:00
Roeland Jago Douma
6e0d636989
Merge pull request #595 from nextcloud/upstream/pr/6485
...
Show a tray message when a folder watcher becomes unreliable #6119
2018-10-24 08:59:15 +02:00
Roeland Jago Douma
d246c1e8b9
Merge branch 'master' into upstream/pr/6485
2018-10-24 08:27:11 +02:00
Roeland Jago Douma
96541d8ab8
Merge pull request #657 from nextcloud/upstream/pr/6688
...
Support higher resolution theme icons
2018-10-24 08:23:41 +02:00
Roeland Jago Douma
091c4fd9b0
Merge branch 'master' into upstream/pr/6688
2018-10-24 07:29:10 +02:00
Nextcloud bot
8098566140
[tx-robot] updated from transifex
2018-10-24 00:50:56 +00:00
Roeland Jago Douma
21dc97b809
Merge pull request #644 from nextcloud/upstream/pr/6632
...
Reconcile: When detecting a local move, keep the local mtime
2018-10-23 23:13:58 +02:00
Julius Härtl
0f9b8daa57
Merge branch 'master' into upstream/pr/6712
2018-10-23 23:09:26 +02:00
Dominik Schmidt
cddb9aa8ba
Support higher resolution theme icons
2018-10-23 23:07:17 +02:00
Roeland Jago Douma
24606c0105
Merge branch 'master' into upstream/pr/6632
2018-10-23 22:51:12 +02:00
Roeland Jago Douma
3384f7e28b
Merge pull request #660 from nextcloud/upstream/pr/6674
...
Data-Fingerprint: Fix backup detection when fingerprint is empty
2018-10-23 22:50:54 +02:00
Roeland Jago Douma
6b7328bb87
Merge branch 'master' into upstream/pr/6632
2018-10-23 22:48:34 +02:00
Roeland Jago Douma
f3529e3dd7
Merge branch 'master' into upstream/pr/6674
2018-10-23 21:43:13 +02:00
Roeland Jago Douma
305952e32e
Merge pull request #634 from nextcloud/upstream/issue/6581
...
Ensure GETFileJob notices finishing #6581
2018-10-23 21:26:21 +02:00
Roeland Jago Douma
c37186cc56
Merge branch 'master' into upstream/issue/6581
2018-10-23 21:08:51 +02:00
Roeland Jago Douma
4e866123c5
Merge pull request #635 from nextcloud/upstream/issue/6522
...
OAuth2: Try to refresh the token even if the credentials weren't ready.
2018-10-23 21:07:04 +02:00
Roeland Jago Douma
35c0c9c0b1
Merge branch 'master' into upstream/issue/6522
2018-10-23 20:13:28 +02:00
Roeland Jago Douma
d3bc9fbdf3
Merge pull request #639 from nextcloud/upstream/pr/6605
...
UpdateInfo: Remove unused code
2018-10-23 13:05:27 +02:00
Roeland Jago Douma
0cf2970134
Merge branch 'master' into upstream/pr/6605
2018-10-23 12:32:16 +02:00
Roeland Jago Douma
206f081505
Merge pull request #727 from nextcloud/fix-issue-268
...
Uses QByteArray to store private key.
2018-10-23 12:31:39 +02:00
Roeland Jago Douma
1c8307f264
Merge branch 'master' into fix-issue-268
2018-10-23 12:04:14 +02:00
Roeland Jago Douma
2d65091f27
Merge pull request #637 from nextcloud/upstream/issue/6545
...
Tray workarounds #6545
2018-10-23 11:48:08 +02:00
Roeland Jago Douma
a492ab8294
Merge branch 'master' into upstream/issue/6545
2018-10-23 10:59:56 +02:00
Nextcloud bot
3da6f45ba9
[tx-robot] updated from transifex
2018-10-23 00:43:03 +00:00
Julius Härtl
856d40fd99
Merge branch 'master' into upstream/issue/6581
2018-10-22 20:41:17 +02:00
Nextcloud bot
846075704e
[tx-robot] updated from transifex
2018-10-22 00:45:03 +00:00
Roeland Jago Douma
156308c72e
Merge branch 'master' into upstream/issue/6581
2018-10-21 14:19:07 +02:00
Camila Ayres
c99a35a8a5
Merge pull request #732 from st4ll1/master
...
Fix cmake command for linux in README too
2018-10-21 11:50:28 +02:00
Andreas Stallinger
f937fdd624
Fix cmake command for linux in README too
2018-10-21 10:40:44 +02:00
Nextcloud bot
1f8c3074a6
[tx-robot] updated from transifex
2018-10-21 00:44:18 +00:00
Nextcloud bot
11673005db
[tx-robot] updated from transifex
2018-10-20 00:43:12 +00:00
Roeland Jago Douma
df24a25829
Merge pull request #396 from nextcloud/upstream/pr/6360
...
SyncJournal: Clear etag filter before sync
2018-10-19 20:26:30 +02:00
Roeland Jago Douma
2dc7ff7332
Merge branch 'master' into upstream/pr/6360
2018-10-19 16:13:09 +02:00
Roeland Jago Douma
7ace48d5de
Merge pull request #643 from nextcloud/upstream/pr/6615
...
Log: Adjust update/reconcile log verbosity
2018-10-19 16:04:26 +02:00
Roeland Jago Douma
56ccff4ee8
Merge pull request #654 from nextcloud/upstream/sqlite-version-3-24
...
sqlite: Update bundled version to 3.24.0
2018-10-19 16:03:04 +02:00
Roeland Jago Douma
9d9f96a685
Merge branch 'master' into upstream/pr/6615
2018-10-19 15:43:50 +02:00
Nextcloud bot
052c37acda
[tx-robot] updated from transifex
2018-10-19 00:42:46 +00:00
Nextcloud bot
fd2e88e13b
[tx-robot] updated from transifex
2018-10-17 00:42:35 +00:00
tuxmaster5000
28b399ec2b
Merge branch 'master' into gitignore
2018-10-16 08:55:18 +02:00
Roeland Jago Douma
4bb936f876
Merge pull request #709 from nextcloud/fix-issue-665
...
Fixes #665 Adds slot for confirmShare button.
2018-10-15 13:58:16 +02:00
Roeland Jago Douma
6805d91033
Merge branch 'master' into fix-issue-665
2018-10-15 13:47:18 +02:00
Nextcloud bot
8da2b9dbf8
[tx-robot] updated from transifex
2018-10-15 00:43:12 +00:00
Camila San
45ff3385c7
Uses QByteArray to store private key.
...
Removes QSslkey. See #268
Signed-off-by: Camila San <hello@camila.codes >
2018-10-15 00:21:08 +02:00
Camila Ayres
53cc6a1611
Merge branch 'master' into gitignore
2018-10-14 16:17:13 +02:00
Nextcloud bot
bfc8154e68
[tx-robot] updated from transifex
2018-10-14 00:43:12 +00:00
Nextcloud bot
74d8f32f37
[tx-robot] updated from transifex
2018-10-13 00:42:33 +00:00
tuxmaster5000
a5e329a1c5
Add cmake temporary stuff
2018-10-12 11:48:32 +02:00
Nextcloud bot
3fe44f0d25
[tx-robot] updated from transifex
2018-10-11 00:43:07 +00:00
Nextcloud bot
e207c91228
[tx-robot] updated from transifex
2018-10-10 00:50:58 +00:00
Nextcloud bot
cdf922f51d
[tx-robot] updated from transifex
2018-10-09 00:49:05 +00:00
Camila Ayres
45ffc0ae09
Merge pull request #710 from kevin147147/patch-1
...
Rename INSTALL to INSTALL.md for Preview :)
2018-10-08 22:00:22 +02:00
kevin147147
e214234001
Rename README to README.md
...
Preview :)
2018-10-08 21:01:08 +02:00
kevin147147
54e58b51ab
Rename INSTALL to INSTALL.md
...
Preview :)
2018-10-08 20:57:34 +02:00
Camila San
debe37308f
Fixes #665 Adds slot for confirmShare button.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-10-08 20:56:01 +02:00
Nextcloud bot
7c096d08aa
[tx-robot] updated from transifex
2018-10-07 00:50:40 +00:00
Nextcloud bot
ac631d008c
[tx-robot] updated from transifex
2018-10-06 00:48:41 +00:00
Nextcloud bot
f1cad3443b
[tx-robot] updated from transifex
2018-10-05 00:51:40 +00:00
Nextcloud bot
cacde7a3aa
[tx-robot] updated from transifex
2018-10-02 00:49:28 +00:00
Camila Ayres
b533c3582e
Updates issue_template.md.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-10-01 17:57:35 +02:00
Nextcloud bot
69f18f6b7d
[tx-robot] updated from transifex
2018-10-01 00:49:10 +00:00
Nextcloud bot
de80f7d6ca
[tx-robot] updated from transifex
2018-09-30 00:50:09 +00:00
Nextcloud bot
38ec3b8972
[tx-robot] updated from transifex
2018-09-29 00:47:33 +00:00
Nextcloud bot
52d40235b6
[tx-robot] updated from transifex
2018-09-28 00:43:34 +00:00
Nextcloud bot
0ee662bb0e
[tx-robot] updated from transifex
2018-09-27 00:52:10 +00:00
Nextcloud bot
5733e90b09
[tx-robot] updated from transifex
2018-09-26 00:52:09 +00:00
Nextcloud bot
95d2c64c1b
[tx-robot] updated from transifex
2018-09-25 00:51:54 +00:00
Nextcloud bot
b71c753a94
[tx-robot] updated from transifex
2018-09-24 00:49:25 +00:00
Nextcloud bot
bd88ddfa07
[tx-robot] updated from transifex
2018-09-23 01:19:35 +00:00
Nextcloud bot
373c6cd631
[tx-robot] updated from transifex
2018-09-22 00:52:01 +00:00
Nextcloud bot
a464ad2c71
[tx-robot] updated from transifex
2018-09-21 00:59:02 +00:00
Nextcloud bot
f3dd97f29c
[tx-robot] updated from transifex
2018-09-20 00:50:44 +00:00
Nextcloud bot
6587955668
[tx-robot] updated from transifex
2018-09-19 00:49:32 +00:00
Nextcloud bot
9013036685
[tx-robot] updated from transifex
2018-09-17 00:52:18 +00:00
Nextcloud bot
ebd632f582
[tx-robot] updated from transifex
2018-09-16 00:51:19 +00:00
Nextcloud bot
ce22007b16
[tx-robot] updated from transifex
2018-09-15 00:50:19 +00:00
Nextcloud bot
6a1043cef0
[tx-robot] updated from transifex
2018-09-14 00:51:47 +00:00
Nextcloud bot
82f3b4c91f
[tx-robot] updated from transifex
2018-09-13 00:50:42 +00:00
Nextcloud bot
d0b6a611f2
[tx-robot] updated from transifex
2018-09-12 00:49:42 +00:00
Camila Ayres
714a4090a7
Merge pull request #668 from nextcloud/update-qtmacgoodies
...
Updates submodule qtmacgoodies.
2018-09-11 16:41:45 +02:00
Camila San
63d7e54ef3
Updates submodule qtmacgoodies.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-09-11 16:11:47 +02:00
Markus Goetz
a2f4917daf
SettingsDialogMac: Show the page for the newly created account
2018-09-11 13:45:01 +02:00
Olivier Goffart
a09f1d14ba
SettingsDialog: Show the page for the newly created account
2018-09-11 13:44:22 +02:00
Nextcloud bot
96c37b1fac
[tx-robot] updated from transifex
2018-09-11 00:50:01 +00:00
Christian Kamm
f4dfdf5889
nautilus: Fix GET_MENU_ITEMS with utf8 filenames #6643
2018-09-10 21:06:57 +02:00
Olivier Goffart
08e4ba3363
Data-Fingerprint: Fix backup detection when fingerprint is empty
...
Add a test to test the data fingerprint feature make me realize it was broken.
The code was relying in the distinction between empty and null QByteArray,
but this was a bad idea as this difference is lost when going through QString.
2018-09-10 20:44:03 +02:00
Markus Goetz
4f83bba829
Windows: Don't ignore files with FILE_ATTRIBUTE_TEMPORARY
...
Too many applications incorrectly use this attribute.
For #6696 #6610
2018-09-10 20:20:40 +02:00
Camila San
90d3917481
Creates .github folder.
...
- Adds issue_template.md to folder .github - previously bug_report.md.
- This will enable the issue template when users creates issues.
Signed-off-by: Camila San <hello@camila.codes >
2018-09-10 17:17:39 +02:00
Camila San
d9cc362258
Adds bug_report.md file.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-09-10 17:09:22 +02:00
Camila Ayres
0a5f890bf9
Adds bug_report template.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-09-10 16:58:27 +02:00
Markus Goetz
b873311bc5
sqlite: Update bundled version to 3.24.0
...
For OS X and Windows.
2018-09-10 16:44:16 +02:00
Camila Ayres
eaa4e77626
Merge pull request #652 from ivaradi/nautilus-plugin-python-fix
...
Use encode()/decode() with Python 3 only.
2018-09-10 15:29:10 +02:00
István Váradi
7a7799407d
Merge branch 'master' into nautilus-plugin-python-fix
2018-09-10 15:17:14 +02:00
István Váradi
a4e23e7655
Merge pull request #598 from ivaradi/icon-name-fix
...
Create symlinks for the small-letter application icon file names
2018-09-10 15:16:45 +02:00
István Váradi
56ea525499
Use encode()/decode() with Python 3 only
2018-09-10 15:05:46 +02:00
István Váradi
e84bdd59c7
Use the correct icon name variable in mirall.desktop.in
2018-09-10 14:54:24 +02:00
István Váradi
b5f484aaf5
Revert "Create symlinks for the small-letter application icon file names"
...
This reverts commit 328f82297a .
2018-09-10 14:50:14 +02:00
István Váradi
264b77c634
Merge branch 'master' into icon-name-fix
2018-09-10 14:08:35 +02:00
Nextcloud bot
23d64dd3ac
[tx-robot] updated from transifex
2018-09-10 00:50:19 +00:00
Olivier Goffart
67f793a49e
Log: Remove inaccurate comment about --logdebug
...
The exact string is actually "sync.*.debug=true\ngui.*.debug=true".
And this is not strictly equivalent to setting the env var, as it
calls QLoggingCategory::setFilterRules.
Over all, that's an implementation details that users do not care about.
2018-09-09 21:44:55 +02:00
Olivier Goffart
d202942a2c
Reconcile: When detecting a local move, keep the local mtime
...
https://github.com/owncloud/client/issues/6629#issuecomment-402450691
2018-09-09 21:38:10 +02:00
Dmitry Mayorov
d338c130af
added logdebug
2018-09-09 21:36:47 +02:00
Christian Kamm
283c4b13a1
Log: Adjust update/reconcile log verbosity
...
Not having these enabled by default is causing significant extra back
and forth with reporters since they must manually use --logdebug for the
log to be useful.
2018-09-09 21:34:41 +02:00
Olivier Goffart
40007537ea
OAuth: Remove the timeout
...
There is no real reason to have a timeout. The connection can stay open
as long as we are not authenticated. The User can still re-open a browser
from the UI at any time.
Issue #6612
2018-09-09 17:57:38 +02:00
Markus Goetz
6122a47241
UpdateInfo: Remove unused code
2018-09-09 17:39:56 +02:00
Christian Kamm
ce3339a00f
fixup: remove outdated Qt5.5 workaround code
2018-09-09 17:27:30 +02:00
Christian Kamm
14df7a3273
fixup: use initializer for contextMenuVisibleManual
2018-09-09 17:23:49 +02:00
Christian Kamm
9330d2b178
fixup: make logging "info"
2018-09-09 17:15:58 +02:00
Christian Kamm
87dd198b52
Tray workarounds #6545
...
* Disentangle the previous 'qdbusWorkarounds' into three different
things
* Make not trusting tray.isVisible() a new workaround
* Introduce env vars for all workaround flags
* Use the workaround flags for OSX
* Determine workaround flags for KDE when the plasma integration plugin
is missing
2018-09-09 13:17:31 +02:00
Olivier Goffart
a68c95522d
OAuth2: Try to refresh the token even if the credentials weren't ready.
...
This can happen when the client is started and the internet connection
was not enabled. Then we would fetch the credentials, but we would
no do the refresh token step (because network is down).
So next time we try to connect, we would also not refresh the token
because the credentials are not marked as 'ready'
Reported in
https://github.com/owncloud/client/issues/6522#issuecomment-396845167
2018-09-09 12:00:59 +02:00
Christian Kamm
cba0627a9c
Ensure GETFileJob notices finishing #6581
...
It could happen that readyRead was emitted for incoming data while the
download was not yet finished. Then the network job could finish with
no more data arriving - so readyRead wasn't emitted again.
To fix this, the finished signal also gets connected to the readyRead
slot.
2018-09-09 11:50:00 +02:00
Nextcloud bot
cb69944b5c
[tx-robot] updated from transifex
2018-09-09 00:52:22 +00:00
Nextcloud bot
f80517d719
[tx-robot] updated from transifex
2018-09-08 00:50:03 +00:00
Camila Ayres
13cfd80093
Adds correct qt5keychain lib file name for cmake instructions in README.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-09-06 10:57:33 +02:00
Camila Ayres
17ac41377e
Fix README cmake instructions for the 3 platforms.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-09-06 10:39:31 +02:00
Nextcloud bot
0b8459ca14
[tx-robot] updated from transifex
2018-09-06 00:52:07 +00:00
Roeland Jago Douma
537fac70bf
Merge pull request #594 from hiiamok/windows-large-app-icon
...
Larger Windows App Icon
2018-09-05 22:54:42 +02:00
Oskar Kruschitz
cf150caa2b
Merge branch 'master' into windows-large-app-icon
2018-09-05 13:24:08 +02:00
Camila Ayres
23d276021e
Updates README cmake instruction for Windows.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-09-05 13:23:58 +02:00
Roeland Jago Douma
599f6f0228
Merge pull request #624 from nextcloud/fix/279/abstract_webflow_qnam
...
Add a WebFlowCredentialsAccessManager
2018-09-05 13:01:06 +02:00
Camila Ayres
bddc573c54
Merge branch 'master' into fix/279/abstract_webflow_qnam
2018-09-05 12:42:56 +02:00
Camila Ayres
1a73d3323a
Merge pull request #625 from hiiamok/mac-app-icon
...
Mac Application Icon
2018-09-05 12:41:09 +02:00
Oskar Kruschitz
2bfb99f174
Mac Application Icon
...
Replaced ownCloud.icns with APPLICATION_ICON_NAME variable
2018-09-05 11:57:26 +02:00
Oskar Kruschitz
f4a704164f
Merge branch 'master' into windows-large-app-icon
2018-09-05 11:37:24 +02:00
Nextcloud bot
e730f95a71
[tx-robot] updated from transifex
2018-09-05 00:48:38 +00:00
Roeland Jago Douma
9f1f99f4db
Add a WebFlowCredentialsAccessManager
...
Fixes #279
Some setups don't make Qt emit the right signals and the client would
end up in state where it could not do the initial authentications.
This is a similar hack that apparently already was is place for basic
http auth.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-09-04 20:59:25 +02:00
Oskar Kruschitz
d236c3c011
Merge branch 'master' into windows-large-app-icon
2018-09-04 08:35:11 +02:00
Nextcloud bot
73ccccb8a7
[tx-robot] updated from transifex
2018-09-04 00:47:25 +00:00
Oskar Kruschitz
7ab2a9bfcb
Merge branch 'master' into windows-large-app-icon
2018-09-03 12:51:26 +02:00
Camila Ayres
b19abe9c86
Merge pull request #614 from Titan-C/host_link
...
In setup wizard put link to nextcloud installation.
2018-09-02 13:18:00 +02:00
Camila Ayres
44026763b8
Merge branch 'master' into host_link
2018-09-02 12:55:44 +02:00
Camila Ayres
617cd6dfdb
Merge pull request #615 from Titan-C/webview_scale
...
Web view scales vertically.
2018-09-02 12:54:41 +02:00
Camila Ayres
3a489b73f9
Merge branch 'master' into webview_scale
2018-09-02 12:23:44 +02:00
Camila Ayres
07013783ea
Merge pull request #405 from nextcloud/sync-hidden-files
...
Sync hidden files by default.
2018-09-02 12:23:29 +02:00
Camila Ayres
7c77864396
Merge branch 'master' into sync-hidden-files
2018-09-02 12:01:07 +02:00
Nextcloud bot
3b8dde601d
[tx-robot] updated from transifex
2018-09-02 00:50:43 +00:00
Tobia De Koninck
d9f79215a7
Fix the hiddensync state in the UI + also sync hidden in cmd
2018-09-01 16:30:27 +02:00
Jan-Christoph Borchardt
309b0b6382
Sync hidden files by default
2018-09-01 16:30:27 +02:00
Nextcloud bot
9d021d004d
[tx-robot] updated from transifex
2018-09-01 00:48:21 +00:00
Óscar Nájera
452f64221e
Web view scales vertically
...
Fix #591
2018-08-31 19:49:13 +02:00
Óscar Nájera
72419a1149
Remove hostButton from setup page
2018-08-31 18:35:52 +02:00
Óscar Nájera
ab5c4749c1
In setup wizard put link to nextcloud installation
...
Fix #604
Remove the not actionable button but a direct link to the nextcloud
installation page. In this case the button is changed for a label with an
html link to the website.
2018-08-31 18:32:00 +02:00
Nextcloud bot
5cdf8a2997
[tx-robot] updated from transifex
2018-08-31 00:48:47 +00:00
Camila Ayres
bfd8897f22
Merge branch 'master' into windows-large-app-icon
2018-08-30 17:05:04 +02:00
Camila Ayres
8c19be7213
Merge pull request #599 from Titan-C/unpause_resume
...
Rename Unpause To Resume.
2018-08-30 17:03:58 +02:00
Camila Ayres
4a47d1c8ef
Merge branch 'master' into unpause_resume
2018-08-30 16:47:28 +02:00
Camila Ayres
e3d7c9f1ea
Merge branch 'master' into icon-name-fix
2018-08-30 16:45:52 +02:00
Camila Ayres
fbd8438072
Merge pull request #603 from Titan-C/login_button
...
Hide login button on setup screen.
2018-08-30 16:43:41 +02:00
Camila Ayres
efc2f0eded
Merge branch 'master' into login_button
2018-08-30 14:33:00 +02:00
Camila Ayres
3e839b2e44
Merge branch 'master' into unpause_resume
2018-08-30 13:31:34 +02:00
Camila Ayres
678e2c873e
Merge pull request #601 from Titan-C/activity_hover_notooltip
...
Drop the ToolTipRole from the activity list.
2018-08-30 13:26:47 +02:00
Óscar Nájera
121c0d8433
Hide login button on setup screen
...
Fix #576
2018-08-30 13:24:23 +02:00
Camila Ayres
881c7f804f
Merge branch 'master' into activity_hover_notooltip
2018-08-30 12:33:40 +02:00
István Váradi
2e55702258
Merge branch 'master' into icon-name-fix
2018-08-30 07:54:49 +02:00
Oskar Kruschitz
964470fc11
Merge branch 'master' into windows-large-app-icon
2018-08-30 07:42:34 +02:00
Nextcloud bot
c4d01b6aea
[tx-robot] updated from transifex
2018-08-30 00:46:36 +00:00
Óscar Nájera
0f80ecbb39
Drop the ToolTipRole from the activity list
...
Fix #515
2018-08-30 00:37:59 +02:00
Oskar Kruschitz
bf35821bc0
Merge branch 'master' into windows-large-app-icon
2018-08-29 20:39:17 +02:00
Óscar Nájera
d896edeee8
Rename Unpause to Resume
...
Fix #192
2018-08-29 17:03:07 +02:00
István Váradi
328f82297a
Create symlinks for the small-letter application icon file names
2018-08-29 16:36:56 +02:00
Camila Ayres
cafdcf77cb
Merge pull request #597 from Titan-C/readmes
...
Improves README documentation.
2018-08-29 16:08:01 +02:00
Óscar Nájera
ed705ba98c
Improving documentation
...
Fix #584
Fix #585
2018-08-29 15:47:44 +02:00
Christian Kamm
2844c925eb
Show a tray message when a folder watcher becomes unreliable #6119
2018-08-28 17:04:25 +02:00
Oskar Kruschitz
ea8676ad2c
Larger Windows App Icon
...
Newer Windows versions are also displaying a 256x256 icon. If this icon size is not present, the 48x48 icon is used, but not resized. This means there is a possibly large empty area around the icon.
2018-08-28 10:06:28 +02:00
Nextcloud bot
028da61824
[tx-robot] updated from transifex
2018-08-28 00:47:44 +00:00
Nextcloud bot
16337bf656
[tx-robot] updated from transifex
2018-08-27 00:48:31 +00:00
Camila Ayres
d8bf20310b
Adds link on how to create a pull request to the README.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-08-25 17:49:34 +02:00
Nextcloud bot
cdd84dce6e
[tx-robot] updated from transifex
2018-08-25 00:47:18 +00:00
Camila Ayres
647df7bcee
Merge pull request #580 from nextcloud/issues/activities
...
Fixes #538 : correctly checks for local sync actitivities.
2018-08-24 14:54:42 +02:00
Camila San
64e21d5083
Fixes #538 : correctly checks for local sync actitivities.
...
- Local sync activities are now listed with the sync icon and included
in the correct list: once a file is synced, activityWidget checks for
its status to know if it is an error or if the file was successfully synced.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-24 09:24:32 +02:00
Nextcloud bot
ea0bdddb2a
[tx-robot] updated from transifex
2018-08-24 00:48:54 +00:00
Nextcloud bot
e9b4453814
[tx-robot] updated from transifex
2018-08-23 00:52:06 +00:00
Nextcloud bot
1991d71136
[tx-robot] updated from transifex
2018-08-22 00:48:25 +00:00
Camila Ayres
6a7a08bd01
Merge pull request #567 from nextcloud/issues/share-dialog
...
Fixes issues in the share dialog
2018-08-21 23:23:04 +02:00
Camila San
d5a0ec7d8b
Fixes #534 : interactions with expiration date and password.
...
- Fixes call for slot when date is set - it was the password
slot for that.
- Adds QProgressIndicator and function to toggle animation.
- Fixes: when date was set, the date was not being correctly set and
displayed.
- Fixes: hides and 'deletes' passsword and expire. date widgets when
the user unchecks it in the toolbox menu.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-21 22:48:51 +02:00
Camila San
eecbdb00de
Fixes #534 : can edit permission were always disabled.
...
- Properly checks files and folder share permissions when displaying
can edit checkbox - which can also be partially checked - and listing
permissios in the tollbutton menu.
- Fixes click on can edit checkbox - which can also change state of
permissions in the toolbutton menu.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-21 22:48:51 +02:00
Camila San
085de2825a
Enhancement #534 : hide tool button when there is no share link.
...
- Only display button when there is a share link.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-21 22:48:51 +02:00
Camila San
cf3ee4b3a4
Fixes share link delete action when clicking on tool button menu.
...
- Shared point was not handled properly.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-21 22:48:50 +02:00
Camila San
8f7bc8cff9
Changes 'Allow editing' for file sharing to a checkbox instead of a radiobutton.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-08-21 22:48:42 +02:00
Camila Ayres
ff9177edc3
Merge pull request #571 from nextcloud/issues/mac-build
...
Fixes mac build.
2018-08-21 22:47:41 +02:00
Camila San
c8d5d9a622
Removes dynamic cast when building navigation apps.
...
- It checks for the menu title to know where to add the apps menu instead of trying to cast
the menu pointer saved in the sender() property.
- The previous solution was not working reliably - see #523
- Adds TODO.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-21 14:57:12 +02:00
Camila San
fa4328a596
Changes repo for 3rdparty/qtmacgoodies.
...
- The fork has the functions needed to add separators in the toolbar.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-21 13:02:54 +02:00
Nextcloud bot
985c2ed1ca
[tx-robot] updated from transifex
2018-08-21 00:47:36 +00:00
Nextcloud bot
034d5b60aa
[tx-robot] updated from transifex
2018-08-20 00:48:31 +00:00
Nextcloud bot
a2f7355d4a
[tx-robot] updated from transifex
2018-08-19 00:47:24 +00:00
Nextcloud bot
17d4aeeb78
[tx-robot] updated from transifex
2018-08-18 00:47:40 +00:00
Nextcloud bot
a214ecf788
[tx-robot] updated from transifex
2018-08-17 00:47:10 +00:00
Camila Ayres
0d9de74726
Merge pull request #562 from ivaradi/qaction2
...
Further QAction constructor fixes
2018-08-15 17:32:43 +02:00
István Váradi
8b996772a4
Further QAction constructor fixes
2018-08-15 17:02:28 +02:00
Camila Ayres
fa5143a66d
Merge pull request #556 from ivaradi/qaction
...
Provide parent to QAction
2018-08-14 21:10:56 +02:00
István Váradi
8cbc757a56
Merge branch 'master' into qaction
2018-08-14 17:13:44 +02:00
Camila Ayres
e9ae10ba6c
Merge pull request #559 from nextcloud/issues/517
...
Fixes #517 : changes QPalette for more readability in the activities list.
2018-08-14 17:12:48 +02:00
István Váradi
5bcc4ece77
Merge branch 'master' into qaction
2018-08-14 17:11:00 +02:00
Camila San
135bcaea3e
Fixes #517 : changes QPalette for more readability in the activities list.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-08-14 17:00:43 +02:00
Camila Ayres
29c11618b3
Merge pull request #558 from nextcloud/issues/518
...
Fixes #518 : adds more margin for the text in the activity
2018-08-14 16:59:54 +02:00
István Váradi
a15a470ea2
Merge branch 'master' into qaction
2018-08-14 16:53:14 +02:00
Camila San
1d4fc91d79
Fixes #518 : adds more margin for the text in the activity (only for Windows).
...
Signed-off-by: Camila San <hello@camila.codes >
2018-08-14 16:32:48 +02:00
Camila Ayres
ef9c302b5e
Merge pull request #550 from nextcloud/issues/533
...
Fixes #533 : Removes the copy activities/notifications button
2018-08-14 16:31:14 +02:00
Camila San
c1c5e5da5f
Fixes #533 : Removes the copy activities/notifications button
...
- Also removes the signal/slot associated with it.
- Minor changes: removes white background and changes frame style to the
same used in the accountsettings for consistency.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-14 13:53:14 +02:00
István Váradi
14615855d0
Provide parent to QAction
2018-08-14 11:54:08 +02:00
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
Camila San
a19904657a
Switches order of widgets in share dialog: share link comes first.
...
- First text input to search for users,then share link and then the list
of users.
- Adjusts size and scroll bar for sharees list.
- Adds option 'can share' to 3 dots menu in share user/group widget.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-02 19:52:28 +02:00
Camila San
7aff1e27c0
Fixes share users/groups widget.
...
- Existing sharees where not being displayed.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-02 19:52:28 +02:00
Camila San
55b0b46bb6
Changes size, size policy, content and margins of the share dialog and its widgets.
...
- Adds select with permissions to share dialog on the user/group search.
- Changes order of widgets, removes excess of text and do not display empty widgets.
- Share user/group widget: replaces combo box for tool button with permissions.
- Using Fixed as size policy it gives a much smoother user experience
when windows size dinamically changes.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-02 19:52:27 +02:00
Camila San
4ecfab4bf3
Improves share dialog.
...
- Removes the tabs: adds items to a vertical layout.
- Fix spacing and alignment.
- Removes extra text.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-02 19:48:42 +02:00
Nextcloud bot
34acc095c7
[tx-robot] updated from transifex
2018-08-02 00:48:46 +00:00
István Váradi
c919b7e069
Merge branch 'master' into ubuntu-compat
2018-08-01 16:28:48 +02:00
Camila Ayres
00e2d4ef93
Merge pull request #523 from nextcloud/fix-navigation-apps
...
Fixes crash on mac OS and linux.
2018-08-01 15:45:06 +02:00
Camila Ayres
2fd6f3583b
Merge branch 'master' into fix-navigation-apps
2018-08-01 15:20:33 +02:00
Nextcloud bot
49be437bfa
[tx-robot] updated from transifex
2018-08-01 00:46:14 +00:00
Camila San
0ac532f5c9
Fixes crash on mac OS and linux.
...
- The crash was happening when the user could not connect and it would
crash on trying to retrieve and display the navigation apps.
- Checks AccountStatePtr earlier in the function
slotNavigationAppsFetched.
- Cast of pointer stored in QVariant to QMenu was not done correctly -
qvariant_cast works best for user type defined or QMetaType known to
QVariant.
Signed-off-by: Camila San <hello@camila.codes >
2018-08-01 00:28:25 +02:00
István Váradi
be3640dc51
Depend on libqt5svg5-dev
2018-07-31 16:24:16 +02:00
István Váradi
343402740f
Make the Bionic control file the default one
2018-07-31 16:22:02 +02:00
István Váradi
1364755141
Use libkf5kio-dev directly on Bionic and Cosmic
2018-07-31 16:21:03 +02:00
Roeland Jago Douma
5be1bcd8b0
Merge pull request #439 from nextcloud/feature/noid/register
...
Providers integration
2018-07-31 14:21:51 +02:00
Julius Härtl
bc96ec8ae1
Fix styling
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2018-07-31 13:35:37 +02:00
Julius Härtl
3159a36f25
Make build optional
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2018-07-31 13:35:36 +02:00
Julius Härtl
156605c2fa
Use proper URL
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2018-07-31 13:35:36 +02:00
Julius Härtl
18f1452b04
Add slideshow images
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2018-07-31 13:35:36 +02:00
Julius Härtl
295750555d
Allow to use provider registration with flow auth
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2018-07-31 13:35:35 +02:00
Nextcloud bot
60bc5c378c
[tx-robot] updated from transifex
2018-07-31 00:48:58 +00:00
Roeland Jago Douma
fa5026bba7
Merge pull request #491 from nextcloud/fix-activities-v2
...
Fix activities v2
2018-07-30 22:39:08 +02:00
Camila San
32bb1ca449
Aligns copy button to the left in the activity widget.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:11:04 +02:00
Camila San
a149660ae9
Enables again alternate row color in the activity list.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:11:04 +02:00
Camila San
524a3d4c6a
Returns default icon when no status matches any of the check for SyncFileItem::Status.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:11:04 +02:00
Camila San
90a2d5a3e7
Aligns text correcty when not all text has content in the activity list.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:11:04 +02:00
Camila San
156b4cf284
Aligns time vertically on the bottom of the notification action text when there is no message.
...
- Minor fix: gives less space for long text that needed ellipses which
was not showing and set right margin because otherwise text was not
painted correctly and completly.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:11:04 +02:00
Camila San
ee612bda3a
Fixes crash when folder it is not set in the activity list.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:11:03 +02:00
Camila San
a1cab471e8
Comments out slotProgressInfo.
...
- Added TODO.
- It seems to be working only in some cases.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:02 +02:00
Camila San
f294cf1b93
Changes icons for errors and warnings in the activity list.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:02 +02:00
Camila San
31892f5337
Changes background color to white for the Activity list widget.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:02 +02:00
Camila San
e9dbee0df5
Removes alternate color on the rows of Activity Widget.
...
- Also fixes the click on each activity: the user had to click twice -
one to select the row and then one click to open file manager or
browser.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:02 +02:00
Camila San
9cbf5aa783
Changes icons for actions in Activity List.
...
- For folder (open file manager) and close (dismiss
notification).
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:02 +02:00
Camila San
36a73432bc
Implements ActivityWidget::slotProgressInfo.
...
- Attempts to implement slot as it was in the old IssuesWidget.
- It should clean up the activity list when needed - e.g. when file
conflict was solved.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
b2834e047d
Refactores ActivityListModel::removeFromActivityList.
...
- Fixes crash when dismissing notification - notification was being
removed from the wrong list.
- Minor changes: removes AccountStatePtr where it was needed anymore now
that ActivityListModel has an _accountState, it doesn't need to be
checked for each activity/notification.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
f63434b856
Stores folder in ActivityData.
...
- The information is needed on ActivityWidget::slotProgressInfo.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
7bc9275a8c
Separates types of errors: SyncErrorType and SyncFileItemType.
...
- This follows what the enums already being used SynResult::Status and
SyncFileItem::Status.
- Do not display buttons for FileErrorTypes - since they are errors on
local syncing, there is nothing to do in the server.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
7b1569df81
Removes static const from activity widget.
...
- It didn't need to be static.
- It crashed on Windows (Visual Studio 15 2017 Win64).
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
f85825dee4
Adds header and forward declaration of 'QMouseEvent' to ActivityItemDelegate.
...
To fix compiling for Qt5.7 (drone error).
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
3673603e5a
Fixes buttons clickable area in the activities list.
...
- Their size was not correctly calculated so it was hard to filter the
clicks on the list. User had to click multiple times before clicking on
the right acceptable area.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
9f9be7814c
Adjust space between action/buttons in the toolbar.
...
- Minor: cleans up code used for debug.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
938c99ec42
Fixes and improves 'copy to clipboard' output.
...
- With the merging of activities and notifications the copy to clipboard
function got broken. Had to put it back as it was before.
- The output text from the clipboard was almost unreadeable. Ajusted the
space between texts and used separator '-' instead of ','.
- Minor: cleans up comments.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
4a6b7854f5
Adds 'Join' string for call notifications.
...
- Stores object_type from the api response to check if notification is a
call so the primary button text and action is 'Join'.
- Puts strings into consts.
- Minor change: Improves comments on ActivityListModel.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
00effb0e2f
Adds 'accept' button for remote share notifications.
...
- Stores object_type form the api response to check if notification is
remote_share, so the primary button text is 'accept' instead of 'more
information'.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
f0ca5dbded
Fix settings dialog for mac.
...
- Fixes adding/removing accounts with separator in the toolbar -
accounts were not added in the right order and removing was not
including the separator.
- Fixes button sizes in the activities list - the buttons were too small
for the text.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
11484d5588
Removes Protocol and Issues widget files and references.
...
- Minor changes:
- Improves comments and qCWarning messages
- Removes commented out code.
- adds TODO's.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
ab3c6da5d7
Gives full path to file to open in file manager.
...
- The path to the file wa being stored in the wrong activity property.
It was in the action link when it should be in the file.
- Minor: comments out the display of issues and protocol widget.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
f402b1d9e4
Changes icons for opening in file manager and to dismiss notification.
...
- The icons used before were not really clear on what their function
was.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:01 +02:00
Camila San
ec51428e4d
Fixes the url for the button 'more information'.
...
- The url for the browser was not full path to the file.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
64d635a046
Fixes the color of the font.
...
- It was too light when the row was selected.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
9de3985021
Small fixes.
...
- Align progress indicator to the center.
- Moves unused code.
- Removes unused labels.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
a9cd3b3a6d
Merges errors and protocols into notifications/activities.
...
- Errors will always be on top, then Notifications comes next and then Activities for last.
- Adds 2 new types of Activity: NotificationType and ErrorType.
- ActivityListModel and ActivityWidget stores AccountState to connect user and widget.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
d0c72dd642
Makes space smaller bewteen user/activities and network/settings menu.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
9ad2a980ce
Moves the separator to between accounts.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
7e8b5f34d7
Fixes the text length for activities.
...
- Activities from the server don't have buttons to interact with so
their content can use the full lenght of the row.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
918ccb1ed3
Removes row when notification is dismissed.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
e3c7a5a2ff
Changes Activity list view icons, buttons and drawing.
...
- Displays the notification icon when available.
- Adds dismiss button with an icon.
- Handles buttons actions in the list view.
- Changes what is painted first (activityitemdelegate) for each row in
the activity list.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
00a73b5ded
Adds class to retrieve icons.
...
- This is an attempt to cache the icons.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
49377976db
Removes notification row from the view when clicking on Dismiss.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
ef4a30fcb9
Displays a menu once the user clicks on the button in the notifications.
...
- In activityitemdelegate the mouse events are filtered (ActivityItemDelegate::editorEvent) to check if the user clicked
on a button in the list of activities/notifications. Then a signal is emitted to ActivityWidget that does the rest:
show submenu when there are more options, open browser, open file manager, send request to server.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
9ad01f0819
Fixes order of the notifications: latest on top.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
7fa5e41e8d
Only displays buttons if it is a notification and adjust space left.
...
- Do not display buttons for activities.
- Adds correctly text and button in the space left depending on the widget size.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:06:00 +02:00
Camila San
4e4a0da3b7
Returns the activity type to the list view.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:05:59 +02:00
Camila San
2350b41dc3
List model returns the list of actions for each activity.
...
- The list of possible actions (server requests( was not being used in
the activityitemdelegate. This is needed to be able to draw the primary
action buttons and other options for each notification in the view.)
- Minor changes:
- Uses different icons for activities and notifications in the list view.
- Align elements in the list view of notifications/activities properly.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:05:59 +02:00
Camila San
d1f4f8a558
Correctly removes actions - account, separator and settings widget from toolbar when account is removed.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:05:59 +02:00
Camila San
a6331c7a75
Fixes widget stack visibility when switching actions.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:05:59 +02:00
Camila San
22a6303c9d
Adds space bewteen different accounts and activity.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:05:59 +02:00
Camila San
1b1468a9c6
Each user has its own list of activities.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:05:59 +02:00
Camila San
b13f77c0fb
Adds one activity widget for each user.
...
- ActivityListModel and ActivityWidget stores an AccountState to connect user and widget.
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:05:59 +02:00
Camila San
8e0c036fc3
Aligns Network and General to the right.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:05:59 +02:00
Camila San
75c2613b1b
Displays activity and notification messages in the list view.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:05:59 +02:00
Camila San
908870ccde
Adds notifications to the Activities list.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-30 22:05:57 +02:00
Roeland Jago Douma
30a4f1edd7
Merge pull request #510 from ivaradi/beta-ppa
...
Use the beta PPA for builds (re #402 )
2018-07-30 20:34:05 +02:00
Roeland Jago Douma
9722fbc151
Merge pull request #507 from doits/allow_macos_gpu_switching
...
allow to switch to the integrated gpu on MacOS
2018-07-30 20:33:41 +02:00
Roeland Jago Douma
7fccae7875
Merge pull request #509 from ivaradi/artful-cosmic
...
Stop building for Artful, enable Cosmic
2018-07-30 20:32:56 +02:00
Nextcloud bot
d49aadaf76
[tx-robot] updated from transifex
2018-07-30 00:50:31 +00:00
Nextcloud bot
adb6606e6f
[tx-robot] updated from transifex
2018-07-29 00:48:28 +00:00
Nextcloud bot
e0a1b00d3e
[tx-robot] updated from transifex
2018-07-28 00:47:08 +00:00
István Váradi
c2ceb173b1
Merge branch 'master' into beta-ppa
2018-07-27 21:00:01 +02:00
István Váradi
5f74baabeb
Merge branch 'master' into artful-cosmic
2018-07-27 20:59:44 +02:00
Nextcloud bot
c38fa06754
[tx-robot] updated from transifex
2018-07-27 00:48:48 +00:00
István Váradi
d63bcb4d4b
Use the beta PPA for builds (re #402 )
2018-07-26 20:19:18 +02:00
István Váradi
dd9e12fe43
Start building for cosmic
2018-07-26 20:08:48 +02:00
István Váradi
8e92f87694
Stop building for artful
2018-07-26 20:07:36 +02:00
Markus Doits
2335688b68
allow to switch to the integrated gpu on MacOS
...
without that key, the client automatically runs on the dedicated gpu (if
present). now it allows the system to use the integrated one.
closes #501
2018-07-25 09:35:53 +02:00
Nextcloud bot
69b6f5a019
[tx-robot] updated from transifex
2018-07-25 00:46:45 +00:00
Roeland Jago Douma
1af353cb2f
Merge pull request #503 from ivaradi/libgnome-keyring0
...
Add a dependency on libgnome-keyring0 on Bionic
2018-07-24 13:26:05 +02:00
István Váradi
d228aa8644
Merge branch 'master' into libgnome-keyring0
2018-07-23 14:50:37 +02:00
Nextcloud bot
7f829a88bf
[tx-robot] updated from transifex
2018-07-23 00:46:53 +00:00
István Váradi
df9cc8396a
Add a dependency on libgnome-keyring0 on Bionic
2018-07-22 20:33:45 +02:00
Nextcloud bot
df4fb880c2
[tx-robot] updated from transifex
2018-07-22 00:52:57 +00:00
Nextcloud bot
e45a37df73
[tx-robot] updated from transifex
2018-07-20 00:46:28 +00:00
Nextcloud bot
b0ec091e04
[tx-robot] updated from transifex
2018-07-19 00:45:48 +00:00
Nextcloud bot
0c44b32843
[tx-robot] updated from transifex
2018-07-18 00:45:39 +00:00
Camila Ayres
720960f0be
Merge pull request #497 from nextcloud/readme-updates
...
Updates the README with build instructions.
2018-07-16 12:35:23 +02:00
Camila Ayres
2511105cce
Adds link to wiki page 'System requirements' to README.
2018-07-16 11:31:34 +02:00
Camila Ayres
7e63fd535e
Updates the README with build instructions.
...
- Adds a shorter version of how to build the client but the extended version will be kept on the Wiki.
- Makes the instructions available if you clone the repo and work offline.
2018-07-16 11:09:05 +02:00
Nextcloud bot
0898ada696
[tx-robot] updated from transifex
2018-07-16 00:45:09 +00:00
Nextcloud bot
dce17b4bd3
[tx-robot] updated from transifex
2018-07-15 00:45:32 +00:00
Nextcloud bot
edf28d9191
[tx-robot] updated from transifex
2018-07-13 00:48:03 +00:00
Camila Ayres
d70e2d5c02
Merge pull request #490 from nextcloud/nickvergessen-patch-1
...
Link IRC to webchat so people without a client can do something.
2018-07-11 09:37:53 +02:00
Joas Schilling
dd154c7505
Link IRC to webchat so people without a client can do something
...
Also note that github doesn't render irc:// links, so it just showed the name
2018-07-11 09:04:03 +02:00
Nextcloud bot
716f88e222
[tx-robot] updated from transifex
2018-07-11 00:47:26 +00:00
Nextcloud bot
62708dea13
[tx-robot] updated from transifex
2018-07-10 09:12:30 +00:00
Nextcloud bot
4f164d1e23
[tx-robot] updated from transifex
2018-07-07 00:40:31 +00:00
Nextcloud bot
e6d46cba17
[tx-robot] updated from transifex
2018-07-06 00:41:45 +00:00
Roeland Jago Douma
e69d56a0cd
Merge pull request #395 from nextcloud/upstream/pr/6388
...
OwnSql: Some refactoring
2018-07-04 13:34:44 +02:00
Camila Ayres
f1c4b76669
Merge branch 'master' into upstream/pr/6388
2018-07-04 10:12:42 +02:00
Nextcloud bot
41ca5388e9
[tx-robot] updated from transifex
2018-07-04 00:41:40 +00:00
Roeland Jago Douma
24efdd3b45
Fix E2E query
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-07-03 11:40:58 +02:00
Roeland Jago Douma
6c11c1aa73
Fix query
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-07-03 10:33:26 +02:00
Olivier Goffart
d114212333
OwnSql: Fixup after feedback for #6388
2018-07-03 10:33:26 +02:00
Olivier Goffart
779969f865
OwnSql: Put the SQL queries next to their use.
...
This avoid haivng to modify 4 places when we want to add a query
2018-07-03 10:33:26 +02:00
Olivier Goffart
518fb90757
OwnSql: Some refactoring
...
Use QByteArray for the query so we don't have to convert twice.
Automatically finish the query when the DB close, so we don't
have to call reset
2018-07-03 10:33:26 +02:00
Roeland Jago Douma
b309a1c8c4
Merge pull request #401 from nextcloud/upstream/pr/6456
...
Issues: Show link to conflicts doc if there are some #6396
2018-07-03 10:32:09 +02:00
Christian Kamm
4fa6fff1a9
Doc: Explaining conflict files and resolving them #6396
2018-07-03 10:18:20 +02:00
Christian Kamm
d549c77af6
Issues: Show link to conflicts doc if there are some #6396
...
The link url is themed.
2018-07-03 10:18:18 +02:00
Roeland Jago Douma
b527013ad8
Merge pull request #402 from ivaradi/master
...
Use the VERSION.cmake file to determine Ubuntu/Debian main package version
2018-07-03 10:17:42 +02:00
István Váradi
e6cc593516
Revert "Do not require exact version for WebEngine dependencies"
...
This reverts commit dcceec25c89e935b59c921ae22c66199f8642531.
2018-07-03 09:11:31 +02:00
István Váradi
dec5473eec
The version is also read from the VERSION.cmake file
2018-07-03 09:11:31 +02:00
István Váradi
ced4cad329
Do not require exact version for WebEngine dependencies
2018-07-03 09:11:31 +02:00
Camila Ayres
b18c62dc41
Merge pull request #472 from nextcloud/feature/noid/loginflow_accept_language
...
Set Accept-language header for webview requests
2018-07-03 08:52:11 +02:00
Roeland Jago Douma
0d70b05b65
Set Accept-language header for webview requests
...
This way the server will properly translate it for you if it has
translations.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-07-03 07:45:02 +02:00
Nextcloud bot
44205359a5
[tx-robot] updated from transifex
2018-07-03 00:44:23 +00:00
Camila Ayres
2361076b75
Merge pull request #471 from nextcloud/fix/458/do_not_show_webview_by_default
...
Do not force to show the webview on construct
2018-07-02 22:22:40 +02:00
Camila Ayres
9627aad04c
Merge branch 'master' into fix/458/do_not_show_webview_by_default
2018-07-02 22:01:03 +02:00
Roeland Jago Douma
cbf417664d
Merge pull request #404 from nextcloud/upstream/pr/6491
...
Proxy settings: Fix bad behavior with empty host
2018-07-02 21:25:53 +02:00
Christian Kamm
70b5d54082
Proxy settings: Fix bad behavior with empty host
...
Fixes f6a075ef54 for #5885
When no host is given it shouldn't just *appear* that there is no
proxy, there actually shouldn't be a proxy set then.
2018-07-02 21:15:30 +02:00
Roeland Jago Douma
34d964fc80
Do not force to show the webview on construct
...
Should fix #458
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-07-02 20:09:30 +02:00
Roeland Jago Douma
93c6576bcb
Merge pull request #470 from nextcloud/update-readme
...
Adds item about Code of Conduct in the README.
2018-07-02 19:48:07 +02:00
Camila San
4adade9818
More polishing the emojis markdown in the README.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-02 18:50:40 +02:00
Camila San
cb6506e3f1
More polishing the emojis markdown in the README.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-02 18:25:10 +02:00
Camila San
165b164e95
Fixes CoC links in the README.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-02 18:21:35 +02:00
Camila San
c437ffc95f
Adds 'Code of Conduct' item to the README.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-02 18:17:32 +02:00
Roeland Jago Douma
9bb58550ff
Merge pull request #469 from nextcloud/update-readme
...
Updates the README
2018-07-02 18:11:32 +02:00
Camila San
3bf8002708
README: changes emoji markup positions.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-02 18:06:59 +02:00
Camila San
74dedf636c
README: trying some emoji markup.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-02 17:47:12 +02:00
Camila San
19f1513af0
Fixes link, put items in a list in the README.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-02 17:29:05 +02:00
Camila San
ee668eb6cd
Changes the order of the content in the README.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-02 17:24:57 +02:00
Camila San
65cb94c316
Updates the README with info about the daily builds and how to compile the client.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-07-02 17:06:48 +02:00
Camila Ayres
178edb97bc
Merge pull request #466 from nextcloud/fix_compile_warnings
...
Fix compile warnings
2018-07-02 13:50:04 +02:00
Roeland Jago Douma
08abc71acb
gui Q_UNUSED
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-07-02 13:02:15 +02:00
Roeland Jago Douma
ce545b1e47
propage*encrypted Q_UNUSED
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-07-02 12:45:44 +02:00
Roeland Jago Douma
e871359453
Remove unneeded ;
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-07-02 11:03:58 +02:00
Roeland Jago Douma
b952fa64ee
Restore logger installation
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-07-02 11:01:52 +02:00
Nextcloud bot
027565e571
[tx-robot] updated from transifex
2018-07-02 00:42:35 +00:00
Nextcloud bot
09e2a4af60
[tx-robot] updated from transifex
2018-07-01 00:44:43 +00:00
Julius Härtl
bc7ef87d18
Merge pull request #460 from nextcloud/no_trademark_text
...
Remove default trademark text
2018-06-29 22:56:28 +02:00
Roeland Jago Douma
d2b75cabb2
Remove default trademark text
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-29 21:36:18 +02:00
Nextcloud bot
85cee68f1d
[tx-robot] updated from transifex
2018-06-29 00:46:29 +00:00
Roeland Jago Douma
70d7676794
Merge pull request #440 from nextcloud/fix/runtestsci
...
Run unit tests on drone
2018-06-28 21:55:15 +02:00
Roeland Jago Douma
97ea6c54bc
Run tests on drone
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-28 14:50:35 +02:00
Camila Ayres
ff23e99a9a
Merge pull request #389 from nextcloud/upstream/pr/6426
...
Theme: unify ownCloudTheme and Theme classes
2018-06-28 14:39:17 +02:00
Roeland Jago Douma
38b89a3fa0
Update testutility
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-28 13:37:02 +02:00
Roeland Jago Douma
6ab7e814a5
Fix tests to actually compile
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-28 13:37:02 +02:00
Roeland Jago Douma
595cbfaa16
Update urls
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-28 12:46:47 +02:00
Camila San
4c7b7dfcaa
Restores previous text in the about section.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-06-28 12:33:40 +02:00
Olivier Goffart
c5ace2338c
Theme: unify ownCloudTheme and Theme classes
...
The goal is to avoid confusion described in issue #6422 by removing
duplicates between the Theme and owncloudTheme.
- Use the about from ownCloudTheme everywhere
- Create default applicationIcons() and condifFileName() that should work
everywhere
- trayFolderIcon was removed as it is not used
- the helpUrl from the default Theme now points to the owncloud client
documentation. Before there was no help entry by default for branded
client if the function was not overriden.
- Do not merge functions that would otherwise break compatibility with
theme that did not override them. For example colors or customMedia.
2018-06-28 12:33:39 +02:00
Roeland Jago Douma
0c21e4945d
Merge pull request #455 from nextcloud/fix/appimage/openssl
...
Fix/appimage/openssl
2018-06-27 23:26:44 +02:00
Roeland Jago Douma
cd0b638a80
Add openssl 1.0 to appimage as Qt needs it
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-27 23:14:10 +02:00
Roeland Jago Douma
8d70eab8fe
Checkout depth of 1 for drone for faster cloning
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-27 23:13:56 +02:00
Roeland Jago Douma
5ce9aedb7a
Merge pull request #452 from nextcloud/organize-windows-translation
...
Windows: moves translation files to /i18n.
2018-06-27 13:14:19 +02:00
Camila Ayres
acc65cdc4a
Merge branch 'master' into organize-windows-translation
2018-06-27 12:29:56 +02:00
Nextcloud bot
c36dafa317
[tx-robot] updated from transifex
2018-06-27 00:46:34 +00:00
Camila San
e69a9c61d0
Windows: moves translation files to /i18n.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-06-26 23:56:34 +02:00
Roeland Jago Douma
aa04f20ad6
Merge pull request #449 from nextcloud/ci/appimage
...
Build AppImage with Qt-5.11
2018-06-26 21:18:30 +02:00
Roeland Jago Douma
7ce9c22d2c
Build AppImage with Qt-5.11
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-26 17:49:00 +02:00
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
Christian Kamm
2bec587d4d
SocketAPI: Allow opening share dialog if contents still syncing #4608
...
With the previous changes the "Share..." action was shown but it didn't
work yet.
2018-06-11 19:35:16 +02:00
Roeland Jago Douma
f31d4ba341
Merge pull request #392 from nextcloud/upstream/pr/6413
...
Rename local discovery option for clarity
2018-06-11 15:25:03 +02:00
Christian Kamm
16ba0cf47e
Blacklist: Add unittest #6411
2018-06-11 14:50:01 +02:00
Christian Kamm
d304fcbda7
Rename local discovery option for clarity
...
It's using full relative filepaths, not just dir paths.
2018-06-11 14:50:01 +02:00
Roeland Jago Douma
2cc94636cf
Merge pull request #391 from nextcloud/upstream/pr/6417
...
Conflicts: Change tags to be more user friendly #6365
2018-06-11 14:48:47 +02:00
Christian Kamm
77fcff5bdf
Conflicts: Change tags to be more user friendly #6365
...
From "_conflict-user-yyyymmdd-hhmmss"
to " (conflicted copy user yyyy-mm-dd hhmmss)"
2018-06-11 14:40:40 +02:00
Nextcloud bot
a9d633c7ef
[tx-robot] updated from transifex
2018-06-11 00:48:08 +00:00
Olivier Goffart
1b6cc36a61
Fix make doc-man in shadow build
...
Issue #6555
2018-06-10 16:07:22 +02:00
Nextcloud bot
e82fdee90c
[tx-robot] updated from transifex
2018-06-10 00:49:25 +00:00
Nextcloud bot
0e00f9d0d3
[tx-robot] updated from transifex
2018-06-09 00:48:57 +00:00
Roeland Jago Douma
dc41f8a16e
Fix windows build
...
* Reorder openssl header import
* not => !
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-08 16:53:56 +02:00
Roeland Jago Douma
7e98a1e802
Merge pull request #390 from nextcloud/upstream/pr/6377
...
Notify if an explicitly excluded folder is created #6222
2018-06-08 14:58:45 +02:00
Christian Kamm
e65caee9cf
Notify if an explicitly excluded folder is created #6222
2018-06-08 14:49:26 +02:00
Nextcloud bot
1ba96d779b
[tx-robot] updated from transifex
2018-06-08 00:49:17 +00:00
Roeland Jago Douma
d0a93ddfc4
Merge pull request #387 from nextcloud/upstream/accountwizard
...
AccountWizard: Reserve space for error label #6546
2018-06-07 15:39:55 +02:00
Christian Kamm
a1d6af60f0
AccountWizard: Reserve space for error label #6546
2018-06-07 15:32:52 +02:00
Roeland Jago Douma
a6179876c7
Merge pull request #385 from nextcloud/upstream/pr/6525
...
Credentials: Retry fetching from the keychain in case the keychain is…
2018-06-07 15:32:16 +02:00
Olivier Goffart
7c9ec4a55a
Credentials: Retry fetching from the keychain in case the keychain is still starting
...
When owncloud is restored, at boot time, it might be started before the
crendential manager. So if we detect an error, wait 10 seconds and hopefully
it'd be loaded by then.
Issues: #4274 , #6522
2018-06-07 15:18:40 +02:00
Roeland Jago Douma
81b0cdc9d2
Merge pull request #386 from nextcloud/upstream/owncloudsynclog
...
owncloudsynclog: 1 MB -> 10 MB #6420
2018-06-07 15:01:34 +02:00
Julius Härtl
689ab5b8b3
Merge branch 'master' into upstream/owncloudsynclog
2018-06-07 14:38:49 +02:00
Roeland Jago Douma
2a60141ef2
Merge pull request #383 from nextcloud/upstream/pr/6526
...
macOS: Don't use WAL for sqlite3 in /Volumes
2018-06-07 10:36:57 +02:00
Markus Goetz
3cd21e258e
macOS: Don't use WAL for sqlite3 in /Volumes
...
For #6049
2018-06-07 10:22:07 +02:00
Roeland Jago Douma
a01c78a4ce
Merge pull request #382 from nextcloud/upstream/pr/6530
...
SyncJournal: Check file existence even for open dbs #6049
2018-06-07 10:21:07 +02:00
Christian Kamm
8147963b24
SyncJournal: Explain added file-exists check
2018-06-07 09:50:09 +02:00
Christian Kamm
cc04ce9fe4
SyncJournal: Check file existence even for open dbs #6049
...
With WAL mode sqlite seems to occasionally crash when the
underlying filesystem goes away.
2018-06-07 09:50:09 +02:00
Roeland Jago Douma
a348ff3134
Merge pull request #381 from nextcloud/upstream/pr/6532
...
Upload: Adjust timeout for final job based on size #6527
2018-06-07 09:49:25 +02:00
Christian Kamm
5f793c151c
Upload: Adjust timeout for final job based on size #6527
...
Some servers have virus scanners and the like that can delay the
response of the final chunked upload assembly significantly, often
breaking the current 5min (!) timeout. See owncloud/enterprise#2480
for details.
2018-06-07 09:38:16 +02:00
Roeland Jago Douma
b2a8eea875
Merge pull request #380 from nextcloud/upstream/pr/6533
...
Propagation: Connection closed is a normal error #6516
2018-06-07 09:35:32 +02:00
Christian Kamm
4fa762b5ce
Propagation: Connection closed is a normal error #6516
...
Because it sometimes appears in conjunction with server bugs and we
don't want to halt all syncing for other files in these cases.
2018-06-07 09:12:46 +02:00
Roeland Jago Douma
f540c37ad3
Merge pull request #375 from nextcloud/upstream/pr/6523
...
PropagateUpload: Remove unused PropagateUploadFileCommon::abort
2018-06-07 09:11:45 +02:00
Olivier Goffart
14ff3534a8
Fix compilation warning
...
propagateuploadng.cpp:500:10: warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
2018-06-07 08:53:12 +02:00
Christian Kamm
3556482bce
TestChunkingNG: Remove unneeded test code
2018-06-07 08:53:12 +02:00
Christian Kamm
d9640dd79e
PropagateUpload: Fix miscount in abort() #6516
...
Previously it tried to abort even jobs that had already finished, which
was not going to work as they wouldn't emit finished() again.
Also, in some cases the abortCount would never go to zero and that case
wasn't well documented.
2018-06-07 08:53:12 +02:00
Christian Kamm
96126a53d3
PropagateUpload: Remove unused PropagateUploadFileCommon::abort
2018-06-07 08:53:10 +02:00
Nextcloud bot
e043840fd0
[tx-robot] updated from transifex
2018-06-07 00:47:40 +00:00
Roeland Jago Douma
448b0ebf63
Merge pull request #374 from nextcloud/upstream/pr/6519
...
ShareLink: Preserve password when unrelated ui changes #6512
2018-06-06 21:01:51 +02:00
Christian Kamm
898a530ba5
ShareLink: Preserve password when unrelated ui changes #6512
2018-06-06 20:56:34 +02:00
Roeland Jago Douma
04930768ee
Merge pull request #370 from nextcloud/upstream/pr/6238
...
update supported linux platforms
2018-06-06 20:56:03 +02:00
Olivier Goffart
e2e6b06d6c
Update installing.rst
2018-06-06 20:50:19 +02:00
Jürgen Weigert
caf21210a6
update supported linux platforms
2018-06-06 20:50:17 +02:00
Roeland Jago Douma
8189c50f51
Merge pull request #368 from nextcloud/upstream/sqlite-version
...
sqlite: Update bundled version to 3.23.1
2018-06-06 20:46:53 +02:00
Olivier Goffart
31ba483845
sqlite: Update bundled version to 3.23.1
...
For OS X and Windows.
2018-06-06 20:40:23 +02:00
Roeland Jago Douma
fb6e503f7b
Merge pull request #367 from nextcloud/upstream/clang
...
Fix a bunch of warning with clang
2018-06-06 20:39:44 +02:00
Olivier Goffart
fbc1747168
Fix a bunch of warning with clang
...
The option -Wno-discarded-qualifiers only exists with GCC, clang warns that
it has no effects.
Also it warns when some virtual fuction are marked with override but not
all of them.
2018-06-06 20:31:14 +02:00
Roeland Jago Douma
075091d7e0
Merge pull request #365 from nextcloud/upstream/pr/6464
...
Logging: Avoid the word "Error"
2018-06-06 20:30:30 +02:00
Markus Goetz
367d0c39e8
Logging: Avoid the word "Error"
...
The old code printed "QNetworkReply::NoError"
2018-06-06 20:24:32 +02:00
Roeland Jago Douma
ba901503fc
Merge pull request #364 from nextcloud/upstream/pr/6458
...
Network settings: If no proxy host given, show "no proxy" #5885
2018-06-06 20:23:49 +02:00
Christian Kamm
e1ab5f3811
Network settings: If no proxy host given, show "no proxy" #5885
...
What happens internally is that a proxy without a hostname gets treated
as no proxy.
2018-06-06 20:11:09 +02:00
Roeland Jago Douma
33b6d0473a
Merge pull request #399 from nextcloud/upstream/pr/6333
...
Use std::chrono::milliseconds to represent milliseconds
2018-06-06 20:09:48 +02:00
Olivier Goffart
073a5184cb
Use std::chrono::milliseconds to represent milliseconds
2018-06-06 17:26:53 +02:00
Julius Härtl
ea58a1038b
Merge pull request #363 from nextcloud/upstream/pr/6468
...
More Button: Use SVG and fix size so it renders good in highdpi
2018-06-06 14:44:24 +02:00
Olivier Goffart
c4af4a5a85
More Button: Use SVG and fix size so it renders good in highdpi
...
When the more button was changed from using a text to an icon,
the size computation was not adjusted proerly to that of a button
with an icon.
And using svg allows it to be rendered correctly with high-dpi
It looks much much nicer now
2018-06-06 13:55:34 +02:00
Roeland Jago Douma
ad43d88fde
Merge pull request #360 from nextcloud/upstream/pr/6428
...
Uploads: Don't delete unexisting chunks
2018-06-06 13:34:55 +02:00
Olivier Goffart
012c638d4e
Uploads: Don't delete unexisting chunks
...
Since commit 4dc49ff3 , we store an entry in the upload info table even
for non chunked uploads. However, if this fails we don't want to remove
non-existant stale chunks if the upload fails.
Without this commit, we would send a DELETE command to clean non-existant
chunks in the dav/uploads/ namespace.
2018-06-06 09:52:02 +02:00
Roeland Jago Douma
27e1efb8a3
Merge pull request #358 from nextcloud/upstream/pr/6434
...
SocketApi/Sharing: Add "copy public link" to menu #6356
2018-06-06 09:34:19 +02:00
Christian Kamm
de9fb7dc9a
Silence warning by removing unnecessary this capture
2018-06-06 09:15:25 +02:00
Christian Kamm
550b845037
SocketApi/Sharing: Add "copy public link" to menu #6356
...
* The new menu option will fetch shares and create a new link share if
no "context menu share" currently exists.
* Various cleanup of common operations in socketapi happened as well,
in particular there's now FileData::get() that calculates all the
relevant paths that are useful for most socketapi actions.
2018-06-06 09:15:23 +02:00
Roeland Jago Douma
d7ce92b017
Merge pull request #357 from nextcloud/upstream/notifications
...
Notifications: Lower hiding timeout
2018-06-05 21:45:37 +02:00
Markus Goetz
eb097cbffb
Notifications: Lower hiding timeout
...
With the 4.5sec timeout, it was very easy to accidently hit the wrong notification
when the previous one dissapeared so late.
2018-06-05 21:24:56 +02:00
Roeland Jago Douma
4e4ec48bbc
Merge pull request #356 from nextcloud/upstream/qunused
...
Q_UNUSED: Sprinkle around
2018-06-05 21:20:09 +02:00
Markus Goetz
de1032ebd7
Q_UNUSED: Sprinkle around
2018-06-05 20:45:51 +02:00
Roeland Jago Douma
27826ddee0
Merge pull request #355 from nextcloud/upstream/pr/6450
...
macOS: Implement new dynamic Finder menu items #6328
2018-06-05 20:45:11 +02:00
Markus Goetz
d3cbe63801
macOS: Implement new dynamic Finder menu items #6328
2018-06-05 20:40:40 +02:00
Roeland Jago Douma
5b0a1d4c79
Merge pull request #354 from nextcloud/upstream/pr/6444
...
macOS: Unload the Finder extension on exit #5382 #3819
2018-06-05 20:39:43 +02:00
Markus Goetz
648911f3ab
macOS: Unload the Finder extension on exit #5382 #3819
2018-06-05 20:22:02 +02:00
Roeland Jago Douma
eda221227f
Merge pull request #353 from nextcloud/upstream/pr/6448
...
Simple permanent logging
2018-06-05 20:21:25 +02:00
Christian Kamm
4a81ae75cf
Logging: Add persistent auto-logdir option #6442
2018-06-05 20:07:53 +02:00
Christian Kamm
428cfc5e1c
LogDir: Compress log when switching files #6442
2018-06-05 20:07:53 +02:00
Christian Kamm
9319b6594e
LogDir: Go to new file on Problem/Abort too #6442
2018-06-05 20:07:53 +02:00
Roeland Jago Douma
a7b7344659
Merge pull request #352 from nextcloud/upstream/pr/6438
...
Folders: Use "Problem" icon for unresolved conflicts #6277
2018-06-05 20:07:00 +02:00
Christian Kamm
63c2474b70
Folders: Use "Problem" icon for unresolved conflicts #6277
2018-06-05 19:59:19 +02:00
Roeland Jago Douma
f9f1f8bda6
Merge pull request #351 from nextcloud/upstream/pr/6437
...
Share link: Update permission wording #6192
2018-06-05 19:58:40 +02:00
Christian Kamm
ed5e413751
Share link: Update permission wording #6192
2018-06-05 19:46:04 +02:00
Roeland Jago Douma
7c4c3b0493
Merge pull request #349 from nextcloud/upstream/macOS
...
macOS: build/installer changes
2018-06-05 13:39:36 +02:00
Roeland Jago Douma
4ddbb35d77
Fix debian patch
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-05 13:29:51 +02:00
Markus Goetz
16bf765818
macOS: Don't hardcode path in Installer source
2018-06-05 13:29:51 +02:00
Markus Goetz
5667408c58
macOS: Offer only standard installation in installer
2018-06-05 13:29:51 +02:00
Markus Goetz
a0e17ce221
create_mac.sh: Also name properly in source dir
2018-06-05 13:29:51 +02:00
Markus Goetz
3defc30e12
macosx.pkgproj; This is a .cmake preprocessed file
2018-06-05 13:29:51 +02:00
Christian Kamm
09f83f4fa9
SyncJournal: Clear etag filter before sync
...
Before, we only cleared the _avoidReadFromDbOnNextSyncFilter *after* a
sync which meant that we had to sync twice after selective sync setup.
Now, we clear the filter *before* a sync as well which allows the actual
next sync to write the correct etags to the db again - instead of only
the sync after that one.
Also expand on comments and rename _avoidReadFromDbOnNextSyncFilter to
_etagStorageFilter.
2018-06-05 12:00:20 +02:00
Roeland Jago Douma
3ce41c71c1
Merge pull request #350 from nextcloud/upstream/pr/6436
...
SyncJournalDb::setSelectiveSyncList: Always use a transaction
2018-06-05 11:30:24 +02:00
Olivier Goffart
613fd30021
SyncJournalDb::setSelectiveSyncList: Always use a transaction
...
Issue #6431
2018-06-05 11:15:51 +02:00
Roeland Jago Douma
0afcb23734
Merge pull request #331 from nextcloud/upstream/pr/6412
...
Blacklisting must prevent parent etag updates #6411
2018-06-05 10:18:53 +02:00
Christian Kamm
c57e4dcf03
Blacklisting must prevent parent etag updates #6411
2018-06-05 10:12:11 +02:00
Roeland Jago Douma
5309694b34
Merge pull request #394 from nextcloud/fix/master/info
...
Fix output add E2E again
2018-06-05 09:39:06 +02:00
Roeland Jago Douma
a0c458d937
Fix output add E2E again
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-05 09:02:41 +02:00
Roeland Jago Douma
a035b9b10b
Merge pull request #393 from ivaradi/master
...
Re-encoded Ubuntu/Debian upload keys
2018-06-05 09:02:23 +02:00
István Váradi
92de0770bc
Re-encoded Ubuntu/Debian upload keys
2018-06-05 08:34:41 +02:00
Roeland Jago Douma
2eb87e769c
Merge pull request #330 from nextcloud/upstream/pr/6408
...
FolderStatusModel: fix potential assert
2018-06-05 08:19:01 +02:00
Olivier Goffart
f4f228de3e
FolderStatusModel: fix potential assert
...
OCC::FolderStatusModel::slotUpdateDirectories: ASSERT: "parentInfo->_fetching" in file /home/olivier/kdegit/owncloud/mirall/src/gui/folderstatusmodel.cpp, line 599
This can happen if the structure of a folder is change while the user
expands the root folder. In this case, resetSubs() is called which
resets _fetching to false.
Instead, we need to keep a pointer to the job so we can abort it by
deleting it.
2018-06-05 08:12:58 +02:00
Roeland Jago Douma
6872cbda7e
Merge pull request #329 from nextcloud/upstream/pr/6416
...
csync_update: add the checksum in the discovery log
2018-06-05 08:12:00 +02:00
Olivier Goffart
3e508329b5
csync_update: add the checksum in the discovery log
...
Issue #6414
2018-06-05 07:52:29 +02:00
Roeland Jago Douma
69aa077212
Merge pull request #338 from ivaradi/master
...
Patch the OSX CMakeLists.txt for Xenial
2018-06-05 07:51:46 +02:00
István Váradi
d0e4c67459
Merge branch 'master' of github.com:nextcloud/client
2018-06-05 06:58:12 +02:00
Nextcloud bot
f8d0cbd468
[tx-robot] updated from transifex
2018-06-05 00:47:52 +00:00
Roeland Jago Douma
dfed78a665
Merge pull request #328 from nextcloud/upstream/issue/5932
...
macdeployqt: Adjust minimum version based on our Qt #5932
2018-06-04 20:23:38 +02:00
Markus Goetz
0d182280c4
macdeployqt: Adjust minimum version based on our Qt #5932
2018-06-04 20:02:43 +02:00
Roeland Jago Douma
8477c5a565
Merge pull request #327 from nextcloud/upstream/pr/6271
...
postinstall macOS: check if Finder is running
2018-06-04 20:00:58 +02:00
Roeland Jago Douma
32ae670c4e
Merge pull request #325 from nextcloud/upstream/ssl-button-speed
...
SslButton: Improve speed (especially on macOS) #6031
2018-06-04 17:14:38 +02:00
Roeland Jago Douma
4bd6f2b26d
Merge pull request #323 from nextcloud/upstream/upload-finished-flag
...
Upload: Simplify 'finished' flag
2018-06-04 17:14:17 +02:00
Roeland Jago Douma
c1171d700e
Merge pull request #322 from nextcloud/upstream/pr/6404
...
Excludes: Expand doc, Desktop.ini only in root folder
2018-06-04 17:13:23 +02:00
Roeland Jago Douma
3a1dc44ec8
Merge pull request #320 from nextcloud/upstream/issue/6403
...
propagateuploadv1: don't finalize after a done()
2018-06-04 17:12:52 +02:00
Roeland Jago Douma
3c3f3541d4
Merge pull request #291 from nextcloud/fixEncryptionDecryptionNonEmptyFolder
...
Forbid to encrypt or decrypt a non-empty folder.
2018-06-04 16:03:25 +02:00
Roeland Jago Douma
c49597d9d8
Merge pull request #319 from nextcloud/upstream/issue/4424
...
Folder: normalize the local path.
2018-06-04 16:02:49 +02:00
Roeland Jago Douma
321e8c0264
Merge pull request #317 from nextcloud/upstream/issue/3146
...
SslButton: Add HTTP/2 info #3146
2018-06-04 16:01:44 +02:00
Roeland Jago Douma
092063d348
Merge pull request #316 from nextcloud/upstream/pr/6384
...
CSync Errors cleanup
2018-06-04 15:59:45 +02:00
Olivier Goffart
393f6c2310
SyncEngine: remove the "CSync" wording from the error messages
...
They are confusing for the user.
Example in issue #6274
2018-06-04 15:41:38 +02:00
Olivier Goffart
5f30177bfc
CSync: Remove unused error codes
...
None of the removed ERRNO code were ever set.
So none of the removed error hapenned anymore
2018-06-04 15:41:38 +02:00
Olivier Goffart
15e93c8a31
CSync: reconcile never returns an error
2018-06-04 15:41:38 +02:00
Olivier Goffart
be29fc2f69
csync: remove CSYNC_PARAM_ERROR
...
It does not make sense to report such error to the user.
Its goal was to show invalid use of the csync API, but this is now done
with asserts.
2018-06-04 15:41:38 +02:00
Olivier Goffart
0443f8dd4d
csync: Simplify csync_walk_local_tree/csync_walk_remote_tree
...
Small refactoring
2018-06-04 15:41:38 +02:00
Tomaz Canabrava
9b74a596c6
Forbid to encrypt or decrypt a non-empty folder.
...
The specs forbid the encryption or decryption of a
non empty folder. so...
1 - check for the sync status, if it's not synced return
as there's no way that I can say that there's items on the
server right now without waiting for the sync to finish
2 - verify if the folder is empty locally
as the user could have send some files to the folder.
2018-06-04 15:33:01 +02:00
Julius Härtl
5df1af79c5
Merge pull request #377 from nextcloud/bugfix/noid/cloudprovidesr_314
...
Fix cloudproviders after merging #314
2018-06-04 15:32:36 +02:00
Morris Jobke
d35ea29ad2
Merge pull request #388 from nextcloud/documentation/macos-osx
...
[documentation] Mac OS X is now macOS
2018-06-04 14:10:55 +02:00
Marius Blüm
78bfae45ae
Mac OS X is now macOS
...
Signed-off-by: Marius Blüm <marius@lineone.io >
2018-06-04 11:44:03 +02:00
Markus Goetz
ab34f36836
owncloudsynclog: 1 MB -> 10 MB #6420
2018-06-03 23:09:23 +02:00
Roeland Jago Douma
f96206705a
Merge pull request #315 from nextcloud/upstream/pr/6379
...
Discovery: Error if properties are missing #6317
2018-06-03 19:58:21 +02:00
Nextcloud bot
70d4c64d99
[tx-robot] updated from transifex
2018-06-03 00:48:45 +00:00
Roeland Jago Douma
4b1c6bb833
Fix cloudproviders after merging #314
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-06-02 20:46:10 +02:00
Roeland Jago Douma
1262cbf4ef
Merge pull request #314 from nextcloud/upstream/pr/6373
...
Make sure ignored and conflict files show up in the issues tab even with partial local discovery
2018-06-02 20:20:19 +02:00
Nextcloud bot
b2433c8961
[tx-robot] updated from transifex
2018-06-02 00:46:48 +00:00
Julius Härtl
c9634d65aa
Merge pull request #313 from nextcloud/upstream/pr/6380
...
ConnectionValidator: change the minimum server version
2018-06-01 15:43:19 +02:00
Julius Härtl
fc4f8fb2d5
Merge pull request #372 from nextcloud/upstream/pr/6488
...
ShareDialog: macOS grey odditiy #5774
2018-06-01 15:42:26 +02:00
Julius Härtl
4be565c56f
Merge pull request #369 from nextcloud/upstream/issue/6406
...
Nautilus shell integration: Print python version on startup #6406
2018-06-01 15:40:23 +02:00
Julius Härtl
e4981931ac
Merge pull request #373 from nextcloud/upstream/pr/6490
...
Nautilus: Fix Python3 and remove many debug
2018-06-01 15:39:56 +02:00
Olivier Goffart
5f969580ac
Nautilus: Fix Python3 and remove many debug
...
Use b'\n' in the call to rfind, as the _remainder is bytes, not a string.
Remove most of the debug message which happens during normal operation.
They are mostly spamming the nautilus console, and can also cause bug
as they may throw exception in case of wrong encoding.
Relates to issue: #6406
2018-06-01 13:35:19 +02:00
Markus Goetz
b8b9b93a6e
ShareDialog: macOS grey odditiy #5774
2018-06-01 13:31:22 +02:00
Olivier Goffart
4d7617d64b
Propagator: remove a bunch of code related to the 'Shared' directory
...
This no longer exists since the owncloud server 7.0 which we no longer
allow to connect to
2018-06-01 13:17:20 +02:00
Olivier Goffart
8484b493e4
ConnectionValidator: change the minimum server version
...
Forbit connection with server older than 7.0. These server did not have
permission.
Also warn for anything older than 9.1. 9.0 is end of life according to
https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule
2018-06-01 13:17:11 +02:00
Christian Kamm
70f0792d4a
Nautilus shell integration: Print python version on startup #6406
2018-06-01 13:02:13 +02:00
Roeland Jago Douma
335298f4e2
Merge pull request #312 from nextcloud/upstream/pr/6374
...
Move ClientProxy and and ConnectionValidator out of libsync
2018-06-01 11:08:20 +02:00
Olivier Goffart
1b587a1241
ConnectionValidator::Status use Q_ENUM
...
So no need to have a manual conversion to QString
This is only used in debug message anyway.
2018-05-31 21:56:55 +02:00
Olivier Goffart
311307e8cb
Move ClientProxy and ConnecitonValidator to gui
...
They are using the ConfigFile and are used to control
when to sync rather than for the sync itself
2018-05-31 21:56:55 +02:00
Olivier Goffart
7e05e1e411
owncloudcmd: Do not overwrite the http timeout for json jobs
...
The AbstractNetworkJob already has a sensible timeout that depends
on an environment variable.
No need to overwrite that with some arbitrary value. (The connection
validator does that because it could cause problems if two connection
validator were to run at the same time. Not a problem here)
2018-05-31 21:56:55 +02:00
Olivier Goffart
204cb470b4
owncloudcmd: Do not read the proxy settings from the gui's config file
...
The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config
2018-05-31 21:56:55 +02:00
Olivier Goffart
9fe8713bdc
Folder: remove unused member
2018-05-31 21:56:44 +02:00
Nextcloud bot
08024f69c8
[tx-robot] updated from transifex
2018-05-31 00:48:48 +00:00
Roeland Jago Douma
c6ef8eec0a
Merge pull request #305 from nextcloud/upstream/pr/6363
...
SyncEngine: Use separate state for two unicode conversions
2018-05-30 08:04:05 +02:00
Roeland Jago Douma
86741de622
Merge pull request #299 from nextcloud/upstream/pr/6349
...
Don't delete contents behind directory junctions #6322
2018-05-30 08:03:04 +02:00
Roeland Jago Douma
c6c42c3c70
Merge pull request #311 from nextcloud/upstream/pr/6371
...
Utility::fsCasePreserving: remove UNIT_TESTING ifdef
2018-05-29 20:33:34 +02:00
Roeland Jago Douma
d410b8e057
Merge pull request #310 from nextcloud/upstream/version-cmake
...
VERSION.cmake: This is 2.4.2 now
2018-05-29 20:32:27 +02:00
Markus Goetz
68601240f8
VERSION.cmake: This is 2.4.2 now
2018-05-29 20:19:42 +02:00
Roeland Jago Douma
6ebcc638e0
Merge pull request #300 from nextcloud/upstream/pr/6351
...
SettingsDialogMac: Also start timer for notifications
2018-05-29 20:19:03 +02:00
Markus Goetz
13b2e51dfe
Notifications: Immediately request when getting account online
2018-05-29 20:09:08 +02:00
Markus Goetz
00d8343e76
SettingsDialogMac: Also start timer for notifications
2018-05-29 20:09:06 +02:00
Nextcloud bot
4089456bc6
[tx-robot] updated from transifex
2018-05-28 00:49:03 +00:00
Roeland Jago Douma
1b756ac80f
Merge pull request #318 from nextcloud/upstream/pr/6402
...
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
2018-05-26 21:33:45 +02:00
Roeland Jago Douma
bb1b86b087
Merge pull request #307 from nextcloud/upstream/pr/6366
...
test/testsyncengine: testNoLocalEncoding is for Linux
2018-05-26 21:30:21 +02:00
Nextcloud bot
e9be7fc18a
[tx-robot] updated from transifex
2018-05-26 00:54:16 +00:00
Nextcloud bot
37cac61f49
[tx-robot] updated from transifex
2018-05-25 00:55:04 +00:00
Nextcloud bot
c2e0a4a73c
[tx-robot] updated from transifex
2018-05-23 16:56:31 +00:00
István Váradi
76c4b05270
Patch the OSX CMakeLists.txt for Xenial
2018-05-22 07:04:09 +02:00
Camila Ayres
122daf4199
Merge pull request #335 from nextcloud/rakekniven-patch-1
...
Fixed tiny grammar issue (adds dot to the end of a sentence)
2018-05-21 17:43:35 +02:00
rakekniven
8d90c8c17b
Fixed tiny grammar issue
2018-05-20 11:17:46 +02:00
Julius Härtl
6a5654d6d2
Merge pull request #294 from nextcloud/upstream/pr/6330
...
SocketAPI: "Open in browser" and disable Share entries when sharing i…
2018-05-19 16:09:50 +02:00
Julius Härtl
9196ab1c98
Merge pull request #246 from k1l1/master
...
scary wording on big changes #216 (translations missing)
2018-05-19 15:44:04 +02:00
Kilian Pfeiffer
bb65eb8cdd
changed wording
...
https://github.com/nextcloud/client/issues/216
2018-05-19 13:17:25 +02:00
Julius Härtl
b7a67863a7
Merge pull request #306 from nextcloud/upstream/pr/6347
...
Set launch-on-startup when the first account is set up
2018-05-18 16:08:52 +02:00
Roeland Jago Douma
b7d5aff901
Merge pull request #303 from nextcloud/upstream/issue/6322
...
SyncJournal: Don't use LIKE with paths
2018-05-18 13:56:25 +02:00
Roeland Jago Douma
1dc3c156d4
Merge pull request #304 from nextcloud/upstream/pr/6364
...
Conflicts: Add user name to conflict file name #6325
2018-05-18 13:56:14 +02:00
Julius Härtl
0283e1bfaa
Merge pull request #295 from nextcloud/upstream/pr/6329
...
Tray: Change icon for unresolved conflicts #6277
2018-05-18 08:53:49 +02:00
Julius Härtl
5f0b56e13a
Merge pull request #326 from nextcloud/upstream/pr/6415
...
Nautilus integration: Not a ColumnProvider
2018-05-17 22:56:57 +02:00
Joss Brown
df8708dd46
postinstall macOS: check if Finder is running
...
Some users have disabled Finder, and the postinstall will always reenable Finder, unless it checks Finder status first.
2018-05-17 21:14:57 +02:00
Roeland Jago Douma
cf4e156fa0
Merge pull request #321 from nextcloud/upstream/qtversion-pkg-name
...
macOS: Put Qt version in .pkg name
2018-05-17 21:13:42 +02:00
Roeland Jago Douma
3b4fcfcc65
Merge pull request #302 from nextcloud/upstream/pr/6352
...
Sharing: Use maximum allowed permissions for new share #6346
2018-05-17 21:11:33 +02:00
Christian Kamm
629b14266b
Nautilus integration: Not a ColumnProvider
...
The nautilus plugin doesn't actually define get_columns(), so pretending
to be a ColumnProvider lead to a critical warning on startup.
2018-05-17 20:52:40 +02:00
Roeland Jago Douma
33555292ae
Merge pull request #301 from nextcloud/upstream/pr/6353
...
HTTP2: Only from Qt 5.9.4 #6285
2018-05-17 15:39:09 +02:00
Roeland Jago Douma
36572b79c3
Merge pull request #298 from nextcloud/upstream/no-shibboleth
...
NO_SHIBBOLETH: Fix warning
2018-05-17 15:38:04 +02:00
Roeland Jago Douma
2e0d724e3e
Merge pull request #297 from nextcloud/upstream/pr/6336
...
- add description for moveToTrash variable
2018-05-17 15:37:40 +02:00
Roeland Jago Douma
cbeb9af7fd
Merge pull request #296 from nextcloud/upstream/issue/6337
...
FolderStatusModel: Refresh folders on Problem sync #6337
2018-05-17 15:37:20 +02:00
Camila Ayres
19ae3e4326
Merge pull request #293 from nextcloud/upstream/pr/6265
...
Move remote-deleted files to trash
2018-05-17 12:20:53 +02:00
Markus Goetz
9ef42b4835
SslButton: Improve speed (especially on macOS) #6031
...
From 1+n*450msec to 1*450msec
2018-05-16 21:03:06 +02:00
Christian Kamm
a2675b559b
Upload: Simplify 'finished' flag
...
* Sometimes there was 'finished' and '_finished'
* Make each done() call automatically set _finished to true
2018-05-16 20:57:26 +02:00
Christian Kamm
5f7fd7c551
Excludes: Expand doc, Desktop.ini only in root folder
...
The Desktop.ini exclude was added for 2.4 because we add such a file to
the synced folder on Windows. It doesn't need to cover subdirectories.
2018-05-16 20:29:12 +02:00
Olivier Goffart
ad276a4bce
Folder: normalize the local path.
...
We otherwise normalize all path in the C form, so we must have
the Folder's path normalized the same. Or all comparizon will fail
(such as knowing if a file from the SocketAPI or the FilesystemWatcher
are part of the folder)
Issue #4424
2018-05-16 20:26:09 +02:00
Olivier Goffart
3506c52be9
propagateuploadv1: don't finalize after a done()
...
Should fix an assert when "Server does not support X-OC-MTime"
(Which only happens with owncloud 5)
Issue #6403
2018-05-16 20:23:47 +02:00
Markus Goetz
434f093f98
SslButton: Add HTTP/2 info #3146
2018-05-16 20:10:51 +02:00
Markus Goetz
b22daf8691
macOS: Put Qt version in .pkg name
2018-05-16 20:08:25 +02:00
whitequark
6dd5876b8a
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
...
As per XDG Base Directories specification:
> If $XDG_RUNTIME_DIR is not set applications should fall back
> to a replacement directory [...]
In practice, the ownCloud client has the fallback, but the plugin
helper does not, and if $XDG_RUNTIME_DIR is not set, the plugin
mysteriously does not work.
2018-05-16 20:05:46 +02:00
Christian Kamm
1868b2f3ec
IssuesWidget: addItem performance improvement
...
Ensure adding a new item isn't usually O(n) by keeping track of which
items have associated issues.
2018-05-16 16:49:41 +02:00
Christian Kamm
a0d7095b2c
IssuesWidget: Don't allow two issues for the same file/folder
...
This is intended to safeguard against invalidation bugs that cause the
same error to be added again for every sync run.
2018-05-16 16:49:03 +02:00
Christian Kamm
a0d5e31423
INSTRUCTION_IGNORE now carries a direction
...
This allows IssuesWidget to selectively wipe only the 'Up' ignores
during selective local discovery.
2018-05-16 16:48:31 +02:00
Christian Kamm
11b6b48c75
ProtocolItem: Adjust the way data is stored again
...
The struct makes it easy to pack data and should consume less memory
overall.
2018-05-16 16:48:06 +02:00
Christian Kamm
800f1ace0c
SyncResult: Make sure the number of conflicts is correct #6226
...
If the SyncResult incorrectly believes that there are no conflicts, the
tray icon won't be correct and there will be no warning about unresolved
conflicts on the account.
Nevertheless, it's pretty awkward that the IssuesWidget is better
informed about pending conflicts than the Folder itself. This kind of
backwards data flow is very confusing.
Unfortunately the only alternative I see is to either keep track of
this information in two places (also in Folder), or create a common
data-holding class that can serve as a model instance for the issues
view as well as provide data directly to the Folder - which would
have been a much larger change.
2018-05-16 16:47:27 +02:00
Christian Kamm
75194d1821
SyncEngine: Make "local discovery?" question available
...
Also fix the minor bug that was mentioned and add tests.
2018-05-16 16:46:40 +02:00
Christian Kamm
2defaf099d
Issues tab: Invalidate issues selectively #6226
...
Everything is invalidated later: after discovery, not before. In
addition entries that should only be invalidated when new local
discovery is done have that behavior now.
2018-05-16 16:45:39 +02:00
Christian Kamm
01f83ff398
ProgressInfo: Add information for local vs remote discovery
2018-05-16 16:45:13 +02:00
Christian Kamm
8077748c9d
slotFolderDiscovered: Fix 'local' always being false
...
It was unused, so no harm done.
2018-05-16 16:44:36 +02:00
Christian Kamm
687b6f5655
Discovery: Error if properties are missing #6317
2018-05-16 16:42:20 +02:00
Olivier Goffart
b0f539fc1f
cmake: Remove references of now unused WITH_TESTING
...
Issue #6318
2018-05-16 13:00:17 +02:00
Olivier Goffart
d4aebd30de
Utility::fsCasePreserving: remove UNIT_TESTING ifdef
...
Since the release package will be build with unit test, we don't
want to query the env variable at every call to fsCasePreserving.
So only test the env variable at startup.
And the testutility can still change the value.
(The env variable is still used from t8.pl and maybe smashbox)
Issue #6318
2018-05-16 12:57:20 +02:00
Markus Goetz
f6b67a866a
test/testsyncengine: testNoLocalEncoding is for Linux
2018-05-15 23:06:39 +02:00
Christian Kamm
583399ad53
Set launch-on-startup when the first account is set up
...
The previous code would disable it when the second account was
configured.
See #6347
2018-05-15 22:59:16 +02:00
Christian Kamm
ea142b8018
Conflicts with user name: Fix tests
2018-05-15 22:54:48 +02:00
Christian Kamm
f244cc4d4a
SyncEngine: Use separate state for two unicode conversions
...
It's unlikely that there were interaction effects but still seems safer
to use different conversion state for the path and rename_path.
2018-05-15 22:44:10 +02:00
Christian Kamm
17d174e6fa
Conflicts: Add user name to conflict file name #6325
...
For the case of uploading conflict files only.
2018-05-15 22:38:35 +02:00
Christian Kamm
ce0e2d0b88
SyncJournal: Don't use LIKE with paths
...
Paths can contain the wildcards % and _ and that would lead to odd
behavior.
This patch also clarifies the behavior of avoidReadFromDbOnNextSync()
which previously dependend on whether "foo/bar" or "foo/bar/" was
passed as input.
Possibly affects #6322
2018-05-15 19:44:00 +02:00
Christian Kamm
7154a001d6
Sharing: Use maximum allowed permissions for new share #6346
...
The client already computed the valid permissions, there was just a typo
that meant we didn't end up using them.
2018-05-15 19:26:40 +02:00
Markus Goetz
e82869d10e
HTTP2: Only from Qt 5.9.4 #6285
2018-05-15 19:23:11 +02:00
Olivier Goffart
88347a985f
Adjust the Move To Trash patch
...
(PR #6265 )
- Remove the UI completely
- Move the #ifdef inside the FileSystem::moveToTrash function, so it is easier to
implement on other platforms
- Q_OS_UNIX includes mac, so we need to disable it. (not using Q_OS_LINUX because of
other BSD that uses XDG spec as well
- Translate the error messages
- Add a couple of doc comments
2018-05-15 19:10:41 +02:00
Christian Kamm
2d1d651fcd
Don't delete contents behind directory junctions #6322
...
QFileInfo::isSymLink() does detect reparse points that are symlinks but
returns false for junctions. The new function FileSystem::isJunction()
can detect those and is used to not recursively delete files inside
directories that are junctions.
See also https://bugreports.qt.io/browse/QTBUG-45344 and the
discussion in the PR https://codereview.qt-project.org/#/c/113019/ .
2018-05-15 18:42:44 +02:00
Markus Goetz
d33692cdc7
NO_SHIBBOLETH: Fix warning
2018-05-15 18:31:12 +02:00
Oleg Solovyov
66eeb96c54
- doc: linux-only setting
2018-05-15 18:25:27 +02:00
Oleg Solovyov
09ade2b892
- add description for moveToTrash variable
2018-05-15 18:22:36 +02:00
Christian Kamm
1fa88c9820
FolderStatusModel: Refresh folders on Problem sync #6337
...
We don't want to refresh too frequently. But Problem is very close to
Success and very common.
2018-05-15 18:08:17 +02:00
Christian Kamm
ad750f569c
Tray: Change icon for unresolved conflicts #6277
2018-05-15 17:58:10 +02:00
Olivier Goffart
2fcd7b20b8
SocketAPI: "Open in browser" and disable Share entries when sharing is disabled.
...
This adds "Open in browser" entry in the menu (Issue #5903 )
Also mark the entries as disabled when the file is not yet on the server.
If re-sharing is not allowed for that file, a disabled explaination
entry is added to the menu.
If sharing is disabled globaly in the branding or in the server,
the share entry will not be present.
(Issues #4205 and #4608 )
Meta issue #6292
2018-05-15 17:39:30 +02:00
Oleg Solovyov
f9fe24feb9
Move remote-deleted files to trash
...
Squashed from https://github.com/owncloud/client/pull/6265
Linux only, Hidden option, disabled by default
2018-05-15 17:23:38 +02:00
Julius Härtl
5e2270bd57
Merge pull request #247 from nextcloud/adds-etag-navigation-apps
...
Checks for 304 response in the navigation apps request
2018-05-08 06:55:41 +02:00
Camila San
d629f2259d
Changes from qCWarning to qCDebug.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-05-07 18:19:29 +02:00
Camila San
bbff83fe7c
Only updates the list of apps when there is a change in the server (not 304 status).
...
Signed-off-by: Camila San <hello@camila.codes >
2018-05-07 18:03:51 +02:00
Camila San
402dc6c33b
Checks for http status code before building navigation apps menu.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-05-07 18:03:51 +02:00
Camila San
23a759ef4a
Adds 304 http status code as valid.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-05-07 18:03:51 +02:00
Camila San
77ebccee72
Adds methods to set/get navigation apps etag response header.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-05-07 18:03:51 +02:00
Camila San
d7286872f6
Adds function to add raw header to the request.
...
Function added to be able to add If-None-Match to save the ETag.
Signed-off-by: Camila San <hello@camila.codes >
2018-05-07 18:03:42 +02:00
Camila Ayres
3b0b0fea33
Merge pull request #282 from ivaradi/master
...
Fix Debian build (another attempt)
2018-05-06 19:23:31 +02:00
István Váradi
ceb83c3709
Merge branch 'master' of github.com:nextcloud/client
2018-05-06 18:28:34 +02:00
István Váradi
a602df065e
Fixed the name of the Qt WebEngine package
2018-05-06 17:12:17 +02:00
István Váradi
181f3bbd26
Added build dependency on qt5webengine-dev ( #281 )
2018-05-06 16:17:16 +02:00
István Váradi
7e210cfcb3
Merge branch 'master' of github.com:nextcloud/client
2018-05-06 10:24:21 +02:00
István Váradi
fee2872a98
Added build dependency on qt5webengine-dev
2018-05-06 09:53:49 +02:00
Roeland Jago Douma
880f256a62
Merge pull request #278 from ivaradi/master
...
Fix Debian build
2018-05-03 22:20:44 +02:00
István Váradi
7827fe4151
Fix Debian build
2018-05-03 19:02:49 +02:00
Roeland Jago Douma
e40bddb2c2
Merge pull request #276 from nextcloud/no_debian
...
Build no debian while it fails
2018-05-03 14:38:38 +02:00
Roeland Jago Douma
ed3a723ad2
Build no debian while it fails
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-03 14:28:11 +02:00
Roeland Jago Douma
889c930b36
Merge pull request #75 from nextcloud/new_flow
...
Add weblogin flow for NC > 12
2018-05-03 14:07:44 +02:00
Roeland Jago Douma
56e17c25b2
Change loading bar to NC blue
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-03 13:55:27 +02:00
Roeland Jago Douma
ef2d113930
Mark credentials as valid if there is no error
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
35e8d0437d
Address comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
6809f12e68
Allow the user to sign in again
...
If the user is signed out (for whatever reason). Show a popup
with the loginflow again.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
ac1664b525
Actually use webflow credentails
...
* Detect invalid auth (if the users token is removed for example)
* Properly store and fetch from keychain
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
6b43d80c01
Start with persisting credentials
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
356f9b4831
Actually connect properly to server
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
715c738ebf
Add urlschema handler so w can catch the nc:// urls
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
c763a6e7fb
Show webview with page
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-02 22:50:48 +02:00
Roeland Jago Douma
c4a88fe57e
Add QWebView as a dependency
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-05-02 22:50:48 +02:00
Camila Ayres
9338dadaab
Merge pull request #265 from k1l1/log_files_path
...
Put log files somewhere else #221 (name conflict)
2018-05-02 15:30:34 +02:00
Kilian Pfeiffer
56c1d79c49
fixes windows crash / renaming changed
2018-04-30 16:09:04 +02:00
Camila Ayres
64cbc88474
Merge pull request #251 from nextcloud/clientSideEncryptionV4
...
Client side encryption v4.
2018-04-26 19:56:55 +02:00
Kilian Pfeiffer
cd926e5b84
resolving name conflict in logfiles
2018-04-24 15:47:23 +02:00
Morris Jobke
a41546834e
Merge pull request #262 from nextcloud/update-transifex-config
...
Update transifex config and move it to a proper place
2018-04-23 19:59:41 +02:00
Morris Jobke
3a763f4d9c
Update transifex config and move it to a proper place
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2018-04-23 15:45:34 +02:00
Roeland Jago Douma
81ae682e87
Revert "Make different program so it doesn't mess with existing config"
...
This reverts commit c04d1f1f69 .
2018-04-22 21:04:37 +02:00
Roeland Jago Douma
75609c1b2c
Merge pull request #254 from ad1rie1/FIX32BitApplication
...
Fix #6394
2018-04-22 20:57:36 +02:00
Camila Ayres
25b40cc852
Merge pull request #255 from ad1rie1/FixDeprecatedTR
...
Fix Use of Deprecated trUtf8.
2018-04-20 11:11:05 +02:00
Adrien
8e52f1237b
Fix Use of Deprecated trUtf8
2018-04-19 12:02:26 +02:00
Julius Härtl
00336bd71d
Merge pull request #253 from k1l1/log_files_path
...
Put log files somewhere else #221
2018-04-19 11:43:29 +02:00
Adrien
5f0a021c04
Fix #6394
2018-04-19 11:35:03 +02:00
Kilian Pfeiffer
40b1f051a4
log files are visible now
2018-04-17 17:59:03 +02:00
Kilian Pfeiffer
faf64958ec
changed paths of logfiles
2018-04-17 15:54:05 +02:00
Tomaz Canabrava
7432d6a814
Merge branch 'master' into clientSideEncryptionV4
2018-04-10 16:18:58 +02:00
Daniel Nicoletti
16aa54ed64
Do not create new db entries when the remote tree does not have proper values
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
3e05bd1da0
Do not detach encrypted files vector
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
3eb3535d0f
Fix downloading NEW encrypted files
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
defe2d7631
Fix matching encrypted data for downloading
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
b12066f1aa
Properly remove encryption data from JSON of deleted file
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
a9208f6581
Remove unused encrypted property
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
6e63a538b7
Make sure bool _currentLockingInProgress is first defined to false
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
a7a8de8787
Fix matching encrypted file for download
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d93f7269b8
Properly mark encrypted files for removal
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d3b6aacf3f
Fix merging remote and local trees when e2e files are involved
...
When populating the tree from the filesystem we need to fill
the e2eMangledName from DB and we when trying to find another
match on the oposite tree we need to take in account that names
don't match and search with the mangled name information
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
c0ef36b8fa
Use QUuid to generate random names
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
60fc5d6dd4
Fix upload of existing encrypted files by matching only filename
2018-04-09 13:23:52 +02:00
Daniel Nicoletti
d5ab642e46
Fix sync status running when encryption data is missing
...
When a file on the server of an encrypted folder do
not have a matching entry on the JSON metadata, we
need to report an error and be done with the job
so that Sync status is not "running".
This eventually should cause the file to be removed
from the server as it can not be recovered anymore.
2018-04-09 13:23:52 +02:00
Tomaz Canabrava
b4b3e422de
Handle gracefully failures in file decryption
2018-03-27 09:18:54 +02:00
Tomaz Canabrava
ed6f56257e
Dont use new with QFiles.
2018-03-26 22:18:07 +02:00
Tomaz Canabrava
461aeca200
Do not crash when failing to decrypt the metadata
2018-03-26 22:02:46 +02:00
Tomaz Canabrava
6c88367ac6
Do not crash if there was an error encrypting the file.
2018-03-26 21:44:46 +02:00
Tomaz Canabrava
5fe9717598
Potentially fix crash acessing a deleted pointer.
2018-03-26 21:37:13 +02:00
Tomaz Canabrava
ec28465e01
Correctly handle systems without client side encryption
2018-03-26 20:51:14 +02:00
Tomaz Canabrava
11684682e6
Return empty metadata in case of error, Display error to the user.
2018-03-25 22:31:49 +02:00
Tomaz Canabrava
96115be0c6
Unlock folder in case of error
2018-03-25 21:54:08 +02:00
Roeland Jago Douma
4c40789dca
Merge pull request #140 from nextcloud/appimage_drone_bump
...
Bump AppImage Drone
2018-03-23 15:36:33 +01:00
Roeland Jago Douma
a2815dac12
Merge pull request #224 from nextcloud/fix-documentation-cmake
...
Remove configure_file for non-existing documentation config file
2018-03-23 15:36:13 +01:00
Julius Härtl
16f53da9ae
Remove configure_file for non-existing documentation config file
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2018-03-22 19:30:05 +01:00
Camila Ayres
08b33c6f4b
Merge pull request #197 from nextcloud/fix-notifications
...
Improves notifications:
- Display the actual response text from the notification API in the popups.
- Do not display sync activities messages like how many files were downloaded, only errors.
- Make the notifications section above the activity feed also clickable. e.g open the call, the file that was shared, open the calendar event etc
- Changes "Show desktop notifications" setting to "Show server notifications"
- Show notifications on startup and then show only NEW notifications: uses If-None-Match check to only retrieve notifications once there are new notifications.
2018-03-13 13:30:44 +01:00
Camila Ayres
eb3b3f02a0
Merge pull request #195 from nextcloud/apps-external-sites-menu
...
Adds apps and external sites to menu.
2018-03-09 11:48:14 +01:00
Camila San
11d178ce1d
Adds absolute=true param to navigation/apps request.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-03-03 23:11:11 +01:00
Camila San
2e4472a4db
Enables server notifications by default.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-03-03 22:44:24 +01:00
Camila San
3c778980df
Makes sure JsonApiJob::finished won't throw a JSON error when status code is 304.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-03-03 22:24:16 +01:00
Camila San
621596f45a
Saves notifications ETag response header to use to request only new notifications.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-03-01 22:19:04 +01:00
Camila Ayres
cb5bc61a44
Merge pull request #163 from nextcloud/edit-system-exclude-list
...
Edit system exclude list.
2018-03-01 19:32:18 +01:00
Camila San
d42401e36a
Changes notifications api endpoint to v2.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-03-01 15:20:36 +01:00
Camila San
6bf9f65fd3
Only notify users of new notifications and only shows them all on startup.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-27 23:05:18 +01:00
Camila San
56709f3cff
Removes string 'Created' from notifications time.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-26 12:56:02 +01:00
Camila San
112c5e10b6
Removes Server Activities option from General settings.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-26 12:02:34 +01:00
Camila San
09a92a518a
Align text and changes spacing in notification widget.
2018-02-26 00:03:29 +01:00
Camila San
0f9d8e15a0
Only uses 'More information' text in button for notification link.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-26 00:02:09 +01:00
Camila San
44f299eba2
Removes debug messages.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-26 00:00:42 +01:00
Camila San
d71438f181
Adds host and scheme to activity link so it can be opened in the
...
browser.
- Removes debug messages.
- Removes Activity data _appName - not used anymore.
Signed-off-by: Camila San <hello@camila.codes >
2018-02-25 23:58:28 +01:00
Camila San
71f4760215
Do not display user account when there is only one user in popup message.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-25 23:57:44 +01:00
Camila San
4a6a8ca6c6
Removes _appName from Activity data.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-25 23:56:54 +01:00
Camila San
e33d2bf7f7
Removes (s) from time strings.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-25 23:55:04 +01:00
Camila San
4c79059146
Changes notification icon bell size.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-25 23:54:04 +01:00
Daniel Hansson
eec728eab8
Merge pull request #196 from ivaradi/master
...
Recommends relation to libgnome-keyring0
2018-02-24 21:46:09 +01:00
Daniel Hansson
d21ea9ed10
Merge pull request #174 from ivaradi/correct-dolphin-plugin-path
...
Dolphin plugin path correction
2018-02-24 21:45:47 +01:00
István Váradi
99add9f00d
Recommend libgnome-keyring0 on Debian too
2018-02-24 10:33:19 +01:00
István Váradi
0b3129f366
Added a Recommends relation to libgnome-keyring0
2018-02-24 10:19:01 +01:00
Camila San
1a0edc1cd0
Sync activities notifications are never shown unless there is an error. Server activities and notifications are off by default.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-23 12:08:37 +01:00
Camila San
99d8d050c2
Compares account menu with the account associated with the action to make sure apps is added to the right position.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-22 20:10:22 +01:00
Camila San
4ffff7454e
Refactores code and displays nav. apps before Pause/Unpause folders sync.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-21 18:49:12 +01:00
Camila San
9acb30ecb2
Refactores code to fetch and display sub menu with list from navigation/apps endpoint.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-20 19:41:08 +01:00
Camila San
61062f9809
Adds ocsnavigationapps files to CMakeslists.txt.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-20 19:33:25 +01:00
Camila San
fb080f08ec
Uses OcsNavigationAppsJob instead of OcsAppsJob and OcsExternalSitesJob in OwncloudGui.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 20:53:12 +01:00
Camila San
c9bc20c63d
Creates navigation/apps API call class OcsNavigationAppsJob.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 20:51:56 +01:00
Camila San
f107b3348c
Removes external sites/apps configuration from general settings.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 20:49:55 +01:00
Camila San
00cfbe39be
Removes external sites/apps configuration from config file.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 20:49:13 +01:00
Camila San
9f559c8e00
Retrieves list of apps and displays it if 'show apps' checkbox is checked in the settings.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:33 +01:00
Camila San
bf77dbac73
Adds checkbox 'showApps' to the general settings form.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:33 +01:00
Camila San
e29953bc11
Adds show apps option to the config file.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:33 +01:00
Camila San
8ada9d0471
List apps for each user in the tray main menu.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:33 +01:00
Camila San
08769b2803
Adds OcsAppsJob to retrieve apps enabled for the user.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:33 +01:00
Camila San
89d743396a
Fixes class name in comments and in ifndef.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:33 +01:00
Camila San
649f3ff904
Changes response parsing for the new request.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:32 +01:00
Camila San
9f0c154e68
Fixes request url - uses the one for all users.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:32 +01:00
Camila San
f48a94ba71
Saves 'show external sites list' option to the config file.
...
Uses option to toggle display of external sites list in the main menu.
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:32 +01:00
Camila San
ec428786ac
Adds checkbox to toggle display of external sites list in the menu.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:32 +01:00
Camila San
69f3468ec0
Lists external sites for each user in the main menu.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:32 +01:00
Camila San
8408851cee
Adds OCS External Sites Job to retrieve it from the server.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-19 19:59:19 +01:00
Tomaz Canabrava
7da0764b8d
Don't class what's not a class
2018-02-18 01:23:59 +01:00
Tomaz Canabrava
176a42a062
Return the error reported by openssl
2018-02-18 01:13:23 +01:00
Tomaz Canabrava
5faeca1b82
Move BIO2ByteArray to annonymous namespace
...
This has no use outside of the clientsidenecryption.cpp
2018-02-18 01:04:44 +01:00
Camila San
32e29fb849
Doesn't open the file manager when there isn't a file associated with the Activity.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-16 19:17:22 +01:00
Camila San
20cf4ed642
Improves Notification Widget UI.
...
- Changes spacing.
- Removes QFrame.
- Changes icon size.
Signed-off-by: Camila San <hello@camila.codes >
2018-02-16 18:04:44 +01:00
Camila San
ab7185a6c7
Changes notification text in the checkboxes and adds tooltips with explanation about it.
...
- Changes the configuration name in ConfigFile and GeneralSettings
accordingly with the new text.
- Makes sure the user sees error and conflict messages even if the
setting is disabled.
Signed-off-by: Camila San <hello@camila.codes >
2018-02-15 20:21:35 +01:00
Camila San
bfc7aa16c6
Adds option to toggle display of Sync and Activity notifications.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-14 20:38:15 +01:00
Camila San
b24751b099
Adds button to open notification in the browser - to update something, join a call, etc.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-14 19:22:08 +01:00
Camila San
a7dd3a7da1
Displays the actual notification subject in the system tray messages.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-12 22:16:46 +01:00
Daniel Nicoletti
99117078f3
Remove table for e2e and add an e2eMangledName column ( #169 )
...
If the code was not complex enough syncing two tables
already started to give UNIQUE constrains errors on
simple sync operations, this also adds initial support
remote delete of an encrypted file
2018-02-12 12:50:51 +01:00
Roeland Jago Douma
1eb7ba72f0
Use standardized filename
...
See https://github.com/nextcloud/end_to_end_encryption_rfc/issues/13
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-02-09 11:40:06 +01:00
István Váradi
2cc670453a
A separate Dolphin client install file is not required for Bionic
2018-02-08 17:19:13 +01:00
István Váradi
22153cf912
KDE_INSTALL_USE_QT_SYS_PATHS turned on so that the plugin is installed to the correct directory on Xenial too
2018-02-08 17:18:18 +01:00
Roeland Jago Douma
0743c63c81
Merge pull request #114 from ivaradi/debian-build
...
Moved Debian build to Drone
2018-02-06 08:18:00 +01:00
István Váradi
7216d05766
The Debian build script needs the history to generate logs and the tags to be able to determine the version
2018-02-02 19:11:10 +01:00
István Váradi
b11661f4c0
Reinstated the check for being on the master branch to enable uploading the packages
2018-02-02 18:57:51 +01:00
Daniel Nicoletti
080c5ea678
Better explanation for encryption passphrase
...
FIXES : #149
2018-02-02 17:27:58 +01:00
Camila San
2545017819
Refactores code.
...
- Renames function from populateTableReadOnlyValues to setupTableReadOnlyItems.
- Use a const to define the number of read only rows.
- Removes enable/disable remove all button checks from where it was not
needed.
Signed-off-by: Camila San <hello@camila.codes >
2018-02-02 16:01:53 +01:00
Camila San
73b7540468
Enable/disable remove all button depending on the number of rows.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-02 15:50:17 +01:00
Camila San
c29d3b7e0b
Adds button to remove all items from ignore list table.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-02 14:40:30 +01:00
Camila San
4855e3242c
Restores correctly default system values for ignore files list.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-02 14:15:45 +01:00
Camila San
bf76b596af
Allows deletion of pre configured patterns in the ignore list.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-01 22:36:40 +01:00
Camila San
6dd349a8a6
Adds button to restore default patterns in the ignore list.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-02-01 22:35:38 +01:00
István Váradi
4c74f29b5f
Removed yakkety and zesty, added bionic
2018-02-01 20:07:40 +01:00
István Váradi
549abc8c90
Build Xenial with Qt 5.5
2018-02-01 20:06:18 +01:00
István Váradi
ed9509f31f
Merge branch 'master' into debian-build
2018-02-01 18:44:55 +01:00
Morris Jobke
b9a7e5622d
Merge pull request #141 from nextcloud/documentation
...
Documentation update
2018-02-01 16:14:44 +01:00
Morris Jobke
5db7f60179
Fix CMake failure
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2018-02-01 16:08:33 +01:00
Morris Jobke
9c43edcad6
Run documentation tests in seperate job
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2018-02-01 15:58:51 +01:00
Morris Jobke
545a406997
Latest refinements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2018-02-01 15:57:37 +01:00
Marius Blüm
d75b32156f
Brand Screenshots
...
Signed-off-by: Marius Blüm <marius@lineone.io >
2018-02-01 14:23:38 +01:00
Camila San
f7697b0584
Enables removing patterns from ignored files list.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-01-31 22:59:51 +01:00
István Váradi
d0896f0c82
Removed some debug printouts and dead code and added Bionic in place of Zesty
2018-01-31 20:04:33 +01:00
István Váradi
4d396c645e
Why does Drone sometimes not use the new changes?
2018-01-31 19:58:24 +01:00
István Váradi
ebaae773f6
Trying a different strategy to sign the package files
2018-01-31 19:53:50 +01:00
István Váradi
88c03a5858
Stepped the version of the build image
2018-01-30 19:22:46 +01:00
István Váradi
11a540114e
Hiding the keys from the output
2018-01-30 19:22:26 +01:00
Roeland Jago Douma
89b2df62c5
Merge pull request #144 from nextcloud/win_images
...
Use Nextcloud images for windows installer
2018-01-30 14:23:32 +01:00
Julius Härtl
da2a1c25d5
Add drone build for documentation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2018-01-30 14:23:10 +01:00
Roeland Jago Douma
df123bb3bc
Use NC windows installer images
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-30 11:55:16 +01:00
Roeland Jago Douma
c04d1f1f69
Make different program so it doesn't mess with existing config
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-30 11:53:52 +01:00
Roeland Jago Douma
f8d805d78b
Use NC windows installer images
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-30 11:25:46 +01:00
Roeland Jago Douma
d85c2bf025
Fix building on windows
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-30 11:10:03 +01:00
Roeland Jago Douma
296f46356e
If the metadata is empty we should store (and not update).
...
Android only creates the metadata file when the first encrypted file is
added. We assumed it would be there.
This hacky code makes us store the metadata if there wasn't any yet.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-29 22:04:50 +01:00
Tomaz Canabrava
dcc9ac7d2e
[Buildfix] Fix build from last merge
2018-01-29 14:17:52 +01:00
Tomaz Canabrava
d24a1e542e
Merge branch 'master' into clientSideEncryptionV3
2018-01-29 14:06:12 +01:00
Morris Jobke
a7e1003c41
Add shared_assets
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2018-01-29 01:19:51 +01:00
Morris Jobke
fe102f359c
Build current documentation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2018-01-29 01:19:47 +01:00
Tomaz Canabrava
f4a50e88f5
[CSE] Ignore renames for downloaded files.
...
- TODO: Fix the incorrect "filename has been removed" popup.
The file is not removed, just the popup shows.
2018-01-28 23:59:53 +01:00
Tomaz Canabrava
682bb2ad43
[CSE] Save the encrypted name relation on downloads
2018-01-28 23:50:12 +01:00
Tomaz Canabrava
d38e5e1529
[CSE] Bypass rename if it's e2e
...
The client tracks the files in server and locally, but the
names of the files differ in the server, but we do *not*
wanna rename the files to the server one, we wanna
keep it as is if it's an encrypted file.
2018-01-28 23:48:51 +01:00
Tomaz Canabrava
7b123650da
[CSE] Search for name, not mangled name.
2018-01-28 23:48:25 +01:00
Tomaz Canabrava
0c94142c97
[CSE] More debug output
2018-01-28 23:47:58 +01:00
Tomaz Canabrava
e8849a2cf9
[CSE] Save the relation of the file / encrypted file names on the db
2018-01-28 22:26:07 +01:00
Roeland Jago Douma
11946d9ef8
Bump
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-28 20:21:12 +01:00
Roeland Jago Douma
4ee1f1fe1a
Foo
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-28 20:19:37 +01:00
Roeland Jago Douma
3c084bb6eb
Bump drone image
...
* Bump to 16.04 since 14.04 doesn't auto build here due to openssl fu
* No more gcc7 since gcc5 is new enough
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-28 20:10:04 +01:00
Roeland Jago Douma
45eefb27cf
Bump AppImage Drone
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-28 20:04:42 +01:00
Tomaz Canabrava
e9a7a56359
[CSE] Store the encrypted file name on the SyncFilePtr
2018-01-28 18:37:01 +01:00
Tomaz Canabrava
a003d216a5
[CSE] Implementation of the setE2eRelation
...
This call creates a new entry on the database for e2e.
2018-01-28 18:05:28 +01:00
Tomaz Canabrava
32eaaa0601
[CSE] GetMangledName implementation
2018-01-28 17:50:10 +01:00
Tomaz Canabrava
be817748f8
[CSE] Reset the new Queries on close
2018-01-28 17:46:20 +01:00
Tomaz Canabrava
b909bb6977
[CSE] Change the Database to handle Encrypted Files
...
Create a table to hold the information between the
real file name and the fake file name
2018-01-28 16:41:07 +01:00
István Váradi
72f629a7dc
Added secrets to .drone.yml
2018-01-27 08:50:28 +01:00
István Váradi
9ad6f1485e
Printing environment
2018-01-26 12:54:35 +01:00
István Váradi
459b6ab1e7
Trigger another build in the hope that it will see the previous commit
2018-01-26 12:41:27 +01:00
István Váradi
85140d3784
Reverting to upper-case key variable names
2018-01-26 12:28:14 +01:00
Roeland Jago Douma
040507fce6
Merge pull request #135 from nextcloud/oc_up
...
Merge upstream changes
2018-01-25 20:31:35 +01:00
István Váradi
7a1f32894b
Try if the variables are lower-case
2018-01-25 17:21:02 +01:00
István Váradi
1acd7db5f8
Dummy commit to trigger a new build
2018-01-25 17:16:59 +01:00
Roeland Jago Douma
e2e99da446
Bump appimage drone image
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-25 14:31:14 +01:00
Julius Härtl
bcb9553925
Use Qt5DBus_FOUND instead of the old WITH_DBUS
...
WITH_DBUS was removed in 257d8142b1
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2018-01-25 14:18:03 +01:00
Roeland Jago Douma
aa7e47f525
Fix new icon naming
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-25 12:19:51 +01:00
Roeland Jago Douma
48bce4c6b0
Merge remote-tracking branch 'oc/master' into oc_up
2018-01-25 11:17:04 +01:00
Roeland Jago Douma
84b26e0d4d
Merge pull request #133 from nextcloud/fix-notification-dismiss-button
...
Uses QString::number to get a string equivalent of the notification_id number
2018-01-24 19:29:21 +01:00
Julius Härtl
3d162745af
Merge pull request #131 from nextcloud/nextcloud_subdir
...
If status.php fails check <server>/nextcloud/status.php
2018-01-24 17:59:48 +01:00
Camila San
7a69e19e4d
Uses QString::number to get a string equivalent of the notification_id number.
...
This fixes the bug reported #117 .
Signed-off-by: Camila San <hello@camila.codes >
2018-01-24 17:29:45 +01:00
Olivier Goffart
02988229b1
FolderStatusModel: don't use deprecated QModelIndex::child
...
Was deprecated in Qt 5.8.
(IMHO this show that child can be usefull and I am not sure the
deprecation was justified)
2018-01-24 10:23:03 +01:00
Roeland Jago Douma
4892b0ec43
Properly fill EncryptedFile
...
* Add a mimetype (mobile clients need this)
* Add the tag unencoded as we encode it when we send the metadata
already
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-23 21:31:00 +01:00
Roeland Jago Douma
21d55c3321
No sharing in metadata yet and PEM as PKCS#8
...
* Don't store the metadata yet this crashes android
- Yes android should be fixed but for now this is quicker ;)
* QSslKey exports PEM as PKCS#1
- This is not handled properly on android so use PKCS#8 helper
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-23 21:02:52 +01:00
István Váradi
5e7f72b8df
Attempt to pass the key in the environment
2018-01-23 19:51:13 +01:00
István Váradi
ed9300f924
Commit to trigger build
2018-01-23 19:42:34 +01:00
Olivier Goffart
72b9beb79c
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
shell_integration/nautilus/syncstate.py
2018-01-23 14:08:15 +01:00
Olivier Goffart
883080b557
Windows shell extension: port to the new protocol
2018-01-23 14:02:56 +01:00
Christian Kamm
ebfac84c69
Shell integration: Make nautilus work with multiselections
...
Previously no menu would ever be shown if more than one file is
selected. Now the GET_MENU_ITEMS command is sent with all selected files
as an argument - similar to what is done for the dolphin integration.
2018-01-23 14:02:56 +01:00
Christian Kamm
3c2622d2de
Shell integration: Update nautilus for GET_MENU_ITEMS
2018-01-23 14:02:56 +01:00
Olivier Goffart
982c591ec9
SocketApi: add a way to disable menu entries
2018-01-23 14:02:56 +01:00
Olivier Goffart
1782ae3c08
SocketAPI: Make it easier to add or remove item in the action menu
...
By making it dynamic.
So far only the dolphin shell extension have been ported
2018-01-23 14:02:56 +01:00
Roeland Jago Douma
7ce009ef49
If status.php fails check <server>/nextcloud/status.php
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-23 13:43:44 +01:00
Christian Kamm
72363155d8
Nautilus integration: Work with python2 and python3
2018-01-23 12:30:58 +01:00
Olivier Goffart
f254ee3211
Nautilus shell integration: Port to Python 3
2018-01-23 12:30:58 +01:00
Christian Kamm
59f2e0634e
Protocol: Correct sorting by size #6326
...
Previously we were sorting by size string, where
"6 MB" < "3 KB".
2018-01-23 12:02:16 +01:00
Christian Kamm
32bb1e6763
ProtocolItem: Use accessors over magic numbers
2018-01-23 12:02:16 +01:00
Christian Kamm
497b327d43
ShareLinkWidget: Remove outdated signal connection
...
Also convert the others to the new syntax to avoid similar errors in the
future.
2018-01-23 12:01:22 +01:00
Christian Kamm
d831369f86
Protocol: Remove entries for auto resolved conflicts #6316
2018-01-23 12:01:22 +01:00
Roeland Jago Douma
a2b8724adf
Hacky way to drop duplicates (we should really use the fileid!)
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-23 11:58:05 +01:00
Roeland Jago Douma
bb85e2ab2c
Reuse existing EncryptedFile
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-23 11:36:15 +01:00
Jenkins for ownCloud
c1a1e55207
[tx-robot] updated from transifex
2018-01-23 02:18:36 +01:00
Olivier Goffart
c3dbb20ce3
Logger: --logdebug only show owncloud's debug message
...
Recent Qt version show way too many debug messages, spamming the console.
So filter only messages that comes from the client.
2018-01-22 21:13:15 +01:00
Roeland Jago Douma
33beb7aade
Don't generate values after we use them
...
* Pregerenate IV
* Pregenerate key
* Pregenerate filename
TODO:
- Reuse existing file entries and update (we might need logic in the
metadatahandling to do this properly).
2018-01-22 15:24:54 +01:00
Tomaz Canabrava
cae6bbc853
[CSE] Start the download process
2018-01-22 14:08:32 +01:00
Christian Kamm
e2b89c5afe
TextXmlParse: Add truncated-xml testcase #6317
2018-01-22 14:05:08 +01:00
Jenkins for ownCloud
ba4712c922
[tx-robot] updated from transifex
2018-01-22 02:18:54 +01:00
Tomaz Canabrava
cf2fa2ea35
[CSE] Get the tag of the encrypted file to feed the metadata
...
Also, change the logging cattegory
2018-01-21 21:59:19 +01:00
Tomaz Canabrava
5d6817e165
[CSE] Save the tag while encrypting.
2018-01-21 21:49:24 +01:00
Tomaz Canabrava
261cedce3f
[CSE] Do not quit if encryption fails
...
It's much more reasonable to return failure and handle it.
2018-01-21 21:40:53 +01:00
Tomaz Canabrava
2d872f2a8d
[CSE] Add missing files
2018-01-21 21:26:05 +01:00
Tomaz Canabrava
009562da1e
[CSE] Remove lambas with lambdas
...
It's hard to reason with lambdas with lambdas, so transform
them into actuall signal / slot calls.
2018-01-21 21:25:06 +01:00
Tomaz Canabrava
d5a76ea70d
[CSE] Remove the DecryptionJob
...
Transform it into an Static function - it was blocking anyway
and this way it's easier to transform it into a thread in the
future.
2018-01-21 21:24:02 +01:00
Tomaz Canabrava
4a2d0ab9e9
[CSE] Move code to display minemonic out of the libsync
...
The libsync should not contain Qt Widget related code.
2018-01-21 19:50:40 +01:00
Jenkins for ownCloud
a19eb59461
[tx-robot] updated from transifex
2018-01-21 02:18:35 +01:00
Jenkins for ownCloud
484ec95596
[tx-robot] updated from transifex
2018-01-20 02:18:50 +01:00
Olivier Goffart
5a97ddde5a
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/gui/updater/updater.cpp
2018-01-19 13:41:29 +01:00
Olivier Goffart
b8539eb329
Get rid of the StopWatch in the PropagateUpload job
...
For issue #6318
The StopWatch is using memory, and we are not really using it.
2018-01-19 13:37:48 +01:00
Christian Kamm
b9c7aa8df3
Sync: Deal with file/folder conflicts #6312
...
Previously conflicts with a different type on both ends lead to sync
errors. Now they are handled in the expected way: the local item gets
renamed and the remote item gets propagated downwards.
This also adds a unittest for the TYPE_CHANGE case. That one looks like
parts of it might be unified with CONFLICT cases.
2018-01-19 09:47:49 +01:00
Jenkins for ownCloud
6f5b3eb4d7
[tx-robot] updated from transifex
2018-01-19 02:18:35 +01:00
Roeland Jago Douma
6d613fb4d5
Quick and dirty way of showing the mnemonic for now
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-18 22:10:55 +01:00
Dominik Schmidt
127e675838
Merge pull request #6310 from owncloud/appveyor
...
Enable appveyor builds
2018-01-18 18:08:09 +01:00
Christian Kamm
c1b5412c16
Exclude regex: Use named captures
...
My benchmarks show no performance difference.
2018-01-18 10:24:24 +01:00
Dominik Schmidt
217c6bbcaf
Add AppVeyor badge
2018-01-18 09:46:06 +01:00
Jenkins for ownCloud
a32b3e565b
[tx-robot] updated from transifex
2018-01-18 02:18:38 +01:00
István Váradi
3ea3699cdd
The source packages are temporarily uploaded even when not on the master branch
2018-01-17 19:24:02 +01:00
Olivier Goffart
926609bd74
Partially revert "shell_integration/dolphin: Silence some warnings"
...
This partially reverts commit 1c721e9422 .
This caused the overlay plugin to be installed at the wrong place
because the kcoreaddons_add_plugin macto still use deprecated
${PLUGIN_INSTALL_DIR}.
I guess we'll have to live with the warnings.
2018-01-17 17:34:27 +01:00
Dominik Schmidt
486ccaff56
Enable tests in appveyor builds
2018-01-17 16:25:03 +01:00
Dominik Schmidt
e0cc93c047
Enable appveyor builds
2018-01-17 16:21:09 +01:00
Christian Kamm
4337e8532e
Exclude matching: Speedup the full-path traversal case
...
Previously we'd use the full regex when the bname triggered a full-path
matching to take place. Now we have a simplified full-traversal regex
for this case that can be significantly faster to apply.
Triggered by #5017 but doesn't actually solve it.
2018-01-17 15:05:50 +01:00
Christian Kamm
a8a6f82270
Link shares: Change default share name #6298
...
There's a 64 character limit and we don't want to accidentally exceed
it.
Eventually there might be server API for default share name generation.
See owncloud/core#29913
2018-01-17 15:03:11 +01:00
Dominik Schmidt
4895b848c8
Merge pull request #6308 from dschmidt/fix-linux-icons
...
Fix Linux icons
2018-01-17 12:53:32 +01:00
Dominik Schmidt
fe3c68b9dd
Fix Linux icons
2018-01-17 12:18:31 +01:00
Jenkins for ownCloud
24d6fda360
[tx-robot] updated from transifex
2018-01-17 02:18:35 +01:00
István Váradi
f4fcf46a1c
Utilizing some Drone environment variables
2018-01-16 19:36:36 +01:00
Roeland Jago Douma
4e7c033ae5
Merge pull request #121 from nextcloud/removes-logout-login-all-accounts
...
Removes 'Log in to all accounts' and 'Log out to all accounts' from the primary client menu.
2018-01-16 09:20:47 +01:00
Jenkins for ownCloud
d4106b9a88
[tx-robot] updated from transifex
2018-01-16 02:18:35 +01:00
Olivier Goffart
2a14ba5582
Folder: remove declaration of non-existing method
2018-01-15 15:43:13 +01:00
Olivier Goffart
2a842a5745
Application: remove declaration of non-existing functions
2018-01-15 15:07:09 +01:00
Olivier Goffart
cfe9909560
admin/linux/Dockerfile: Add comments
2018-01-15 13:56:35 +01:00
Olivier Goffart
8331f04b5b
Merge pull request #6244 from owncloud/cleanuo
...
Modernize makefiles and remove dead code
2018-01-15 13:49:57 +01:00
Camila Ayres
cd36f73f6b
Removes 'Log in to all accounts' and 'Log out to all accounts' from main menu.
...
This is not an often used option and it should be fine if this can only be done
from within the settings dialog.
Signed-off-by: Camila San <hello@camila.codes >
2018-01-15 11:48:27 +01:00
Olivier Goffart
d0713d018c
client_de.ts: Fix spacing in a translation
...
Issue #6303
2018-01-15 11:29:08 +01:00
Roeland Jago Douma
5722d29e42
Double encode the metadatakeys
...
This is required by a misunderstanding of the RFC.
You need to resetup your test user.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-15 11:26:06 +01:00
Jürgen Weigert
a33fc2a0db
Update updater.cpp
...
deprecate suffix nightly, promote suffix daily
2018-01-15 11:25:10 +01:00
Jenkins for ownCloud
ca200e788e
[tx-robot] updated from transifex
2018-01-15 02:18:34 +01:00
Dominik Schmidt
7839c4d4e1
Revert "Disable stack protection for mingw win32 builds in 2.4"
...
This reverts commit 298f1ab570 .
We're shipping libssp-0.dll now with mingw builds. We would
have enough time to test this for 2.5.0 now anyway, but we
also will most likely switch to MSVC for that release.
2018-01-14 14:39:29 +01:00
Jenkins for ownCloud
c454d626b6
[tx-robot] updated from transifex
2018-01-14 02:18:36 +01:00
Dominik Schmidt
969d90d15b
Fix UIC detection in windows cross env
2018-01-14 00:57:40 +01:00
Dominik Schmidt
d8a279c671
Fix windows cross build of the updater and bump libcrashreporter-qt revision
2018-01-14 00:45:02 +01:00
Dominik Schmidt
6d56f30d9b
Fix incorrect target_include_directories usage for crash reporter
2018-01-13 23:49:58 +01:00
Dominik Schmidt
86ea5876cd
Use standard png2ico in our cross env too
2018-01-13 23:28:52 +01:00
Dominik Schmidt
bb8468c627
Add Linux CI Dockerfile
2018-01-13 23:28:18 +01:00
Dominik Schmidt
fc62e9e9d9
Fix .def and .rc files not being compiled into windows shell extensions
2018-01-13 21:01:09 +01:00
Dominik Schmidt
15967b1219
Install all dlls to BINDIR so craft does not ignore them
2018-01-13 13:58:17 +01:00
Dominik Schmidt
0656c77da8
Set CMAKE_CXX_STANDARD to 14
2018-01-13 13:58:17 +01:00
Dominik Schmidt
81c20352e1
Use new ECMAddAppIcon macro for application icons.
...
cmake/modules/ECMAddAppIcon.cmake is heavily patched to support sidebar icons, OUTFILE_BASE parameter and to not include 64 and 64@2x icons on macOS which are not supported. All changes are made in a way that we can upstream this.
2018-01-13 13:58:17 +01:00
Dominik Schmidt
4e52ee9ebd
Build Explorer extension if building with MSVC
2018-01-13 13:58:17 +01:00
Dominik Schmidt
6ee87a77cc
Fix macOS updater build without deprecated Qt apis
2018-01-13 13:58:17 +01:00
Dominik Schmidt
539d6fd92e
Link client against QtMacExtras as it bundles qtmacgoodies
2018-01-13 13:58:17 +01:00
Dominik Schmidt
da98e2aa28
Fix building sqlite on macOS and Windows
2018-01-13 13:58:17 +01:00
Dominik Schmidt
1f9763eda9
Package libssp-0.dll in NSIS installer.
...
It's needed since 586fd346ea activated stack-protector-strong
2018-01-13 13:58:17 +01:00
Dominik Schmidt
cbf470f17b
Fix csync installation on windows
2018-01-13 13:58:17 +01:00
Dominik Schmidt
1f12d6344b
Fix sqlite compilation (on OSX)
2018-01-13 13:58:17 +01:00
Olivier Goffart
437d45981e
Remove unused c_strlist
2018-01-13 13:58:17 +01:00
Olivier Goffart
3ae327ea8e
Modernize out CMakeLists.txt
...
Mainly uses target_include_directories instead of include_directories
so libraries public include directory get automatically added when adding
the target in target_link_library
2018-01-13 13:58:17 +01:00
Olivier Goffart
1c721e9422
shell_integration/dolphin: Silence some warnings
2018-01-13 13:58:17 +01:00
Olivier Goffart
5d0aa5f039
Remove unused c_path
2018-01-13 13:58:17 +01:00
Olivier Goffart
41798cef18
Csync: remove some unused build system stuff
2018-01-13 13:58:17 +01:00
Olivier Goffart
1c11778693
Remove the unusued csync_file_locked_or_open test in csync_reconcile
...
It is unused. Also remove the corresponding error code
2018-01-13 13:58:17 +01:00
Olivier Goffart
3ddd4b6f16
Get rid of csync_log
...
We use Qt's debugging code everywhere
2018-01-13 13:58:17 +01:00
Olivier Goffart
d948ed11a1
Csync: use QElapsedTimer and qCInfo instead of CSYNC_LOG and its own csync time function
...
This allow to remove all the csync time manipulation routne which are now unused
2018-01-13 13:58:17 +01:00
Olivier Goffart
257d8142b1
Build system: Get rid of QtVersionAbstraction.cmake
...
Use modern cmake with target_link_libraries and Qt5:: that
automatically add the include path and compile flags
2018-01-13 13:58:17 +01:00
Olivier Goffart
48c55b7d29
csync/std: don't build in a separate library
...
There is no need to create a static library for the csync/std file, just
put everything together in csync
2018-01-13 13:58:17 +01:00
Olivier Goffart
776bbbf7b1
Don't include sqlite3.h from headers
...
So that sqlite is not part of the public interface of csync
(and that the sqlite include path don't need to be passed when compiling
libsync or gui)
2018-01-13 13:58:17 +01:00
Dominik Schmidt
f326bf371d
Merge pull request #6299 from dschmidt/linux-docker-ci
...
Use docker for Linux CI
2018-01-13 13:46:04 +01:00
Jenkins for ownCloud
4cf7ca4162
[tx-robot] updated from transifex
2018-01-13 02:18:33 +01:00
István Váradi
9eb395efd1
The Debian Docker image reference is fixed
2018-01-12 19:55:56 +01:00
Roeland Jago Douma
99aebf292c
Yet another drone image
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-12 19:36:09 +01:00
Dominik Schmidt
01f3b82ea5
Move pulling docker images to their own stages
2018-01-12 17:19:22 +01:00
Roeland Jago Douma
d1c84fd859
Bump drone docer used for appimage
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-01-12 15:21:30 +01:00
Jenkins for ownCloud
c22e3aaa4b
[tx-robot] updated from transifex
2018-01-12 02:19:52 +01:00
Dominik Schmidt
dbf15fb8dc
Make setLaunchOnStartup debug output more meaningful
2018-01-11 16:11:23 +01:00
Dominik Schmidt
a253129fd6
Fix running tests until #6210 is fixed
2018-01-11 16:11:06 +01:00
Dominik Schmidt
a8ba3ee9e1
Use docker for Linux CI
2018-01-11 16:10:31 +01:00
István Váradi
66c745e133
Moved Debian build to Drone
2018-01-11 11:34:41 +01:00
Olivier Goffart
9613f6437d
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/libsync/networkjobs.cpp
2018-01-11 10:46:50 +01:00
Jürgen Weigert
9dc765142c
Update updater.cpp
...
depricate suffix nightly, promote suffix daily
2018-01-10 16:19:08 +01:00
Christian Kamm
7d70f1becb
Ignore files that can't be encoded for the filesystem
...
There's an upstream bug where QTextCodec::canEncode returns true even
though it should be false. This works around that issue and adds a test.
The original work was done in 72809ef5b1
See #6287 , #5676 , #5719
See https://bugreports.qt.io/browse/QTBUG-6925
2018-01-10 13:36:00 +01:00
Jenkins for ownCloud
a476c5420a
[tx-robot] updated from transifex
2018-01-10 02:18:51 +01:00
Christian Kamm
cdd8d10940
Fix resizing crash when currentPage() is null
...
Sentry:
https://sentry.io/owncloud/desktop-win-and-mac/issues/425331770/
2018-01-09 13:54:11 +01:00
Christian Kamm
883deb1c5d
Fix potential crash in Composite job destruction
...
Sentry:
https://sentry.io/owncloud/desktop-win-and-mac/issues/427476987/
2018-01-09 13:53:57 +01:00
Christian Kamm
e389fcaecb
Avatars: Use old location for servers <10 #6279
2018-01-09 11:34:56 +01:00
Christian Kamm
585d2b20bd
Exclude regex: Restore old matching on Windows #6245
...
Unfortunately matching behaved differently on Windows. This patch
restores the previous matching behavior but still uses the new regular
expression based matching.
Further work will hopefully unify the behavior between platforms without
breaking backwards compatibility.
2018-01-09 11:09:05 +01:00
Jenkins for ownCloud
9078d9cfab
[tx-robot] updated from transifex
2018-01-09 02:18:35 +01:00
Daniel Nicoletti
a7ee1a95a6
Download and decrypt file if parent folder is marked as encrypted
2018-01-08 21:08:31 +01:00
Daniel Nicoletti
3abbbab6a0
Faster way to detecting CSE capability
2018-01-08 21:08:31 +01:00
Christian Kamm
51b662fdfe
Minor logging additions
...
- Clearly mark local and remote discovery start, to make this searchable
even without --logdebug.
- Promote two messages from debug to info: The 'N entries read from db'
message is useful and the 'read from db but ignored' message is rare
and surprising - if there's a bug there we want to see what happened in
the logs.
2018-01-08 09:36:30 +01:00
Jenkins for ownCloud
b6d74ad753
[tx-robot] updated from transifex
2018-01-08 02:18:35 +01:00
Jenkins for ownCloud
5656323434
[tx-robot] updated from transifex
2018-01-06 02:18:39 +01:00
Christian Kamm
81baebf113
owncloudcmd: Set proxy earlier #6281
...
In particular before the capability call.
Also warn if no proxy is set because the command line doesn't follow the
strict format requirements.
(cherry picked from commit d0e7f61db6 )
2018-01-05 10:26:55 +01:00
Christian Kamm
f7c884d4d1
owncloudcmd: Remove some dead code
...
(cherry picked from commit 0f8790d993 )
2018-01-05 10:26:53 +01:00
Christian Kamm
d0e7f61db6
owncloudcmd: Set proxy earlier #6281
...
In particular before the capability call.
Also warn if no proxy is set because the command line doesn't follow the
strict format requirements.
2018-01-05 10:23:29 +01:00
Christian Kamm
0f8790d993
owncloudcmd: Remove some dead code
2018-01-05 10:12:25 +01:00
Christian Kamm
86377aa37a
Folder: Remove unused 'dirty proxy' setting
2018-01-05 09:44:20 +01:00
Christian Kamm
3988f3ad77
GCC: Fix implicit-fallthrough warnings
2018-01-05 09:43:53 +01:00
Christian Kamm
7aa9af08c3
Issues: Speed up insertion and add hard upper limit #6272
...
Since sorting was enabled permanenty the list would be resorted with
each inserted issue. When inserting thousands of ignored files that
would make the whole ui freeze up.
Instead, sorting is disabled for inserts now and is reenabled after some
time has passed. That way users usually see the sorted view without the
lockups. Also, there's now a maximum of 50k issue entries.
2018-01-05 08:44:27 +01:00
Jenkins for ownCloud
15803d1837
[tx-robot] updated from transifex
2018-01-05 02:18:35 +01:00
Christian Kamm
ab9d6285c6
Proxy: Hostname validation and reconnection on setting change
...
Where 'validation' currently just means "check whether it's empty".
Code adapted from wiggiBe's original PR #6140
2018-01-04 14:30:24 +01:00
Jenkins for ownCloud
c0c10fd5f1
[tx-robot] updated from transifex
2018-01-04 02:18:34 +01:00
Jenkins for ownCloud
e2d4a38639
[tx-robot] updated from transifex
2018-01-03 02:18:34 +01:00
Jenkins for ownCloud
f89676d4bb
[tx-robot] updated from transifex
2018-01-02 02:18:36 +01:00
Jenkins for ownCloud
b9c167fc13
[tx-robot] updated from transifex
2018-01-01 02:18:34 +01:00
Jenkins for ownCloud
3bac06d6e5
[tx-robot] updated from transifex
2017-12-31 02:18:36 +01:00
Jenkins for ownCloud
504e11b5bb
[tx-robot] updated from transifex
2017-12-30 02:18:36 +01:00
Daniel Nicoletti
e2c895e61f
Fix encrypted file location on the server
2017-12-29 17:28:35 +01:00
Daniel Nicoletti
ca92c46970
Add category logging to PropagateUploadEncrypted
2017-12-29 17:28:35 +01:00
Daniel Nicoletti
50916bcda5
Mark ClientSideEncryption::isFolderEncrypted() as const
2017-12-29 17:28:35 +01:00
Daniel Nicoletti
c6491d50bb
Replace deprecated Qt API usage
2017-12-29 17:28:35 +01:00
Daniel Nicoletti
fdc96d3a4f
Fix deprecated use of QUrl::setQueryItems()
2017-12-29 17:28:35 +01:00
Daniel Nicoletti
e06e04ee93
Fix parsing list of encrypted folders
2017-12-29 17:28:35 +01:00
Tomaz Canabrava
7d68fa17e7
Merge pull request #107 from dantti/clientSideEncryptionV3
...
Prepend "nextcloud" for all logging categories
2017-12-29 11:52:40 +01:00
Jenkins for ownCloud
b80ba97154
[tx-robot] updated from transifex
2017-12-29 02:18:34 +01:00
Daniel Nicoletti
a63d34f870
Prepend "nextcloud" for all logging categories
...
Thus making easier to exclude logging from kio, qt
and only enable "nextcloud.*"
2017-12-28 17:33:10 -02:00
Tomaz Canabrava
c772857054
Merge pull request #106 from dantti/clientSideEncryptionV3
...
Fix URL in dialog that requests password
2017-12-28 13:08:33 +01:00
Daniel Nicoletti
c963259bfb
Fix URL in dialog that requests password
...
An URL that had base like "http://localhost/nextcloud/ "
would get the last slash '/' removed and then appended
with "index.php..." resulting in
http://localhost/nextcloudindex.php
2017-12-28 10:00:17 -02:00
Jenkins for ownCloud
e3e38f3eac
[tx-robot] updated from transifex
2017-12-28 02:18:36 +01:00
Jürgen Weigert
6e445033c7
OBS publishing details added
...
OBS has two pubishing swithces: one per package and one per project,
we always only switch per project! we have too many dependency packages to keep that in sync manually!
2017-12-27 12:37:02 +01:00
Jenkins for ownCloud
93c9f4316b
[tx-robot] updated from transifex
2017-12-27 02:18:35 +01:00
Jenkins for ownCloud
47a7000121
[tx-robot] updated from transifex
2017-12-26 02:18:36 +01:00
Jenkins for ownCloud
6c9026e330
[tx-robot] updated from transifex
2017-12-25 02:18:36 +01:00
Tomaz Canabrava
efc039863b
[CSE] Tons of debugs.
2017-12-24 17:08:04 +01:00
Tomaz Canabrava
da9f1c412d
[CSE] Remove debug
2017-12-24 16:36:57 +01:00
Tomaz Canabrava
06c34ed617
[CSE] Assorted fixes
...
- Unlock the folder even on error
- Use the correct name of the file for upload
2017-12-24 16:30:39 +01:00
Jenkins for ownCloud
d59c609a73
[tx-robot] updated from transifex
2017-12-24 02:18:35 +01:00
Jenkins for ownCloud
6ee48c8f15
[tx-robot] updated from transifex
2017-12-23 02:18:34 +01:00
Tomaz Canabrava
60ef722b60
[CSE] Update the metadata when a file is being uploaded.
2017-12-22 23:05:39 +01:00
Tomaz Canabrava
e70bf44aaf
[CSE] Fix the generation of the data for the update Metadata
2017-12-22 22:39:45 +01:00
Tomaz Canabrava
124a7253a4
[CSE] Create job to Update Metadata
2017-12-22 22:02:16 +01:00
Jenkins for ownCloud
6af823b36a
[tx-robot] updated from transifex
2017-12-22 02:18:56 +01:00
Olivier Goffart
a642d99d4b
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
VERSION.cmake
src/CMakeLists.txt
2017-12-21 12:51:01 +01:00
Roeland Jago Douma
65dfc47ac7
Set public key once certificate is retrieved
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-21 10:20:03 +01:00
Roeland Jago Douma
0dc7831336
Key is already base64 decoded
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-21 09:49:31 +01:00
Jenkins for ownCloud
8c7ea61623
[tx-robot] updated from transifex
2017-12-21 02:18:35 +01:00
Tomaz Canabrava
b72113a53d
[CSE] Prepare the beginning of the upload.
...
I still need to send the metadata.
2017-12-21 00:35:23 +01:00
Tomaz Canabrava
df5fd3fbe6
[CSE] More debug output, fix input file path
2017-12-21 00:00:27 +01:00
Tomaz Canabrava
7be5f0a736
[CSE] Update the finished signal
2017-12-20 23:36:49 +01:00
Tomaz Canabrava
d87648c99a
[CSE] Use the metadata as pointer.
2017-12-20 23:30:51 +01:00
Tomaz Canabrava
25d58ccd58
Revert "Store metadata keys as keys"
...
This commit broke decryption.
This reverts commit b9f094cd94 .
2017-12-20 23:16:42 +01:00
Tomaz Canabrava
dd0528037d
[CSE] Generate a random name for the temporary file
2017-12-20 23:09:28 +01:00
Tomaz Canabrava
7e83f0591b
[CSE] Create the Encrypted File on Disk
2017-12-20 22:32:38 +01:00
Tomaz Canabrava
3760b86e07
[CSE] Mobe fileEncryption to a static function
...
and I'll move all of those to a namespace latter.
2017-12-20 22:28:01 +01:00
Tomaz Canabrava
20198c5c7b
Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3
2017-12-20 22:11:46 +01:00
Roeland Jago Douma
3c301a8282
Add missing FolderMetadata functions
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-20 22:08:57 +01:00
Roeland Jago Douma
74bc9213c5
Generate encrypted metadata on the fly
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-20 22:04:26 +01:00
Tomaz Canabrava
679bb1f18e
[CSE] Expose EncryptionHelper
2017-12-20 21:33:25 +01:00
Tomaz Canabrava
14b18b146d
Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3
2017-12-20 21:29:54 +01:00
Roeland Jago Douma
5e23ca9658
FolderMetaData: store metadataKeys in a QMap
...
* This allows us to pick the right key for files
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-20 21:25:27 +01:00
Roeland Jago Douma
b9f094cd94
Store metadata keys as keys
...
Don't store them base64 encoded. But store them directly useable
2017-12-20 21:17:41 +01:00
Roeland Jago Douma
c35b57cfba
Parse the files in the metadata
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-20 20:49:16 +01:00
Tomaz Canabrava
1e899f4172
[CSE] Do not create QPointer from raw pointers
2017-12-20 20:00:59 +01:00
Tomaz Canabrava
0347cf4e9e
[CSE] Store the sharing keys in memory
2017-12-20 19:40:58 +01:00
Roeland Jago Douma
fc73ad7476
Salt should not be hardcoded
...
We append the salt (just like the IV) to the ciphertext of the private
key. This means we also have to split it off properly.
This breaks compartibility with currently stored keys on your server.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-20 16:07:33 +01:00
Markus Goetz
067508c082
VERSION.cmake: This branch is now 2.4.1
2017-12-20 16:03:35 +01:00
Roeland Jago Douma
b924ad7282
Lower mnemonic when generating password
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-20 15:41:38 +01:00
Roeland Jago Douma
4551bbe0e0
Forget key + cert + mnemonic on account removal
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-20 15:35:23 +01:00
Roeland Jago Douma
a48a3e0acc
Cleanup old functions
...
Those functions had no use anymore since we store the key and cert in
the keychain. Removed them so we don't use them by accident.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-20 13:41:13 +01:00
Roeland Jago Douma
ee281963fe
Base64 magic:
...
* metadata keys: bin -> b64 -> enc -> b64
* sharing metadat: string -> b64 -> enc -> b64
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-20 10:22:35 +01:00
Jenkins for ownCloud
79065ba5c6
[tx-robot] updated from transifex
2017-12-20 02:18:53 +01:00
Tomaz Canabrava
ab89231ca2
[CSE] Remove unused debug
2017-12-20 00:25:56 +01:00
Tomaz Canabrava
d26ade1870
[CSE] Fix the result of the decryption
...
However the text still looks like encrypted.
2017-12-20 00:25:39 +01:00
Tomaz Canabrava
a1e6901ecc
[CSE] Decrypt correctly the metadata
...
There's a bug that's returning an empty bytearray, need to look
into that.
2017-12-20 00:20:27 +01:00
Tomaz Canabrava
494ae31de9
[CSE] Fix correct json object
2017-12-19 23:09:39 +01:00
Tomaz Canabrava
a02246dc65
[CSE] Fix Metadata bugs p1
...
The RFC was misleading, I took the chance to fix a few
inconsistencies regarding the QJsonDocument.
2017-12-19 22:47:05 +01:00
Tomaz Canabrava
5609a1dbe8
[CSE] Remove old debug code so I can focus.
2017-12-19 17:02:23 +01:00
Jenkins for ownCloud
3fbd156c83
[tx-robot] updated from transifex
2017-12-19 02:18:35 +01:00
Jenkins for ownCloud
8fb191afcf
[tx-robot] updated from transifex
2017-12-18 02:18:34 +01:00
Tomaz Canabrava
aa36cc4a5c
[CSE] Reduce probability of conflicts when rebasing
...
Creates a new file/class to handle upload,
propagateuploadencrypted.h/cpp. This should have all the logic to deal
with the encryption and upload.
2017-12-17 22:38:43 +01:00
Tomaz Canabrava
b9cdc8e922
[CSE] Fix the url to delete the metadata
2017-12-17 21:19:32 +01:00
Tomaz Canabrava
23f832caf4
[CSE] Code Cleanup
2017-12-17 19:19:44 +01:00
Tomaz Canabrava
7ef2489f1d
[CSE] Fix infoForFileId
...
We need to traverse the path recursivelly.
2017-12-17 19:14:34 +01:00
Jenkins for ownCloud
ab37856a91
[tx-robot] updated from transifex
2017-12-17 02:18:35 +01:00
Hefee
844e03d000
Also disable fstack-protector for alpha plattform.
...
This fixes #6211 .
(cherry picked from commit 69e81e8f65 )
2017-12-16 14:08:08 +01:00
Hefee
69e81e8f65
Also disable fstack-protector for alpha plattform.
...
This fixes #6211 .
2017-12-16 14:03:59 +01:00
Jenkins for ownCloud
46e796303e
[tx-robot] updated from transifex
2017-12-16 02:18:35 +01:00
Tomaz Canabrava
ce41e3e42f
[CSE] Work the Set Decrypted Bit
2017-12-15 23:32:41 +01:00
Olivier Goffart
1940c2f9bf
Exclude: Use Qt to load the exclude file
...
fopen does not work well with relative path tand forward slashes on windows
This fix the windows textexcludedfiles test.
And also make the code simpler.
Note that the 'trimmed' might be a behavior change, but i think it is ok
2017-12-15 19:16:20 +01:00
Christian Kamm
83e94c3ec7
Fix compile after rebase
2017-12-15 18:05:44 +01:00
Christian Kamm
a7c0cfc8eb
Upload conflict files #4557
...
If the server has the 'uploadConflictFiles' capability conflict
files will be uploaded instead of ignored.
Uploaded conflict files have the following headers set during upload
OC-Conflict: 1
OC-ConflictBaseFileId: 172489174instanceid
OC-ConflictBaseMtime: 1235789213
OC-ConflictBaseEtag: myetag
when the data is available. Downloads accept the same headers in return
when downloading a conflict file.
In the absence of server support clients will identify conflict files
through the file name pattern and attempt to deduce the base fileid.
Base etag and mtime can't be deduced though.
The upload job for a new conflict file will be triggered directly from
the job that created the conflict file now. No second sync run is
necessary anymore.
This commit does not yet introduce a 'username' like identifier that
automatically gets added to conflict file filenames (to name the files
foo_conflict-Fred-1345.txt instead of just foo_conflict-1345.txt).
2017-12-15 18:03:53 +01:00
Christian Kamm
7ae8ba35de
Remove unused csync test file
...
Now found at
test/csync/csync_tests/check_csync_update.cpp
2017-12-15 18:02:04 +01:00
Christian Kamm
8eebc53728
Unify item type enum
...
Previously, there was csync_ftw_type_e and SyncFileItem::Type. Having
two enums lead to a bug where Type::Unknown == Type::File that went
unnoticed for a good while.
This patch keeps only a single enum.
2017-12-15 18:02:04 +01:00
Tomaz Canabrava
2e516dfc67
Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3
2017-12-15 15:05:51 +01:00
Tomaz Canabrava
250c8ff1bf
[CSE] Add job to delete metadata
...
This is needed for the correct functioning of the Set Folder
as Decrypted
2017-12-15 15:02:43 +01:00
Olivier Goffart
ee366df58f
Fix the TestFolderMan on Windows
2017-12-15 14:51:00 +01:00
Olivier Goffart
482ee875a1
Fix TestSyncEngine on windows
2017-12-15 14:39:01 +01:00
Tomaz Canabrava
5607e27f20
[CSE] Actually save the http response result
2017-12-15 14:25:57 +01:00
Olivier Goffart
b10edfecfc
Workaround MSVC bug with enum in bitfield
...
MSVC stores the enum as signed in the bitfield (contrary to the C++ spec)
Which means that once we store a value such as SyncFileItem::DetailError
in a bitfield, we get a negative value back, then of course, further
comparison fails.
2017-12-15 14:18:45 +01:00
Tomaz Canabrava
43332d3ac7
[CSE] Properly update UI status to encrypted / decrypted
2017-12-15 14:00:42 +01:00
Roeland Jago Douma
8c178bd035
Merge pull request #95 from nextcloud/fix-libcloudproviders-conditions
...
Fix build on windows
2017-12-15 12:58:13 +01:00
Julius Härtl
49a16ffb4b
Fix build on windows
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-12-15 10:59:14 +01:00
Klaas Freitag
3b96097cf6
Config: Look for exclude file in a relative path.
...
If the application binary is not installed in /usr/bin the client
with this patch considers to check the relative location
../../etc/owncloud-client/ to find the system exclude.
This is an important bit for AppImage based packages of the client,
as this runs from a temporar mountpoint and the system file can not
be found under /etc.
2017-12-15 09:54:40 +01:00
Christian Kamm
298f1ab570
Disable stack protection for mingw win32 builds in 2.4
...
Mingw builds could have it enabled! But we need to ship libssp and test
this more. For the upcoming 2.4 release it should be disabled.
2017-12-15 09:16:59 +01:00
Jenkins for ownCloud
79dd8e9074
[tx-robot] updated from transifex
2017-12-15 02:18:52 +01:00
Roeland Jago Douma
99b4381591
Don't try to decrypt twice
...
The DecryptMetaDataKeys already base64 decoded
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-14 23:11:40 +01:00
Roeland Jago Douma
69a201a62d
Percentencode the json we send so special chars don't cause trouble
...
The + sign was lost in transfer.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-14 23:11:07 +01:00
Roeland Jago Douma
56028759d5
Merge branch 'master' into clientSideEncryptionV3
2017-12-14 20:47:05 +01:00
Markus Goetz
8d5afff0a4
Update ChangeLog for 2.4.0
2017-12-14 20:07:14 +01:00
Roeland Jago Douma
be3afd1291
Add FileEncryptJob and FileDecryptJob
...
This handles encryption and decryption of files.
Just create the job and start off.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-14 16:54:56 +01:00
Roeland Jago Douma
ac524d8e85
Merge pull request #92 from nextcloud/drone_up
...
Bump drone images
2017-12-14 14:54:46 +01:00
Tomaz Canabrava
82c07236c1
[CSE] Add new method "infoForFolderId"
...
we need to query the model for the subfolderinfo, but we don't
have the model index, we have the folder id. this returns it.
2017-12-14 14:39:07 +01:00
Roeland Jago Douma
76b8d2536b
Bump drone images
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-14 12:57:16 +01:00
Olivier Goffart
4dc49ff3b0
SyncEngine: Recover when the PUT reply (or chunkin's MOVE) is lost
...
This can happen if the upload of a file is finished, but we just got
disconnected right before recieving the reply containing the etag.
So nothing was save din the DB, and we are not sure if the server
recieved the file properly or not. Further local update of the file
will cause a conflict.
In order to fix this, store the checksum of the uploading file in
the uploadinfo table of the local db (even if there is no chunking
involved). And when we have a conflict, check that it is not because
of this situation by checking the entry in the uploadinfo table.
Issue #5106
2017-12-14 11:56:12 +01:00
Olivier Goffart
4369853ddb
TestSystem: Add QIODevice in the serverOverride function, and add a DelayedReply
...
Preparing to add test that needs the QIODevice.
Also make the DelayedReply so we can generalize the existing delay on FakeChunkMoveReply
to any reply.
2017-12-14 11:56:12 +01:00
Roeland Jago Douma
de4492a2fd
Merge pull request #55 from nextcloud/libcloudproviders-integration
...
Integrate libcloudproviders support
2017-12-14 11:50:43 +01:00
Christian Kamm
d870729709
Require Qt >= 5.6 #6241
2017-12-14 11:31:30 +01:00
Julius Härtl
1cedb1919f
Integrate libcloudproviders support
...
This commit integrates support for libcloudproviders
desktop integration API. If build with the library it
will check on startup if the DBus interface is available
and then use it instead of the legacy status icon.
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-12-14 11:19:25 +01:00
Roeland Jago Douma
09fa5966da
Merge pull request #90 from nextcloud/oc_up
...
Merge upstream
2017-12-14 11:18:54 +01:00
Roeland Jago Douma
fe4bb52a6d
Merge remote-tracking branch 'oc/master' into oc_up
2017-12-14 10:27:11 +01:00
Christian Kamm
f40cceaf04
Share link: Adjust design of folder sharing permissions #6192
2017-12-14 08:34:44 +01:00
Jenkins for ownCloud
b357003a95
[tx-robot] updated from transifex
2017-12-14 02:18:37 +01:00
Daniel Hansson
042816bd0d
Merge pull request #88 from ivaradi/debian-build
...
Ubuntu/Debian build
2017-12-13 21:40:02 +01:00
Tomaz Canabrava
c592871f94
[CSE] Do not handle b64 inside of the decrypt function
...
the decrypt function should deal with the raw data always.
2017-12-13 16:37:52 +01:00
rockihack
5cc3b526e8
stack-protector is not supported on hppa.
...
(cherry picked from commit 8a963a67f2 )
2017-12-13 11:28:22 +01:00
rockihack
1b2a8ba6b0
Enable stack-protector-strong on Windows and macOS.
...
(cherry picked from commit 586fd346ea )
2017-12-13 11:28:22 +01:00
rockihack
8a963a67f2
stack-protector is not supported on hppa.
2017-12-13 11:27:48 +01:00
rockihack
586fd346ea
Enable stack-protector-strong on Windows and macOS.
2017-12-13 11:27:48 +01:00
Christian Kamm
e5ed8fc90a
Merge remote-tracking branch 'origin/2.4'
2017-12-13 11:03:24 +01:00
Markus Goetz
75676f8830
Notifications: Propagate "Dismiss" as DELETE to server #5922
...
(cherry picked from commit e86416fff7 )
2017-12-13 11:00:40 +01:00
Jenkins for ownCloud
530853c988
[tx-robot] updated from transifex
2017-12-13 02:18:36 +01:00
Tomaz Canabrava
9916583ffa
[CSE] More verbose output
2017-12-12 21:50:30 +01:00
Roeland Jago Douma
25734afd39
First base64 decode
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-12-12 21:42:37 +01:00
Tomaz Canabrava
ea3558faf6
[CSE] Fix strings
2017-12-12 21:29:06 +01:00
Tomaz Canabrava
159c0e138f
[CSE] Add a DecryptAsync method
...
Also, cleanup a bit of the old calls. One particular difference
is that I used to set padding to 1 and it should actually be
PKCS1_OAEP_PADDING
2017-12-12 21:23:02 +01:00
Tomaz Canabrava
aca298ca64
[CSE] Be explicit that async encryption uses publicKey
2017-12-12 20:14:31 +01:00
Tomaz Canabrava
2127b2629d
[CSE] Move encryption related network jobs to its own file
...
Move encryption related network jobs to it's own file,
the original file was starting to be just way too big.
2017-12-12 19:36:47 +01:00
István Váradi
c26d986dbf
New repository directory name
2017-12-12 17:27:01 +01:00
István Váradi
e55518f820
Fixed IV variable reference
2017-12-12 17:22:29 +01:00
István Váradi
44854beefb
Further script and file path renaming
2017-12-12 17:17:23 +01:00
István Váradi
7e41a811dd
Fix of script path
2017-12-12 17:14:49 +01:00
István Váradi
d2e159c385
Automatic building of Ubuntu/Debian packages
2017-12-12 17:11:46 +01:00
Tomaz Canabrava
f6f078d1ee
[CSE] Rename Variable
2017-12-12 16:15:05 +01:00
Tomaz Canabrava
ce37235cc4
[CSE] Retrieve the Private Key from the KeyChain
...
This fixes one thing and exposes a bug.
the MetadataKeys are not being correctly unencrypted.
2017-12-12 16:09:49 +01:00
Tomaz Canabrava
0a58ea76e5
[CSE] Start the work with an existing metadata
2017-12-12 15:35:53 +01:00
Olivier Goffart
02283fc686
Merge pull request #6224 from owncloud/deprecated
...
Remove use of deprecated Qt API
2017-12-12 11:48:04 +01:00
Tomaz Canabrava
e6f835d138
[CSE] Unlock the folder after a lock
...
This makes sure the folder will be unlocked for next tests
2017-12-12 11:26:54 +01:00
Tomaz Canabrava
33b1fcfe66
Merge branch 'master' into clientSideEncryptionV3
2017-12-12 10:46:43 +01:00
Christian Kamm
dcf0baa9de
Journal: 64bit inodes, fix storing uint64s generally
...
In addition to using the right function when retrieving inodes this
*also* fixes a more general bug ownsql had with storing uint64 values
that didn't fit into an int64.
2017-12-12 10:30:54 +01:00
Martin
cd2057fc04
Update Overlay Icon naming
2017-12-12 10:18:00 +01:00
Jenkins for ownCloud
3e294d5339
[tx-robot] updated from transifex
2017-12-12 02:18:35 +01:00
Olivier Goffart
bae00358b9
Merge pull request #6219 from owncloud/config
...
Move config and remove most dependencies form the sync engine.
2017-12-11 17:10:18 +01:00
Jenkins for ownCloud
36573a5c6f
[tx-robot] updated from transifex
2017-12-11 02:18:33 +01:00
Jenkins for ownCloud
9a835af7ce
[tx-robot] updated from transifex
2017-12-10 02:18:34 +01:00
Jenkins for ownCloud
ca48ff793c
[tx-robot] updated from transifex
2017-12-09 02:18:34 +01:00
Olivier Goffart
58e8a25869
Enable deprecated warnings
2017-12-08 16:16:06 +01:00
Olivier Goffart
d517d92f6c
FolderWizard: don't use deprecated API
2017-12-08 16:16:06 +01:00
Olivier Goffart
71dcf7fc37
SSLButton: Removes some call to deprecated functions
2017-12-08 16:16:02 +01:00
Olivier Goffart
0a59faf03d
OcsJob: Use QUrlQuery
...
Qurl::setEncodedQueryItems is deprecated.
2017-12-08 16:15:48 +01:00
Olivier Goffart
7bd48b1327
cmd: remove usage of deprecated qInstallMsgHandler
2017-12-08 16:15:48 +01:00
Olivier Goffart
8c652e061d
Remove uses of deprecated QString::fromAscii
2017-12-08 16:15:48 +01:00
Olivier Goffart
a4816d6a8c
Updater: use QUrlQuery
...
QUrl::addQueryItem is deprecated
2017-12-08 16:15:47 +01:00
Olivier Goffart
1a503d54f6
Remove usage of deprecated qSort
2017-12-08 16:15:47 +01:00
Olivier Goffart
263668b1cb
Remove use of deprecated translate call
2017-12-08 16:15:38 +01:00
Olivier Goffart
3df65460f5
Remove usage of QString::null
...
Replaces by "QString()"
2017-12-08 16:15:22 +01:00
Olivier Goffart
74672d493d
Utility: use QUrlQuery
...
For QUrl::setQuery is deprecated in Qt5
2017-12-08 16:15:17 +01:00
Tomaz Canabrava
0a83d3e743
[CSE] Fix reading the public key for the metadata
...
This broke when we started to use QSslKey and the Qt Keychain
framework.
2017-12-08 11:24:22 +01:00
Tomaz Canabrava
a08a32ceca
[CSE] Fetch the metadata for the upload.
2017-12-08 10:32:05 +01:00
Tomaz Canabrava
6745777ca3
[CSE] Save folder id and token for the lock
...
So we can unlock it later. - perhaps we should store this
on the disk or something, to make it harder to lose.
2017-12-08 10:19:56 +01:00
Olivier Goffart
f1b7d506ae
csync_exclude: fix compilation of non-test builds
2017-12-08 09:43:26 +01:00
Jenkins for ownCloud
fc8c88be41
[tx-robot] updated from transifex
2017-12-08 02:18:35 +01:00
Tomaz Canabrava
70d562668c
[CSE] Add handling for side-by-side uploads.
2017-12-07 21:51:42 +01:00
Tomaz Canabrava
ccd8cff4db
[CSE] Try to lock repeteadly the folder if needed.
...
The upload is made in an event loop with more than one
upload at the same time, this confuses the hell out of the
folder locking mechanism.
We need to lock the folder and ask the other trials to try
again in a few seconds in the future to give time for the
uploader to actually upload the current file that's locking
the folder.
2017-12-07 21:31:20 +01:00
Tomaz Canabrava
9f678652f8
[CSE] Lock the folder to upload a file.
2017-12-07 20:52:54 +01:00
Tomaz Canabrava
76916b6c48
[CSE] Request the Folder ID.
2017-12-07 19:39:30 +01:00
Tomaz Canabrava
4878e824e5
[CSE] Fix reading encrypted status of folders.
2017-12-07 19:04:12 +01:00
Tomaz Canabrava
893ca66af8
[CSE] Fix indentation
...
Parts of the code are indented by spaces, other parts by tabs.
This needs to run in the whole codebase.
2017-12-07 18:12:25 +01:00
Tomaz Canabrava
19120fde9f
[CSE] Don't query for files on GetFolderEncryptStatusJob
...
The request for folders whas also replying for files.
2017-12-07 18:10:14 +01:00
Tomaz Canabrava
7fe4dd2163
[CSE] Renane GetFolderEncryptStatus to GetFolderEncryptStatusJob
...
it's a network job after all
2017-12-07 18:06:55 +01:00
Olivier Goffart
4581d708ff
Account: remove dependency with ConfigFile
...
Part of #6213
2017-12-07 17:39:16 +01:00
Olivier Goffart
e0a14cac5b
ConfigFile: use QStandardPaths::AppConfigLocation for the config file
...
Also use appName instead of appNameGui in order to compute the path
Issue: #2245
The reason is to respect the XDG spec on Unix (#1601 ) and might help
on windows roaming profiles (#684 )
2017-12-07 17:39:16 +01:00
Olivier Goffart
ac844a2a45
AbstractNetworkJob: move the httpTimeout from the propagator to the network job
...
Remove one dependency from the config file for the sync engine.
Part of issue #6213
2017-12-07 17:39:16 +01:00
Olivier Goffart
7230fa6b4f
SyncOptions: move to its own file
...
It does not really belong in the discoveryphase.h as it is used also for
propagator option.
Also use C++11 style member initializer
2017-12-07 17:35:38 +01:00
Olivier Goffart
e25af4f0dc
csync_exclude: Fix compile
...
csync_exclude.cpp:428:17: error: assigning to 'char *' from incompatible type 'const char *'
bname = path;
^~~~
The C library's strrchr always return 'char*'
Only the C++'s std::strrchr has two overloads
2017-12-07 17:34:14 +01:00
Tomaz Canabrava
863e86138f
[CSE] Pass the folder to the GetEncryptionStatus
...
Sometimes we are only interested in folders.
2017-12-07 17:32:35 +01:00
Christian Kamm
287670c9d6
Excludes: Remove fnmatch codepath
...
Now all exclude patterns can be translated to regular expressions.
2017-12-07 14:38:21 +01:00
Christian Kamm
994f3bb644
Excludes: fnmatch doesn't treat '{' as special
...
Neither the documentation at
http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13
nor the fnmatch source code in <glibc>/posix/fnmatch_loop.c points
toward { causing special matching behavior.
2017-12-07 14:38:21 +01:00
Christian Kamm
e5c780ee19
Excludes: Translate full-path patterns to regex
...
Improves full matches by more than an order of magnitude
and also improves speed of traversal matches by roughly 20%,
judging by the check_csync_exclude performance test.
2017-12-07 14:38:21 +01:00
Christian Kamm
1c3d5ab158
Excludes: Introduce dir-only regex matches
2017-12-07 14:38:21 +01:00
Christian Kamm
5d668eca40
Excludes: Optimize Desktop.ini check
2017-12-07 14:38:21 +01:00
Christian Kamm
7ab127ad53
Excludes: Refactor for pending improvements
...
Make ExcludedFiles something that is instantiated outside of
the CSYNC context and then given to it as a hook.
ExcludedFiles still lives in csync_exclude and the internal
workings haven't been touched.
2017-12-07 14:38:21 +01:00
Olivier Goffart
dd91f4a86e
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/csync/csync.cpp
2017-12-07 09:37:50 +01:00
Olivier Goffart
3485109125
Jenkinsfile: Fix compilation
...
Add a CMAKE_PREFIX_PATH so it finds the right QtKeychain
2017-12-07 09:35:04 +01:00
Jenkins for ownCloud
a1136e7695
[tx-robot] updated from transifex
2017-12-07 02:18:34 +01:00
Hefee
32f38dc5f8
fix typo error: occured-> occurred
2017-12-06 20:02:53 +01:00
Christian Kamm
ceac18c554
Reconcile: Rename maps are consistent with update phase #6212
...
For duplicate file ids the update phase and reconcile phase determined
the rename mappings independently. If they disagreed (due to different
order of processing), complicated misbehavior would result.
This patch fixes it by letting reconcile try to use the mapping that the
update phase has computed first.
2017-12-06 16:42:11 +01:00
Christian Kamm
99f32dcb99
Clear csync rename mappings after reconcile
...
They were being preserved *across sync runs*.
2017-12-06 16:42:11 +01:00
Christian Kamm
79fe71db58
Hide selective sync buttons while disconnected #5809
...
The choices or big folder warnings will pop up again on reconnection.
2017-12-06 16:41:28 +01:00
Jenkins for ownCloud
ac937030f0
[tx-robot] updated from transifex
2017-12-06 02:18:35 +01:00
Olivier Goffart
ed5385faa3
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
src/libsync/connectionvalidator.cpp
src/libsync/networkjobs.cpp
2017-12-05 15:58:13 +01:00
Markus Goetz
fe234499dd
Update release_template.md
2017-12-05 09:22:23 +01:00
Jenkins for ownCloud
67d77dd6ce
[tx-robot] updated from transifex
2017-12-05 02:18:35 +01:00
Tomaz Canabrava
66aecb9626
[CSE] Handle normal uploads in CSE enabled instances
2017-12-04 22:45:10 +01:00
Tomaz Canabrava
6f35cbff6b
[CSE] Fetch the Folder information for encryption status
2017-12-04 22:27:13 +01:00
Tomaz Canabrava
387737d908
[CSE] Start to create the upload logic.
2017-12-04 21:33:43 +01:00
Markus Goetz
755ef0119a
ChangeLog: More 2.4.0 changes up to now
2017-12-04 13:18:29 +01:00
Hefee
1a1ab92ed9
make doc-man working again.
2017-12-04 12:37:30 +01:00
Michael Stingl
b29e9b931d
move man rst files to separate dir
2017-12-04 12:37:30 +01:00
Markus Goetz
0479322c1d
fstack-protector: Improve previous commit
2017-12-04 12:37:03 +01:00
Klaas Freitag
0be7b6fe1f
Only enable -fstack-protector-strong compiler flag for gcc > 4.9
...
On older/other compilers this flag is not understood.
2017-12-04 12:37:03 +01:00
Olivier Goffart
ee98daf9ea
Shibboleth: Upgrade to OAuth2 When the server supports it
...
If the server support both Shibboleth and OAuth2, upgrades to OAuth2
Issue #6198
2017-12-04 08:09:34 +01:00
Jenkins for ownCloud
f2beaba3e9
[tx-robot] updated from transifex
2017-12-04 02:18:34 +01:00
Tomaz Canabrava
8c4928d9f6
Merge branch 'uploadImprovements' into clientSideEncryptionV3
2017-12-03 18:15:33 +01:00
Jenkins for ownCloud
823c7469e1
[tx-robot] updated from transifex
2017-12-03 02:18:34 +01:00
Jenkins for ownCloud
10efe1faee
[tx-robot] updated from transifex
2017-12-02 02:18:34 +01:00
Olivier Goffart
e0954b0999
test/syncenginetestutils.h: Don't use toTimeZone only to get the UTC
2017-12-01 13:18:09 +01:00
Jenkins for ownCloud
5ff3e448f5
[tx-robot] updated from transifex
2017-12-01 02:18:34 +01:00
Jenkins for ownCloud
58bcbba841
[tx-robot] updated from transifex
2017-11-30 02:18:34 +01:00
Roeland Jago Douma
18b456ea2c
Merge pull request #77 from nextcloud/bump_drone
...
Bump drone images to contain WebEngine
2017-11-29 12:51:59 +01:00
Roeland Jago Douma
529442e0f8
Bump drone images
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-29 12:34:34 +01:00
Olivier Goffart
30e3932af8
FolderWizard: Fix minimum size
...
There are several bugs in QWizard that needs to be worked around for the minimum
size of the widget to take effect.
Issue #4280
2017-11-29 08:03:06 +01:00
Jenkins for ownCloud
e86937e2e2
[tx-robot] updated from transifex
2017-11-29 02:18:34 +01:00
Tomaz Canabrava
35eb071874
[uploadImprovements] use the new struct on PropagateUploadNg
...
use the new struct on PropagateUploadNg to make the algorithm
more future proof.
2017-11-28 22:58:52 +01:00
Tomaz Canabrava
a64bd6059b
[uploadImprovements] fix struct hole
2017-11-28 22:22:37 +01:00
Tomaz Canabrava
a623b14209
[uploadImprovements] use the new struct info in PropagateUploadV1
...
Add a new member for the UploadFileInfo in PropagateUploadCommon
to hold the full file path - as it can change if we use a temporary
file to upload.
Adapt propagateuploadv1 to use the new calls.
2017-11-28 22:17:29 +01:00
Tomaz Canabrava
f609336bfc
Split file to upload from the file on disk
...
They can be conceptually equal - I can upload the file
on disk, and that's what I do right now. But if we want
to accept filters in the future, filters that change
the file on disk like shrinking an image, the current
information used is wrong and we need a way to separate those.
This patch introduces a new struct that holds the *actual*
file that will be uploaded, be it a temporary one or
the original file.
2017-11-28 21:28:06 +01:00
Tomaz Canabrava
2cacf2547e
Merge branch 'master' into clientSideEncryptionV3
2017-11-28 20:12:57 +01:00
Markus Goetz
6276d9290d
utility_mac: Check for NULL from LSSharedFileListItemResolve #6123
...
Possibly also #6074
2017-11-28 13:35:15 +01:00
Roeland Jago Douma
0f60deb043
Store and retrieve keys in keychain
...
* Store privatekey, certificate and mnemonic in keychain
* Retrieve private + public key from server
- ask for mnemonic to decrypt private key
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-28 12:36:35 +01:00
Markus Goetz
cde6589af8
owncloudcmd: Don't need Qt Sql module
2017-11-28 10:18:01 +01:00
Jenkins for ownCloud
482d538559
[tx-robot] updated from transifex
2017-11-28 02:18:53 +01:00
Tomaz Canabrava
c4d3d0987d
[CSE] Find the start of the upload
2017-11-27 22:20:24 +01:00
Tomaz Canabrava
47b5cd0fbb
[CSE] Shows correctly Encrypt / Decrypt in the menu
2017-11-27 21:19:54 +01:00
Tomaz Canabrava
dd903d447f
[CSE] Store the encryption status without the webdav url
...
The Folder information on the desktop client doesn't
knows about the webdav layout aparently.
2017-11-27 21:09:13 +01:00
Tomaz Canabrava
d2d2df4c75
[CSE] Try to find the webdav url of a folder.
2017-11-27 21:06:38 +01:00
Roeland Jago Douma
8c411b32f7
Merge pull request #67 from edent/patch-3
...
Update ownCloud references to NextCloud
2017-11-27 20:40:01 +01:00
Roeland Jago Douma
ccd050455a
Merge pull request #62 from bceverly/master
...
Added build support for FreeBSD
2017-11-27 20:39:19 +01:00
Roeland Jago Douma
ffb9f69cf6
Start with moving data to the keychain
...
* Check for cert + privateKey in keychain
* Work with QSslKey and QSslCertificate
* Abstract reading the BIO's a bit more
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-27 16:21:53 +01:00
Roeland Jago Douma
74c4d27ea0
Indent
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-27 16:12:56 +01:00
Tomaz Canabrava
e3050f7456
[CSE] Pass by reference, return by value.
...
Also, Do not create variables in the heap to change it's value
via reference, prefer an aggregation value. use a Typedef to
fully specify what you want in return.
2017-11-27 15:21:29 +01:00
Jenkins for ownCloud
6cc5ce7a66
[tx-robot] updated from transifex
2017-11-27 02:18:35 +01:00
Jenkins for ownCloud
7a80fe4939
[tx-robot] updated from transifex
2017-11-26 02:18:36 +01:00
Roeland Jago Douma
9cbe795045
Move more encryption functions to encryption helper
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-25 21:43:15 +01:00
Olivier Goffart
b8444053b8
AccountSettings: Fix the size of the "Add Sync Folder Connection" button
...
The problem here is that the QPainter is created on the viewport with is a
QWidget, but QAbstractItemView can have a different font, and the
QStyleOptionViewItem::font is this font. QStyleOptionViewItem::font
was used to compute the sizeHint, and the default font from the QPainter
was used to draw the text, so they could be not in sync.
Fix it by always using the font for QPushButton
Reported in
https://github.com/owncloud/client/issues/6156#issuecomment-346576328
2017-11-25 16:07:06 +01:00
Roeland Jago Douma
0ee0243595
Merge pull request #65 from edent/patch-2
...
Typo in documentation
2017-11-25 15:55:41 +01:00
Roeland Jago Douma
b6e986bb1b
Merge pull request #64 from edent/patch-1
...
Typo
2017-11-25 15:55:14 +01:00
Roeland Jago Douma
e0fbdfe175
Remove obsolete encryption functions
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-25 15:50:47 +01:00
Olivier Goffart
753d7addb4
libsync: Fix compilation with TOKEN_AUTH_ONLY
...
This means we cannot use QtGui in libsync.
So this mostly disable the avatar from the account and the avatarjob
Note that there is one logic change: in ConnectionValidator::slotUserFetched
we do the avatar job even if the user is empty. Otherwise we would end up in
a invalid state. This restore the 2.3.x behavior that was broken in
commit e05d6bfcdc
2017-11-25 12:57:16 +01:00
Terence Eden
632570a13b
Update ownCloud references to NextCloud
...
Fixes #66
2017-11-25 10:26:23 +00:00
Terence Eden
e6be710cdb
Typo in documentation
...
Fixes #63
2017-11-25 10:03:36 +00:00
Terence Eden
0b00ab8a15
Typo
...
Fixes #63
2017-11-25 10:03:00 +00:00
Jenkins for ownCloud
c0ae96e7a8
[tx-robot] updated from transifex
2017-11-25 02:18:35 +01:00
Roeland Jago Douma
12adff76e2
Properly decrypt private key and send it to the server
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-24 22:10:28 +01:00
Roeland Jago Douma
6d145a676b
Added EncryptionHelper
...
This is to move generic encryption methods out of the main code and into
small helper functions. So we don't scatter the encryption code all over
the place.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-24 21:05:21 +01:00
bceverly
5279e2fb37
Added support for FreeBSD
2017-11-24 08:54:29 -05:00
bceverly
51e355e403
Added support for FreeBSD
2017-11-24 08:54:24 -05:00
Jenkins for ownCloud
e99d64011e
[tx-robot] updated from transifex
2017-11-24 02:18:38 +01:00
Tomaz Canabrava
45d9323653
[CSE] Update encryption status when folder is updated
2017-11-23 16:55:12 +01:00
Tomaz Canabrava
57e0d7abcb
[CSE] Fix pointer to e2e
...
Qt expects things to be pointers even if they are stack
variables.
2017-11-23 16:54:45 +01:00
Olivier Goffart
72809ef5b1
csync_update: ignore remote files that cannot be encoded
...
This is mainly for linux, whose local is not UTF-8.
For example, in latin1, it is not possible to encode emoji or chinese character.
If there are such character in the filename, Qt would just save the file using
the replacement character ('?'). Then, on the next sync, client would rename
the files using this replacement character.
Avoid this by ignoring the files which cannot be downloaded because the
filename cannot be represented with the user's locale
Relates to issue #5676 and #5719
2017-11-23 12:51:28 +01:00
Jenkins for ownCloud
7a790c88e8
[tx-robot] updated from transifex
2017-11-23 02:18:33 +01:00
Jenkins for ownCloud
01377f6ea9
[tx-robot] updated from transifex
2017-11-22 02:18:34 +01:00
Christian Kamm
8c94601ef2
User shares: Further avatar tweaks
2017-11-21 16:33:03 +01:00
Christian Kamm
f27ceb7fab
User shares: Use background color, remove permission frame #6176
2017-11-21 16:33:03 +01:00
Christian Kamm
60bde048c6
User shares: Fix missing label when there are only link shares
...
The "not shared with users or groups" label only appeared if there were
no shares at all.
2017-11-21 16:33:03 +01:00
Christian Kamm
3b961204e1
Avatars in user share dialog: Minor tweaks
2017-11-21 16:33:03 +01:00
Christian Kamm
e9907bc8ae
AvatarJob improvements
...
* Drop AvatarJob2
* Allow AvatarJob to retrieve different sizes and users
* Make creating a circular avatar into a function
(maybe all avatars should be made into that shape in the first place)
2017-11-21 16:33:03 +01:00
Roeland Jago Douma
6b9b5252de
User shares: Show avatars
...
[Sharing] Show placeholders for avatars
Just like on the web show placeholders for avatars in the sharing dialog
[Sharing] Show avatars!
[Sharing] Show same avatar placeholder for group/federated shares as on
web
2017-11-21 16:33:03 +01:00
Roeland Jago Douma
84a093e450
Merge pull request #53 from nextcloud/build_appimage
...
Automatically start building AppImages on PR's
2017-11-21 14:27:53 +01:00
Roeland Jago Douma
be8b99bf3a
Build AppImage on all pushes
...
This allows quickly testing of the appimages for feedback
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-21 14:20:09 +01:00
Christian Kamm
d949ec6877
Protocol: Introduce context menu with "open in browser" #6121
...
To do this conveniently a bunch of functionality that's common to
IssueWidget and ProtocolWidget is moved to ProtocolItem.
Also the convenience function to asynchronously retrieve the private
link url is moved from the socket api to the network jobs.
2017-11-21 12:42:10 +01:00
Olivier Goffart
96dede4e84
TestChunkingNG: Test that resuming does not send past data.
2017-11-21 11:19:14 +01:00
Roeland Jago Douma
e7b7b8923f
Merge pull request #52 from nextcloud/single_drone
...
No double building on PR's
2017-11-21 10:18:01 +01:00
Tomaz Canabrava
a118419f0c
[CSE] buildfix, use the correct type.
2017-11-21 09:55:44 +01:00
Roeland Jago Douma
407d71b305
Merge pull request #50 from nextcloud/correct_app_password_link
...
Have correct app password link
2017-11-21 09:48:01 +01:00
Roeland Jago Douma
d63e18aa9d
Merge pull request #51 from nextcloud/no_jenkins
...
We don't use Jenkins
2017-11-21 09:38:37 +01:00
Roeland Jago Douma
26ba89c2a8
No double building on PR's
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-21 09:27:52 +01:00
Roeland Jago Douma
7c5150421c
We don't use Jenkins
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-21 09:20:17 +01:00
Roeland Jago Douma
462353d0ee
Have correct app password link
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-21 09:17:42 +01:00
Jenkins for ownCloud
72783aa068
[tx-robot] updated from transifex
2017-11-21 02:18:35 +01:00
Tomaz Canabrava
d31aa7836a
[CSE] Add job to find what folders are encrypted.
...
This still needs to be correctly setuped in the call chain.
The job returns a QVariantMap with the folder-webdav-url
and the encrypted status.
2017-11-20 21:38:17 +01:00
Jürgen Weigert
0abe7a77fb
Update release_template.md
2017-11-20 18:12:18 +01:00
Jürgen Weigert
ad408c5717
post release checks added
...
this fixes https://github.com/owncloud/client/issues/5836
2017-11-20 18:12:18 +01:00
Tomaz Canabrava
34e6534813
Merge branch 'clientSideEncryptionV3' of github.com:nextcloud/client into clientSideEncryptionV3
2017-11-20 18:01:48 +01:00
Tomaz Canabrava
6d464d9dc6
Merge branch 'master-nextcloud' into clientSideEncryptionV3
2017-11-20 18:00:58 +01:00
Roeland Jago Douma
2236d05d25
Merge pull request #49 from nextcloud/nc_theme
...
Nextcloud theme
2017-11-20 16:47:31 +01:00
Roeland Jago Douma
f0537b20d1
Update with NC icons
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-20 16:14:40 +01:00
Roeland Jago Douma
9878559002
Move to NC theme
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-20 15:46:18 +01:00
Markus Goetz
658a8c0609
mirall.desktop.in: Clean bogus comments #5767
2017-11-20 15:29:39 +01:00
Olivier Goffart
e7a91a1169
AccountSettings: Use the proper position to show the menu over sub-folder
...
The menu can be open with the keyboard shortcut.
(Fixup for the fix of #5596 )
Also use popup instead of exec to show the menu: it's safer as it does
not re-enter the event loop.
2017-11-20 15:22:45 +01:00
Roeland Jago Douma
6b3006b325
OwnCloudCPack.cmake to NextcloudCPack.cmake
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-20 14:12:52 +01:00
Roeland Jago Douma
5dc73ffd8b
OWNCLOUD.cmake => NEXTCLOUD.cmake
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-20 14:12:52 +01:00
Roeland Jago Douma
b835bdc55b
Merge pull request #48 from nextcloud/oc_master
...
Bump to oc master
2017-11-20 13:43:34 +01:00
Roeland Jago Douma
725be9ff54
Merge branch 'master' of https://github.com/owncloud/client into oc_master
2017-11-20 13:29:59 +01:00
Christian Kamm
14a51458ab
Link share: Move 'delete' button to the bottom #6163
2017-11-20 12:42:41 +01:00
Christian Kamm
aafe7c4732
Merge remote-tracking branch 'origin/2.4'
2017-11-20 11:54:56 +01:00
Christian Kamm
86c2e9e825
Tray: Fix 'Open folder' action creation
...
It looks like the action was created but not added to the menu. Did this
work with previous Qt versions?
2017-11-20 11:48:55 +01:00
Olivier Goffart
480932a58a
Checksum: Ignore unkown OC-Checksum header when downloading...
...
And if there are several checksums, pick the "best" one.
The case of several checksum was reported in
https://github.com/nextcloud/client_theming/issues/213
2017-11-20 10:51:15 +01:00
Jenkins for ownCloud
529bcab009
[tx-robot] updated from transifex
2017-11-20 02:18:34 +01:00
Jenkins for ownCloud
9a4871abeb
[tx-robot] updated from transifex
2017-11-19 02:18:36 +01:00
Jenkins for ownCloud
40665c05ac
[tx-robot] updated from transifex
2017-11-18 02:18:36 +01:00
Michael Stingl
d832312acc
Add 2.3.3 System Requirements to client repo ( #5996 )
...
I would like to maintain the System Requirements in the client repo.
2017-11-17 15:05:42 +01:00
Jenkins for ownCloud
63cf0e347b
[tx-robot] updated from transifex
2017-11-17 02:18:37 +01:00
Olivier Goffart
2192386d86
test/testsyncengine: test for PR #6168
2017-11-16 13:31:54 +01:00
Christian Kamm
e694ffcd03
PropagateDownload: Adjustments to skipping downloads #6153
...
Previously we required matching mtimes but that's actually
unnecessary when the question is about whether to skip the
download. We will still update the file's metadata.
Also, adjust behavior when the checksum is weak (Adler32):
in these cases we still depend on equal mtimes.
2017-11-16 13:31:54 +01:00
Christian Kamm
eff401d418
Share links: Confirm deletion explicitly #6163
...
Also add the "Delete" action to the "..." menu.
2017-11-16 11:16:47 +01:00
Roeland Jago Douma
9394fe6e84
Use openssl functions to get random words
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-16 10:45:57 +01:00
Jenkins for ownCloud
7049ccd7ab
[tx-robot] updated from transifex
2017-11-16 02:18:53 +01:00
Markus Goetz
8fb2167fca
sqlite: Update bundled version to 3.21
...
For OS X and Windows.
2017-11-15 21:53:53 +01:00
Markus Goetz
d0b8528022
Changelog: 2.4 changes up to now
2017-11-15 21:47:34 +01:00
Samuel Alfageme
13d80beb83
Changelog Updated with latest changes
...
Web equivalent PR: https://github.com/owncloud/owncloud.org/pull/1318
2017-11-15 13:37:25 +01:00
Christian Kamm
06ce8dd8bd
Wizard: Add explanation text when server error is shown #6157
...
Just showing a box with the message can be surprising.
2017-11-15 11:01:44 +01:00
Olivier Goffart
9a1ea67a35
Theme: Update the wizard size on high dpi screen
...
Issue #6156
2017-11-15 10:46:08 +01:00
Christian Kamm
e616f904b6
Share link: Add tooltip to delete button #6163
2017-11-15 10:16:33 +01:00
Christian Kamm
bff24ffd2f
PropagateDownload: Fix GET with redirects #6159
...
The GET jobs were redirected, but the custom incremental handling
in readyRead didn't propagate to the follow-up job.
2017-11-15 10:11:15 +01:00
Jenkins for ownCloud
2cdc969cc5
[tx-robot] updated from transifex
2017-11-15 02:18:34 +01:00
Matthew Setter
b13fd786b6
Fix broken download link
2017-11-14 12:25:48 +01:00
Matthew Setter
89d55d0af8
Fix broken images in the FAQ
2017-11-14 12:25:48 +01:00
Matthew Setter
d46335aba1
Minor formatting fixes
...
Fix broken header and table
2017-11-14 12:25:48 +01:00
Matthew Setter
e417a4b159
Fix title casing to match style guide
2017-11-14 12:25:48 +01:00
Christian Kamm
b0f986c740
Private links: Account for overwritehost #6146
...
Retrieve ocs/v1.php/config to determine the desired host and build the
private link urls with that instead.
2017-11-14 12:14:11 +01:00
Christian Kamm
18091f99d4
Private links: Retrieve numeric file id property #6146
...
Some servers have non-compliant instance ids (that start with a number)
and thereby make deducing the numeric file id from the full id
unreliable.
To circumvent this problem we retrieve the fileid property from the
server with a PROPFIND.
2017-11-14 12:14:11 +01:00
Christian Kamm
3ae2071129
DetermineAuth: Remove concept of Unknown #6148
...
This restores 2.3 behavior. Some servers reply 404 to GETs and PROPFINDs
to the remote.php/webdav/ url and used to work. Being more picky would
break them.
2017-11-14 12:10:35 +01:00
Christian Kamm
820ebf4b6e
Sql: db close() failing isn't fatal
...
The assert was made fatal when looking at asserts for #5429 #5518
without having a particular problem in mind. Recent reports weakly
suggest that this might lead to occasional crashes for users when
sqlite_close fails in ways that look ignorable.
2017-11-14 12:10:19 +01:00
Jenkins for ownCloud
161f6baba6
[tx-robot] updated from transifex
2017-11-14 02:18:32 +01:00
Tomaz Canabrava
14aeb6921b
[CSE] Fix invalid memory access
2017-11-13 18:15:08 +01:00
Tomaz Canabrava
8adfc28de7
[CSE] Store lock-token and retrieve later
2017-11-13 17:54:19 +01:00
Tomaz Canabrava
a0f0e5617a
[CSE] Move the e2e object to the Account
...
This is important as a lot of the code would start
to rely in direct access to the client side encryption
and there are different keys for different accounts.
2017-11-13 17:22:09 +01:00
Tomaz Canabrava
6351c01ee7
[CSE] Remember the token for folders
2017-11-13 17:04:02 +01:00
Tomaz Canabrava
e32fd58578
[CSE] handle success and failure of metadata upload.
2017-11-13 17:03:40 +01:00
Tomaz Canabrava
22a2ab8999
[CSE] Start to send the metadata to the server
2017-11-13 16:46:30 +01:00
Jenkins for ownCloud
89d7dbf2cf
[tx-robot] updated from transifex
2017-11-13 02:18:32 +01:00
Tomaz Canabrava
4755b8c8a3
[CSE] More warnings
2017-11-12 13:03:52 +01:00
Tomaz Canabrava
19d64e6308
[CSE] Remove warnings
2017-11-12 12:55:12 +01:00
Jenkins for ownCloud
b1972e56fa
[tx-robot] updated from transifex
2017-11-12 02:18:33 +01:00
Tomaz Canabrava
05d826a954
Merge branch 'master' into clientSideEncryptionV3
2017-11-11 16:28:20 +01:00
Tomaz Canabrava
685ceacace
[CSE] Memleaks
2017-11-11 16:25:38 +01:00
Jenkins for ownCloud
7d10f9829e
[tx-robot] updated from transifex
2017-11-11 02:18:34 +01:00
Jenkins for ownCloud
d2723bc0ac
[tx-robot] updated from transifex
2017-11-10 02:18:50 +01:00
Jenkins for ownCloud
a0d43f8ba6
[tx-robot] updated from transifex
2017-11-09 02:18:50 +01:00
Christian Kamm
37c5612aee
Discovery: Treat files starting with '.' as hidden #6145
...
This bug was introduced when strcmp(a, b) != 0 was accidentally
converted to a == b.
2017-11-08 12:53:46 +01:00
Jenkins for ownCloud
f2e73c0887
[tx-robot] updated from transifex
2017-11-08 02:25:47 +01:00
Jenkins for ownCloud
aca36cc1ac
[tx-robot] updated from transifex
2017-11-07 02:21:25 +01:00
Tomaz Canabrava
ee4a848d9a
[CSE] Correctly Unlock the Folder
...
Wireshark is love, and life.
2017-11-06 20:58:30 +01:00
Tomaz Canabrava
7290cf2813
[CSE] Adjust the CN accordingly to the server
2017-11-06 20:57:50 +01:00
Christian Kamm
9af6e29f42
DetermineAuthType: Adjustments for tight firewalls #6135
...
With some firewalls we can't GET /remote.php/webdav/. Here we keep the
GET request to detect shibboleth through the redirect pattern but then
use PROPFIND to figure out the http auth method.
Currently we prefer OAuth to Shibboleth to Basic auth.
This also restores the fallback behavior of assuming basic auth
when no auth type can be determined.
2017-11-06 13:09:10 +01:00
Jenkins for ownCloud
d6db77cce8
[tx-robot] updated from transifex
2017-11-06 02:25:40 +01:00
Jenkins for ownCloud
71d2e3de74
[tx-robot] updated from transifex
2017-11-05 02:26:45 +01:00
Jenkins for ownCloud
a7e07239e3
[tx-robot] updated from transifex
2017-11-04 02:19:35 +01:00
Roeland Jago Douma
131fd4e483
Fix encryptJSON and descryptJSON
...
Now working with tag
Basically we called EVP_*Update to much which resulted in weird output.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-03 18:00:05 +01:00
Tomaz Canabrava
be9cd358d4
[CSE] Bypass Qt DELETE Bug
...
It appears that Qt implementation of the DELETE http request
does not send bodyData, and we need that for Nextcloud.
Currently I changed the http request on the server side
to accept a POST instead of a DELETE, so I can actually
develop.
Also, I already poked the Qt developers that did this code.
2017-11-03 17:00:28 +01:00
Tomaz Canabrava
6ad6852045
[CSE] Cleanup - remove commented metadata.
2017-11-03 16:59:39 +01:00
Tomaz Canabrava
832cbef8e7
[CMAKE] Bump minimum version to 3.2
...
Removes a lot of warnings.
2017-11-03 15:43:57 +01:00
Tomaz Canabrava
5514f14e88
[CSE] Get and send the lock - token
2017-11-03 15:12:12 +01:00
Tomaz Canabrava
ea9e2135a1
[CSE] Remove uneeded comments.
2017-11-03 14:28:13 +01:00
Tomaz Canabrava
b53003792f
[CSE] Removed lambdas for Metadata / Lock / Unlock
2017-11-03 12:34:30 +01:00
Tomaz Canabrava
6facd29663
[CSE] Start to break the lambdas
...
Lambda within a lambda is a terrible idea,
Use default signal / slot connections with a
method instead.
2017-11-03 12:00:25 +01:00
Tomaz Canabrava
3b157caf09
[CSE] Handle encrypt / lock / unlock
2017-11-03 11:21:01 +01:00
Tomaz Canabrava
d7e05c9b05
[CSE] Comment out broken code.
...
But why it's broken?
2017-11-03 11:20:44 +01:00
Christian Kamm
3608114ec1
Journal: Fix low-disk space errors
...
Fixes a regression from 4dbe9d4113 ,
low disk space can lead to IOERR not just CANTOPEN.
2017-11-03 10:44:47 +01:00
Christian Kamm
c9d5a9cea2
HttpCreds: Don't create empty client cert keychain entries #5752
...
This doesn't do anything about deleting the client cert keychain
entries when the whole account is removed though.
2017-11-03 10:28:56 +01:00
Jenkins for ownCloud
354cdfdbc1
[tx-robot] updated from transifex
2017-11-03 02:19:05 +01:00
Jürgen Weigert
d903afc4bf
Adding post-release checks to template ( #6109 )
...
copied 3 items from https://github.com/owncloud/client/issues/5889
2017-11-02 16:57:02 +01:00
Christian Kamm
4dbe9d4113
Journal: Don't crash if the db file is readonly #6050
...
Surprisingly sqlite3_open_v2() returns ok on readonly files with
SQLITE_OPEN_READWRITE. Probably due to the journal mode?
2017-11-02 16:36:51 +01:00
Roeland Jago Douma
8e3e3a4575
Be java compatible and store the tag at the end of the cipher text
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-02 12:39:42 +01:00
Christian Kamm
c743cc171a
Client certs: Improve error message #6128
...
"Could not load certificate" can very well just be a bad password.
2017-11-02 11:30:44 +01:00
Jenkins for ownCloud
7963a8322d
[tx-robot] updated from transifex
2017-11-02 02:18:48 +01:00
Tomaz Canabrava
8d537fdd3c
[CSE] Get Metadata from the server
2017-11-01 18:32:33 +01:00
Tomaz Canabrava
4a66cf11d2
[CSE] Send Metadata to the server
2017-11-01 18:21:30 +01:00
Tomaz Canabrava
2698759525
[CSE] Implement the Folder Unlock api job
2017-11-01 17:54:17 +01:00
Tomaz Canabrava
1b1add5ead
[CSE] Add api to lock file
2017-11-01 17:36:54 +01:00
Christian Kamm
6ac44f05cd
Credentials: Namespace windows cred keys #6125
...
The application name is prepended to the key. QtKeychain doesn't
do that automatically on the platform.
2017-11-01 17:03:30 +01:00
Tomaz Canabrava
e5fdcd2f38
[CSE] Add TODO:
2017-11-01 16:48:19 +01:00
Tomaz Canabrava
ef2529ca44
[CSE] Set padding to 0 for the Rsa encryption
...
Also, commented out the finalization of the decrypt operation
because that was messing with the encryption. There's something
wrong here but I need to get this working and I can fix stuff
later.
2017-11-01 16:13:17 +01:00
Christian Kamm
64a84fda38
Wizard: Don't report confusing error message #6116
...
For historical reasons CheckServerJob doesn't just check url/ but also
url/owncloud/. However, that means if url/status.php is a 404 and
url/owncloud/status.php is a 404, the user will see the latter url
appear in the error message. That's potentially confusing.
Instead, just show the account url which will be closer to what the
user typed into the account wizard, while being adjusted for protocol
and possible redirects.
2017-11-01 15:57:58 +01:00
Tomaz Canabrava
1a891423e5
[CSE] Call the decryption function to test.
2017-11-01 15:48:40 +01:00
Tomaz Canabrava
41ebcd0b7e
[CSE] Decryption of the metadata blob
2017-11-01 15:29:14 +01:00
Tomaz Canabrava
77ec3b086d
[CSE] Remember to finalize encryption
2017-11-01 15:24:19 +01:00
Tomaz Canabrava
88d87bf0ca
[CSE] Convert encrypted bitearray to Base64
...
also, start the decrypt.
2017-11-01 14:46:32 +01:00
Jenkins for ownCloud
8eec79680c
[tx-robot] updated from transifex
2017-11-01 02:19:02 +01:00
Tomaz Canabrava
eb43fa1459
[CSE] Internal metadata encryption working
2017-10-31 17:52:01 +01:00
Tomaz Canabrava
8793fdbc69
[CSE] Remember to actually use the correct variable
2017-10-31 16:06:01 +01:00
Tomaz Canabrava
4bb7ebb6aa
[CSE] Convert the base64 data to raw, for the decyrption
2017-10-31 13:17:22 +01:00
Tomaz Canabrava
3628f3739d
[CSE] Start the decryption of the metadata
2017-10-31 13:06:20 +01:00
Tomaz Canabrava
b28b4705de
[CSE] Correctly store the encrypted metadata
...
Missing the conversion to base64.
2017-10-31 12:07:47 +01:00
Tomaz Canabrava
560ce958de
[CSE] Remove warning.
2017-10-31 11:24:10 +01:00
Tomaz Canabrava
69d73162aa
[CSE] functions for encrypt / decrypt folder
...
The code was scattered around the slot for the context
menu request and had already too many indentation levels.
2017-10-31 11:09:34 +01:00
Tomaz Canabrava
69dc099b17
[CSE] Dedicated function for the subfolder menu
2017-10-31 11:03:24 +01:00
Tomaz Canabrava
c7d9abbea3
[CSE] Rework pubkeyPath to be able to fetch pubKey
2017-10-30 20:02:55 +01:00
Tomaz Canabrava
a986532442
[CSE] Generate a random password for the metadata.
2017-10-30 19:08:03 +01:00
Tomaz Canabrava
cf56d58241
[CSE] Start the encryption of the metadataKey
2017-10-30 19:05:55 +01:00
Tomaz Canabrava
edb04c137c
[CSE] Call the FolderMetadata
2017-10-30 19:05:32 +01:00
Tomaz Canabrava
c695c50c33
[CSE] Implement the empty metadata
...
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org >
2017-10-30 15:40:05 +01:00
Tomaz Canabrava
5420741edb
Merge branch 'master' into clientSideEncryptionV3
2017-10-30 11:21:36 +01:00
Jenkins for ownCloud
0968d74dad
[tx-robot] updated from transifex
2017-10-30 02:27:13 +01:00
Jenkins for ownCloud
876a1c5140
[tx-robot] updated from transifex
2017-10-29 02:18:42 +01:00
Jenkins for ownCloud
1455636169
[tx-robot] updated from transifex
2017-10-29 02:21:41 +02:00
Jenkins for ownCloud
7ea9a5ca4e
[tx-robot] updated from transifex
2017-10-28 02:18:51 +02:00
Christian Kamm
05c1bfb6cf
Merge remote-tracking branch 'origin/2.4'
2017-10-27 10:29:31 +02:00
Jenkins for ownCloud
2d2ec2a576
[tx-robot] updated from transifex
2017-10-27 02:20:55 +02:00
Jürgen Weigert
17126de5c7
APPLICATION_NAME may contain whitespace
...
Need some quotes to survive in makensis.
2017-10-26 18:44:38 +02:00
Jenkins for ownCloud
e4612ca5d4
[tx-robot] updated from transifex
2017-10-26 02:19:20 +02:00
Jenkins for ownCloud
15af5878b6
[tx-robot] updated from transifex
2017-10-25 02:21:52 +02:00
Jocelyn Turcotte
d9f6468310
Windows: Remove navigation pane entries when uninstalling
...
Issue #5295
2017-10-24 16:10:53 +02:00
Jocelyn Turcotte
10c6951438
Windows: Add a setting to enable/disable the explorer navigation pane integration
...
Issue #5295
2017-10-24 16:10:53 +02:00
Jocelyn Turcotte
56e38e6f80
Windows: Add sync folders to Explorer's navigation pane
...
This is only the navigation pane, the SyncRootManager entries aren't handled yet.
This follows the instructions from:
https://msdn.microsoft.com/en-us/library/windows/desktop/dn889934%28v=vs.85%29.aspx
Issue #5295
2017-10-24 16:10:53 +02:00
Roeland Jago Douma
238f0b3610
Add note
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-10-24 15:53:17 +02:00
Roeland Jago Douma
817baf292d
Use EVP_aes_128_gcm
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-10-24 15:51:53 +02:00
Roeland Jago Douma
ca6fa7b341
Update decryp function
...
* Do not use AAD
* Do not try to decrypt the last 16 bytes as Android adds the tag there
by default
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-10-24 15:51:53 +02:00
Roeland Jago Douma
bacbf337d2
Update encryption function
...
* Do not use padding
* Do not use the ADD data
* Append the tag to the ciphertext to be compatible with Android
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-10-24 15:51:53 +02:00
Olivier Goffart
c36043a175
ShareDialog: trigger a sync for folder affected by a change of sharing
...
This allow the sync engine to query the new metadata and update the
overlay icons.
Note: we also need to invalidate the etags because the server does not
change the etag of parent directories that see their share-types changed.
Issue #6098
2017-10-24 15:50:14 +02:00
Olivier Goffart
ee63b36ed3
SyncFileStatusTracker: Detect changed in the shared flag
...
... even if the file is not changed.
We get an UPDATE_METADATA in that case, so make sure we let the
SyncFileStatusTracker know about it.
That means we need to filter out UPDATE_METADATA in the other listeners
of this signal.
Issue #6098
2017-10-24 15:50:14 +02:00
Olivier Goffart
35d28294cd
SyncEngine: remove SyncEngine::syncItemDiscovered
...
It is unused.
2017-10-24 15:50:14 +02:00
Olivier Goffart
c6bd3ab31a
Sharing: remove the ShareManager::_jobContinuation
...
It is growing indefinitively in case of error, causing a leak.
Use a labda instead to pass the capture
2017-10-24 15:50:14 +02:00
Christian Kamm
9c7ee6ef85
Reconcile: Rename handling fixes: duplicate file ids
...
When users share the same tree several times (say A/ and A/B/ are both
shared) the remote tree can have several entries that have the same
file id. This needs to be respected in rename detection.
Also adds several tests and fixes for issues noticed during testing.
See #6096
2017-10-24 10:54:23 +02:00
Christian Kamm
e85a339d94
Local discovery: Use db instead of filesystem
...
We mostly trust the file watchers meaning that we don't re-scan the
local tree if we have done that recently and no file watcher events
have arrived. If the file watchers invalidate a subtree, we rescan
only that subtree.
Since we're not entirely sure the file watchers are reliable, we still
do full local discoveries regularly (1h by default). There is a config
file setting as well as an environment variable to control the interval.
2017-10-24 10:00:20 +02:00
Christian Kamm
66f0ce6616
FolderWatcher: reliability and data-loss signal
...
Add state and signal to catch the following two known problems:
* Linux: inotify user watch pool is exhausted. Folder watcher becomes
unreliable.
* Windows: buffer is too small, some notifications are lost but watching
stays reliable.
2017-10-24 10:00:20 +02:00
Christian Kamm
fb2d31c9ce
Folder: Move FolderWatcher to Folder
...
This makes it unnecessary for FolderMan to manage the list and removes
the need for some forwarders.
This is done in preparation for follow-up commits that want to add
diagnostics to FolderWatcher that shall be available from within Folder.
2017-10-24 10:00:20 +02:00
Christian Kamm
8865405a32
Version: master branch is future 2.5 now
2017-10-24 09:56:16 +02:00
Christian Kamm
f3ea375083
Wizard: Resolve url/ redirects only if url/status.php not found
...
Unfortunately checking the base-url for redirects in all cases lead
to incorrect behavior in some SAML/OAuth2 edge cases.
This new iteration checks the base url for redirects only if the
standard CheckServerJob can't reach the server. That way the 2.3
behavior is only changed in cases that would have lead to errors.
See #5954
2017-10-24 09:42:08 +02:00
Jenkins for ownCloud
15b02547e8
[tx-robot] updated from transifex
2017-10-24 02:18:49 +02:00
Tomaz Canabrava
476fe66043
[CSE] Add beginnign of the code to deal with the metadata
2017-10-23 21:06:26 +02:00
Tomaz Canabrava
bb53c2586f
[CSE] Add Nlohmann's json library
...
Because nobody deservers to deal with Qt's JSON API
2017-10-23 21:06:26 +02:00
Tomaz Canabrava
23f5bb7ed9
[CSE] Move network jobs out of networkjobs.h
...
Since those networkjobs are all about client side
encryption, mvoe them to clientsideencryption.h
This will help with fewer conflicts with the origin.
2017-10-23 21:06:26 +02:00
Jenkins for ownCloud
13b1f8b33e
[tx-robot] updated from transifex
2017-10-23 02:19:01 +02:00
Jenkins for ownCloud
ccd32c04a9
[tx-robot] updated from transifex
2017-10-22 02:21:00 +02:00
Jenkins for ownCloud
df19b20d07
[tx-robot] updated from transifex
2017-10-21 02:20:25 +02:00
Olivier Goffart
f41c9fbb7f
owncloudsetupwizard: Fix "add new account" if the wizard is already visible
...
Clicking on the "Add new Account" from the systray menu should raise
the wizard, even if it is already running.
Relates to issue #6105
2017-10-20 12:41:48 +02:00
Olivier Goffart
a0e50670de
Shibolleth: raise the browser when clicking on the tray
...
Issue #6105
Dynamically find the browser trough topLevelWidgets instead of
forwarding the call to the relevant page as it would require to break
many abstration layers (OwncloudSetupWizard -> OwncloudWizard ->
AbstractCredentialsWizardPage -> OwncloudShibbolethCredsPage)
And considering that we want to phase shibboleth down, I tought is
was not worth adding an interface for this.
The OAuth page don't have this problem because it shows a label and
allow the user to re-open the browser.
2017-10-20 10:51:35 +02:00
Jenkins for ownCloud
984631d807
[tx-robot] updated from transifex
2017-10-20 02:21:27 +02:00
Olivier Goffart
a9761a8976
Use qEnvironmentVariable* instead of qgetenv when appropriate
...
Now that we use Qt5, we should do that. It is slightly more efficient
and declares the intent.
(Modified using clazy)
2017-10-19 13:57:49 +02:00
Jenkins for ownCloud
84d8624e03
[tx-robot] updated from transifex
2017-10-19 02:21:00 +02:00
Tomaz Canabrava
1a47052aa3
[CSE] Remove unused function
...
This is already being called from somwhere else.
2017-10-18 21:51:39 +02:00
Tomaz Canabrava
e0988f482c
[CSE] Build fix
...
- change the name of one Qt Message Handler
- changed parameter from int to QString
2017-10-18 21:51:39 +02:00
Tomaz Canabrava
d83e8819ce
[CSE] SetEncryptionFlagApiJob
...
This new job sets the Encryption Flag in a folder.
2017-10-18 21:51:39 +02:00
Tomaz Canabrava
623eb29845
[CSE] Helper functions for the URL's
2017-10-18 21:51:39 +02:00
Tomaz Canabrava
1436d5bac1
[CSE] Better debug output
2017-10-18 21:51:39 +02:00
Tomaz Canabrava
0b50afe915
[CSE] Correctly Set's the client as connected
...
If we manage to encrypt and upload the private key
to the server, the client is in it's connected state.
2017-10-18 21:51:39 +02:00
Tomaz Canabrava
cfb6e3be8c
[CSE] Send the Private Key to the server
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
78136a10b0
[CSE] Debug statements to help find the encrypt error
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
08dfe86f37
[CSE] Adjust the calls to ent-to-end encryption
...
We changed the name.
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
0f1480728e
[cse] Use fake data to verify the encryption
...
beware, this is broken.
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
ba3d2a61d5
[cse] Call the encrypt and decrypt functions on fake data
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
e0d368cbb3
[cse] Update the encrypt and decrypt algorithm to GCM
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
4f7265c04f
[aes] Create the Decrypt function.
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
6b53b4f257
[cse] Add the crypt method, based on OpenSSL Wiki
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
77c0309e02
[cse] use PKCS5_PBKDF2_HMAC_SHA1 on the random-word passphrase
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
5395fc56b1
[cse] Start the encryption algorithm for the Private Key
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
fd00e180f5
[aes] fix out of bounds access.
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
60729f1fc4
[cse] Enable OpenSSL for encryption
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
418401a33c
[cse] new method, getUnifiedString
...
Enter a string list, return a string.
2017-10-18 21:51:38 +02:00
Tomaz Canabrava
2111aeaac1
[cse] Add wordlist & related methods.
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
69c709714d
[cse] Save signed key on disk
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
090336c928
[cse] Correctly send the CSR
...
finally.
Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org >
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
307dfd195c
[cse] Call the CSR job.
...
There's something wrong on the CSR job that I need to discover.
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
304231811d
[cse] Start the job to sign the public key.
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
ecb05020a9
[cse] Do not save the certificate on disk
...
Store it on memory, and discard it as soon as no longer
needed.
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
d2992d92ba
[cse] Generate the CSE
...
I still need to send it to the server. It's been a long
learning with the OpenSSL library.
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
c358980448
[cse] Link Against OpenSSL
...
For some reason, this was working untill I added a call
to X509_REQ_get_subject_name, then the linking suddenly
stopped working (even tougth I'm using a ton of other
OpenSSL calls)
Force to link against 1.0
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
42a3098595
[cse] s/scr/csr
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
58e2e6b30b
[cse] Generate the public / private keys and store locally
...
Now I need to understand what the hell I need to do
to send this to the server.
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
8c342cb1dd
[cse] Generate the KeyPair
...
Not stored anywhere yet, but it's correctly running.
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
17693a75e5
[cse] Request public key from server
...
This is the first step needed to properly communicate.
Next, get private key.
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
f4bbec1019
[bugfix] Return the error code, don't discard it.
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
29b64640fa
[cse] Start to fetch the basics to fetch the key from the server
2017-10-18 21:51:37 +02:00
Tomaz Canabrava
3f4d915a17
[cse] Add files to handle client side encryption
...
This will be the responsible for encryption,
decryption and talking with the server.
2017-10-18 21:51:36 +02:00
Tomaz Canabrava
7e2085375f
[cse] Invalid read of 1
2017-10-18 21:51:36 +02:00
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
Markus Goetz
9866010b4c
SettingsDialogMac: Fix account display name #6078
2017-10-18 10:41:01 +02:00
Markus Goetz
a3c1052cae
owncloudcmd: Fix timestamps, Fix --logdebug
...
We did not set a log handler so there were no timestamps.
The --debug didn't have an effect, let's use --logdebug like in GUI version.
(Command line always outputs some log)
Found in owncloud/documentation#3436
2017-10-18 09:16:05 +02:00
Jenkins for ownCloud
726cbc160c
[tx-robot] updated from transifex
2017-10-18 02:19:58 +02:00
Christian Kamm
bf39343920
Sync: Add capability for invalid filename regexes #6092
2017-10-17 17:15:49 +02:00
Markus Goetz
af24b4132d
Packaging: Require ZLIB
...
For owncloud/enterprise#2295
2017-10-17 16:53:11 +02:00
Markus Goetz
d339b68715
Checksums: Use addData function
...
Our implementation had bad error handling.
This one now uses a new Qt5 addData function.
owncloud/enterprise#2252
2017-10-17 13:26:54 +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
eadc791795
[tx-robot] updated from transifex
2017-10-17 12:43:06 +02:00
Jenkins for ownCloud
408cf11b2b
[tx-robot] updated from transifex
2017-10-17 12:40:55 +02:00
Markus Goetz
e3ba8d3209
Merge branch 'master' into 2.4
2017-10-17 12:37:20 +02:00
Christian Kamm
17b1c83ae5
Activity: Allow sorting of issues and protocol #6086
...
The issues tab uses custom ordering where overall and summary sync
issues are displayed first. This ordering is preserved by creating
special sorting logic for the "time" column.
It needed special handling anyway, since sorting by time-string would
have yielded incorrect results.
2017-10-17 09:47:57 +02:00
Christian Kamm
b2a8ffc577
Abort: Fix crash with early aborts
...
_chunkCount could be 0, leading to a floating point exception
I also added initializers for several uninitialized integers in the
upload jobs.
2017-10-17 09:44:52 +02:00
Christian Kamm
e2711224ed
Propagator: Avoid duplicate async abort
2017-10-17 09:44:52 +02:00
Christian Kamm
2ac7e0200a
Test case for #5949
2017-10-17 09:44:52 +02:00
Christian Kamm
e6b971b316
TestUtils: Invalidate etags on PUT or chunk-MOVE
2017-10-17 09:44:52 +02:00
Christian Kamm
111bb485ec
UploadNG: Avoid div-by-zero for super fast uploads
2017-10-17 09:44:52 +02:00
Piotr Mrowczynski
e10775d34f
Fix paused sync file move issue #5949
...
Dont abort final chunk immedietally
Use sync and async aborts
2017-10-17 09:44:52 +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
Christian Kamm
f598ac89ac
HttpCreds: Fix retry after wrong password #5989
...
This is an ugly solution.
2017-10-13 14:24:37 +02:00
Christian Kamm
3f7b3ca962
Checksums: Improve logging and add global disable #5017
2017-10-13 13:08:20 +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
Christian Kamm
096cd348f0
Doc: Update FAQ entry on deeply nested directories #1067
2017-10-11 16:01:46 +02:00
Christian Kamm
01c2ffe2ae
PropagateDownload: Read Content-md5 header #6088
2017-10-11 09:06:23 +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 , but did not extend to checking
the file size in case of potential local moves.
This commit adds this check and adds tests for various move+change
scenarios.
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
Olivier Goffart
0a8c394ee9
fixup! [tx-robot] updated from transifex
2017-10-05 22:01:38 +02:00
Olivier Goffart
cd44d8ed77
Test OAuth2
...
Include a test for PR #6057
2017-10-05 22:01:38 +02:00
Olivier Goffart
cfc38753b4
SyncEngine: _hasNoneFiles should be set when there are INSTRUCTION_UPDATE_METADATA
2017-10-05 22:01:38 +02:00
Olivier Goffart
c424dec7d4
OAuth: fix compilation with old gcc
...
We need to used QPointer::data in the signal slot connection
Relates to pr #6065
2017-10-05 22:01:38 +02:00
Jenkins for ownCloud
78078b714e
[tx-robot] updated from transifex
2017-10-05 22:01:38 +02:00
Markus Goetz
36117336e7
Updater: Rudimentary support for beta channel
...
So we can get people update from our alpha to the beta and rc
2017-10-05 22:01:38 +02:00
Olivier Goffart
d59c146488
Fix encoding of version string
2017-10-05 22:01:38 +02:00
Olivier Goffart
6583ebdcd9
csync_rename: optimize lookup
...
Avoid many memory allocations in reconcile
2017-10-05 22:01:38 +02:00
Olivier Goffart
917e2e43c6
csync_reconcile: Optimize reconcile by avoiding alocations
...
Fix performence regression from commit d66c2b5fae
For every new file we would look up every parent directories. Allocating
a new QByteArreay for every parent riectory just to know if it is in the other
tree is wasting lots of CPU.
Use a ByteArrayRef trick, similar to QStringRef
2017-10-05 22:01:37 +02:00
Dominik Schmidt
bdd3dc743b
Set CMAKE_INSTALL_RPATH as RPATH for installed executables
2017-10-05 22:01:37 +02:00
Christian Kamm
9143ddd0ad
Packaging: Add options for fine-grained builds #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-10-05 22:01:37 +02:00
Christian Kamm
f46440eb67
Packaging: Adjust APPNAME handling #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-10-05 22:01:37 +02:00
Christian Kamm
96a6d64500
Packaging: Make check for theme.qrc more specific #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-10-05 22:01:37 +02:00
Christian Kamm
08bc21937b
Packaging: Change directory for docs #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-10-05 22:01:37 +02:00
Christian Kamm
f64519bfbd
Move the --version output text to Theme #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-10-05 22:01:37 +02:00
Jenkins for ownCloud
494df32ee4
[tx-robot] updated from transifex
2017-10-05 22:01:37 +02:00
Olivier Goffart
bbbd2319ed
Use QDateTime::currentDateTimeUtc instead of the non utc version
...
QDateTime::currentDateTime is terribly slow.
2017-10-05 22:01:37 +02:00
Olivier Goffart
79c775bcd8
OAuth: Fix crash when closing the browser while identifying
...
To reproduce, log in and click "authorize" on the browser, then close
the browser before the client has replied, (but after redirected to localhost,
i.e. when the client is asking the server for the token)
The problem is that socket can be destroyed so we don't need to answer on a
destroyed socket.
2017-10-05 22:01:37 +02:00
Olivier Goffart
a3b1597d17
OwnSQL: don't parse the error message when we are done
2017-10-05 22:01:37 +02:00
Jocelyn Turcotte
ecb4e96794
SyncJournalDb: Reimplement the db_is_empty logic from csync
...
This reduces the initial sync local discovery time from
2.0 to 0.6 seconds in LargeSyncBench on my machine.
2017-10-05 22:01:37 +02:00
Jocelyn Turcotte
185cb2e39a
Use SyncJournalDb in csync
...
This gets rid of the csync_statedb sqlite layer and use
the same code and same connection as the rest of the SyncEngine.
Missing functions are added to SyncJournalDb and change a few minor
things (like changing SyncJournalFileRecord::_modtime to be an int64
instead of a QDateTime, like it was in csync).
2017-10-05 22:01:37 +02:00
Jocelyn Turcotte
c6610f6fbf
SyncJournalDB: Allow callers of getFileRecord if the query failed
...
The current implementation would return the same value whether the query failed
or if no row would be found. This is something that is currently checked by csync
and needs to be provided if we want to use SyncJournalDB there.
Adjusted all call sites to also check the return value even though they
could still just rely on rec.isValid(), but makes it more explicit as to what
happens for database errors in those cases, if we ever want to gracefully handle
them.
2017-10-05 22:01:37 +02:00
Jocelyn Turcotte
d76ecf015c
SyncJournalDB: Bind phash as a qlonglong instead of a QString
...
This is what csync does and we don't need to pass it as a string
to let sqlite convert it back to a uint64 later.
2017-10-05 22:01:36 +02:00
Jenkins for ownCloud
312f3a9bf3
[tx-robot] updated from transifex
2017-10-05 22:01:36 +02:00
Olivier Goffart
fd9662b803
bandwidthmanager: Fix unregistering devices on delete
...
from the destroyed signal, qobject_cast won't work because the object
is already destroyed. One must use reinterpret_cast then
2017-10-05 22:01:36 +02:00
Olivier Goffart
37810c0a19
PropagateUpload: Fix another non-normalized connect that appears while profiling
2017-10-05 22:01:36 +02:00
Olivier Goffart
38a76ac5bf
benchlargesync: Do several syncs
...
Make sure there is already a small sync before so the database is queried.
Make also a sync after to run an update with many files in the database.
2017-10-05 22:01:36 +02:00
Olivier Goffart
d100f9ac67
c_utf8_from_locale: optimize the UTF8 case on Linux
...
Avoid converting to a QString as an intermediate step
2017-10-05 22:01:36 +02:00
Olivier Goffart
5fc864adb6
csync: use a unordered_map for the FileMap
...
Saves more than 10% of csync_update on LargeSyncBench
2017-10-05 22:01:36 +02:00
Jenkins for ownCloud
2738d5d9ab
[tx-robot] updated from transifex
2017-10-05 22:01:36 +02:00
Olivier Goffart
0936cfee5d
chsck_vio: fix readdir test by removing it.
...
The code that was creating the files in the directory was removed in
commit 6906b8d30c . The directory is empty
so the result is expected to be null. It was passing before because the
code was returning an entry for . and .., but since commit
35f80bd439 this is no longer the case
2017-10-05 22:01:36 +02:00
Olivier Goffart
38962ca694
csync_update: fix assert
...
Amend 1dc44c0f62
2017-10-05 22:01:36 +02:00
Jenkins for ownCloud
7e677516ae
[tx-robot] updated from transifex
2017-10-05 22:01:36 +02:00
Markus Goetz
cabf7a79d5
macOS: Fix compile
2017-10-05 22:01:36 +02:00
Olivier Goffart
2b12990f19
Httpcreds: Fix double slash in the Request App Password url
...
Issue #6044
2017-10-05 22:01:36 +02:00
Olivier Goffart
3184d4bb32
OAuth2: Fix double slash in URL
...
We need to use concatPath to avoid possible double '/' in the URLs if the
account url() ends with '/'.
This has become even more of a problem since commit
d1b8370a4a which was resolving the url after
a redirect where most server actually add a '/' if the url is a folder
2017-10-05 22:01:36 +02:00
Jenkins for ownCloud
0cbbea9796
[tx-robot] updated from transifex
2017-10-05 22:01:35 +02:00
Olivier Goffart
b19677ea97
csync_vio_local: merge readdir and stat in the same call
...
For the remote this was already done long time ago
For windows, this was already partially done
The goal is to avoid needless conversion of the path to local encoding.
2017-10-05 22:01:35 +02:00
Olivier Goffart
dc0a0841fa
csync_update/reconcile: replace CSYNC_LOG with qDebug/qInfo
...
CSYNC_LOG has quite an overhead as it uses vsprintf and it might
be run even if the category is disabled
2017-10-05 22:01:35 +02:00
Christian Kamm
351e65309c
SyncEngine: Adjust free space messaging
...
Before, the way the info message was phrased implied a failure. And
since the large numbers can be hard to compare that can be confusing.
2017-10-05 22:01:35 +02:00
Olivier Goffart
e36c8678d9
csync: remove unused type
2017-10-05 22:01:35 +02:00
Olivier Goffart
f793de4629
RemotePermissions: Store in a class rather than in a QByteArray to save memory
...
Create a specific type that parses the permissions so we can store
it in a short rather than in a QByteArray
Note: in RemotePermissions::toString, we make sure the string is not
empty by adding a space, this was already existing before commit
e8f7adc7ca where it was removed by mistake.
2017-10-05 22:01:35 +02:00
Jenkins for ownCloud
cd4908ac6a
[tx-robot] updated from transifex
2017-10-05 22:01:35 +02:00
Olivier Goffart
0ad05aee0d
Port to new signal-slot syntax what cannot be done automatically
...
Some slot were protected or private but needed to be public.
Some needed a static_cast (can't use qOverload because it is in Qt 5.7)
This is not only a partial change.
2017-10-05 22:01:35 +02:00
Olivier Goffart
190f821d93
DiscoveryPhase: use the new syntax in disconnect
...
Since we used the new syntax in connect, we need to use it in disconnect
2017-10-05 22:01:35 +02:00
Olivier Goffart
7aca2352be
Use the Qt5 connection syntax (automated with clazy)
...
This is motivated by the fact that QMetaObject::noralizeSignature takes 7.35%
CPU of the LargeSyncBench. (Mostly from ABstractNetworkJob::setupConnections and
PropagateUploadFileV1::startNextChunk). It could be fixed by using normalized
signature in the connection statement, but i tought it was a good oportunity
to modernize the code.
This commit only contains calls that were automatically converted with clazy.
2017-10-05 22:01:35 +02:00
Olivier Goffart
3143b32aa5
test/stub: add some call required by the next patches
...
As we use the new connection syntax in folderman.cpp, some more symbol
need to be mocked
2017-10-05 22:01:35 +02:00
Olivier Goffart
e8a76859c1
Include <QAuthenticator> from code that connect to signal that uses it
...
The new connection syntax will need that
2017-10-05 22:01:35 +02:00
Olivier Goffart
c219ceea52
Gui: Use lambda instead of QSignalMapper
...
It's simpler, and QSignalMapper is deprecated in Qt 5.10
2017-10-05 22:01:34 +02:00
Olivier Goffart
608f5034ef
Remove settingsdialog.cpp.Rbt431
2017-10-05 22:01:34 +02:00
Jenkins for ownCloud
78458662a5
[tx-robot] updated from transifex
2017-10-05 22:01:34 +02:00
Markus Goetz
800dd485ef
ChangeLog: More 2.4.0 changes
2017-10-05 22:01:34 +02:00
Jenkins for ownCloud
f4ca43293b
[tx-robot] updated from transifex
2017-10-05 22:01:34 +02:00
Christian Kamm
6161b5519b
Fix compile with bad strrchr signature
2017-10-05 22:01:34 +02:00
Christian Kamm
2cac928810
Conflicts: Upload them files if env variable says so
...
Set OWNCLOUD_UPLOAD_CONFLICT_FILES=1 to trigger this behavior.
Note that this is experimental and unsupported. The real feature is
likely to end up in 2.5.
Uploading conflict files is simply done by removing the pattern from
csync_exclude. The rest here deals with making the conflict notification
ui approximately work.
There are still some concerns about where an uploaded conflict file
appears in the sync protocol and issues list (it should be in both, but
is only in one of them currently!).
See #4557 .
2017-10-05 22:01:34 +02:00
Christian Kamm
05927b68a8
Private links: Retrieve link through propfind property #6020
...
* The sharing ui does a propfind anyway: use that to query the new
property as well!
* For the socket api, asynchronously query the server for the right url
when an action that needs it is triggered.
The old, manually generated URL will be used as fallback in case the
server doesn't support the new property or the property can't be
retrieved for some reason.
Depends on owncloud/core#29021
2017-10-05 22:01:34 +02:00
Jenkins for ownCloud
b3f90111e2
[tx-robot] updated from transifex
2017-10-05 22:01:34 +02:00
Jocelyn Turcotte
254f6291df
Fix the build (make install)
2017-10-05 22:01:34 +02:00
Olivier Goffart
faa7fd1b32
Gui: Allow to add multiple sync folder connection of the same folder
...
... or child folders
There is also no real reason to forbid the user from syncing the same
folder to multiple location on its hardrive.
A real use case is when the user uncheck a big directory using "choose
what to sync", but would still like to sync a folder within this disabled
tree. The user can now do this with the "add folder" feature
Since 2.3, we even support syncing the same local folder to multiple
remote folder, so why not allow syncing the same remote folder several
times?
Relates to issue #3645
2017-10-05 22:01:34 +02:00
Jocelyn Turcotte
76d95f8b87
SyncJournalDB: Only reset_and_clear_bindings once
...
We only need to do it once between each query execution and
that can be right before the first bind.
2017-10-05 22:01:34 +02:00
Jocelyn Turcotte
4e90bd7a5a
csync_update: Remove the check for csync_get_statedb_exists
...
This always returns true since _csync_statedb_is_empty also always
returns true. This function was initially intended to be a shortcut
in case the database doesn't contain any row, but has been broken since
27fb5d9128 and now won't return false
unless the statement fails.
The _last_db_return_error in _csync_detect_update would take care
of that code path in a more direct and clearer way anyway.
2017-10-05 22:01:33 +02:00
Jocelyn Turcotte
81e32e1a08
Move SyncJournalDB to src/common
2017-10-05 22:01:33 +02:00
Jocelyn Turcotte
98ef3050d8
Reverse the dependency between SyncJournalFileRecord and SyncFileItem
...
This will allow us to also use the SyncJournalDB in csync.
2017-10-05 22:01:33 +02:00
Jocelyn Turcotte
4c2e078eac
Move non-csync-dependent parts of FileSystem to src/common
...
This keep the csync-dependent parts in src/libsync, slitting the namespace
over two files.
This will allow moving SyncJournalDB to src/common as well.
2017-10-05 22:01:33 +02:00
Jocelyn Turcotte
dc3c3195b5
Update sync-algorithm.md
...
The rbtree was replaced by a std::map.
2017-10-05 22:01:33 +02:00
Christian Kamm
cda72effe2
Checksums: Clearer behavior and added testing
2017-10-05 22:01:33 +02:00
Jocelyn Turcotte
0f21ed6a5b
Remove SyncFileItem::_isDirectory
...
It's always equivalent to _type == SyncFileItem::Directory.
2017-10-05 22:01:33 +02:00
Jocelyn Turcotte
85a93efe51
Remove SyncFileItem::log
...
This remove the remaining "other" fields of the sync log to save a
bit of memory.
other_etag and other_fileId don't give much information to the users
and other_instruction will always be INST_NONE anyway.
other_modtime and other_size are kept since they are sometimes used.
They were renamed to have a bit more meaningful name.
SyncEngine::checkPermissions will now fetch its information from the
csync trees since they are now preserved until right after this point.
Fixes #3213
2017-10-05 22:01:33 +02:00
Jocelyn Turcotte
82dd1775eb
Remove SyncEngine::_remotePerms
...
Now that csync is using a more convenient data structure for
its file trees, wait a little bit longer before destroying them and
fetch the remote permissions from the remote tree there instead.
2017-10-05 22:01:33 +02:00
Jocelyn Turcotte
3bc1f63b0a
Remove the usage of phash in csync
...
Only store the path since they represent the same thing, and do the
phash conversion during DB lookup like done in libsync.
We could get rid of everything since we also have an index on the path
column, but since it's the primary key this makes the migration non-trivial.
2017-10-05 22:01:33 +02:00
Jocelyn Turcotte
2276df1eec
Replace the custom rbtree by a std::map
2017-10-05 22:01:33 +02:00
Jocelyn Turcotte
ec52807e29
csync: Keep the csync_file_stat_t instances created during discovery
...
Now that they use the same structure, avoid _csync_detect_update
having to recreate another instance and transfer everything manually.
Any instance created during discovery should now be used all the way
up to SyncEngine::treewalkFile.
This also makes sure that the path and types are properly set in that
object instead of having to pass everything as separate parameters.
This gets rid of csync_ftw_flags_e which was now converted from,
and to csync_ftw_type_e, already in the csync_file_stat_t.
Issue #1817
2017-10-05 22:01:33 +02:00
Jenkins for ownCloud
7f88a3e1cd
[tx-robot] updated from transifex
2017-10-05 22:01:33 +02:00
Jenkins for ownCloud
74049e3e92
[tx-robot] updated from transifex
2017-10-05 22:01:33 +02:00
Jenkins for ownCloud
d01c7dc7db
[tx-robot] updated from transifex
2017-10-05 22:01:33 +02:00
Christian Kamm
b92de38c31
AbstractNetworkJob: Allow relative redirect
...
Previously all redirects were considered absolute.
2017-10-05 22:01:32 +02:00
Christian Kamm
78b082a23c
Reduce timeout for some admin jobs
...
The oauth token jobs and the wizard redirect check job shouldn't have
5min timeouts.
2017-10-05 22:01:32 +02:00
Christian Kamm
1aa1e7f833
Wizard: Handle url-shortener redirects #5954
...
Grab any permanent redirects from the base url the user entered
before attempting to connect to a modified url (with status.php
added).
2017-10-05 22:01:32 +02:00
Christian Kamm
4d2261420d
HttpCreds: Remove migration code from 1.7
2017-10-05 22:01:32 +02:00
Christian Kamm
23153a4866
Credentials: Use per-account keychain entries #5830
...
This requires a lot of migration code: the old entries need to be read,
saved to the new locations and then deleted.
2017-10-05 22:01:32 +02:00
Christian Kamm
7f75a533d1
Journal: Second attempt at journal mode fallback #5723
...
Some filesystems, vms or other limitations make using the WAL journal
mode impossible. We are notified of this problem through an sqlite
IOERR for SHMMAP. In that case We want to attempt to fall back to the
DELETE journal mode.
2017-10-05 22:01:32 +02:00
Christian Kamm
e47b8ffaca
OAuth: Don't use implicit POST bodies
...
The query args of POST requests become the request body. If there's a
redirect, the redirected url will therefore not contain the query
arguments. Use an explicit request body to make the redirection work.
2017-10-05 22:01:32 +02:00
Christian Kamm
a79b0a3791
OAuth: Pass client auth in header instead of url
...
To play more nicely with redirects.
2017-10-05 22:01:32 +02:00
Christian Kamm
ce51ea34b9
OAuth: Use redirectable jobs for oauth token management
2017-10-05 22:01:32 +02:00
Christian Kamm
0e8ce9c3db
PropagateUpload: Model of remote quota, avoid some uploads #5537
...
When we see a 507 error, assume that quota is < uploaded size.
2017-10-05 22:01:32 +02:00
Christian Kamm
76faf4937b
SyncOptions/Propagator: Parallelism as an option
...
Very useful for changing it on a per-test basis.
2017-10-05 22:01:32 +02:00
Christian Kamm
df05042e7f
Make DetailError different from BlacklistedError
...
It's quite different in regard to blacklist handling and overall
sync failure changes.
2017-10-05 22:01:32 +02:00
Helmut K. C. Tessarek
e8f17f5b0b
remove qt4 code
2017-10-05 22:01:32 +02:00
Jenkins for ownCloud
7d1285d313
[tx-robot] updated from transifex
2017-10-05 22:01:31 +02:00
Christian Kamm
72131ff4ce
Excludes: Allow escaping # #6012
...
Otherwise adding patterns that start with # are impossible to add, since
they get treated as comments. Also add this escaping for patterns added
in the ui.
2017-10-05 22:01:06 +02:00
Jenkins for ownCloud
c03d53e1dd
[tx-robot] updated from transifex
2017-10-05 22:01:05 +02:00
Jenkins for ownCloud
bc5a6527f9
[tx-robot] updated from transifex
2017-10-05 22:01:05 +02:00
Markus Goetz
7ca1107ea0
ChunkingNgTest: CI debuggability #6015
2017-10-05 22:01:05 +02:00
Christian Kamm
4acb70e79d
Journal: Fall back to DELETE on IO error #5723
...
Also add logging of extended error codes for this IO error, maybe we can
become more specific about which situations should trigger a journal
mode switch.
2017-10-05 22:01:05 +02:00
Christian Kamm
755b18db61
Folder: Check etag again after active sync #4116
...
Maybe more things were happening on the server?
2017-10-05 22:01:05 +02:00
Jenkins for ownCloud
bf8151a8ad
[tx-robot] updated from transifex
2017-10-05 22:01:05 +02:00
Christian Kamm
b810ce7768
Update server url in case of permanent redirection #5972
...
This is the first time the account url may update outside of
account setup.
Summary of redirection handling:
1. During account setup (wizard)
- status.php gets permanently redirected -> adjust url
- authed PROPFIND gets *any* redirection -> adjust url
2. During connectivity ping (ConnectionValidator)
- status.php gets permanently redirected -> adjust url (new!)
All other redirections should be followed transparently and
don't update the account url in the settings.
2017-10-05 22:01:05 +02:00
Christian Kamm
1c0d80c20d
Use DetermineAuthTypeJob in HttpCredentials
...
* Move it to networkjobs
* Minor adjustments to its logic
* Fixes redirect handling for oauth/basic http auth check #6003
2017-10-05 22:01:05 +02:00
Markus Goetz
ed9977a2b3
Add clean_tarball.sh #6005
2017-10-05 22:01:05 +02:00
Jenkins for ownCloud
546c7c420a
[tx-robot] updated from transifex
2017-10-05 22:01:05 +02:00
Jocelyn Turcotte
bdf3f1e271
Windows: Make sure that the folder and Desktop.ini have the right attributes ( #6018 )
...
When created from scratch, the owncloud icon won't be picked-up by
explorer unless the right attributes are set on both the sync root and the
Desktop.ini file.
Issue #2446
2017-10-05 22:01:04 +02:00
rockihack
4e90179065
Enable DEP & ASLR on Windows
2017-10-05 22:01:04 +02:00
Markus Goetz
43f85a787b
Remove qtkeychain submodule #6004
2017-10-05 22:01:04 +02:00
Jocelyn Turcotte
a8c33885bb
Fix the macOS Sparkle build
2017-10-05 22:01:04 +02:00
Christian Kamm
3591849279
Http credentials: Fix behavior for bad password #5989
...
When the GET request from askFromUser is scheduled on the QNAM inside
the slot that handles the QNetworkReply::finished signal, it seems to
not get processed at all.
This workaround moves the sending of the new GET to the event loop,
sidestepping the problem.
2017-10-05 22:01:04 +02:00
Christian Kamm
8a094d2b0e
Fix compile errors
...
cmocka seems to #define fail to something inappropriate.
2017-10-05 22:01:04 +02:00
Jocelyn Turcotte
deb123b80d
csync_statedb: (really) Make sure children of non-synced items aren't read from the DB
...
No tests are covering this and I reversed the original logic.
2017-10-05 22:01:04 +02:00
Jocelyn Turcotte
7a97dc1783
csync_statedb: Make sure children of non-synced items aren't read from the DB
...
Fix a regression during C++ conversion from 704ca366b3
2017-10-05 22:01:04 +02:00
Jocelyn Turcotte
41f215fd8d
Fix build after C++ conversion of csync
...
Use the same macro as in SyncFileItem for bitfields on enums.
Fixes #5993
2017-10-05 22:01:04 +02:00
Jocelyn Turcotte
e0fa5723eb
Use a C++ contructor and destructor for CSYNC
...
Merge csync_create and csync_init into the constructor and
replace csync_destroy with the destructor.
Also use a QByteArray for csync_s::root_perms and flatten
csync_rename_s as a rename sub-struct of csync_s since it
can now handle C++ types.
2017-10-05 22:01:04 +02:00
Jocelyn Turcotte
4947dc22ab
Remove csync_s::replica
...
The only difference with csync_s::current is that it's
assigned the value of csync_s::local::type and
csync_s::remote::type, which never change. So might as
well only use the "current" field with constants.
2017-10-05 22:01:04 +02:00
Jocelyn Turcotte
157e933ae5
Replace TREE_WALK_FILE with csync_file_stat_t
...
Just expose csync_file_stat_t since we don't need an abstraction layer
anymore. Also pass the nodes of both trees directly to the visitor
function.
Issue #1817
2017-10-05 22:01:04 +02:00
Jocelyn Turcotte
7fad474863
Replace csync_vio_file_stat_t with csync_file_stat_t
...
Also move csync_normalize_etag to common/utility since we
don't need the char* function anymore.
Remove the single space file_stat->remotePerm codepath since
this won't be used in csync anymore since
8de3bda0b1 .
Issue #1817
2017-10-05 22:01:04 +02:00
Matthew Setter
26dde9b543
Fix link to download the ownCloud client
...
This was requested in https://github.com/owncloud/documentation/issues/3354 .
2017-10-05 22:01:04 +02:00
Matthew Setter
b43e948167
Fix broken images in FAQ
...
This relates to https://github.com/owncloud/documentation/issues/3354 .
2017-10-05 22:01:03 +02:00
Jürgen Weigert
9da3822305
Update ChangeLog
2017-10-05 22:01:03 +02:00
Jocelyn Turcotte
61d949730b
Make csync_file_stat_t public and partly convert to C++
...
This is the first commit trying to unify csync_file_stat_s,
csync_vio_file_stat_s and csync_tree_walk_file_s. Use QByteArray
and unique_ptr already since I'm not used to track memory allocations
and this will make the transition easier.
Issue #1817
2017-10-05 22:01:03 +02:00
Jocelyn Turcotte
bfc7ea562d
Move Utility to a new common static library
...
Now that csync builds as C++, this will avoid having to implement
functionalities needed by csync mandatorily in csync itself.
This library is built as part of libocsync and symbols exported
through it.
This requires a relicense of Utility as LGPL. All classes moved into
this library from src/libsync will need to be relicensed as well.
2017-10-05 22:01:03 +02:00
Christian Kamm
6d8c98f6b4
Add minor unittest for numeric id extraction #5933
2017-10-05 22:01:03 +02:00
Jocelyn Turcotte
4aca1b9697
StatusTracker: Fix different case paths not matching ( #5981 )
...
Use a custom std::map comparator functor to do all comparisons
on contained QStrings using Qt::CaseInsensitive on macOS and Windows.
Issue #5257
2017-10-05 22:01:03 +02:00
Jürgen Weigert
f96990b489
fix branded nemo and caja shell integration ( #5966 )
...
* Update createcajaplugin.sh
* first apply branding, then create copies. Better.
Fixes https://github.com/owncloud/ownbrander/issues/753
* fix https://github.com/owncloud/ownbrander/issues/752 too.
2017-10-05 22:01:03 +02:00
Jocelyn Turcotte
7280359c66
Fix cmocka deprecation warnings
...
Just use cmocka_run_group_tests like we already use in
some of those tests.
2017-10-05 22:01:03 +02:00
Jocelyn Turcotte
b30c3202f0
Enable csync logs in unit tests
...
Go through the Logger to enable the csync-QDebug bridge.
2017-10-05 22:01:03 +02:00
Jocelyn Turcotte
ac4be17192
Compile almost all of csync as C++
...
This will allow us to unify data structures between csync and libsync.
Utility functions like csync_time and c_std are still compiled as C
since we won't need to be coupled with Qt in the short term.
2017-10-05 22:01:03 +02:00
Jocelyn Turcotte
39e9938cad
Use .cpp for existing csync .cc files
...
Make this consistent with the rest of the client code.
2017-10-05 22:01:03 +02:00
Jocelyn Turcotte
f897a91354
Move csync to src/csync
2017-10-05 22:01:03 +02:00
Jocelyn Turcotte
5948f26884
Move csync/tests to test/csync
2017-10-05 22:01:03 +02:00
Jocelyn Turcotte
95579b3de1
Move csync/tests/ownCloud to test/scripts/txpl
2017-10-05 22:00:57 +02:00
Christian Kamm
90befac901
Rename detection: File size must be equal
...
Comparison of file sizes for potential conflicts was added in
0eb9401c62 , but did not extend to checking
the file size in case of potential local moves.
This commit adds this check and adds tests for various move+change
scenarios.
2017-10-05 14:17:07 +02:00
Christian Kamm
22f71ce17e
t9.pl: Make more reliable
...
Sometimes the 'touch' didn't change the mtime since too little time had
passed!
2017-10-05 14:13:10 +02:00
Markus Goetz
0931f25747
ChangeLog: Re-format and re-order
2017-10-05 13:07:42 +02:00
Markus Goetz
971f2391cf
ChangeLog: More 2.4.0 changes
2017-10-05 12:52:50 +02:00
Christian Kamm
43a26eb50a
Excludes: Fix bug with escapes in the regex, add tests
2017-10-05 10:40:53 +02:00
Christian Kamm
99d406072f
Excludes: optimize csync_is_windows_reserved_word
2017-10-05 10:19:48 +02:00
Markus Goetz
3a1a56c7ad
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 10:19:48 +02:00
Jenkins for ownCloud
57cbba81e7
[tx-robot] updated from transifex
2017-10-05 02:18:35 +02:00
Markus Goetz
e48d55d126
sqlite: Update bundled version to 3.20.1
...
For OS X and Windows.
2017-10-04 17:12:12 +02:00
Jürgen Weigert
1c03fa8642
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-04 07:49:27 +02:00
Jenkins for ownCloud
670ff36024
[tx-robot] updated from transifex
2017-10-04 02:18:35 +02:00
Jenkins for ownCloud
6b3f6d9860
[tx-robot] updated from transifex
2017-10-03 02:18:33 +02:00
Jenkins for ownCloud
ac5876e94e
[tx-robot] updated from transifex
2017-10-02 02:18:33 +02:00
Jenkins for ownCloud
b13f44023d
[tx-robot] updated from transifex
2017-10-01 02:18:33 +02:00
Jenkins for ownCloud
2f15d8aef5
[tx-robot] updated from transifex
2017-09-30 02:18:32 +02:00
rockihack
ecaa37efbe
Linux Hardening
...
see: https://wiki.debian.org/Hardening#User_Space
2017-09-29 14:34:30 +02:00
Jenkins for ownCloud
33e421473c
[tx-robot] updated from transifex
2017-09-29 02:18:33 +02:00
Jürgen Weigert
eb1a96c164
Update clean_tarball.sh
...
warning against removing sqlite. it is used with Linux with cmake switch on CentOS6
USE_OUR_OWN_SQLITE3=TRUE
2017-09-28 21:09:43 +02:00
Jürgen Weigert
2afcac763d
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-09-28 19:32:55 +02:00
Jürgen Weigert
28fe903aee
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-09-28 19:01:55 +02:00
Olivier Goffart
253d197ccb
fixup! [tx-robot] updated from transifex
2017-09-28 18:38:33 +02:00
Olivier Goffart
0ceb806f1a
Test OAuth2
...
Include a test for PR #6057
2017-09-28 18:38:33 +02:00
Olivier Goffart
800b9cf167
SyncEngine: _hasNoneFiles should be set when there are INSTRUCTION_UPDATE_METADATA
2017-09-28 11:15:36 +02:00
Olivier Goffart
1da398e6c6
OAuth: fix compilation with old gcc
...
We need to used QPointer::data in the signal slot connection
Relates to pr #6065
2017-09-28 10:55:28 +02:00
Jenkins for ownCloud
074cb132bb
[tx-robot] updated from transifex
2017-09-28 02:18:36 +02:00
Markus Goetz
2df74fd9d7
Updater: Rudimentary support for beta channel
...
So we can get people update from our alpha to the beta and rc
2017-09-27 16:23:34 +02:00
Roeland Jago Douma
cba78eb11f
Merge pull request #2 from nextcloud/update-readme
...
Update README
2017-09-27 14:03:23 +02:00
Roeland Jago Douma
cc7cb6b650
Remove templates for now
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-09-27 14:02:49 +02:00
Christoph Wurst
8eb466c9c5
Update README
...
Adjust branding and remove some sections
2017-09-27 14:00:02 +02:00
Olivier Goffart
d68b07dfc7
Fix encoding of version string
2017-09-27 12:06:49 +02:00
Olivier Goffart
a52dff713b
csync_rename: optimize lookup
...
Avoid many memory allocations in reconcile
2017-09-27 11:41:55 +02:00
Olivier Goffart
041c5e6d44
csync_reconcile: Optimize reconcile by avoiding alocations
...
Fix performence regression from commit d66c2b5fae
For every new file we would look up every parent directories. Allocating
a new QByteArreay for every parent riectory just to know if it is in the other
tree is wasting lots of CPU.
Use a ByteArrayRef trick, similar to QStringRef
2017-09-27 11:41:55 +02:00
Dominik Schmidt
a2ce739192
Set CMAKE_INSTALL_RPATH as RPATH for installed executables
2017-09-27 09:13:44 +02:00
Christian Kamm
ca4ad58a06
Packaging: Add options for fine-grained builds #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-09-27 09:13:44 +02:00
Christian Kamm
89df8fb692
Packaging: Adjust APPNAME handling #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-09-27 09:13:44 +02:00
Christian Kamm
9a021d2279
Packaging: Make check for theme.qrc more specific #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-09-27 09:13:44 +02:00
Christian Kamm
82e87805c3
Packaging: Change directory for docs #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-09-27 09:13:44 +02:00
Christian Kamm
844bfc5f25
Move the --version output text to Theme #5957
...
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
2017-09-27 09:13:44 +02:00
Jenkins for ownCloud
706c68f69c
[tx-robot] updated from transifex
2017-09-27 02:18:33 +02:00
Olivier Goffart
13e0cc6b50
Use QDateTime::currentDateTimeUtc instead of the non utc version
...
QDateTime::currentDateTime is terribly slow.
2017-09-26 16:14:17 +02:00
Olivier Goffart
7af81f7665
OAuth: Fix crash when closing the browser while identifying
...
To reproduce, log in and click "authorize" on the browser, then close
the browser before the client has replied, (but after redirected to localhost,
i.e. when the client is asking the server for the token)
The problem is that socket can be destroyed so we don't need to answer on a
destroyed socket.
2017-09-26 14:56:57 +02:00
Olivier Goffart
278129b286
OwnSQL: don't parse the error message when we are done
2017-09-26 11:03:23 +02:00
Jocelyn Turcotte
54c522c861
SyncJournalDb: Reimplement the db_is_empty logic from csync
...
This reduces the initial sync local discovery time from
2.0 to 0.6 seconds in LargeSyncBench on my machine.
2017-09-26 11:03:23 +02:00
Jocelyn Turcotte
a034ee894c
Use SyncJournalDb in csync
...
This gets rid of the csync_statedb sqlite layer and use
the same code and same connection as the rest of the SyncEngine.
Missing functions are added to SyncJournalDb and change a few minor
things (like changing SyncJournalFileRecord::_modtime to be an int64
instead of a QDateTime, like it was in csync).
2017-09-26 11:03:23 +02:00
Jocelyn Turcotte
6f46764daa
SyncJournalDB: Allow callers of getFileRecord if the query failed
...
The current implementation would return the same value whether the query failed
or if no row would be found. This is something that is currently checked by csync
and needs to be provided if we want to use SyncJournalDB there.
Adjusted all call sites to also check the return value even though they
could still just rely on rec.isValid(), but makes it more explicit as to what
happens for database errors in those cases, if we ever want to gracefully handle
them.
2017-09-26 11:03:23 +02:00
Jocelyn Turcotte
e1d482ea7c
SyncJournalDB: Bind phash as a qlonglong instead of a QString
...
This is what csync does and we don't need to pass it as a string
to let sqlite convert it back to a uint64 later.
2017-09-26 11:03:23 +02:00
Jenkins for ownCloud
c34ec00d3a
[tx-robot] updated from transifex
2017-09-26 02:18:33 +02:00
Olivier Goffart
090abdee87
bandwidthmanager: Fix unregistering devices on delete
...
from the destroyed signal, qobject_cast won't work because the object
is already destroyed. One must use reinterpret_cast then
2017-09-25 12:56:20 +02:00
Olivier Goffart
ce04a76b17
PropagateUpload: Fix another non-normalized connect that appears while profiling
2017-09-25 12:49:55 +02:00
Olivier Goffart
2953eed729
benchlargesync: Do several syncs
...
Make sure there is already a small sync before so the database is queried.
Make also a sync after to run an update with many files in the database.
2017-09-25 12:49:55 +02:00
Olivier Goffart
bf2b089c5c
c_utf8_from_locale: optimize the UTF8 case on Linux
...
Avoid converting to a QString as an intermediate step
2017-09-25 10:35:28 +02:00
Olivier Goffart
3107e63040
csync: use a unordered_map for the FileMap
...
Saves more than 10% of csync_update on LargeSyncBench
2017-09-25 10:35:28 +02:00
Jenkins for ownCloud
2ec8194d01
[tx-robot] updated from transifex
2017-09-25 02:18:29 +02:00
Olivier Goffart
d113498c7b
chsck_vio: fix readdir test by removing it.
...
The code that was creating the files in the directory was removed in
commit 6906b8d30c . The directory is empty
so the result is expected to be null. It was passing before because the
code was returning an entry for . and .., but since commit
35f80bd439 this is no longer the case
2017-09-25 00:17:47 +02:00
Olivier Goffart
d8206ccbc7
csync_update: fix assert
...
Amend 1dc44c0f62
2017-09-25 00:17:47 +02:00
Jenkins for ownCloud
fbd8de1c24
[tx-robot] updated from transifex
2017-09-24 02:18:33 +02:00
Markus Goetz
81d9f94a29
macOS: Fix compile
2017-09-23 13:42:39 +02:00
Olivier Goffart
382cc444f0
Httpcreds: Fix double slash in the Request App Password url
...
Issue #6044
2017-09-23 10:10:40 +02:00
Olivier Goffart
0cec6f08ca
OAuth2: Fix double slash in URL
...
We need to use concatPath to avoid possible double '/' in the URLs if the
account url() ends with '/'.
This has become even more of a problem since commit
d1b8370a4a which was resolving the url after
a redirect where most server actually add a '/' if the url is a folder
2017-09-23 10:10:40 +02:00
Jenkins for ownCloud
2112e16cca
[tx-robot] updated from transifex
2017-09-23 02:18:30 +02:00
Olivier Goffart
35f80bd439
csync_vio_local: merge readdir and stat in the same call
...
For the remote this was already done long time ago
For windows, this was already partially done
The goal is to avoid needless conversion of the path to local encoding.
2017-09-22 16:18:18 +02:00
Olivier Goffart
1dc44c0f62
csync_update/reconcile: replace CSYNC_LOG with qDebug/qInfo
...
CSYNC_LOG has quite an overhead as it uses vsprintf and it might
be run even if the category is disabled
2017-09-22 11:12:19 +02:00
Christian Kamm
eae3f7ce0a
SyncEngine: Adjust free space messaging
...
Before, the way the info message was phrased implied a failure. And
since the large numbers can be hard to compare that can be confusing.
2017-09-22 11:07:27 +02:00
Olivier Goffart
aa322d41aa
csync: remove unused type
2017-09-22 09:58:55 +02:00
Olivier Goffart
95d23b1914
RemotePermissions: Store in a class rather than in a QByteArray to save memory
...
Create a specific type that parses the permissions so we can store
it in a short rather than in a QByteArray
Note: in RemotePermissions::toString, we make sure the string is not
empty by adding a space, this was already existing before commit
e8f7adc7ca where it was removed by mistake.
2017-09-22 09:29:08 +02:00
Jenkins for ownCloud
0464cdb43f
[tx-robot] updated from transifex
2017-09-22 02:18:30 +02:00
Olivier Goffart
35e4fe061d
Port to new signal-slot syntax what cannot be done automatically
...
Some slot were protected or private but needed to be public.
Some needed a static_cast (can't use qOverload because it is in Qt 5.7)
This is not only a partial change.
2017-09-21 14:05:39 +02:00
Olivier Goffart
02924ad83e
DiscoveryPhase: use the new syntax in disconnect
...
Since we used the new syntax in connect, we need to use it in disconnect
2017-09-21 14:05:39 +02:00
Olivier Goffart
ff4213b59f
Use the Qt5 connection syntax (automated with clazy)
...
This is motivated by the fact that QMetaObject::noralizeSignature takes 7.35%
CPU of the LargeSyncBench. (Mostly from ABstractNetworkJob::setupConnections and
PropagateUploadFileV1::startNextChunk). It could be fixed by using normalized
signature in the connection statement, but i tought it was a good oportunity
to modernize the code.
This commit only contains calls that were automatically converted with clazy.
2017-09-21 14:05:39 +02:00
Olivier Goffart
c4e51247d8
test/stub: add some call required by the next patches
...
As we use the new connection syntax in folderman.cpp, some more symbol
need to be mocked
2017-09-21 14:05:39 +02:00
Olivier Goffart
1218a38f2c
Include <QAuthenticator> from code that connect to signal that uses it
...
The new connection syntax will need that
2017-09-21 14:05:39 +02:00
Olivier Goffart
797f8087bc
Gui: Use lambda instead of QSignalMapper
...
It's simpler, and QSignalMapper is deprecated in Qt 5.10
2017-09-21 14:05:39 +02:00
Olivier Goffart
bf77ac6ba5
Remove settingsdialog.cpp.Rbt431
2017-09-21 09:25:45 +02:00
Jenkins for ownCloud
eafb006649
[tx-robot] updated from transifex
2017-09-21 02:18:30 +02:00
Markus Goetz
a9bf7a90ed
ChangeLog: More 2.4.0 changes
2017-09-20 14:44:33 +02:00
Jenkins for ownCloud
ee7593bbe3
[tx-robot] updated from transifex
2017-09-20 02:18:35 +02:00
Christian Kamm
30843cd368
Fix compile with bad strrchr signature
2017-09-19 12:44:59 +02:00
Christian Kamm
53195b064a
Conflicts: Upload them files if env variable says so
...
Set OWNCLOUD_UPLOAD_CONFLICT_FILES=1 to trigger this behavior.
Note that this is experimental and unsupported. The real feature is
likely to end up in 2.5.
Uploading conflict files is simply done by removing the pattern from
csync_exclude. The rest here deals with making the conflict notification
ui approximately work.
There are still some concerns about where an uploaded conflict file
appears in the sync protocol and issues list (it should be in both, but
is only in one of them currently!).
See #4557 .
2017-09-19 11:45:38 +02:00
Christian Kamm
dca2664707
Private links: Retrieve link through propfind property #6020
...
* The sharing ui does a propfind anyway: use that to query the new
property as well!
* For the socket api, asynchronously query the server for the right url
when an action that needs it is triggered.
The old, manually generated URL will be used as fallback in case the
server doesn't support the new property or the property can't be
retrieved for some reason.
Depends on owncloud/core#29021
2017-09-19 10:51:03 +02:00
Jenkins for ownCloud
e1dfc38a90
[tx-robot] updated from transifex
2017-09-19 02:18:38 +02:00
Jocelyn Turcotte
2e90e9c35b
Fix the build (make install)
2017-09-18 15:32:05 +02:00
Olivier Goffart
8f5110900c
Gui: Allow to add multiple sync folder connection of the same folder
...
... or child folders
There is also no real reason to forbid the user from syncing the same
folder to multiple location on its hardrive.
A real use case is when the user uncheck a big directory using "choose
what to sync", but would still like to sync a folder within this disabled
tree. The user can now do this with the "add folder" feature
Since 2.3, we even support syncing the same local folder to multiple
remote folder, so why not allow syncing the same remote folder several
times?
Relates to issue #3645
2017-09-18 15:17:06 +02:00
Jocelyn Turcotte
5e332983e2
SyncJournalDB: Only reset_and_clear_bindings once
...
We only need to do it once between each query execution and
that can be right before the first bind.
2017-09-18 14:00:52 +02:00
Jocelyn Turcotte
6e240a3e9c
csync_update: Remove the check for csync_get_statedb_exists
...
This always returns true since _csync_statedb_is_empty also always
returns true. This function was initially intended to be a shortcut
in case the database doesn't contain any row, but has been broken since
27fb5d9128 and now won't return false
unless the statement fails.
The _last_db_return_error in _csync_detect_update would take care
of that code path in a more direct and clearer way anyway.
2017-09-18 14:00:52 +02:00
Jocelyn Turcotte
a1f1775d15
Move SyncJournalDB to src/common
2017-09-18 14:00:52 +02:00
Jocelyn Turcotte
5fbed0d1cd
Reverse the dependency between SyncJournalFileRecord and SyncFileItem
...
This will allow us to also use the SyncJournalDB in csync.
2017-09-18 14:00:52 +02:00
Jocelyn Turcotte
bd25225045
Move non-csync-dependent parts of FileSystem to src/common
...
This keep the csync-dependent parts in src/libsync, slitting the namespace
over two files.
This will allow moving SyncJournalDB to src/common as well.
2017-09-18 14:00:52 +02:00
Jocelyn Turcotte
013eba0e79
Update sync-algorithm.md
...
The rbtree was replaced by a std::map.
2017-09-18 14:00:52 +02:00
Christian Kamm
78212e03d6
Checksums: Clearer behavior and added testing
2017-09-18 12:52:09 +02:00
Jocelyn Turcotte
a8ea7b0858
Remove SyncFileItem::_isDirectory
...
It's always equivalent to _type == SyncFileItem::Directory.
2017-09-18 11:46:09 +02:00
Jocelyn Turcotte
0e97770c47
Remove SyncFileItem::log
...
This remove the remaining "other" fields of the sync log to save a
bit of memory.
other_etag and other_fileId don't give much information to the users
and other_instruction will always be INST_NONE anyway.
other_modtime and other_size are kept since they are sometimes used.
They were renamed to have a bit more meaningful name.
SyncEngine::checkPermissions will now fetch its information from the
csync trees since they are now preserved until right after this point.
Fixes #3213
2017-09-18 11:46:09 +02:00
Jocelyn Turcotte
3d7bd7583b
Remove SyncEngine::_remotePerms
...
Now that csync is using a more convenient data structure for
its file trees, wait a little bit longer before destroying them and
fetch the remote permissions from the remote tree there instead.
2017-09-18 11:46:09 +02:00
Jocelyn Turcotte
bfacac8683
Remove the usage of phash in csync
...
Only store the path since they represent the same thing, and do the
phash conversion during DB lookup like done in libsync.
We could get rid of everything since we also have an index on the path
column, but since it's the primary key this makes the migration non-trivial.
2017-09-18 11:46:09 +02:00
Jocelyn Turcotte
d66c2b5fae
Replace the custom rbtree by a std::map
2017-09-18 11:46:09 +02:00
Jocelyn Turcotte
72e44ce3d7
csync: Keep the csync_file_stat_t instances created during discovery
...
Now that they use the same structure, avoid _csync_detect_update
having to recreate another instance and transfer everything manually.
Any instance created during discovery should now be used all the way
up to SyncEngine::treewalkFile.
This also makes sure that the path and types are properly set in that
object instead of having to pass everything as separate parameters.
This gets rid of csync_ftw_flags_e which was now converted from,
and to csync_ftw_type_e, already in the csync_file_stat_t.
Issue #1817
2017-09-18 11:46:09 +02:00
Jenkins for ownCloud
0806e0466c
[tx-robot] updated from transifex
2017-09-18 02:18:30 +02:00
Jenkins for ownCloud
c05ca51238
[tx-robot] updated from transifex
2017-09-17 02:18:29 +02:00
Jenkins for ownCloud
1a4a5bfc57
[tx-robot] updated from transifex
2017-09-16 02:18:35 +02:00
Christian Kamm
be5d5aea6d
AbstractNetworkJob: Allow relative redirect
...
Previously all redirects were considered absolute.
2017-09-15 15:25:10 +02:00
Christian Kamm
8635b8ac84
Reduce timeout for some admin jobs
...
The oauth token jobs and the wizard redirect check job shouldn't have
5min timeouts.
2017-09-15 15:25:10 +02:00
Christian Kamm
d1b8370a4a
Wizard: Handle url-shortener redirects #5954
...
Grab any permanent redirects from the base url the user entered
before attempting to connect to a modified url (with status.php
added).
2017-09-15 15:25:10 +02:00
Christian Kamm
1f57fd0407
HttpCreds: Remove migration code from 1.7
2017-09-15 09:29:05 +02:00
Christian Kamm
671599c8b2
Credentials: Use per-account keychain entries #5830
...
This requires a lot of migration code: the old entries need to be read,
saved to the new locations and then deleted.
2017-09-15 09:29:05 +02:00
Christian Kamm
0b4fd52d63
Journal: Second attempt at journal mode fallback #5723
...
Some filesystems, vms or other limitations make using the WAL journal
mode impossible. We are notified of this problem through an sqlite
IOERR for SHMMAP. In that case We want to attempt to fall back to the
DELETE journal mode.
2017-09-15 09:28:35 +02:00
Christian Kamm
e05f5fc50d
OAuth: Don't use implicit POST bodies
...
The query args of POST requests become the request body. If there's a
redirect, the redirected url will therefore not contain the query
arguments. Use an explicit request body to make the redirection work.
2017-09-15 09:28:03 +02:00
Christian Kamm
da6250fc1f
OAuth: Pass client auth in header instead of url
...
To play more nicely with redirects.
2017-09-15 09:28:03 +02:00
Christian Kamm
7d075cdcb7
OAuth: Use redirectable jobs for oauth token management
2017-09-15 09:28:03 +02:00
Christian Kamm
3a55ff2119
PropagateUpload: Model of remote quota, avoid some uploads #5537
...
When we see a 507 error, assume that quota is < uploaded size.
2017-09-15 09:27:07 +02:00
Christian Kamm
b5b055e1ae
SyncOptions/Propagator: Parallelism as an option
...
Very useful for changing it on a per-test basis.
2017-09-15 09:27:07 +02:00
Christian Kamm
0c99673581
Make DetailError different from BlacklistedError
...
It's quite different in regard to blacklist handling and overall
sync failure changes.
2017-09-15 09:27:07 +02:00
Helmut K. C. Tessarek
709aa27031
remove qt4 code
2017-09-15 07:11:05 +02:00
Jenkins for ownCloud
5b01d63491
[tx-robot] updated from transifex
2017-09-15 02:18:32 +02:00
Jürgen Weigert
46b3d41b20
Update release_template.md
2017-09-15 00:37:12 +02:00
Christian Kamm
0b7ad2c804
Excludes: Allow escaping # #6012
...
Otherwise adding patterns that start with # are impossible to add, since
they get treated as comments. Also add this escaping for patterns added
in the ui.
2017-09-14 14:53:05 +02:00
Jenkins for ownCloud
8392d6c136
[tx-robot] updated from transifex
2017-09-14 02:18:30 +02:00
Jenkins for ownCloud
4ced7e9c80
[tx-robot] updated from transifex
2017-09-13 02:18:31 +02:00
Markus Goetz
3d120983da
ChunkingNgTest: CI debuggability #6015
2017-09-12 17:26:54 +02:00
Christian Kamm
70aafd74a8
Journal: Fall back to DELETE on IO error #5723
...
Also add logging of extended error codes for this IO error, maybe we can
become more specific about which situations should trigger a journal
mode switch.
2017-09-12 14:12:24 +02:00
Christian Kamm
66415831ea
Folder: Check etag again after active sync #4116
...
Maybe more things were happening on the server?
2017-09-12 13:58:59 +02:00
Jenkins for ownCloud
2b7919fb3a
[tx-robot] updated from transifex
2017-09-12 02:18:30 +02:00
Christian Kamm
09173fb727
Update server url in case of permanent redirection #5972
...
This is the first time the account url may update outside of
account setup.
Summary of redirection handling:
1. During account setup (wizard)
- status.php gets permanently redirected -> adjust url
- authed PROPFIND gets *any* redirection -> adjust url
2. During connectivity ping (ConnectionValidator)
- status.php gets permanently redirected -> adjust url (new!)
All other redirections should be followed transparently and
don't update the account url in the settings.
2017-09-11 19:27:36 +02:00
Christian Kamm
de5de6284c
Use DetermineAuthTypeJob in HttpCredentials
...
* Move it to networkjobs
* Minor adjustments to its logic
* Fixes redirect handling for oauth/basic http auth check #6003
2017-09-11 19:15:43 +02:00
Markus Goetz
de8ab35cb3
Add clean_tarball.sh #6005
2017-09-11 18:56:22 +02:00
Jenkins for ownCloud
237b597e19
[tx-robot] updated from transifex
2017-09-11 16:03:15 +02:00
Jocelyn Turcotte
2d7a4bdb06
Windows: Make sure that the folder and Desktop.ini have the right attributes ( #6018 )
...
When created from scratch, the owncloud icon won't be picked-up by
explorer unless the right attributes are set on both the sync root and the
Desktop.ini file.
Issue #2446
2017-09-11 15:32:42 +02:00
rockihack
6f270a3648
Enable DEP & ASLR on Windows
2017-09-11 11:18:18 +02:00
Markus Goetz
8be2aaa751
Remove qtkeychain submodule #6004
2017-09-08 15:23:16 +02:00
Jocelyn Turcotte
5ede5ab4ce
Fix the macOS Sparkle build
2017-09-08 13:58:14 +02:00
Christian Kamm
506f7c0764
Http credentials: Fix behavior for bad password #5989
...
When the GET request from askFromUser is scheduled on the QNAM inside
the slot that handles the QNetworkReply::finished signal, it seems to
not get processed at all.
This workaround moves the sending of the new GET to the event loop,
sidestepping the problem.
2017-09-07 11:23:24 +02:00
Christian Kamm
4b686a4394
Fix compile errors
...
cmocka seems to #define fail to something inappropriate.
2017-09-07 11:02:05 +02:00
Jocelyn Turcotte
a18a601291
csync_statedb: (really) Make sure children of non-synced items aren't read from the DB
...
No tests are covering this and I reversed the original logic.
2017-09-07 10:26:19 +02:00
Jocelyn Turcotte
92fc50d4b0
csync_statedb: Make sure children of non-synced items aren't read from the DB
...
Fix a regression during C++ conversion from 704ca366b3
2017-09-07 10:17:58 +02:00
Jocelyn Turcotte
57c812bc00
Merge pull request #5979 from owncloud/csync-merge-filestat-types
...
csync: Merge csync_vio_file_stat_t, csync_file_stat_t and TREE_WALK_FILE data structures
2017-09-06 13:09:16 +02:00
Jocelyn Turcotte
715b8c4683
Fix build after C++ conversion of csync
...
Use the same macro as in SyncFileItem for bitfields on enums.
Fixes #5993
2017-09-06 13:08:23 +02:00
Jocelyn Turcotte
b1bb7ec1a8
Use a C++ contructor and destructor for CSYNC
...
Merge csync_create and csync_init into the constructor and
replace csync_destroy with the destructor.
Also use a QByteArray for csync_s::root_perms and flatten
csync_rename_s as a rename sub-struct of csync_s since it
can now handle C++ types.
2017-09-06 13:08:23 +02:00
Jocelyn Turcotte
f6136dd036
Remove csync_s::replica
...
The only difference with csync_s::current is that it's
assigned the value of csync_s::local::type and
csync_s::remote::type, which never change. So might as
well only use the "current" field with constants.
2017-09-06 13:08:23 +02:00
Jocelyn Turcotte
cb49635231
Replace TREE_WALK_FILE with csync_file_stat_t
...
Just expose csync_file_stat_t since we don't need an abstraction layer
anymore. Also pass the nodes of both trees directly to the visitor
function.
Issue #1817
2017-09-06 13:08:23 +02:00
Jocelyn Turcotte
e8f7adc7ca
Replace csync_vio_file_stat_t with csync_file_stat_t
...
Also move csync_normalize_etag to common/utility since we
don't need the char* function anymore.
Remove the single space file_stat->remotePerm codepath since
this won't be used in csync anymore since
8de3bda0b1 .
Issue #1817
2017-09-06 13:08:23 +02:00
Matthew Setter
ab8061a57f
Fix link to download the ownCloud client
...
This was requested in https://github.com/owncloud/documentation/issues/3354 .
2017-09-06 09:09:14 +02:00
Matthew Setter
f414355680
Fix broken images in FAQ
...
This relates to https://github.com/owncloud/documentation/issues/3354 .
2017-09-06 09:08:53 +02:00
Jürgen Weigert
6dd043659c
Update ChangeLog
2017-09-05 18:20:03 +02:00
Jocelyn Turcotte
704ca366b3
Make csync_file_stat_t public and partly convert to C++
...
This is the first commit trying to unify csync_file_stat_s,
csync_vio_file_stat_s and csync_tree_walk_file_s. Use QByteArray
and unique_ptr already since I'm not used to track memory allocations
and this will make the transition easier.
Issue #1817
2017-09-05 17:25:19 +02:00
Jocelyn Turcotte
cf15cbf0b3
Move Utility to a new common static library
...
Now that csync builds as C++, this will avoid having to implement
functionalities needed by csync mandatorily in csync itself.
This library is built as part of libocsync and symbols exported
through it.
This requires a relicense of Utility as LGPL. All classes moved into
this library from src/libsync will need to be relicensed as well.
2017-09-05 17:25:19 +02:00
Christian Kamm
de7c301654
Add minor unittest for numeric id extraction #5933
2017-09-05 13:40:26 +02:00
Jocelyn Turcotte
48d2fc1599
StatusTracker: Fix different case paths not matching ( #5981 )
...
Use a custom std::map comparator functor to do all comparisons
on contained QStrings using Qt::CaseInsensitive on macOS and Windows.
Issue #5257
2017-08-31 13:32:00 +02:00
Jürgen Weigert
839361594d
fix branded nemo and caja shell integration ( #5966 )
...
* Update createcajaplugin.sh
* first apply branding, then create copies. Better.
Fixes https://github.com/owncloud/ownbrander/issues/753
* fix https://github.com/owncloud/ownbrander/issues/752 too.
2017-08-31 13:16:34 +02:00
Jocelyn Turcotte
40abe3f370
Merge pull request #5978 from owncloud/csync-cpp
...
Move csync to src/ and compile most of it at C++
2017-08-25 15:36:32 +02:00
Roeland Jago Douma
cacba220f9
Merge pull request #48 from nextcloud-gmbh/master-oc
...
Bump to oc master
2017-08-25 15:06:26 +02:00
Roeland Jago Douma
cdc5c1db43
Merge remote-tracking branch 'oc/master' into master-oc
2017-08-23 15:40:35 +02:00
Jocelyn Turcotte
7a5a706397
Fix cmocka deprecation warnings
...
Just use cmocka_run_group_tests like we already use in
some of those tests.
2017-08-22 15:22:57 +02:00
Jocelyn Turcotte
59ea79d9e6
Enable csync logs in unit tests
...
Go through the Logger to enable the csync-QDebug bridge.
2017-08-22 15:22:56 +02:00
Jocelyn Turcotte
4e5898efd7
Compile almost all of csync as C++
...
This will allow us to unify data structures between csync and libsync.
Utility functions like csync_time and c_std are still compiled as C
since we won't need to be coupled with Qt in the short term.
2017-08-22 15:22:56 +02:00
Jocelyn Turcotte
a512586140
Use .cpp for existing csync .cc files
...
Make this consistent with the rest of the client code.
2017-08-22 11:18:22 +02:00
Jocelyn Turcotte
28a0971cdf
Move csync to src/csync
2017-08-22 11:18:22 +02:00
Jocelyn Turcotte
5c9827a33c
Move csync/tests to test/csync
2017-08-22 11:18:22 +02:00
Jocelyn Turcotte
f0362b2332
Move csync/tests/ownCloud to test/scripts/txpl
2017-08-22 11:18:22 +02:00
Martin
5bf48bc68f
Merge pull request #5974 from owncloud/Documentation_Activity_Update
...
Documentation improvement for #5969
2017-08-20 21:09:42 +02:00
Martin
6e47d9a2e5
Documentation improvement for #5969
2017-08-20 18:17:58 +02:00
Jocelyn Turcotte
a480a318fd
Hardcode Desktop.ini in the exclude list
...
This prevents it from being removed from the exclude list, which
would be an issue since the client itself creates this file in a way
that wouldn't match on machines with different installation paths.
2017-08-15 13:37:33 +02:00
Jocelyn Turcotte
251f1d0047
Windows: Use the application icon for the sidebar
...
By setting the icon in Desktop.ini of the root folder, this adds the icon
both when browsing the folder directly and to the sidebar shortcut.
To avoid overwriting any user setting that could exist in Desktop.ini,
only do this if the file doesn't exist. Editing .ini files on Windows
isn't trivial and isn't worth it given that this file won't exist most
of the time.
Fixes #2446
2017-08-15 13:37:33 +02:00
Markus Goetz
1c3127e43b
CMake: Print the Qt version and path #5957 #5932
2017-08-14 14:24:27 +02:00
Roeland Jago Douma
63d99f3e30
Merge pull request #47 from nextcloud-gmbh/drone_qt5.9
...
Add Qt5.9 to drone
2017-08-05 21:15:30 +02:00
Roeland Jago Douma
067c174e61
Add Qt5.9 to drone
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-05 21:08:45 +02:00
Roeland Jago Douma
993e1eb89c
Merge pull request #46 from nextcloud-gmbh/drone_57_58
...
Add qt5.7 and qt5.8 CI tests
2017-08-05 14:37:26 +02:00
Roeland Jago Douma
6cb4131024
Add qt5.7 and qt5.8 CI tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-05 14:29:13 +02:00
Markus Goetz
20a979173f
Sync Folder: Add file manager favorite also in folder wizard #455
...
Not only in the account wizard.
2017-08-04 17:38:01 +02:00
Markus Goetz
4aad318446
Upload: Log the checksum / file hash
2017-08-04 15:42:11 +02:00
Markus Goetz
13a5653c4e
ChangeLog: More 2.4.0 stuff
2017-08-04 15:23:44 +02:00
Roeland Jago Douma
ceccc661f1
Merge pull request #43 from nextcloud-gmbh/drone
...
Get drone up and running
2017-08-04 10:55:06 +02:00
Roeland Jago Douma
53087ac803
Add drone test for Qt-5.6
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-03 22:29:46 +02:00
Matthew Setter
119ecb4259
Merge pull request #5762 from owncloud/update-docs-to-2.3.2
...
Update client docs version string to 2.3.2
2017-08-03 13:56:39 +02:00
Matthew Setter
8bd047174a
Update client docs version string to 2.4.0
...
Need to update this to match the latest version.
2017-08-01 17:28:50 +02:00
Matthew Setter
416393a794
Merge pull request #5929 from owncloud/doc-cleanup
...
Clean up the client docs removing old, outdated, content
2017-08-01 11:52:05 +02:00
Jocelyn Turcotte
9e36cabcbf
macos: Add a sidebar icon
...
In the process, use an iconset to generate the icns using iconutil.
Also add some missing icon resolutions according to the guidelines.
Issue #296
2017-07-31 18:43:47 +02:00
Matthew Setter
3731eba9b6
Clean up the client docs removing old, outdated, content
...
This makes changes as suggested by @michaelstingl in
https://github.com/owncloud/documentation/issues/3240 .
2017-07-31 14:04:02 +02:00
Olivier Goffart
f707a43b3c
FolderWizard: fix crash in FolderWizardRemotePath::slotHandleLsColNetworkError
...
The Job is a LsColJob, not a MkColJob!
Reproduce by entering a name with invalid character that cause an error 400
in the folder wizard's remote path line edit.
(Relates issue #5924 )
2017-07-28 11:57:08 +02:00
Jocelyn Turcotte
7a96e8a292
General settings: Put all advanced checkboxes in a layout
...
The mac style has the concept of Layout Item Rectangle that bleeds
widgets margins into parent margins. This unfortunately doesn't work
when the parent layout doesn't have any margin, like we do when we
have the hierarchy:
Vertical(normal margin)
/ Horizontal(no margin, uses parent layout spacing)
/Widget
I guess Qt should propagate remaining uneaten margins to grand-parent
layouts and so on to have this work properly, but nobody seems to
have touched that code since Qt 4.4.
So just try to make the problem less worse by making sure that
all checkboxes we want to align are either in the same layout, or
in a loyout of their own.
Issue #5492
2017-07-27 17:37:27 +02:00
Jocelyn Turcotte
90cce0ab56
Fix the selective sync notification folder list being cropped
...
The maximumHeight would stay at the last animated value.
Issue #5492
2017-07-27 17:37:27 +02:00
Olivier Goffart
41ed603abf
AccountState: reset _waitingForNewCredentials when signin in
...
Just to force the logic to re-ask the credenticals, in case we were
already asking them when singin off.
Issue: https://github.com/owncloud/client/issues/5893#issuecomment-316949686
2017-07-26 14:58:28 +02:00
Markus Goetz
cdce7f2044
encoding_tests: No more iconv
2017-07-26 11:46:18 +02:00
Olivier Goffart
6ae88514d8
OAuth: clear refresh token when the server claim not to support oauth
...
Allow upgrade path when the server removes support for oauth
Relates: https://github.com/owncloud/client/issues/5848#issuecomment-317353049
We also need to force the account to commit the config to the disk,
otherwise we may not register we are no longer using owncloud and we
risk sending the password as the token to the token refresh API call
2017-07-25 12:34:13 +02:00
Olivier Goffart
c043840cb1
OAuth: Fix refresh of token after expiration
...
Before commit d3b00532b1 ,
fetchFromKeychain was called everytime we detect that the creds are
invalid (in AccountState::slotInvalidCredentials)
But since that commit, AccountState was calling askFromUser directly,
breaking the refresh of the token.
So I made sure AccountState::slotInvalidCredentials still calls
refreshAccessToken.
Another change that was made was too be sure to clear the cookies
in HttpCredentials::invalidateToken even when we are only clearing the
access_token. That's because the session with a cookie may stay valid
longer than the access_token
2017-07-25 12:34:13 +02:00
Olivier Goffart
a831164d65
Revert "Revert "Discovery: consider also the "shared by me" as shared""
...
This reverts commit efa7821dd2 .
This reverts the revert, but also add a check that the server version
is bigger than 10.0
Issue #4788
2017-07-25 12:11:33 +02:00
Jocelyn Turcotte
a41dc00160
Don't keep the list of touched files for the whole sync
...
We only want to know if they were touched within the last 15 seconds,
so change the data structure to use a QMultiMap, and sort them by
QElapsedTimer. This allows us to iterate over old entries ordered by
time and to stop once we find a recent entry.
This makes the look-up slower but in most cases the folder watcher
will report any change within milliseconds, and we start from the
most recent. What this really makes slower are actual user file
changes while a fast sync is underways which will need to iterate
over the whole map to find out the file isn't there.
This reduces the growth of the memory usage when downloading a large
amount of files.
2017-07-24 17:54:29 +02:00
Jocelyn Turcotte
5a1bf7d8fe
windows: Fix a memory leak in FileSystem::longWinPath
...
Also use c_path_to_UNC directly instead of doing an extra
UTF-8->wchar conversion.
2017-07-24 17:54:29 +02:00
Olivier Goffart
075c423c62
buildint.rst: Put back reference to openssl on windows
...
OpenSSL might no longer be needed to build the client, but we still need
it to run it.
That reverts part of commit 6e57b0219e for
this file.
Fix #5858
Reported in https://central.owncloud.org/t/locally-built-client-error-creating-ssl-context/8264
2017-07-21 08:57:57 +02:00
Olivier Goffart
d9813dbc90
Propagator: fix a qMax which should have been a qMin
2017-07-18 08:58:07 +02:00
Olivier Goffart
50874eecfa
OAuth: Add the user in the authorize call
...
Issues: #5897 , https://github.com/owncloud/oauth2/issues/48
2017-07-17 10:13:12 +02:00
Olivier Goffart
3cea550d08
PropagateUpload: Remove the Qt workaround against data corruption
...
This was only for Qt <= 5.4, which we don't really support anymore.
And even then, the data corruption is happens very seldomly anyway.
2017-07-17 10:12:48 +02:00
Olivier Goffart
5e9d6f1cbd
Merge pull request #5905 from kaustubh-welankar/issue_5692_pull
...
Fix for issue number #5692 :
Abort owncloudcmd if the capabilities call fails.
2017-07-17 08:38:57 +02:00
Olivier Goffart
b1363d1a79
AccessManager: Disable HTTP/2 without TLS
...
Qt would otherwise still try to do HTTP/2 connection even over "http://".
And that does not work with server that does not support it
2017-07-17 08:20:17 +02:00
Olivier Goffart
520923b5a7
HTTP/2 Support
...
We need Qt 5.9 for HTTP2 because, even if Qt 5.8 already has support
for it, there is some critical bug in the HTTP2 implementation which
make it unusable [ https://codereview.qt-project.org/186050 and
https://codereview.qt-project.org/186066 ]
When using HTTP2, we can use many more parallel network request, this
is especially good for small file handling
Lower the priority of the GET and PUT propagation jobs, so the quota
or selective sync ui PROPFIND will not be blocked by them
2017-07-17 08:20:17 +02:00
Olivier Goffart
2ba46e05ee
Merge pull request #5326 from owncloud/cleanup_tests
...
Use OWNCLOUD_BIN_DIR directly in C++ code.
2017-07-15 14:48:25 +02:00
Kaustubh Welankar
90ed57f478
Change error message. Removed Qt5 if check
2017-07-15 16:50:40 +05:30
Markus Goetz
ab580103c7
csync_vio: Better log for stat errors
2017-07-14 15:37:56 +02:00
Kaustubh Welankar
1c6a83d0dd
Fix for issue number 5692
2017-07-14 16:50:49 +05:30
Olivier Goffart
06f3a70f9a
OAuth: Better message when loggin in with the wrong username
...
Since the user is already in the browser, put the error message in the
browser with a message to log out and then log in as the right user.
Issue #5895
2017-07-14 11:17:24 +02:00
Markus Goetz
1fb68e8711
X-Request-ID: Send per request not per account #5853
2017-07-14 09:14:01 +02:00
Christian Kamm
bd107e133f
Ensure qsrand is called
2017-07-13 18:06:40 +02:00
Christian Kamm
1c2d5f16c8
Account: Send a X-Request-ID header #5853
2017-07-13 18:06:40 +02:00
Olivier Goffart
5738110cb6
OAuth2: Have a link to the browser in the owncloud UI
...
When the browser is open, ad a link in the ui to re-open
the browser.
Issue #5893
2017-07-13 16:09:42 +02:00
Kashyap Prajapati
6be122edc4
Broken URL fixed in Dockerfile
...
Url to mingw repo fixed.
2017-07-13 14:49:00 +02:00
Christian Kamm
7979342edf
AccountSettings: Draw a box to indicate pending conflicts
2017-07-13 11:48:10 +02:00
Christian Kamm
2cdf5517cb
Conflicts: Detect and show in issues tab
...
Incidentally fixes a potential issue where conflicts were silently-
ignored and thus deleted if the parent folder was deleted.
2017-07-13 11:48:10 +02:00
Markus Goetz
7adcb76f68
check_vio_ext: Align with new UTF8 behaviour on macOS
2017-07-13 10:01:17 +02:00
Olivier Goffart
acf65b4c23
csync: Use Qt for encodeing/decoding filesystem strings
...
Issues:
- #5661 On mac, iconv did not support all of unicode and some
files with emoji in the filename could not be uploaded
- #5719 , #5676 On linux, we will now support non utf-8 locale
2017-07-13 10:01:17 +02:00
Olivier Goffart
d099c2a8db
csync: Move the locale<->utf8 conversion to a different file
...
It's a C++ file so we will be able to use Qt from it
2017-07-13 10:01:17 +02:00
Olivier Goffart
20f1257e88
csync: Remove iconv depedency
...
We use iconv to normalize the string on mac. But the iconv version
on mac does not support full unicode.
So we will use Qt to normalize the string
2017-07-13 10:01:17 +02:00
Christian Kamm
fe0de111fd
IssuesWidget: Fix insertion of sync errors before item errors
2017-07-12 10:10:00 +02:00
Christian Kamm
e7a0c1b6d0
SyncEngineTest: _size now correct for uploads #5855
2017-07-12 10:09:04 +02:00
Christian Kamm
da54b3d7e5
Merge remote-tracking branch 'origin/2.3'
2017-07-12 10:06:04 +02:00
Christian Kamm
971abaea80
IssuesWidget: Add button to retry 507 errors #5537
...
Since these errors are blacklisted, it can take up to 24h to retry items
that had a 507 error for a while. This way users can intervene and cause
an upload attempt immediately.
2017-07-12 09:04:27 +02:00
Christian Kamm
a76670f3b8
IssuesWidget: Hide folder column when possible
2017-07-12 09:04:27 +02:00
Christian Kamm
e13b618a65
Add ElidedLabel
...
A label that adjusts its text based on Qt::TextElideMode.
2017-07-12 09:04:27 +02:00
Christian Kamm
cd1b89475c
PropagateUpload: Better messaging for 507 #5537
...
It now produces a summary error message indicating the problem.
Adjust blacklist database table to contain 'errorCategory'. This is
useful for two things:
- Reestablishing summary messages based on blacklisted errors. For
example if we don't retry a 507ed file, we still want to show the
message about space on the server
- Selectively wiping the blacklist: When we have ui for something like
"I deleted some files, please retry all files now!", we want to
delete all blacklist entries of a specific category only.
2017-07-12 09:04:27 +02:00
Christian Kamm
5d90b48790
PropagateUpload: Put upload error handling in one function
2017-07-12 09:04:27 +02:00
Christian Kamm
c3cb186952
ProgressInfo: Carry a sync status
...
* A bunch of code was determining sync status by ad-hoc comparing some
progress info fields. It can now just check the status, making it
easier to comprehend.
* There's a clear indication for "a new sync is starting", which helps
wiping the issues tab at the right time.
2017-07-12 09:04:27 +02:00
Christian Kamm
5ca743dd25
SyncEngine: Introduce overall errors that are not tied to a file #5746
...
For now we use them for:
* csync errors: This allows them to appear in the sync issues tab
* insufficient local disk space, as a summary of individual file errors
Insufficient remote space will use them too, as might other issues that
are bigger than a single sync item.
2017-07-12 09:04:27 +02:00
Jenkins for ownCloud
c9db5d234f
[tx-robot] updated from transifex
2017-07-12 02:18:29 +02:00
Samuel Alfageme
4fd773d4ae
More refs. to corresponding issue/PR on 2.3.3 changelog
2017-07-11 17:29:49 +02:00
Markus Goetz
5d67271acd
ChangeLog: 2.3.3
2017-07-11 17:18:56 +02:00
Olivier Goffart
d34dbbdb0b
OAuth: Redirects to the server in case of sucessfull login
...
Requires https://github.com/owncloud/oauth2/pull/45
This commit moves the reply after we got the token reply from
the server, that allows to reply with an error to the browser
if the login does not work.
2017-07-11 09:56:04 +02:00
Jenkins for ownCloud
f52cefaa94
[tx-robot] updated from transifex
2017-07-11 02:18:29 +02:00
Christian Kamm
1c9b51c330
IssuesTab: Hide filters if they wouldn't be useful
...
As suggested by @dragotin
2017-07-10 11:13:48 +02:00
Christian Kamm
122854af77
FolderMan: Add missing folderListChanged emits
...
She signal of a folder list change was not emitted when folders were
deleted from the list.
2017-07-10 11:13:48 +02:00
Jenkins for ownCloud
2c127ae2d5
[tx-robot] updated from transifex
2017-07-10 02:18:29 +02:00
Jenkins for ownCloud
7db4455592
[tx-robot] updated from transifex
2017-07-09 02:18:29 +02:00
Christian Kamm
a5ace5e71d
Account/Credentials: Have identical lifetimes
...
The QNAM may continue to outlive both.
Rename Credentials::getQNAM() to createQNAM() while we're at it - it's
used to make a new QNAM that will subsequently be owned by the Account
object.
See d01065b9a1 for rationale.
Relates to
d40c56eda5
147cf798a6
2017-07-08 13:07:13 +02:00
Jenkins for ownCloud
0d926f7632
[tx-robot] updated from transifex
2017-07-08 02:18:29 +02:00
Jocelyn Turcotte
af4f1083b7
shell/windows Build 46: Private links context menu
2017-07-07 18:10:48 +02:00
Jürgen Weigert
186f16e688
Update building.rst
2017-07-07 16:01:20 +02:00
Christian Kamm
99b1f69271
Link share: Remove direct download if unavailable #5837
...
It would have been much nicer to keep the menu assigned to the
QToolButton, but if one switches away from InstantPopup (to adjust the
entries before they're displayed), the button always gets a menu
indicator that can't be removed.
2017-07-07 11:23:32 +02:00
Christian Kamm
e54be1c4ee
Link shares: Add "show file listing" option #5837
2017-07-07 11:23:32 +02:00
Christian Kamm
411621bf03
shell integrations: Change share menu title to "Share..."
...
Since the appname is in the context submenu title already.
Also drop APPNAME string.
2017-07-07 10:50:07 +02:00
Christian Kamm
ca2ffd4fb3
SocketAPI: Change strings to a consistent _MENU_TITLE postfix
2017-07-07 10:49:51 +02:00
Jocelyn Turcotte
3b20684dc7
shell/macos: Remove legacy (< 10.10) overlay icons
...
Having to update the plugins to add a submenu in the context menu,
it's more cost-effective to remove support for legacy macOS versions
than implementing and testing this setup.
2017-07-07 10:49:51 +02:00
Jocelyn Turcotte
b6db9789ee
shell/macos: Use a submenu to include private link actions
2017-07-07 10:49:51 +02:00
Jocelyn Turcotte
7a4daf799a
shell/windows: Use a submenu to include private link actions
...
Refactor things a bit to be able to reuse some code and
clean things up.
2017-07-07 10:49:51 +02:00
Jocelyn Turcotte
389499d639
SocketApi: Add GET_STRINGS:BEGIN and END
...
The Windows shell extension relied on the response of
SHARE_MENU_TITLE to advance its state machine, but in order
to use the new GET_STRINGS instead, we need to know when the
last string was received. Also add BEGIN for consistency.
2017-07-07 10:49:51 +02:00
Jocelyn Turcotte
7b58a82840
SocketApi: Adjust the format of the mailto: URL
...
Minor tweaks that weren't actually an issue, but just in case.
2017-07-07 10:49:51 +02:00
Jocelyn Turcotte
9d818066a7
SocketApi: Improve logging
2017-07-07 10:49:51 +02:00
Christian Kamm
0238a29c7c
Introduce private link sharing #5023
...
* SocketAPI has COPL_LOCAL_LINK / EMAIL_LOCAL_LINK commands
* The nautilus and dolphing shell integrations show a submenu from which
one can share as well as access the private link.
* The SocketAPI provides a new GET_STRINGS command to access localized
strings.
* The private link can also be accessed from the user/group sharing
dialog.
* The numeric file id is extracted from the full id to create the
private link url.
2017-07-07 10:49:51 +02:00
Jenkins for ownCloud
383ba63c5a
[tx-robot] updated from transifex
2017-07-07 02:18:31 +02:00
Jenkins for ownCloud
4e5e290ec2
[tx-robot] updated from transifex
2017-07-07 01:15:16 +02:00
Christian Kamm
d01065b9a1
Fix crash on account deletion
...
Calling forgetSensitiveData() on account deletion leads to a timer for
clearQNAMCache() being queued. Then the Account object is deleted. The
Credentials object stays alive for now because it has a deleteLater
deleter.
If the timer calls into a slot on the Credentials object, the _account
pointer will be invalid at this time.
As a workaround, move the target slot to Account - that way it will not
be called as the account object is already destroyed.
However since Account and Credentials are mutually dependent, it would
be much preferable if their lifetimes were linked, avoiding this
category of bugs.
The current behavior was introduced in
d40c56eda5 and I currently don't
understand why - maybe there's another way of dealing with the problem
that existed then.
2017-07-06 14:34:02 +02:00
Hefee
607287a9d6
Use OWNCLOUD_BIN_DIR directly in C++ code.
...
No need to do a STR replacement and the macro changing the path.
It actually broke test execution for Debian.
See https://bugs.debian.org/844937
2017-07-06 08:41:02 +02:00
Jenkins for ownCloud
01b3cde79b
[tx-robot] updated from transifex
2017-07-06 02:18:28 +02:00
Jenkins for ownCloud
5b0fea195d
[tx-robot] updated from transifex
2017-07-05 02:18:35 +02:00
ckamm
ce8341ca1f
Add a more functional error view #5516 ( #5861 )
...
* Add a more functional error view #5516
* Allow filtering of ignores and warnings to see only important bits.
* Navigate from the folder view to the error view by clicking on the
error list with the red background.
* Move the error list into its own ui file to allow easier extension.
* Fix issue around tab id handling in ActivitySettings.
* Rename "Action" column to "Issue".
* Change mouse cursor to hand over button and new error list area
Several OSX fixes provided by guruz.
2017-07-04 14:08:41 +02:00
Christian Kamm
9493e8f42e
AccountState: Add a 1-5min reconnection delay #5872
...
This only applies when the server was explicitly in maintenance mode or
when it was 503-unavailable.
2017-07-04 13:12:41 +02:00
Christian Kamm
b1aaf055b1
Blacklist: Don't let errors become warnings #5516
...
Before, blacklisted errors were set to FileIgnored status and hence
displayed as warnings. Now, they have their own BlacklistedError
category which allows them to appear as errors in the issues list and in
the shell integration icons.
2017-07-04 13:07:51 +02:00
Olivier Goffart
34e75f80bc
main.cpp: Fix a compiler warning
...
src/gui/main.cpp:112:9: warning: bool literal returned from 'main' [-Wmain]
Used 1 to keep previous behaviour. I supposed the code was meant
to return success (0), but it does not really matter anyway.
2017-07-04 11:43:07 +02:00
Markus Goetz
f4d1a07b72
SyncEngine: Keep local size in SyncItem #5855
2017-07-04 11:42:44 +02:00
Christian Kamm
0db095e02a
SyncEngineTest: Fix test reliability
...
There was a rounding issue in the mtimes which sometimes resulted in an
off-by-one error. Caused by storing a full QDateTime in the FileInfo but
the mtime saved to the disk being truncated to seconds.
2017-07-04 09:57:22 +02:00
Jenkins for ownCloud
99f5580c37
[tx-robot] updated from transifex
2017-07-04 02:18:29 +02:00
Olivier Goffart
30095a0c3f
Fix check_csync_update
...
Commit 8160963110 changed the
SQL requests from csync to read from the checksumtype table.
So we need to add this table in the fake DB as well
2017-07-03 17:26:29 +02:00
Olivier Goffart
946c6967e9
Fix check_csync_exclude test
...
Commit 4697f0274f remove .htaccess from
the sync-exclude.lst, so use another known excluded pattern
2017-07-03 17:26:29 +02:00
Piotr Mrowczynski
d1e00099dc
Classify chunked items correctly. Issue #5850
2017-07-03 14:41:53 +02:00
Markus Goetz
f49985697b
TestSyncJournalDB: Fix concurrent usage on CI
2017-07-03 14:08:39 +02:00
Christian Kamm
d018d460e3
csync tests: remove stray 'print'
2017-07-03 13:16:55 +02:00
Christian Kamm
851a3128e4
SyncEngine: Add unittest for SyncFileItem properties #5855
...
Checks instruction, direction, size, modtime for three common cases.
2017-07-03 12:54:24 +02:00
Christian Kamm
bdb8a4a0cb
csync tests: Fix for new owncloudcmd return codes
...
These were introduced in 4af45394f9
2017-07-03 11:48:38 +02:00
Jenkins for ownCloud
2a410217e2
[tx-robot] updated from transifex
2017-07-03 02:18:29 +02:00
Jenkins for ownCloud
2c0e820d9a
[tx-robot] updated from transifex
2017-07-02 02:18:29 +02:00
Jenkins for ownCloud
2326ea77e6
[tx-robot] updated from transifex
2017-07-01 02:18:28 +02:00
Jenkins for ownCloud
e6984f4058
[tx-robot] updated from transifex
2017-06-30 02:18:46 +02:00
Samuel Alfageme
aeea27b57b
Update central.owncloud.org link
...
Desktop client category was renamed, old link was 404 - see: https://central.owncloud.org/t/new-central-categories-you-decide
2017-06-29 17:54:42 +02:00
Samuel Alfageme
0f70bd7913
Update central.owncloud.org link
...
Desktop client category was renamed, old link was 404 - see: https://central.owncloud.org/t/new-central-categories-you-decide
2017-06-29 17:52:00 +02:00
Roeland Jago Douma
d810c13304
Merge pull request #27 from nextcloud-gmbh/wording-fix
...
Change wording from synchronizing to synchronized
2017-06-29 16:06:07 +02:00
Jan-Christoph Borchardt
3d2f5b6af1
Change wording from synchronizing to synchronized
2017-06-29 15:36:57 +02:00
Jenkins for ownCloud
e8f95743cc
[tx-robot] updated from transifex
2017-06-29 02:22:16 +02:00
Roeland Jago Douma
e240904a32
Merge pull request #33 from nextcloud-gmbh/update_doc
...
Point to NC doc repo
2017-06-28 16:44:31 +02:00
Roeland Jago Douma
58e0c6c630
Point to NC doc repo
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-06-28 16:40:42 +02:00
Roeland Jago Douma
501394ec6f
Merge pull request #32 from nextcloud-gmbh/oc_master
...
Oc master
2017-06-28 13:24:24 +02:00
Jenkins for ownCloud
fd0b8f3583
[tx-robot] updated from transifex
2017-06-28 02:22:09 +02:00
Jenkins for ownCloud
2a52b087fd
[tx-robot] updated from transifex
2017-06-27 02:22:10 +02:00
Jenkins for ownCloud
c70cdd61ca
[tx-robot] updated from transifex
2017-06-26 02:22:09 +02:00
Jenkins for ownCloud
5979db1270
[tx-robot] updated from transifex
2017-06-25 02:22:09 +02:00
Jenkins for ownCloud
0edc29dc72
[tx-robot] updated from transifex
2017-06-24 02:22:16 +02:00
Jenkins for ownCloud
5e4aaab91b
[tx-robot] updated from transifex
2017-06-23 02:22:09 +02:00
Markus Goetz
59bbbd5e66
Jenkinsfile: Some comments
2017-06-22 15:42:56 +02:00
Markus Goetz
1e98ba27c6
CSyncSqliteTest: Fix test
2017-06-22 15:11:49 +02:00
Markus Goetz
2244b35a6d
test_journal.db: Add checksumtype table
2017-06-22 15:11:49 +02:00
Christian Kamm
15ee7b39ac
Merge remote-tracking branch 'origin/2.3'
2017-06-22 14:06:31 +02:00
Jenkins for ownCloud
6a298d180d
[tx-robot] updated from transifex
2017-06-22 02:22:09 +02:00
Markus Goetz
cb7d74a063
Jenkinsfile: Compile in debug because of all the asserts
2017-06-21 15:11:55 +02:00
Markus Goetz
bc946053a3
Jenkinsfile: Compile in debug because of all the asserts
2017-06-21 15:02:26 +02:00
Markus Goetz
bfe095b065
Jenkinsfile: Run verbose tests
2017-06-21 12:18:21 +02:00
Markus Goetz
30bcd45a14
Jenkinsfile: Run full testing
2017-06-21 12:13:01 +02:00
Markus Goetz
cd5ad7db64
Jenkinsfile: Run full testing
2017-06-21 12:12:08 +02:00
Markus Goetz
1332e7d66a
Jenkinsfile: 2.3.3 will ship with Qt 5.
...
This should fix the current CI run too
2017-06-21 11:59:24 +02:00
Markus Goetz
f44d3914ef
owncloudcmd: Explain --debug parameter
2017-06-21 10:01:32 +02:00
Jenkins for ownCloud
949e8e5f51
[tx-robot] updated from transifex
2017-06-21 02:22:08 +02:00
Christian Kamm
1e78a14f1a
Ignore ui: Add the sync journal patterns #5844
...
The ignore patterns for the journal files are hardcoded. Add them to
the UI to make them discoverable.
2017-06-20 13:35:34 +02:00
Christian Kamm
4291ea47f7
Journal: Don't use a ._ path if it won't work #5633
...
When synchronizing a folder on a samba share, creating files that begin
with ._ is often forbidden. This prevented the client from creating
its ._sync_abcdef.db file.
Now, it'll check whether the preferred filename is creatable, and if
it isn't it'll use .sync_abcdef.db instead.
The disadvantage is that this alternative path won't be ignored by
older clients - that was the reason for the ._ prefix.
2017-06-20 13:35:34 +02:00
Jenkins for ownCloud
b50706a7aa
[tx-robot] updated from transifex
2017-06-20 02:22:12 +02:00
Jocelyn Turcotte
b20f87eef3
shell/Windows: Update binaries to build 45
2017-06-19 12:11:11 +02:00
Frederik Juul Christiani
bc2e1a53cb
shell_integration/windows: Create _newQueries as a non-signaled auto-reset event.
...
Since ResetEvent() is never called, the call to WaitForMultipleObjects()
can always return immediately once the event has been signaled.
2017-06-19 12:11:11 +02:00
Frederik Juul Christiani
e7d4d12e16
Initialize stop variable.
...
Avoid stopping the worker thread immediately if the stop variable happens to be true.
2017-06-19 12:11:11 +02:00
Jenkins for ownCloud
f348a7d4f4
[tx-robot] updated from transifex
2017-06-19 02:22:08 +02:00
Jenkins for ownCloud
9c82c36c71
[tx-robot] updated from transifex
2017-06-18 02:22:08 +02:00
Jenkins for ownCloud
480388133e
[tx-robot] updated from transifex
2017-06-17 02:22:17 +02:00
Jocelyn Turcotte
5d24a2dc0f
Remove debug messages by default from sync.engine
...
Other categories were already set properly.
2017-06-15 20:10:30 +02:00
Christian Kamm
8160963110
Compare the hash of files with identical mtime/size #5589
...
* For conflicts where mtime and size are identical:
a) If there's no remote checksum, skip (unchanged)
b) If there's a remote checksum that's a useful hash, create a
PropagateDownload job and compute the local hash. If the hashes
are identical, don't download the file and just update metadata.
* Avoid exposing the existence of checksumTypeId beyond the database
layer. This makes handling checksums easier in general because they
can usually be treated as a single blob.
This change was prompted by the difficulty of producing file_stat_t
entries uniformly from PROPFINDs and the database.
2017-06-15 13:54:16 +02:00
Christian Kamm
d50d8b86cf
SyncEngineTest: Add network override
...
This is useful for monitoring what kind of network requests are
sent to the fake server. Such as "did this sync cause an upload?"
and "was there a propfind for this path?". It can also inject
custom replies.
2017-06-15 13:53:57 +02:00
Christian Kamm
b28e06608c
SyncEngineTest: Send 'checksums' in FakePropfind
2017-06-15 13:53:57 +02:00
Christian Kamm
cd411e5fb1
SyncEngineTest: Fix date locale related bug
...
The client is very picky about date strings it accepts. If dates are
formatted with a non-C locale (such as localized weekday names), it
fails to parse it and tests fail in subtle ways.
2017-06-15 13:53:57 +02:00
Jocelyn Turcotte
9daef50ce6
shell/Windows: Update binaries to build 45
2017-06-14 14:17:50 +02:00
Frederik Juul Christiani
fae178f70b
shell_integration/windows: Create _newQueries as a non-signaled auto-reset event.
...
Since ResetEvent() is never called, the call to WaitForMultipleObjects()
can always return immediately once the event has been signaled.
2017-06-14 12:14:22 +02:00
Frederik Juul Christiani
744208f701
Initialize stop variable.
...
Avoid stopping the worker thread immediately if the stop variable happens to be true.
2017-06-14 12:14:21 +02:00
Olivier Goffart
85d8ae6b93
AccountSettings: Triggering log in re-ask about previously rejected certificates #5819
...
Issue #5819
2017-06-14 11:48:24 +02:00
Jenkins for ownCloud
ff79cc9107
[tx-robot] updated from transifex
2017-06-14 02:22:19 +02:00
Olivier Goffart
5100a2daf1
OAuth: cleanup debug messages
...
- Add category to the all messages (they did not have it was merged right after
the patch to add category everywhere, but this code did not have it.)
- Make sure there is no warnings in the normal flow. (The wizard does a request
without authentication to determine the auth type)
2017-06-13 12:08:24 +02:00
Olivier Goffart
6e57b0219e
Don't link dirrectly against openssl
...
All our crypto code is handled by qt nodaways.
No need to carry this dependency.
Especially since it causes warnings on system where there are
twp openssl version installed:
/usr/bin/ld: warning: libcrypto.so.1.0.0, needed by /usr/lib/libQt5Network.so.5.9.0, may conflict with libcrypto.so.1.1
2017-06-13 11:27:23 +02:00
Markus Goetz
3a002a1ddf
Update ChangeLog
2017-06-12 18:46:57 +02:00
Christian Kamm
4b0d956b3d
OAuth: Fix a typo in the success message
2017-06-12 12:58:20 +02:00
Olivier Goffart
85408961ba
Wizard: Don't let the second to last page go back with OAuth2
...
We don't want to re-open the browser in that case.
2017-06-12 12:58:20 +02:00
Olivier Goffart
04b6794318
OAuth: Error handling in the wizard
...
Issues: #5813 and #5811
2017-06-12 12:58:20 +02:00
Jenkins for ownCloud
e86b6b2246
[tx-robot] updated from transifex
2017-06-09 02:22:10 +02:00
Olivier Goffart
3314a472c3
SyncEngine: SelectiveSync: Remove local files of undelected folder despite other modified files
...
Issue #5783
When the directry that should be removed by selective sync contains changes,
we ignore the whole sub tree instead of only ignoreing new files.
We cannot ignore the whole directory, we need to ignore only the directory
that do not have files to remove
2017-06-08 14:53:54 +02:00
Christian Kamm
aeeb408c74
Merge branch '2.3'
2017-06-08 13:02:34 +02:00
Olivier Goffart
18c39197e5
ownsql: fix build on jenkins
...
sqlite3_system_errno was only added in sqlite 3.12
(cherry picked from commit e2e56f45af )
2017-06-08 12:53:45 +02:00
Christian Kamm
7eb8219419
Add extra logging for SQLITE_CANTOPEN errors #5633
...
(cherry picked from commit 05c1dcef9b )
2017-06-08 12:52:58 +02:00
Jenkins for ownCloud
2f915af690
[tx-robot] updated from transifex
2017-06-08 02:22:10 +02:00
Jenkins for ownCloud
272898a792
[tx-robot] updated from transifex
2017-06-07 02:22:13 +02:00
Olivier Goffart
63c40b45e4
OAuth: Fix the secret to the one from commit 05fd985f9f in the oauth2 repository
...
05fd985f9f
2017-06-06 14:49:34 +02:00
Olivier Goffart
c17a678385
FolderStatusModel: fix assert in Qt when the list of subfolder is empty
...
Fix an assert that happens in beginInsertRows when opening a folder
and that folder is empty.
This can only be reproduced with a debug build of Qt.
2017-06-06 14:49:03 +02:00
Olivier Goffart
e2e56f45af
ownsql: fix build on jenkins
...
sqlite3_system_errno was only added in sqlite 3.12
2017-06-06 14:47:11 +02:00
Christian Kamm
05c1dcef9b
Add extra logging for SQLITE_CANTOPEN errors #5633
2017-06-06 12:59:57 +02:00
Christian Kamm
cc5fe558ba
Fix maintenance mode detection #5755
...
The server sends "maintenance": "true" which isn't a json boolean...
2017-06-06 10:45:41 +02:00
Jenkins for ownCloud
68ee08440e
[tx-robot] updated from transifex
2017-06-05 02:22:03 +02:00
Jenkins for ownCloud
b02b99003a
[tx-robot] updated from transifex
2017-06-03 02:22:02 +02:00
Jenkins for ownCloud
e3306abbcb
[tx-robot] updated from transifex
2017-06-02 02:22:13 +02:00
Olivier Goffart
3d93527a8e
Authentication with OAuth2
...
When the OAuth2 app (https://github.com/owncloud/oauth2 ) is enabled,
We will open a browser and perform the OAuth2 authentication
Issue: #4798 and https://github.com/owncloud/platform/issues/17
2017-06-01 10:39:33 +02:00
Markus Goetz
8a19f2ac65
ChangeLog: More things that were done until now
2017-06-01 10:37:01 +02:00
Julius Härtl
b7fa50be4c
Set proper application name, icon name for freedesktop notifications
...
Use application name defined in OEM build configuration
2017-06-01 10:01:05 +02:00
Jenkins for ownCloud
61d05fa4d7
[tx-robot] updated from transifex
2017-05-31 02:22:17 +02:00
Markus Goetz
42751f87d9
Application: debug implies logdebug
2017-05-29 22:05:26 +02:00
Dominik Schmidt
0fc3df45ce
Remove obsolete FindQtKeychain for Qt4
2017-05-29 21:44:25 +02:00
Dominik Schmidt
78dede2ac4
Fix build on Debian 7 (CMake pre 2.8.12)
2017-05-29 21:44:25 +02:00
Christian Kamm
577a2715bd
Download: Retrigger folder discovery on 404
...
See owncloud/enterprise#1966
If the server and the client's database go out of sync, there could be
persistent 404 errors. This change ensures that the problem corrects
itself eventually by triggering a remote discovery of the file's
parent folders.
It does not address the root cause that might have lead to the
divergence.
2017-05-29 21:41:10 +02:00
Olivier Goffart
f88431adbf
Don't call QElapsedTimer::restart on uninitialized timer
...
That's an undefined behavior.
Since we don't use the return value anyway, we should just use start()
2017-05-29 10:51:05 +02:00
Jenkins for ownCloud
56de50de28
[tx-robot] updated from transifex
2017-05-25 02:22:08 +02:00
Jenkins for ownCloud
a48785ee5e
[tx-robot] updated from transifex
2017-05-24 02:22:16 +02:00
Jenkins for ownCloud
3be73ad1ca
[tx-robot] updated from transifex
2017-05-23 02:22:15 +02:00
Christian Kamm
03aa7e3044
Sharing: Disable 'set password' button when password is empty #5788
2017-05-22 14:41:06 +02:00
Christian Kamm
91f6cae168
Share dialog: Use default icon if available #5781
2017-05-22 14:15:53 +02:00
Christian Kamm
ddd584077c
Share link: Fix disabled API/sharing #5778
...
* Don't hide the displayed error directly after showing it
* Don't try to fetch shares when sharing isn't possible
2017-05-22 10:59:57 +02:00
Christian Kamm
8201f0b6ea
Share Dialog: Remove unused hline
2017-05-22 10:59:57 +02:00
Christian Kamm
f2b5fcd706
Share link: Fix parsing integer ids #5777
...
Older ownCloud servers like 8.2.0 used to use integer ids.
This broke when switching to QJson because toString() on JSON
values is strict and returns "" for integers.
2017-05-22 10:54:30 +02:00
Christian Kamm
950439e5b8
Sharing dialog: Ensure error labels are expanding #5774
2017-05-22 10:52:52 +02:00
Christian Kamm
f24cdf5a05
Share dialog: Hide the icon when unused
...
Previously this used up some space when there was no icon, leading
to an oddly indented header.
2017-05-22 10:52:52 +02:00
Christian Kamm
d3b00532b1
Credentials: Simplify credential flow #5728
...
And as a side effect: don't ask for user password when we can't
connect to the server in the first place.
2017-05-22 10:52:18 +02:00
Christian Kamm
b7ed0fce2a
Account: forget credentials on delete #5752
2017-05-22 10:49:11 +02:00
Christian Kamm
c1d2a9ab92
Sharing: Show warning that link shares are public #5785 #5747
...
Backport of 3872e060ba33913e43714776a1afce787e772351
2017-05-22 10:28:16 +02:00
Christian Kamm
87a7642381
Settings: Ensure the 'about' label isn't cut off #5760
2017-05-22 10:11:09 +02:00
Christian Kamm
57d965aeba
Merge branch '2.3'
2017-05-22 10:00:28 +02:00
Christian Kamm
9b4e00c3fc
mirall.desktop.in: Remove superfluous lines #5767
2017-05-22 09:59:13 +02:00
Jenkins for ownCloud
97a4302b58
[tx-robot] updated from transifex
2017-05-22 02:22:15 +02:00
Jenkins for ownCloud
bac5121221
[tx-robot] updated from transifex
2017-05-21 02:22:14 +02:00
Jenkins for ownCloud
3462b1d1a3
[tx-robot] updated from transifex
2017-05-20 02:22:15 +02:00
Jenkins for ownCloud
54cc1cdcf7
[tx-robot] updated from transifex
2017-05-20 01:18:15 +02:00
Jenkins for ownCloud
0fd678e9a6
[tx-robot] updated from transifex
2017-05-19 02:22:22 +02:00
Jenkins for ownCloud
580762b4e6
[tx-robot] updated from transifex
2017-05-18 02:22:27 +02:00
Christian Kamm
5eaae83a01
Merge remote-tracking branch 'origin/2.3'
2017-05-17 13:10:19 +02:00
Jocelyn Turcotte
c50136d675
Add the account name and folder when starting the sync
...
This should help clearly delimiting them in the log for multi-account setups.
This information is already available elsewhere in the log in any case.
Issue #5672
2017-05-17 12:39:59 +02:00
Christian Kamm
494ea5c78c
Reformatting: Add .git-blame-ignore-revs
...
For git hyper-blame support
2017-05-17 12:31:49 +02:00
Christian Kamm
c8d0f788e0
Apply clang-format
2017-05-17 12:26:27 +02:00
Christian Kamm
ae263d60bd
Reformatting: Reformat some lines that would become really long
2017-05-17 12:26:27 +02:00
Christian Kamm
df3fe25702
Reformatting: Adjust trailing comments
...
These would otherwise be line-wrapped by clang-format,
and then consecutive reformattings remove the aligned
comment indentation
Example:
int a; // too long comment
->
int a; // too long
// comment
->
int a; // too long
// comment
2017-05-17 12:26:27 +02:00
Christian Kamm
566e6c813e
Add .clang-format style
...
From http://code.qt.io/cgit/qt/qtrepotools.git/tree/config/_clang-format
2017-05-17 12:26:27 +02:00
Jenkins for ownCloud
c09a828f7b
[tx-robot] updated from transifex
2017-05-17 02:22:16 +02:00
Christian Kamm
c5a0ce5a43
Selective sync: Skip excluded folders when reading db
...
When a new folder becomes selective-sync excluded, we already mark it
and all its parent folders with _invalid_ etags to force rediscovery.
That's not enough however. Later calls to csync_statedb_get_below_path
could still pull data about the excluded files into the remote tree.
That lead to incorrect behavior, such as uploads happening for folders
that had been explicitly excluded from sync.
To fix the problem, statedb_get_below_path is adjusted to not read the
data about excluded folders from the database.
Currently we can't wipe this data from the database outright because we
need it to determine whether the files in the excluded folder can be
wiped away or not.
See owncloud/enterprise#1965
2017-05-16 13:58:45 +02:00
Jenkins for ownCloud
6d74601cf3
[tx-robot] updated from transifex
2017-05-16 02:22:31 +02:00
Christian Kamm
ee4892e345
Wizard: Skip result page with acceptance instead of closing #5764
2017-05-12 10:21:07 +02:00
Jenkins for ownCloud
557931f207
[tx-robot] updated from transifex
2017-05-12 02:18:31 +02:00
Jocelyn Turcotte
7fd2f292e7
Promote a few more logs to info/warning
2017-05-11 17:22:59 +02:00
Markus Goetz
b68d982619
macOS: Fix usage of qCDebug in .mm file
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte
cf058bc537
Add the possiblility to enable debug logging categories
...
Add a checkbox in the log window as well as a --logdebug command-line
option that should have the same effect.
Issue #5647
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte
cc9680c1e8
Also pass csync logs through QMessageLogger
...
This allows using logging rules and custom message patterns with csync.
This also pass the a relative verbosity to the message logger.
Issue #5647
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte
b7553d5bdf
Upgrade some qCDebug to qCInfo or qCWarning
...
Use qCInfo for anything that has general value for support and
development. Use qCWarning for any recoverable error and qCCritical
for anything that could result in data loss or would identify a serious
issue with the code.
Issue #5647
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte
4ad190a558
Use Qt logging categories for logging
...
This gives more insight about the logs and allow setting fine-tuned
logging rules. The categories are set to only output Info by default
so this allows us to provide more concise logging while keeping the
ability to extract more information for a specific category when
developping or debugging customer issues.
Issue #5647
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte
3a193655b3
Improve the logging message pattern
...
Add the log level and category name in the output. Only output the
thread ID and function name for qCDebug statements as they are not
necessary for general use and make the log harder to read.
Also make sure that the message pattern is set when NO_MSG_HANDLER is
used. Using an environment variable should have priority over it anyway.
2017-05-11 17:22:59 +02:00
Jocelyn Turcotte
e10a08f64d
Remove the unused folderwatcher_qt implementation
2017-05-11 17:22:59 +02:00
Matthew Setter
84e9400742
Add explanation of how to replace local sync folder to FAQ
...
This fixes owncloud/documentation/issues/2923.
(cherry picked from commit 6580af65c1 )
2017-05-11 12:07:33 +02:00
Markus Goetz
cc94c772cd
ChangeLog: 2.4 until now
2017-05-11 12:03:52 +02:00
Christian Kamm
4b6edaa01a
Detect maintenance mode #4485
...
When we first detect a 503 (probably from a PROPFIND) and enter the
ServiceUnavailable state, we new trigger a status.php query that will
switch the state to MaintenanceMode if necessary.
2017-05-11 11:39:49 +02:00
Jenkins for ownCloud
45f831da4c
[tx-robot] updated from transifex
2017-05-11 02:18:31 +02:00
Markus Goetz
8da7919a43
Sharing: Fix UI glitch when sharing is disabled
2017-05-10 15:41:58 +02:00
Markus Goetz
f52d66a954
Sharing: Optionally show warning that links are public
...
For https://github.com/owncloud/enterprise/issues/1914
2017-05-10 15:41:58 +02:00
Jenkins for ownCloud
55dfbb9446
[tx-robot] updated from transifex
2017-05-10 02:18:36 +02:00
Jocelyn Turcotte
4d3212b31f
Merge branch 2.3 into master
2017-05-09 18:23:01 +02:00
Markus Goetz
973dc9e1e2
Update release_template.md
2017-05-09 13:12:22 +02:00
Markus Goetz
8e1422fb37
VERSION.cmake: This is 2.3.3 now
2017-05-09 12:23:52 +02:00
Christian Kamm
881641f0b7
Remove stray debug output
2017-05-09 10:37:40 +02:00
Jenkins for ownCloud
6a378a6362
[tx-robot] updated from transifex
2017-05-09 02:18:36 +02:00
Jocelyn Turcotte
879dadba78
Use QTemporaryDir in TestOwnSql
...
This will improve the cleanup and possibly help for #5366 .
2017-05-08 23:18:06 +02:00
Jocelyn Turcotte
5266720c62
Jenkinsfile: Also use 4 parallel jobs for linux builds
2017-05-08 23:18:06 +02:00
Jocelyn Turcotte
dca2b67338
Favor QtKeychain installed together with Qt
...
By default we will look in /usr/lib, which would prevent us from
using a different path for Qt as QtKeychain depends on Qt itself.
2017-05-08 23:18:06 +02:00
Markus Goetz
d1b1da3414
Update release_template.md
2017-05-08 20:34:57 +02:00
Markus Goetz
48a359b69e
Update release_template.md
2017-05-08 17:01:37 +02:00
Markus Goetz
2a8f9a7c04
Update release_template.md
2017-05-08 16:17:07 +02:00
Markus Goetz
ea691aa2a0
ChangeLog: 2.3.2
2017-05-08 15:50:09 +02:00
Christian Kamm
3da1e9a4b9
Remove 3rdparty qjson #5710
2017-05-08 11:50:33 +02:00
Christian Kamm
f1b42cedda
Port PollJob responses to Qt5's QJson #5710
2017-05-08 11:50:33 +02:00
Christian Kamm
2598579d84
Switch JsonApiJob to Qt5's QJson #5710
2017-05-08 11:50:33 +02:00
Christian Kamm
c5b6ec209a
Sharing: Switch from QtJson to Qt5's QJson #5710
2017-05-08 11:50:33 +02:00
Olivier Goffart
13705999f7
Discovery: Increase the MAX_DEPTH and show deep folder as ignored
...
Before this patch, to deep folder would just be ignored, without any feedback.
This patch makes it so deep folder are properly shown as ignored in the UI.
Also increase the MAX_DEPTH
Issue: #1067
2017-05-08 11:29:51 +02:00
Markus Goetz
fbe812b9bc
Selective Sync: Open sub folder context menu #5596
2017-05-08 11:24:02 +02:00
Olivier Goffart
4697f0274f
Exclude list: remove .htaccess
...
As per issue #5701 , if the server does not support it, let the server
show return an error, but we should not blacklist it localy
2017-05-08 11:17:22 +02:00
Jenkins for ownCloud
9597c2b808
[tx-robot] updated from transifex
2017-05-08 02:18:29 +02:00
Jenkins for ownCloud
3817202b9c
[tx-robot] updated from transifex
2017-05-07 02:18:30 +02:00
Jenkins for ownCloud
ed960e5a71
[tx-robot] updated from transifex
2017-05-06 02:18:30 +02:00
Jenkins for ownCloud
8b08ca2d00
[tx-robot] updated from transifex
2017-05-05 02:18:28 +02:00
Christian Kamm
aff8008baf
Downloads: Remove empty temporary if disk space full #5746
2017-05-04 15:12:14 +02:00
Christian Kamm
c922015521
SSL error handling: Remove unnecessary confusing code
...
I'm confident this is unnecessary. The original bug in #3283 was
to call ignoreSslErrors() without an argument in the 'accept'
case, which meant ignoring *all* subsequent SSL errors.
With that fixed, explicitly aborting the reply and resetting QNAM
is not needed since not ignoring the error will lead to the SSL
handshake failing.
See also:
75b38d1a2f (workaround introduced)
89376e14d6 (real fix)
76ce5adbf0 (cherry-pick of workaround)
2017-05-04 09:19:01 +02:00
Jenkins for ownCloud
b20adf2281
[tx-robot] updated from transifex
2017-05-04 02:18:38 +02:00
Markus Goetz
4ed9edb104
Wizard: Don't show not-so-useful result page #5726
...
Better immediately show the settings dialog where people can see what's going on.
They can go to sync folder or webinterface from there.
2017-05-03 19:21:46 +02:00
Olivier Goffart
bb244d527c
Better words for the error message when one cannot create the database.
...
Issue #5291
2017-05-03 17:53:46 +02:00
Matthew Setter
7f1d13dfbf
Merge pull request #5741 from owncloud/add-checksum-details
...
Document the checksums addition in 10.0
2017-05-03 13:32:21 +02:00
Matthew Setter
3185b0940b
Increase the clarity of the checksum statements
...
This comes after discussion and feedback with @phil-davis.
2017-05-03 13:17:09 +02:00
Christian Kamm
d709a47b93
Share dialog: Add option to copy/email direct links #5627
2017-05-03 10:26:27 +02:00
Jenkins for ownCloud
b02f724e7e
[tx-robot] updated from transifex
2017-05-03 02:18:29 +02:00
Matthew Setter
013a0e25d5
Document the checksums addition in 10.0
...
This commit documents the new checksums addition in 10.0, specifically
in the desktop client. This fixes owncloud/documentation/issues/2964.
2017-05-02 12:48:08 +02:00
Jenkins for ownCloud
6d2f77851e
[tx-robot] updated from transifex
2017-05-02 02:18:27 +02:00
Jenkins for ownCloud
131055aefc
[tx-robot] updated from transifex
2017-05-01 02:18:29 +02:00
Jenkins for ownCloud
0682f8793c
[tx-robot] updated from transifex
2017-04-30 02:18:28 +02:00
Jenkins for ownCloud
fdf4a53283
[tx-robot] updated from transifex
2017-04-29 02:18:29 +02:00
Jenkins for ownCloud
ccc1db02a0
[tx-robot] updated from transifex
2017-04-28 02:18:30 +02:00
Luca Lorenzetto
3db8d3dfb6
When creating explorer favorite use more specific windows functions ( #5690 )
...
Fixes https://github.com/owncloud/client/issues/2719
2017-04-27 10:34:07 +02:00
Jenkins for ownCloud
4e15e2055c
[tx-robot] updated from transifex
2017-04-27 02:18:30 +02:00
Tommy Sparber
72a3e08907
Move check for mono icons into separate function
2017-04-26 17:39:01 +02:00
Christian Kamm
f8c0e796df
SqlDatabase: Ask freeSpace for directory, fix for Windows
...
See owncloud/enterprise#1955
2017-04-26 12:38:04 +02:00
Jenkins for ownCloud
fd40113e48
[tx-robot] updated from transifex
2017-04-26 02:18:39 +02:00
Jenkins for ownCloud
ca8b961e60
[tx-robot] updated from transifex
2017-04-25 02:18:37 +02:00
Markus Goetz
b6e3709e74
ChangeLog for 2.3.2
2017-04-24 12:08:36 +02:00
Michael Stingl
4202387c52
templates > .github and create release_template ( #5590 )
2017-04-24 11:54:53 +02:00
Christian Kamm
cd4e647816
Merge remote-tracking branch 'origin/2.3'
2017-04-24 10:32:53 +02:00
Jenkins for ownCloud
fd97a09e64
[tx-robot] updated from transifex
2017-04-24 02:18:29 +02:00
Jenkins for ownCloud
42d2594071
[tx-robot] updated from transifex
2017-04-23 02:18:28 +02:00
Jenkins for ownCloud
ff70cf9b5f
[tx-robot] updated from transifex
2017-04-22 02:18:28 +02:00
Kiril Vladimiroff
3a31694147
Remove all conditional checks for Qt 4.x ( #5505 )
2017-04-21 18:13:32 +02:00
Christian Kamm
05236f0a7a
Sharing multiple public links: Depend on new capability
...
See owncloud/core#27709 : files_sharing/public/multiple
2017-04-21 14:08:00 +02:00
ckamm
a475526805
Merge pull request #5695 from ckamm/sharedialog-multiplelinkshares
...
Multiple link shares and UI adjustments for share dialog
2017-04-21 10:17:55 +02:00
Christian Kamm
3c1a2cde33
ShareDialog: Review fixes
...
* Allow creating nameless shares
* Display token as name for nameless shares
(both to be consistent with server)
* Allow changing a share's name by editing it in the table
* Minor adjustments
2017-04-21 10:16:08 +02:00
Christian Kamm
a1f7168d2a
ShareDialog: Add support for multiple public link shares #5655
...
Starting from oC 10.0.0 having several public link shares with
different attributes for a path will be supported. This adds
functionality to create, edit and delete these public link shares.
The behavior is currently gated by server version, but should be
adapted to use a capability as soon as one is introduced, see
owncloud/core#27622 .
The UI reduces to a single-share version when talking to older servers.
Testing scenarios:
* Link sharing is disabled (by capability, not by theme)
* Required passwords
* Required expiry
* Forbidden 'allow upload' for folders
* New and old servers
2017-04-21 10:10:12 +02:00
Christian Kamm
1e1c2f8de2
Rename ShareWidget to ShareUserLine
...
There will probably be a ShareLinkLine too, due to #5655
2017-04-21 10:09:01 +02:00
Christian Kamm
76e67db04b
ShareDialog: Use a tab widget #5655
2017-04-21 10:09:01 +02:00
Jenkins for ownCloud
9d06e99b58
[tx-robot] updated from transifex
2017-04-21 02:18:30 +02:00
Kaustubh Welankar
70c3514996
Removed Magic Numbers in propagator #5685 ( #5705 )
2017-04-20 11:14:53 +02:00
Olivier Goffart
9aeb587d6c
Require Qt5
2017-04-20 09:39:41 +02:00
Dominik Schmidt
51041d0f15
Disable Qt4 CI
2017-04-20 09:39:41 +02:00
ckamm
543e8a224c
Fix a crash in ProxyAuthHandler ( #5711 )
...
See
https://sentry.io/owncloud/desktop-win-and-mac/issues/243433178/activity/
https://sentry.io/owncloud/desktop-win-and-mac/issues/234182688/activity/
The problem was that an account's QNetworkAccessManager can be deleted
when reentering the event loop.
2017-04-20 09:21:33 +02:00
ckamm
ea378fe837
FolderStatusModel: Fix crash for empty relativePath ( #5713 )
...
The problem was that split("", SkipEmptyParts) is the empty list.
See
https://sentry.io/owncloud/desktop-win-and-mac/issues/251167186/
2017-04-20 09:16:55 +02:00
Markus Goetz
de9ee295be
Some Dialogs: Bring to top on tray click #5515 #5566 ( #5664 )
...
On my OS X, it might get hidden under other apps while I opened it and then want to quickly
verify something in another app.
2017-04-20 08:55:44 +02:00
Jenkins for ownCloud
3a8d6a6f16
[tx-robot] updated from transifex
2017-04-20 02:18:30 +02:00
Markus Goetz
5ac58d3b83
Server: Parse version from capabilities too #5691 ( #5698 )
...
Newer servers will have the option of hiding version, versionstring, edition
and productname. They will always send the full information in the capabilities.
2017-04-19 11:02:03 +02:00
dheule
ada2be94f2
added owncloudcmd bandwidth limit parameter ( #5707 )
2017-04-19 10:32:36 +02:00
Jenkins for ownCloud
866991df4c
[tx-robot] updated from transifex
2017-04-19 02:18:38 +02:00
Jenkins for ownCloud
7613938181
[tx-robot] updated from transifex
2017-04-18 02:18:27 +02:00
Jenkins for ownCloud
4eb4069c15
[tx-robot] updated from transifex
2017-04-17 02:18:28 +02:00
Jenkins for ownCloud
f097e472f4
[tx-robot] updated from transifex
2017-04-16 02:18:27 +02:00
Jenkins for ownCloud
c46b97ec37
[tx-robot] updated from transifex
2017-04-15 02:18:27 +02:00
Jenkins for ownCloud
1994cd7ba2
[tx-robot] updated from transifex
2017-04-14 02:18:37 +02:00
Olivier Goffart
8cb3a77022
Merge remote-tracking branch 'origin/avatar_pics'
...
Also fix compilation because of 22370fdbdadd06f0cacd249a8d7a32f0d3c1374e
Pull request #5482
2017-04-13 11:54:28 +02:00
Olivier Goffart
1ed4eb46f2
Merge remote-tracking branch 'origin/2.3'
...
Conflicts:
VERSION.cmake
2017-04-13 10:19:35 +02:00
Christian Kamm
7c31da5a95
AccountSettings: Sync with clean discovery on Ctrl-F6 #5666
2017-04-13 10:11:21 +02:00
Christian Kamm
1f245b3791
AccountSettings: Easier access to selected folder alias
2017-04-13 10:11:21 +02:00
Olivier Goffart
4af45394f9
owncloudcmd: return code depend on sync result
...
Issue #3936
2017-04-13 10:10:47 +02:00
Jenkins for ownCloud
c1c5a488d0
[tx-robot] updated from transifex
2017-04-13 02:18:32 +02:00
Markus Goetz
554d1b88fc
Avatar: macOS support
2017-04-12 17:55:28 +02:00
Jenkins for ownCloud
5e18d5cf4e
[tx-robot] updated from transifex
2017-04-12 02:18:30 +02:00
Christian Kamm
8a639d39fc
ShareDialog: Reenable user input textedit on error #5694
2017-04-11 15:50:32 +02:00
Jenkins for ownCloud
e43425cf16
[tx-robot] updated from transifex
2017-04-11 02:18:28 +02:00
Markus Goetz
26af3ce525
Wizard: Improve folder creation (2)
2017-04-10 16:15:28 +02:00
Jenkins for ownCloud
5f316f8b96
[tx-robot] updated from transifex
2017-04-10 02:18:28 +02:00
Jenkins for ownCloud
35060f4954
[tx-robot] updated from transifex
2017-04-09 02:18:27 +02:00
Jenkins for ownCloud
0b2f1dda48
[tx-robot] updated from transifex
2017-04-08 02:18:38 +02:00
Jenkins for ownCloud
1a555449ec
[tx-robot] updated from transifex
2017-04-08 01:15:19 +02:00
Jenkins for ownCloud
5ba61e5399
[tx-robot] updated from transifex
2017-04-07 02:18:29 +02:00
Jenkins for ownCloud
0809703d2b
[tx-robot] updated from transifex
2017-04-06 02:18:28 +02:00
Jenkins for ownCloud
55b423fbb5
[tx-robot] updated from transifex
2017-04-06 01:15:15 +02:00
Markus Goetz
e08ec11fd4
Wizard: Improve folder creation
2017-04-05 16:55:52 +02:00
Jenkins for ownCloud
0c2f65a939
[tx-robot] updated from transifex
2017-04-05 02:18:28 +02:00
Christian Kamm
29e34bd2c0
Doc: Update to new sync journal db name #5662
2017-04-04 10:49:26 +02:00
Christian Kamm
6abc2bf72d
Transfers: Show a decimal for single digit MB rates #4428
2017-04-04 09:54:06 +02:00
Christian Kamm
a10fe84a83
ShareDialog: Hide the detailed permissions if there is only one #5655
2017-04-04 09:40:48 +02:00
Christian Kamm
7d9c4d052c
ShareDialog: Margin and spacing refinements #5627
2017-04-04 09:40:48 +02:00
Christian Kamm
f8d69dfe8e
ShareDialog: Fix thumbnail size #5654
2017-04-04 09:40:48 +02:00
Christian Kamm
2841714817
owncloudcmd docs: Mention required sync-exclude.lst #5679
2017-04-04 09:38:23 +02:00
Christian Kamm
35af03b2e5
Improve http error messages; cleanup
...
By default QNetworkReply::errorString() often produces messages like
"Error downloading <url> - server replied: <reason>"
but the "downloading" part invariably confuses people since the
error might very well have been produced by a PUT request.
This commit produces clearer error messages for HTTP errors.
Additionally:
* Remove some unnecessary null checks from slots connected to
network job signals and document that these signals never send
null replies.
* There was a bug where AbstractNetworkJob::_timedout wasn't
set when derived classes overrode slotTimeout. We now ensure
it's always set by disallowing overrides of slotTimeout.
Instead it now calls onTimedOut, which allows custom handling.
* Several subclasses declared errorString, isTimedOut. Move
these to AbstractNetworkJob.
* Unify handling of OC-ErrorString (via the new, general
Job::errorString)
* Add documentation in various places.
2017-04-04 09:27:37 +02:00
Jenkins for ownCloud
ce735d8d68
[tx-robot] updated from transifex
2017-04-04 02:18:31 +02:00
Samuel Alfageme
ae018eab42
Fixing a duplicate in the build instructions
...
- The duplicate and some typos were introduced in 42aed56a5a
- Also fixes some minor format issues. There's a lot of notes in this docs, we should refactor some.
2017-04-03 21:19:39 +02:00
Jenkins for ownCloud
484c8397e3
[tx-robot] updated from transifex
2017-04-03 02:18:28 +02:00
Jenkins for ownCloud
b8de36c585
[tx-robot] updated from transifex
2017-04-02 02:18:27 +02:00
Jenkins for ownCloud
59ba292edd
[tx-robot] updated from transifex
2017-04-01 02:18:36 +02:00
Jenkins for ownCloud
bc9c4fe17b
[tx-robot] updated from transifex
2017-03-31 02:18:27 +02:00
Jenkins for ownCloud
7253f64d26
[tx-robot] updated from transifex
2017-03-30 02:18:30 +02:00
Markus Goetz
28e9c56a4b
Chunking NG: Also send OC-Total-Length on MOVE
...
For https://github.com/owncloud/core/issues/26988
2017-03-29 19:51:02 +02:00
Roeland Jago Douma
68f0f1b404
complete url when using themed wizardUrlPostfix
...
Before we would only open the part of the url that the users entered.
Now if the wizardUrlPostfix is used this is should be appended to that
when opening the browser on the result page.
2017-03-29 18:09:15 +02:00
Samuel Alfageme
96f152d57c
Removed the coverity badge
...
Following the discussion on da45d99b8f
Also updated the link to the current building instructions.
2017-03-29 17:26:10 +02:00
Jenkins for ownCloud
f1a35527ee
[tx-robot] updated from transifex
2017-03-29 02:18:28 +02:00
Olivier Goffart
039ff0ca8e
PropagateDownload: fix possible crash
...
Backtrace looks like this:
Crash: EXCEPTION_ACCESS_VIOLATION_READ at 0x0
File "propagatedownload.cpp", line 234, in OCC::GETFileJob::slotReadyRead
File "moc_propagatedownl_CA5CFSHZDTX34X.cpp", line 86, in OCC::GETFileJob::qt_static_metacall
File "qobject.cpp", line 495, in QMetaCallEvent::placeMetaCall
File "qobject.cpp", line 1256, in QObject::event
File "qapplication.cpp", line 3804, in QApplicationPrivate::notify_helper
GETFileJob::slotReadyRead can be called with a QueuedConnection when the
bendwith manager is involved. In that case, if the QNAM was reset
in between, the reply might have been destroyed.
(This is only speculation based on the backtrace)
2017-03-28 18:04:19 +02:00
Olivier Goffart
85afa4788b
AccountState: Attempt to fix a crash
...
Backtrace from the crash reporter:
Crash: EXCEPTION_ACCESS_VIOLATION_READ at 0x21
File "qcoreapplication.cpp", line 1281, in QCoreApplication::postEvent
File "qobject.cpp", line 2125, in QObject::deleteLater
File "connectionvalidator.cpp", line 240, in OCC::ConnectionValidator::reportResult
File "connectionvalidator.cpp", line 206, in OCC::ConnectionValidator::slotAuthFailed
File "moc_connectionvalidator.cpp", line 127, in OCC::ConnectionValidator::qt_static_metacall
File "qobject.cpp", line 3716, in QMetaObject::activate
File "moc_networkjobs.cpp", line 653, in OCC::PropfindJob::finishedWithError
File "networkjobs.cpp", line 570, in OCC::PropfindJob::finished
I believe the problem is caused because 'this' was deleted in ConnectionValidator::reportResult
as the signal connectionResult gets emited. The AccountState::slotConnectionValidatorResult
slot does indeed call slotInvalidCredentials which might call {Shibboleth,Http}Credentials::fetchFromKeychain
which might emit fetched directly, which will call AccountState::slotCredentialsFetched
which deletes the _connectionValidator
So use deleteLater when deleting the _connectionValidator, hoping this helps
2017-03-28 18:04:19 +02:00
Christian Kamm
53c5f03c32
Merge branch 'dynamic_chunking'
2017-03-28 11:35:01 +02:00
Christian Kamm
e86499d990
dynamic chunking: cleanup, fixes, improvements
...
* make target duration a client option instead of a capability
* simplify algorithm for determining chunk size significantly
* preserve chunk size for the whole propagation, not just per upload
* move options to SyncOptions to avoid depending on ConfigFile
in the propagator
* move chunk-size adjustment to after a chunk finishes, not when
a new chunk starts
2017-03-28 11:32:10 +02:00
Jenkins for ownCloud
3ca071c612
[tx-robot] updated from transifex
2017-03-28 02:18:27 +02:00
Piotr M
88e0f97798
dynamic chunking prototype
2017-03-27 13:43:39 +02:00
Jenkins for ownCloud
d78b84a12f
[tx-robot] updated from transifex
2017-03-27 02:18:28 +02:00
Olivier Goffart
5c2b185374
VERSION: 2.3.1 was release, this branch is now for 2.3.2
2017-03-25 09:06:59 +01:00
Jenkins for ownCloud
8339ff3c1c
[tx-robot] updated from transifex
2017-03-25 02:18:28 +01:00
Jenkins for ownCloud
73e58fa090
[tx-robot] updated from transifex
2017-03-25 01:15:15 +01:00
Jürgen Weigert
e2cda2dc65
Update CMakeLists.txt
...
remove doc-man target in doc/CMakeLists.txt https://github.com/owncloud/client/issues/2153
2017-03-24 18:31:29 +01:00
ajasja
090d02a65f
Documented the usage of environment variables.
...
In particular the `OWNCLOUD_CHUNK_SIZE` as requested per #2449 .
I looked through the code and it seems the env vars override the conf file, but I'm not 100 % sure.
The `OWNCLOUD_CRITICAL_FREE_SPACE_BYTES` and `OWNCLOUD_FREE_SPACE_BYTES` are now mentioned in two places.
2017-03-24 12:26:46 +01:00
Christian Kamm
a0e88477c1
ShareDialog: Make "can edit" partially checked sometimes #5642
...
Previously the check box was checked if *any* of its sub-permissions
were granted. This can hide the fact that only a limited subset of them
are actually granted.
The new behavior is to display as "partially checked" if only some
of the sub-permissions are available. Clicking the check box itself
still toggles between granting all or none of them.
2017-03-24 09:52:01 +01:00
Jenkins for ownCloud
4e70a14c29
[tx-robot] updated from transifex
2017-03-24 02:18:28 +01:00
Markus Goetz
da45d99b8f
Update README.md
...
Fix Jenkins badges
2017-03-23 18:18:36 +01:00
Jenkins for ownCloud
14131cf020
[tx-robot] updated from transifex
2017-03-23 02:18:37 +01:00
Jenkins for ownCloud
dd5b36779d
[tx-robot] updated from transifex
2017-03-22 02:18:28 +01:00
Christian Kamm
f67989afea
Wizards: Never propose an existing folder for syncing #5597
2017-03-21 17:07:35 +01:00
Christian Kamm
14fef4a0d3
Wizard: Remove unused oldLocalFolder property
2017-03-21 17:07:35 +01:00
Olivier Goffart
d3439d5526
owncloudsetuppage.ui: Remove that file, it is unused
2017-03-21 16:38:13 +01:00
Jenkins for ownCloud
34bb950889
[tx-robot] updated from transifex
2017-03-21 02:18:29 +01:00
Samuel Alfageme
489efa24f7
Fixing a typo on an issue reference
...
(cherry picked from commit ed03cdf45a )
2017-03-20 17:29:36 +01:00
Matthew Setter
9840ae9e96
Fix incorrect documentation for the ownCloud command-line client
...
This fixes #5609 .
2017-03-20 17:29:16 +01:00
Samuel Alfageme
d375e9b86c
Including some info on the proxy config. in the docs.
...
This was a request of @michaelstingl to document how to configure the proxy manually via the .cfg file for config provisioning purposes.
- Restructured the bullet points into 3 different tables; I believe it's a cleaner approach; maybe this is also applicable to other sections.
- Would be logical to include also settings on proxy auth?
2017-03-20 11:55:02 +01:00
Olivier Goffart
722918abd6
Folder::showSyncResultPopup: Fix undefined behavior when there is no errors
...
When there is no errors _syncResult.firstItemError() is NULL, and accessing
it's _file member is an undefined behavior. (Thankfully, createGuiLog did not
use the string when the count was 0, but we are not supposed to create
null references.
Found with the UB sanitizer:
src/gui/folder.cpp:348:49: runtime error: member access within null pointer of type 'OCC::SyncFileItem'
src/gui/folder.cpp:348:19: runtime error: reference binding to null pointer of type 'const QString'
2017-03-20 11:53:13 +01:00
Jenkins for ownCloud
48fe8d1cb8
[tx-robot] updated from transifex
2017-03-20 02:18:28 +01:00
Jenkins for ownCloud
1000cdda09
[tx-robot] updated from transifex
2017-03-19 02:18:28 +01:00
Jenkins for ownCloud
d71b59b817
[tx-robot] updated from transifex
2017-03-18 02:18:35 +01:00
Jenkins for ownCloud
95b92c12ac
[tx-robot] updated from transifex
2017-03-17 02:18:36 +01:00
Olivier Goffart
4597201560
Merge remote-tracking branch 'origin/2.3'
...
Conflicts:
src/libsync/owncloudpropagator.h
2017-03-16 14:35:08 +01:00
Olivier Goffart
a60370255e
ActivityListModel: attempt to fix a crash.
...
The backtrace seems to indicate that the account is invalid.
I don't know how this can happen, maybe the account's display
name was changed while the app is running?
Backtrace:
Crash: EXC_BAD_ACCESS / KERN_INVALID_ADDRESS at 0x18
Module "owncloud", in OCC::AccountState::account
Module "owncloud", in OCC::ActivityListModel::data
Module "owncloud", in OCC::ActivityItemDelegate::paint
Module "QtWidgets", in QListView::paintEvent
Module "QtWidgets", in QWidget::event
Module "QtWidgets", in QFrame::event
Module "QtWidgets", in QAbstractScrollArea::viewportEvent
Module "QtWidgets", in QAbstractItemView::viewportEvent
Module "QtWidgets", in QAbstractScrollAreaFilter::eventFilter
Module "QtCore", in QCoreApplicationPrivate::sendThroughObjectEventFilters
2017-03-16 14:31:15 +01:00
Olivier Goffart
21909cae04
Propagator: change order of destruction
...
The destructor of the PropagateItemJob will access the propagator's
_activeJobList. So the _rootJob needs to be destroyed before it.
Order of destruction is the reverse of the order of the members in
the class. So put it at the end so it can be destroyed first.
(This made TestSyncEngine::testDirDownloadWithError crash sometimes
in the master branch)
2017-03-16 14:24:25 +01:00
Markus Goetz
176ea20fef
ChangeLog for 2.3.1
2017-03-16 14:19:23 +01:00
Olivier Goffart
574435687d
Merge remote-tracking branch 'origin/2.3'
...
Conflicts:
src/libsync/owncloudpropagator.cpp
2017-03-16 13:51:53 +01:00
Christian Kamm
1a279ca158
About: Show the runtime versions of Qt and OpenSSL #5592
...
I didn't want to touch this visible translated string in a
patch release so I just switched the data.
For Qt versions before 5, we continue to show the build-time version
of OpenSSL but it's clearly marked as such.
2017-03-16 12:40:42 +01:00
Olivier Goffart
0ed929f24b
SyncEngine: fix test regression in TestChunkingNG::testCreateConflictWhileSyncing
...
In 8ef11a38c9 , we started blacklisting
SoftError for 0 seconds. But if the two sync happen with less than
1s interval, we would still prevent them to happen.
So make sure we expire if 0 seconds have expired
2017-03-16 10:17:08 +01:00
Jenkins for ownCloud
41eeed981f
[tx-robot] updated from transifex
2017-03-16 02:18:29 +01:00
Olivier Goffart
8e68e0321c
Attempt to fix a crash in FolderStatusModel::slotUpdateDirectories
...
The backtrace looks like:
File "atomic_base.h", line 396, in QString::~QString
File "qlist.h", line 442, in OCC::FolderStatusModel::slotUpdateDirectories
This is the only QList operation, and it may crash if the list is empty.
It can be empty if the propfind returned empty results.
I'm not sure how this can be possible to have an empty list there since
the server is always supposed to return at least one entry, for the directory
itself. But it can happen if a directory was transformed in a file, or
if there is a bug on the server.
2017-03-15 17:23:39 +01:00
Christian Kamm
881b32521b
HttpCreds: Update app passwords url #5605
...
See also owncloud/core#27360
2017-03-15 16:30:08 +01:00
Christian Kamm
b98876e265
Account server version: Helper to create versions
...
Hex literals don't work well with version 10: 0x100000 doesn't do
the right thing.
2017-03-15 16:30:08 +01:00
Olivier Goffart
dbb5bcb784
Ignore list editor: adjust the size
...
The previous patch on this file made it a bit too big, so make it a bit smaller
For issue #5600
2017-03-15 16:00:48 +01:00
Samuel Alfageme
fce194ce08
Using different window flags on the connection method dialog ( #5614 )
...
This is a possible fix for #3850 , applying custom window flags (http://doc.qt.io/qt-5.8/qt.html#WindowType-enum ) on the connection method dialog. These avoid resizing the dialog and displaying a maximize button on OS X and context help button on Windows.
2017-03-15 15:46:51 +01:00
Jenkins for ownCloud
d95b43f347
[tx-robot] updated from transifex
2017-03-15 02:18:36 +01:00
Christian Kamm
9ca9773e9d
Add more versions to --version #5592
...
* Add git revision, if available
* Add SSL runtime version
* Add compile-time Qt version
2017-03-14 16:13:52 +01:00
Christian Kamm
13b2568358
Windows/NTFS: Do not attempt to upload inaccessible files #5544
...
It is possible to create files with filenames that differ
only by case in NTFS, but most operations such as stat and
open only target one of these by default.
When that happens, we want to avoid uploading incorrect data
and give up on the file.
Typically this situation should never occurr during normal use
of Windows. It can happen, however, when a NTFS partition is
mounted in another OS.
2017-03-14 16:03:08 +01:00
Jenkins for ownCloud
7a2d12bb47
[tx-robot] updated from transifex
2017-03-14 02:18:30 +01:00
Olivier Goffart
2152bc5fca
Ignore list editor: adjust the size of the columns in the table
...
So the title of the column is fully visible.
Adjust the default size and the size policy of the label so it behave
correctly as the window get resized
Issue #5600
2017-03-13 17:05:24 +01:00
Jenkins for ownCloud
11aecf1af2
[tx-robot] updated from transifex
2017-03-13 02:18:30 +01:00
Jenkins for ownCloud
903d6c80fe
[tx-robot] updated from transifex
2017-03-12 02:18:30 +01:00
Jenkins for ownCloud
585221c58c
[tx-robot] updated from transifex
2017-03-11 02:18:38 +01:00
Christian Kamm
8ef11a38c9
Blacklist: Escalate repeated SoftError to NormalError #5500
2017-03-10 15:51:55 +01:00
Matthew Setter
5204524691
Merge pull request #5585 from owncloud/add-replace-sync-directory-to-faq
...
Add explanation of how to replace local sync folder to FAQ
2017-03-10 09:11:38 +01:00
Matthew Setter
9af7e8cff0
Revise the point about starting a clean sync
...
On review, after feedback from @phil-davis, he's right that users need
to be fully briefed as to the implications of choosing a clean sync —
especially when they have a large amount of data in their account.
2017-03-10 08:35:55 +01:00
Jenkins for ownCloud
f94a15b0fa
[tx-robot] updated from transifex
2017-03-10 02:18:30 +01:00
Klaas Freitag
5e33898a08
Avatar: Use QImage instead of QPixmap to avoid dep on QApplication.
...
That fixes the test suite.
2017-03-09 22:34:36 +01:00
Olivier Goffart
9c83c57f1c
Propagator: Attempt to fix a crash in OwncloudPropagator::scheduleNextJob
...
The crash reporter shows many crashes in OwncloudPropagator::scheduleNextJob.
We don't really know what could be the cause, but it's probably because
the _activeJobList contains dangling pointer.
So this patch makes sure to remove all the jobs from this list as they get
destroyed.
2017-03-09 15:48:52 +01:00
Olivier Goffart
1a98b49f1b
Fix TestSyncEngine::testDirDownloadWithError
...
On master, the scheduling is different and the tasks abort in another
order
2017-03-09 10:35:58 +01:00
Olivier Goffart
0e8f0481d4
Merge remote-tracking branch 'origin/2.3'
...
Conflicts:
src/libsync/owncloudpropagator.cpp
2017-03-09 09:54:14 +01:00
Jenkins for ownCloud
1d0ef83078
[tx-robot] updated from transifex
2017-03-09 02:18:30 +01:00
Jenkins for ownCloud
4ab217ba04
[tx-robot] updated from transifex
2017-03-08 02:18:33 +01:00
Matthew Setter
6580af65c1
Add explanation of how to replace local sync folder to FAQ
...
This fixes owncloud/documentation/issues/2923.
2017-03-07 15:41:24 +01:00
Christian Kamm
cdf16dd905
Remove unreachable code #5582
2017-03-07 13:23:47 +01:00
Christian Kamm
4a1a5fa076
AbstractNetworkJob: Improve redirect handling #5555
...
* For requests:
- reuse the original QNetworkRequest, so headers and attributes
are the same as in the original request
- determine the original http method from the reply and the request
attributes
- keep the original request body around such that it can be sent
again in case the request is redirected
* Simplify the interface that is used for creating new requests in
AbstractNetworkJob.
2017-03-07 13:18:01 +01:00
Jenkins for ownCloud
298684aaa0
[tx-robot] updated from transifex
2017-03-07 02:18:31 +01:00
Jenkins for ownCloud
005c027274
[tx-robot] updated from transifex
2017-03-07 01:15:15 +01:00
Olivier Goffart
f4495c5c80
ActivityListModel: fix possible crash in slotActivitiesReceived
...
Backtrace from the crash reporter:
Crash: EXCEPTION_ACCESS_VIOLATION_READ at 0x401
File "moc_activitylistmo_M5OEXJ7XGJYTWT.cpp", line 92, in OCC::ActivityListModel::qt_static_metacall
File "qobject.cpp", line 3730, in QMetaObject::activate
File "moc_networkjobs_7AMNCW4BBANVRK.cpp", line 1342, in OCC::JsonApiJob::jsonReceived
File "networkjobs.cpp", line 714, in OCC::JsonApiJob::finished
File "abstractnetworkjob.cpp", line 207, in OCC::AbstractNetworkJob::slotFinished
File "moc_abstractnetwor_PFI2TXGQHRE33H.cpp", line 98, in OCC::AbstractNetworkJob::qt_static_metacall
File "qobject.cpp", line 3730, in QMetaObject::activate
File "moc_qnetworkreply.cpp", line 367, in QNetworkReply::finished
File "qnetworkreplyhttpimpl.cpp", line 2100, in QNetworkReplyHttpImplPrivate::finished
File "qnetworkreplyhttpimpl.cpp", line 279, in QNetworkReplyHttpImpl::abort
My theory is that the AccountState stored in a property of the job was destroyed.
before the job timed out.
Therefore, the qobject_cast within the qvariant_cast would call the metaObject()
virtual function on a dangling pointer.
Fix it by storing a QPointer instead which will track the deletion.
2017-03-06 17:25:22 +01:00
Olivier Goffart
f862c626a1
Propagator: Fix finished signal of directory being emited twice and causing crash
...
When there is a FatalError, we ended up emiting the finished signal for
the directory job several times, which would lead to crashes
Issue #5578
2017-03-06 16:14:04 +01:00
Markus Goetz
6487bb071b
NSIS: Don't display link on finish page
2017-03-06 15:40:10 +01:00
Jenkins for ownCloud
e7296d03d3
[tx-robot] updated from transifex
2017-03-05 02:18:29 +01:00
Jenkins for ownCloud
139bb8f094
[tx-robot] updated from transifex
2017-03-04 02:18:29 +01:00
Olivier Goffart
d30ed7fb8a
VERSION: master branch is 2.4
2017-03-03 11:00:33 +01:00
Olivier Goffart
13df7fcee0
Merge branch '2.3'
...
Conflicts:
src/libsync/owncloudpropagator.cpp
2017-03-03 10:57:23 +01:00
Olivier Goffart
84ecbc4c89
2.3.0 was released: Update version
2017-03-03 10:48:47 +01:00
Olivier Goffart
4a010ce7cd
SslButton: Remove additional ')'
...
Regression since 7bfe061382
Issue: #5573
2017-03-03 10:43:47 +01:00
Jenkins for ownCloud
40698c8fd0
[tx-robot] updated from transifex
2017-03-03 02:18:27 +01:00
Jenkins for ownCloud
3adaf44f7b
[tx-robot] updated from transifex
2017-03-02 02:18:30 +01:00
Matthew Setter
6e4ecd11a1
Update client version from 2.2 to 2.3 ( #5568 )
...
As the latest version of 2.3, the version information needs to be
updated as well.
2017-03-01 13:26:49 +01:00
Jenkins for ownCloud
3983fecaf1
[tx-robot] updated from transifex
2017-03-01 02:18:28 +01:00
Jenkins for ownCloud
7effcff245
[tx-robot] updated from transifex
2017-02-28 02:18:28 +01:00
Jocelyn Turcotte
384f18da38
Potential fix for crash in PropagateDirectory::abort ( #5564 )
2017-02-27 17:09:29 +01:00
Jenkins for ownCloud
75e06c25c7
[tx-robot] updated from transifex
2017-02-27 02:18:29 +01:00
Jenkins for ownCloud
d0341eb509
[tx-robot] updated from transifex
2017-02-26 02:18:29 +01:00
Jenkins for ownCloud
74bf16ccb1
[tx-robot] updated from transifex
2017-02-25 02:18:28 +01:00
Jenkins for ownCloud
96e1f74ef3
[tx-robot] updated from transifex
2017-02-24 02:18:31 +01:00
Jocelyn Turcotte
793a994ce6
Don't abort propagation job abortions synchronously from finished
...
This leads to crashes since we changed the connection to the parent
jobs not to be queued anymore.
We don't really need to bubble up the finished state through
parents in that case, and it would also mean that we'd recurse
all the way through leaves as we go up to each parent. So just call
abort directly on the OwncloudPropagator and make sure the abortion
call is posted to the event loop.
2017-02-23 17:54:33 +01:00
Jocelyn Turcotte
19bf5e2ff1
Reduce the connection data used by PropagateDirectory objects
...
Avoid using connections to report up the job tree for signals
that we can directly communicate to the OwncloudPropagator.
This slightly reduces the memory usage and avoid passing those calls
through the whole parent chain.
2017-02-23 17:54:33 +01:00
Jocelyn Turcotte
16ad3d5c88
Create PropagateItemJobs only before starting them
2017-02-23 17:54:33 +01:00
Jocelyn Turcotte
ff2d98596f
Split running jobs into a separate vector
2017-02-23 17:54:33 +01:00
Jocelyn Turcotte
072698d606
Split the subjob logic out of PropagateDirectory
2017-02-23 17:54:33 +01:00
Jocelyn Turcotte
0b098045f1
Replace WaitForFinishedInParentDirectory with WaitForFinished for directory moves
...
In preparation for the PropagateDirectory refactoring, simplify things
by removing WaitForFinishedInParentDirectory, which is currently
implemented as a one-level check.
This value is important for directory items, but is however never
used since a directory CSYNC_INSTRUCTION_RENAME item will always be in
PropagateDirectory::_firstJob, which will have to pass through its own
PropagateDirectory job's parallelism() before reaching the parent's
_subJobs optimization.
Since PropagateDirectory::parallelism can only return WaitForFinished
or FullParallelism, that value is lost. So this commit doesn't
change the behavior for directories, and allow file renames to be
scheduled in parallel across directories (which isn't a problem).
2017-02-23 17:54:33 +01:00
Jocelyn Turcotte
ddb6b3b262
Fix TestSyncEngine::abortAfterFailedMkdir (again)
...
It could be possible that _firstJob is marked as finished if
aborted before its parent PropagateDirectory was marked as finished,
allowing a posted scheduleNextJob call to schedule the child job
in-between.
2017-02-23 17:54:33 +01:00
Olivier Goffart
7bfe061382
Verify that all strings are properly escaped ( #5558 )
...
- I checked every occurence of a '%2' and make correct use of the
QString::arg overload that takes several argument instead of chaining
them, because the first argument can contains a '%1'
- I tried to look for every label that they either use plain text or richtext
and escape the user provided strings in there.
2017-02-23 14:54:17 +01:00
Jenkins for ownCloud
1333252902
[tx-robot] updated from transifex
2017-02-23 02:18:29 +01:00
Christian Kamm
21a09df7d1
Wizard: Handle PROPFIND redirects #5553
...
By default, followRedirects is true for all requests, to transparently
handle redirections. In the wizard, we have special redirect-handling
code though and that was being skipped.
Setting the flag to false allows the wizard to be aware of redirects
and to handle them in the correct way. Tested with the server described
in
https://github.com/owncloud/administration/tree/master/redirectServer
There's a second bug here, where followRedirects always converts
redirected requests to the GET verb. That means redirected PROPFINDs
will never have worked. This change un-breaks them for the wizard only.
There should be no case that previously worked that stops working now.
2017-02-22 13:24:13 +01:00
Jenkins for ownCloud
23313c47f8
[tx-robot] updated from transifex
2017-02-22 02:18:36 +01:00
Matthew Setter
7f2470f1f6
Merge pull request #5549 from owncloud/fix-documentation-build-process
...
Fix documentation build process
2017-02-21 13:52:45 +01:00
Matthew Setter
488b964c52
Merge branch 'master' into fix-documentation-build-process
2017-02-21 12:07:57 +01:00
Matthew Setter
b4d3f696bf
Re-add the Makefile for controlling the build process
...
I'm not sure, why the file was removed, it was there in 2013, but it was
removed. This commit adds it back so that the build process can be
automated in a UNIX environment.
2017-02-21 11:58:15 +01:00
Markus Goetz
4a880ec113
Update ChangeLog
2017-02-21 11:53:54 +01:00
Matthew Setter
9cc4d363b2
Fix the Sphinx-doc build configuration
...
I'm not sure what the configuration/setup has been like to date. But as
it stood, it didn't build successfully. Given that, I've created a copy
of doc/conf.py, included in this commit, from the default doc/conf.py.in
and set the appropriate variables as necessary.
NOTE: The build didn't work when the version, release, and latex_logo
values weren't set, either directly or with interpolatable values.
2017-02-21 11:49:23 +01:00
Matthew Setter
b646caffd0
Merge pull request #5547 from owncloud/update-docs-build-configuration
...
Create a build configuration file
2017-02-21 09:37:01 +01:00
Matthew Setter
b9bc3e36b8
Merge pull request #5545 from owncloud/grammar-updates
...
Fix grammar and spelling errors in the documentation
2017-02-21 09:28:55 +01:00
Jenkins for ownCloud
39b16389f9
[tx-robot] updated from transifex
2017-02-21 02:18:36 +01:00
Markus Goetz
65d8f51a10
Message Boxes: Force to be more on top #5503 ( #5536 )
2017-02-20 13:58:35 +01:00
Matthew Setter
24aaf7a034
Create a build configuration file
...
This is no different from the default file, conf.py.in, except for the
specification of the logo file.
2017-02-20 11:04:01 +01:00
Matthew Setter
80f2e40e67
Fixed grammar and spelling errors in the documentation
2017-02-20 10:52:22 +01:00
Jenkins for ownCloud
15d1c7374c
[tx-robot] updated from transifex
2017-02-20 02:18:28 +01:00
Jenkins for ownCloud
a11cee4e26
[tx-robot] updated from transifex
2017-02-19 02:18:28 +01:00
Jenkins for ownCloud
a9dc2ebff6
[tx-robot] updated from transifex
2017-02-18 02:18:30 +01:00
Olivier Goffart
112a7dba73
Propagator: Fix t8.pl
...
The test sets OWNCLOUD_MAX_PARALLEL to 1 to disable parallelism.
But since the max amount of parallelism is twice as much, that does not
work.
So change the way we compute the hardMaximumActiveJob: Use the value of
OWNCLOUD_MAX_PARALLEL to maximize this amount and base the maximum amount
of transfer jobs on it instead of the other way.
A result of this change is that, in case of bandwidth limit, we keep the
default of 6 non-transfer jobs in parallel. I believe that's fine since
the short jobs do not really use bandwidth, so we can still keep the same
amount of small jobs.
2017-02-17 16:56:57 +01:00
Christian Kamm
ee11b5d9be
Revert "Don't blacklist 507 Insufficent Storage #5346 ( #5424 )"
...
This reverts commit e1f5a49c21 .
Retrying uploads with insufficent storage errors frequently leads to
high server traffic. See #5537 for links and a sketch of a correct
solution.
2017-02-17 16:21:54 +01:00
Jocelyn Turcotte
824be789bf
Revert "Fix TestSyncEngine::abortAfterFailedMkdir"
...
This reverts commit 1cec2ca13d
but keeps the reset() -> take() part that is probably the cause
of crashes we've seen in the crash reporter.
2017-02-17 14:06:30 +01:00
Jenkins for ownCloud
db20aa01da
[tx-robot] updated from transifex
2017-02-17 02:18:36 +01:00
Olivier Goffart
a3f4907e0b
AccessManager: don't set an invalid network configuration on linux ( #5538 )
...
If we call
setConfiguration(QNetworkConfiguration());
This sets an invalid configuration on the QNAM.
But later, when we really go online because interfaces are discovered,
QNetworkAccessManagerPrivate::_q_onlineStateChanged is called (with isOnline=true).
And this will set the state to disconnected because customNetworkConfiguration is
true, and the networkConfiguration state is disabled.
The workaround we to fix another bug on Windows in which the default network
configuration was not behaving properly.
The issue on linux is hard to reproduce and only happen in some condition,
but it was reproduced on smashbox when they run two owncloudcmd at the same time.
Issues: #4720 , #3600
2017-02-16 16:14:55 +01:00
Christian Kamm
4d7dd0c909
Recent Changes: Fix duplicates #5256
...
The transmissionProgress emission when the whole sync finishes
shouldn't look exactly like the one for the last file.
2017-02-16 15:10:46 +01:00
Jenkins for ownCloud
88da5f6592
[tx-robot] updated from transifex
2017-02-16 02:18:36 +01:00
Olivier Goffart
e8c10501a5
Folder: Keep files option after aboutToRemoveAllFiles should not clear selective sync list ( #5531 )
...
We were removing the wholme journal db when the user wanted to keep all files,
But that would also remove the selective sync lists.
We should only remove the metadata table.
Issue #5484
2017-02-15 13:27:41 +01:00
Roeland Jago Douma
99aaf22ae5
Update windows docker file to use 2.3 OBS repo
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-02-15 09:49:29 +01:00
Jenkins for ownCloud
3943016f3b
[tx-robot] updated from transifex
2017-02-15 02:18:29 +01:00
Olivier Goffart
172689d35c
Merge remote-tracking branch 'origin/2.3'
2017-02-14 15:08:10 +01:00
Jocelyn Turcotte
60a4a742a3
Disable tests uncompatible with Qt4 for that build
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
b26db062d2
Fix the UNIT_TESTING build on Windows
...
- Put all tests in the bin directory so that DLLs can be loaded
- Add missing exports
- Skip tests that use code depending on zlib
- The "GMT" timezone is named differently, use the int constructor instead
5 tests are still failing, it's not really worth fixing at the moment
since no developper is currently using Windows as its main platform.
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
611f633ba8
Fix FolderManTest on macOS
...
On macOS /var is a symlink to /private/var and we have to make sure that we
use the canonical path before and after it enters the code to make sure we
compare paths correctly.
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
3265948458
Fix ExcludedFilesTest on macOS
...
Use the same logic to find sync-exclude as check_csync_exclude.c
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
0e3e9d5991
Fix FileSystemTest on macOS
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
0be6cd3bf7
Fix FolderWatcherTest on macOS and Windows
...
- We need to use a QGuiApplication on macOS or else we don't get notifications
- Switch to use QSignalSpy rather than lists and sleeps
- Use system() for all modifications since we pass kFSEventStreamCreateFlagIgnoreSelf
- Keep using the local process on Windows since it catches its own events
2017-02-14 14:32:41 +01:00
Jocelyn Turcotte
867b78052d
Fix UtilityTest on macOS
2017-02-14 14:32:41 +01:00
Olivier Goffart
058f7df635
Folder: remove unused variable
2017-02-14 10:10:07 +01:00
Jenkins for ownCloud
c1552d7984
[tx-robot] updated from transifex
2017-02-14 02:18:27 +01:00
Markus Goetz
575b981542
Modify Jenkinsfile for 2.3
2017-02-13 14:47:51 +01:00
Jenkins for ownCloud
0d0af95956
[tx-robot] updated from transifex
2017-02-13 02:18:28 +01:00
Jenkins for ownCloud
6c5d873647
[tx-robot] updated from transifex
2017-02-12 02:18:28 +01:00
Jenkins for ownCloud
71187e1744
[tx-robot] updated from transifex
2017-02-11 02:18:34 +01:00
Christian Kamm
006ce854a6
Doc: For conflicts, the local file is renamed #5521
2017-02-10 12:50:35 +01:00
Jenkins for ownCloud
697178bab6
[tx-robot] updated from transifex
2017-02-10 02:18:29 +01:00
Jenkins for ownCloud
d8a86da377
[tx-robot] updated from transifex
2017-02-09 02:18:33 +01:00
Jocelyn Turcotte
d1dace9e7f
Remove unneeded Q_DECLARE_METATYPE
2017-02-08 17:57:20 +01:00
Jocelyn Turcotte
1cec2ca13d
Fix TestSyncEngine::abortAfterFailedMkdir
...
It could be possible that _firstJob is marked as finished if
aborted before its parent PropagateDirectory was marked as finished,
allowing a posted scheduleNextJob call to schedule the child job
in-between.
2017-02-08 17:32:04 +01:00
Jocelyn Turcotte
1d9e08d109
Skip TestSyncEngine::abortAfterFailedMkdir
2017-02-08 17:25:32 +01:00
ckamm
7879c470b3
Merge pull request #5518 from ckamm/asserts
...
Improve usage of asserts
2017-02-08 15:25:02 +01:00
Christian Kamm
3c7545a45f
CMake: Don't force-enable asserts #5429
...
Should be safer now that we've gone through asserts and assured that
one ones that should be fatal continue to exist in release builds
independently of QT_NO_DEBUG.
2017-02-08 15:15:19 +01:00
Christian Kamm
4c1fdf1dee
Double check usage of asserts #5429
...
A few are supposed to be fatal.
2017-02-08 15:15:19 +01:00
Christian Kamm
18e25122db
Performance: reserve() _remotePerm #5496
2017-02-08 15:06:09 +01:00
Olivier Goffart
439e688906
Folder: Change the wording for the massive deletion message
...
Issue #5503
2017-02-08 14:30:14 +01:00
ckamm
4198d9f420
Settings: Don't migrate settings on access error #5499 ( #5523 )
...
Previously, we'd try migrating from legacy settings if reading
the settings failed with an error. Now, we try again after a
couple of seconds and eventually give up.
2017-02-08 14:28:50 +01:00
Olivier Goffart
06579a5c70
AccountManager: Fix small leak in the account migration code
...
The QSettings object was not deleted in every possible code paths
2017-02-08 12:31:07 +01:00
Markus Goetz
df773ea8bb
CentOS: More build fixes
2017-02-08 11:39:28 +01:00
Markus Goetz
e7be4faac8
CentOS: Another attempt
2017-02-08 11:15:23 +01:00
Jenkins for ownCloud
a184c6bec1
[tx-robot] updated from transifex
2017-02-08 02:18:27 +01:00
Markus Goetz
1102ac20ac
Improve previous fix
...
After comment on 78a798eef3
2017-02-07 19:40:32 +01:00
Markus Goetz
6a4ae63f14
CentOS: Another fix for old compiler version (2)
2017-02-07 19:22:04 +01:00
Markus Goetz
6c6961e4d9
ChangeLog for 2.3 additions
2017-02-07 19:04:00 +01:00
Markus Goetz
78a798eef3
Old Qt: Another build fix
2017-02-07 18:54:40 +01:00
Markus Goetz
19dd656989
CentOS: Another fix for old compiler version
2017-02-07 18:32:34 +01:00
Markus Goetz
d9fac50e9b
CentOS: Fix build for old compiler version
2017-02-07 18:05:29 +01:00
Markus Goetz
9614a94035
Revert "Disable RTTI"
...
This reverts commit 85d3de1589 .
This breaks our old Qt on CentOS.
We can re-introduce this with #5470
2017-02-07 17:35:04 +01:00
Jenkins for ownCloud
5002964546
[tx-robot] updated from transifex
2017-02-07 02:18:27 +01:00
Jenkins for ownCloud
4cca1ba55f
[tx-robot] updated from transifex
2017-02-06 02:18:27 +01:00
Jenkins for ownCloud
3e99c32582
[tx-robot] updated from transifex
2017-02-05 02:18:27 +01:00
Jenkins for ownCloud
74ce597f8d
[tx-robot] updated from transifex
2017-02-04 02:18:27 +01:00
Jenkins for ownCloud
a27b2d94b3
[tx-robot] updated from transifex
2017-02-03 02:18:27 +01:00
Jenkins for ownCloud
890e771ec1
[tx-robot] updated from transifex
2017-02-02 02:18:27 +01:00
Jenkins for ownCloud
5df10cb8f8
[tx-robot] updated from transifex
2017-02-01 02:18:28 +01:00
Jenkins for ownCloud
9acc974268
[tx-robot] updated from transifex
2017-01-31 02:18:26 +01:00
Jenkins for ownCloud
42e64026ae
[tx-robot] updated from transifex
2017-01-30 02:18:28 +01:00
Jenkins for ownCloud
78e7d13f9f
[tx-robot] updated from transifex
2017-01-29 02:18:27 +01:00
Jenkins for ownCloud
2d55332a45
[tx-robot] updated from transifex
2017-01-28 02:18:34 +01:00
Jenkins for ownCloud
72cd9abd4a
[tx-robot] updated from transifex
2017-01-28 01:15:15 +01:00
Olivier Goffart
0d16cf41fe
Merge remote-tracking branch 'origin/master' into 2.3
...
We can do that because the only changes that were in master but not in 2.3 were the
translations change and documentation change, and the support for the 'M' permission
which we want in 2.3.
2017-01-27 17:45:05 +01:00
Olivier Goffart
65e4afedc4
Account Wizard: don't whitelist everything on the first sync if we still want to confirm big folder
...
Issue: https://github.com/owncloud/client/pull/5340#issuecomment-274564441
2017-01-27 15:59:59 +01:00
Olivier Goffart
b76a9654cc
General Settings: Make sure to reload the settings when an account is added
...
The Size limit, or confirmation checkboxes might have changed.
We need to guard against saving if the control changes while we are loading
Issue: https://github.com/owncloud/client/pull/5340#issuecomment-274878023
2017-01-27 15:59:59 +01:00
Olivier Goffart
38cf459b3e
Confirm External Storage: adjust the notification message
...
We need to forward the information that the folder is an external storage
for the notification message.
Issue: https://github.com/owncloud/client/pull/5340#issuecomment-274878023
2017-01-27 15:59:59 +01:00
Olivier Goffart
ed7416098e
Wizard: Increase the size
...
The advanced page has become quite complex and does not fit on the screen
anymore if the fonts are too big
2017-01-27 15:59:59 +01:00
Olivier Goffart
517623e457
FolderStatusModel: Different icon for external storages
...
Issue: https://github.com/owncloud/client/pull/5340#issuecomment-274564441
2017-01-27 15:59:59 +01:00
Olivier Goffart
f89bc09fd1
Discovery: Filter 'M' out of permissions for non root storage
...
The sync engine rely on the 'M' in premission to ask for confirmation
(As requested in issue #5340 )
But we only want to ask the premission for the 'root' of the mounting point and not
for every subfolders within it.
So we change the discovery phase in a way that it does not keep the 'M' for
children within the external storage.
2017-01-27 15:59:59 +01:00
Olivier Goffart
f854c5263b
Wizard: Add options to ask confirmation for external storage
...
Added two checkboxes in the Account Wizard in the advanced page to change the first options.
Also added a checkbox in the general settings to ask for confirmation for external storages.
Theme options allow to hide the checkboxes in the wizard.
As described in issue #5340
2017-01-27 15:59:59 +01:00
Olivier Goffart
70da607e06
Discovery: Add branding option to disable default sync of 'M' directories
...
Issue #5331 and https://github.com/owncloud/enterprise/issues/1594
2017-01-27 15:59:59 +01:00
Jenkins for ownCloud
4f28b2daad
[tx-robot] updated from transifex
2017-01-27 02:18:28 +01:00
Jocelyn Turcotte
8884fe7236
Remove PropagateDirectory::_runningNow
...
This variable isn't used anymore except in a stray Q_ASSERT.
2017-01-26 17:13:54 +01:00
Jocelyn Turcotte
bb3efc5988
Clear SyncEngine::_remotePerms after the sync
...
Also make reuse the SyncFileItem::_remotePerm QByteArray allocation
instead of redoing the copy from the csync char*.
2017-01-26 17:13:54 +01:00
Jocelyn Turcotte
f6665ccc81
Pack boolean members in PropagateUploadFileCommon #5457
2017-01-26 17:13:54 +01:00
Jocelyn Turcotte
f1e9be4fa8
Don't use the StopWatch for each job in production builds #5456
...
This accounted for more than 10% of the peak memory usage while only
providing value through the debugging log.
2017-01-26 17:13:54 +01:00
Jocelyn Turcotte
9db23d4df1
Remove SyncFileItem::_requestDuration #5456
...
This will save a QElapsedTimer in each job that was used only for
.owncloudsync.log (for which the request duration doesn't bring much
value).
2017-01-26 17:13:54 +01:00
Jocelyn Turcotte
9d16ad844c
Don't reallocate a QByteArray for each contentChecksumType call #5481
2017-01-26 17:13:54 +01:00
Jocelyn Turcotte
b0700ebbab
Remove duplicate SyncFileItem entries for the log
...
The accuracy of that log isn't as important as the few bytes those
fields take as hostage for the whole sync.
2017-01-26 17:13:54 +01:00
Markus Goetz
2bda55be81
Don't create legacy 'folders/' subdirectory
2017-01-26 12:29:58 +01:00
Markus Goetz
e859d220be
Cookies: Use different DB for different accounts ( #5490 )
...
This is a follow up to #5469
2017-01-26 10:54:03 +01:00
Piotr Mrówczyński
c3ae5123cb
Delete finished propagation jobs in PropagateDirectory #5269 ( #5400 )
2017-01-26 10:03:22 +01:00
Jenkins for ownCloud
a1a5111a8a
[tx-robot] updated from transifex
2017-01-26 02:18:40 +01:00
Jocelyn Turcotte
ee211d7609
Release SyncFileItem objects with their job
...
We now delete subjobs as their propagation is complete. This allows us
to also release the item by making sure that nothing else is holding a
reference to it.
Remove the stored SyncFileItemVector from SyncEngine and SyncResult
and instead gather the needed info progressively as each itemCompleted
signal is emitted.
This frees some holes on the heap as propagation goes, allowing many
memory allocations without the need of requesting more virtual memory
from the OS, preventing the memory usage from increasingly growing.
2017-01-25 23:26:23 +01:00
Jocelyn Turcotte
1fc5a76622
Pass the SyncFileItem as SyncFileItemPtr in itemCompleted
...
This will allow us to keep a reference on the items in connected slots.
2017-01-25 23:26:23 +01:00
Jocelyn Turcotte
a764d7eb86
Don't pass the PropagatorJob in itemCompleted
...
This was to catch duplicate emissions for PropagateDirectory but we
don't emit this signal anymore from there.
This fixes a warning about PropagatorJob not being a registered metatype.
This reverts commit fe42c1a818 .
2017-01-25 23:26:23 +01:00
Jocelyn Turcotte
605a18ff73
Tests: Add a large sync benchmark
...
This simulates a ~50k files sync that can be used to measure memory
usage without having to wait for a server.
2017-01-25 23:26:23 +01:00
Jocelyn Turcotte
92e86641d1
Bring back the error message if the sync-exclude.lst file is missing
...
We unconditionnally add the file on startup, but don't check for errors.
During sync we check for errors, but only try loading the file if it
exists.
2017-01-25 23:26:23 +01:00
Markus Goetz
c8cfb3160e
Merge remote-tracking branch 'origin/selective-sync-big-folder' into 2.3
2017-01-25 19:45:20 +01:00
Olivier Goffart
268fc97a71
Merge pull request #5480 from owncloud/chunking-ng-cleanup
...
Chunking ng cleanup
2017-01-25 19:19:48 +01:00
Jenkins for ownCloud
de2458d892
[tx-robot] updated from transifex
2017-01-25 02:18:34 +01:00
Matthew Setter
d75b838897
Add extra note about deleting .csync_journal.db
...
This is added as per the recommendation from @guruz in #5252 .
2017-01-24 16:18:21 +01:00
Carla Schroder
4df7cab72a
add note about deleting .csync_journal.db for "CSync unknown error"
2017-01-24 16:18:21 +01:00
Christian Kamm
59c1fdbe05
Shib: Use different keychain entry per account #5469
...
Previously shib multiaccount didn't work at all because the
session cookie was stored in the same keychain entry.
2017-01-24 13:14:11 +01:00
Christian Kamm
26234dbf6c
Folders: Adjust ui when account is disconnected #5477
...
Previously if you paused/unpaused a folder for a disconnected account
they would prepare to sync and thus display the 'Waiting...' text. With
this change, folders that can't possibly sync don't show text like
this.
When account connectivity changes, all unpaused folders will be
scheduled anyway.
2017-01-24 10:26:03 +01:00
Jenkins for ownCloud
05a254b527
[tx-robot] updated from transifex
2017-01-24 02:18:28 +01:00
Klaas Freitag
e95b73dfac
Avatar: Set a circle mask around the avatar image.
...
The server displays the avatar cut into a circle, and so we do.
2017-01-23 21:36:18 +01:00
Klaas Freitag
c00e3e8c0a
ConnectionValidator: Set a 20 second timeout for Avatar request.
2017-01-23 21:35:12 +01:00
Klaas Freitag
2a12610a46
Update ASCII-Art describing the connection check flow.
...
Added Avatar fetching
2017-01-23 21:34:34 +01:00
Jenkins for ownCloud
d282a8380e
[tx-robot] updated from transifex
2017-01-23 11:11:23 +01:00
Klaas Freitag
d466a05915
SettingsDialog: Display the user avatar as action icon if available.
...
The avatar image is fetched from the server async, thus connect a signal
from the account if the avatar changes.
Server feature https://github.com/owncloud/core/pull/26872 is needed.
2017-01-22 13:58:36 +01:00
Klaas Freitag
e05d6bfcdc
Make the Account store the avatar pixmap.
...
The avatar pixmap is fetched from the server by the Connectionvalidator,
once it has validated the user name, it queries the avatar pixmap.
If the server does not have the avatar route, an empty pixmap is stored.
2017-01-22 13:55:08 +01:00
Klaas Freitag
b49dd02e3d
New network job AvatarJob: GETs the account avatar from server.
2017-01-22 13:52:19 +01:00
Jenkins for ownCloud
83dfbb933b
[tx-robot] updated from transifex
2017-01-22 02:18:27 +01:00
Jenkins for ownCloud
100603fdc0
[tx-robot] updated from transifex
2017-01-21 02:18:28 +01:00
Olivier Goffart
d6fdda8efa
ChunkingNG: add '0' padding on the filename ( #5476 )
...
The server sorts the chunk by name alphabetically. So if we want to keep
the chunk in order, we need to add a few '0' in front of the chunk name
2017-01-20 16:03:50 +01:00
Markus Goetz
faedaa5e09
Update issue_template.md
2017-01-20 16:00:50 +01:00
Olivier Goffart
8a70d22af7
ChunkingNG: Add some tests
...
- Test that we recover correctly if the chunks were removed on the server.
- Test changing the file localy while uploading.
2017-01-20 14:48:53 +01:00
Olivier Goffart
a63d970e5e
ChunkingNG: remove stale chunks when cleaning the uploadInfo table
...
Stale chunks might be there because a file was removed or would just not
be uploaded, for any reason.
We just start the DeleteJob but we don't care if it success or not.
Relates to https://github.com/owncloud/core/issues/26981
One of the test is testing the case where the file is modified on the server
during the upload. So this test the precondition failed error.
The FakeGetReply logic was modified because resizing a 150MB big QByteArray
by increment of 16k just did not scale when downloading a big file.
2017-01-20 14:48:53 +01:00
Olivier Goffart
f6c77fad17
ChunkingNG: delete stale chunks if the file was changed locally
...
Relates to https://github.com/owncloud/core/issues/26981
We do not track the success or error of the DeleteJob because it does not
matter. If it fails, it might be because the chunks were already removed.
If not, the chunks will be stale, but the server must anyway do a few
cleanup from time to time because we do not always remove the chunks
2017-01-20 14:48:53 +01:00
Jenkins for ownCloud
661c7f0558
[tx-robot] updated from transifex
2017-01-20 02:18:34 +01:00
Jenkins for ownCloud
a7efe144fc
[tx-robot] updated from transifex
2017-01-19 02:18:40 +01:00
Jocelyn Turcotte
b68a28de8d
StatusTracker: Emit OK for the last child before parents ( #5467 )
...
The current logic tried to avoid a DB lookup just to fetch whether
the file is shared or not since that info is already in the
SyncFileItem. The implementation would however need to decrease the
sync count for itself (and parents) before emitting the new status,
thus emitting the OK status for parents before that last child that
ended the propagation for that folder.
Change the implementation to achieve what we want: give the
possibility to decSyncCount to use a pre-fetched sharing state while
still doing the emission for all involved files. This ensures that
the leaf file also gets its status emitted before its parents.
Issue #4797
2017-01-18 15:40:52 +01:00
Samuel Alfageme
72a7b7ca42
Reference to build Qt5 with qtwebkit support in the docs #5129 ( #5471 )
...
This addresses the issue only on OS X. It should be stated though, that qtwebkit is not part of the qt5core lib and therefore a requirement for the projectto build in the rest of the OSS
2017-01-18 14:46:47 +01:00
Jocelyn Turcotte
166ef85a51
shell/Windows: Update binaries to build 44
2017-01-18 13:34:02 +01:00
Matthew Setter
1f60c61f87
Update the MacOS automatic update instructions
...
As requested in #5431 , the automatic update instructions for MacOS X
have been simplified; removing the older, incorrect instructions.
2017-01-18 12:55:23 +01:00
Matthew Setter
30ef794fa1
Fix several typos in the client documentation
2017-01-18 12:53:33 +01:00
Jocelyn Turcotte
47fbfbc006
shell/Windows: Avoid memory allocations and copies when querying icons
...
IsMemberOf is called for every file (in the ownCloud directory or not) and
with every instance of OCOverlay (we have 5) when displaying a list of
files in Explorer.
Refactor the code to avoid copying the list of watched directories, as
well as creating a wstring from a PWWSTR for files outside watched
directories.
Also change some calls of begin_with to use isDescendantOf since it
properly handles parent paths not ending with a backslash, which could
lead to SocketAPI queries for sibling folders with a name that starts with
a watched folder name.
2017-01-18 12:15:52 +01:00
Jocelyn Turcotte
e131c142ff
shell/Windows: Fix the view not being updated on StateError
...
Since StateError == 0, if this was the status used when the path
isn't in the map already, the view would not be updated since the
new state would be the same as the default-constructed state in the
map. Fix by explicitly inserting in that case, this also avoid aving
to do two lookups in the map when a path already has an entry.
2017-01-18 12:15:52 +01:00
Jocelyn Turcotte
1b99ff2e91
shell/Windows: Remove the UPDATE_VIEW message handling
...
The client now tries to only push STATUS messages to connections
unless they previously requested it with a RETRIEVE_FILE_STATUS,
but this means that we now have to make sure that a new connection
will rerequest every icon that the user will see on files from that
point on.
To that end, we now send a SHChangeNotify for every file in the cache
when we lose the connection (or on UNREGISTER_PATH) to make sure that
what's on the screen matches what's in the cache. We also remove the
_oldCache logic that made this more difficult to enforce.
The client has been able to reliably push status updates on macOS
for a few versions now, and we don't need it on Windows either. The
_oldCache mechanism was to avoid sending to many update requests
when receiving an UPDATE_VIEW.
Also fixes #4766
2017-01-18 12:15:52 +01:00
Jocelyn Turcotte
3e85d47a57
shell/Windows: Convert tabs to space
...
It was a mix of both and the rest of the code uses spaces.
2017-01-18 12:15:52 +01:00
Jocelyn Turcotte
e709d75d56
shell/Windows: Remove unused files
...
The real OCContextMenu.cpp is in the OCContextMenu folder.
2017-01-18 12:15:52 +01:00
Jocelyn Turcotte
cb5cfb8cf6
shell/macOS: Make sure the root folder's cache is cleared on disconnect
...
The SocketAPI now only sends status pushes for paths requested by the
shell. We have to make sure that Finder doesn't just show the entry
from its cache after a reconnect.
2017-01-18 12:15:52 +01:00
Jocelyn Turcotte
ebd2a15711
shell/macOS: Remove backslashes from the extension display name
...
Tell cmake not to escape shell strings adding backslashes before
spaces by passing the VERBATIM optiton. Also add the quotes to
whole command line arguments to prevent quotes from appearing on the
XCode side, because of the VERBATIM option.
This only affects themed clients since the default theme doesn't
have space in its APPLICATION_NAME.
2017-01-18 12:15:52 +01:00
Jocelyn Turcotte
d3a0608bd5
SocketAPI: Only push status for files requested by the shell #5361
...
We currently push the SYNC status for all files that will be propagated,
and then the OK status when those files are propagated.
On top of this, we send those statuses to all clients connected, even
if the socket is kept open by an application that only needed to show
a file open dialog. On macOS we're also using an NSConnection which
means that we have to wait for the RPC call to return from the
extension, which makes bulk status changes possibly heavy.
Reduce the time spent needlessly sending status pushes by limiting
them to files requested through that socket since it connected.
To limit the data to store, only remember the parent directory of
files requested, and store those in a bloom filter.
Note that this adds a requirement to shell extensions: they should
make sure that the status cache only contains entries that have been
requested through the socket API. In other words, the status cache
must be empty when each socket client connects to the socket API.
Otherwise the cached icon type will be shown to the user, and the
SocketAPI won't push new status for that file if it didn't receive
a RETRIEVE_FILE_STATUS.
2017-01-18 12:15:52 +01:00
Jocelyn Turcotte
c25b599bbb
SocketApi::slotReadSocket: Small optimizations
...
- Use the looked-up method index also for the invocation
- Do the method name concatenation already on QByteArray since we'll
convert anyway
- Use staticMetaObject instead of metaObject()
2017-01-18 12:15:52 +01:00
Jocelyn Turcotte
a5ff9e58e3
SocketAPI: Remove unecessary null-checks
...
Those methods are private and there is only one call-site, we can
be sure that this parameter won't be null already.
2017-01-18 12:15:52 +01:00
Olivier Goffart
9b96899d75
Sync Engine: Specify what chars are not syncable in the error message #1733 ( #5449 )
2017-01-18 11:45:46 +01:00
Olivier Goffart
b046cca010
Fix more compilation errors with Qt 4
...
Ammand last commit which was a fixup to the change from pull request #5468
for issue #5453
2017-01-18 10:19:51 +01:00
Olivier Goffart
edf0a99a8a
Fix compilation with Qt 4
...
Fixup to the change from pull request #5468 for issue #5453
2017-01-18 09:57:36 +01:00
Jenkins for ownCloud
a4640b202f
[tx-robot] updated from transifex
2017-01-18 02:18:27 +01:00
Markus Goetz
5ef2e88f00
NSIS: Adjust to 5.6.2 image
2017-01-17 17:35:32 +01:00
Christian Kamm
352f168313
Folder: Remove unused variable
2017-01-17 14:53:09 +01:00
Markus Goetz
85d3de1589
Disable RTTI
...
Shrinks owncloud binary by 24 KB and libowncloudsync by 14 KB.
I don't know if it has influence on memory usage or runtime speed though.
Was worth a try.
2017-01-17 14:52:10 +01:00
Markus Goetz
588a88fb63
Updater: Don't create instance for invalid URL
...
Also don't use dynamic_cast
For enterprise/#689
2017-01-17 14:52:10 +01:00
Christian Kamm
cd9e88ad22
PropagatorJob: Remove unneccessary pointer #5453
2017-01-17 14:47:38 +01:00
Christian Kamm
29b39acfbe
PropagatorJob: Access propagator through function #5453
2017-01-17 14:47:38 +01:00
Matthew Setter
7427be0062
Merge pull request #5466 from settermjd/add-directory-limit-to-faq
...
Add Sync Client's Directory Depth Limit To FAQ
2017-01-17 14:33:35 +01:00
Matthew Setter
e7546903cc
Add an FAQ entry about the sync client's sub-directory scan limit
...
As requested in #1067 , this commit adds an entry to the FAQ to highlight
the fact that the sync client will never scan greater than 50
sub-directories.
2017-01-17 11:14:52 +01:00
Matthew Setter
78e3a7e897
Revise the FAQ entry style
...
This approach uses less content, and makes the content more prominent.
2017-01-17 10:36:42 +01:00
Jenkins for ownCloud
1a21b8698e
[tx-robot] updated from transifex
2017-01-17 02:18:34 +01:00
Carlos Damken
280906eab9
Ignoring "System Volume Information"
...
Avoid to upload the "System Volume Information"
2017-01-16 19:11:56 +01:00
Markus Goetz
9d7425b201
DB: Also migrate -shm and -wal to new name #3764 #5045 ( #5459 )
2017-01-16 15:42:11 +01:00
Markus Goetz
7eb43d7f7e
PropagateUploadFileNG: Delete unused map contents to free memory
2017-01-13 19:00:04 +01:00
ckamm
d76e0ec6d8
Reset stuck chunked uploads eventually #5344 ( #5443 )
...
Previously this wasn't happening for errors that were not
NormalErrors because they don't end up in the blacklist.
This revises the resetting logic to be independent of the
error blacklist and make use of UploadInfo::errorCount
instead.
412 errors should reset chunked uploads because they might be
indicative of a checksum error.
Additionally, server bugs might require that additional
errors cause an upload reset. To allow that, a new capability
is added that can be used to advise the client about this.
2017-01-13 14:44:45 +01:00
Olivier Goffart
0249a68420
SelectiveSync: adjust the position of the "Loading" label
...
It should be parented to the treeview to be sure that is shows inside of it.
2017-01-13 10:55:45 +01:00
Christian Kamm
aa6f041c36
wizardSelectiveSyncDefaultNothing applies to folder wizard #4581
...
Previous the Theme option only applied to the account setup wizard.
2017-01-13 10:52:39 +01:00
Christian Kamm
dce3f8c4f6
Selective sync: Adjust widget common to folder/account wizards
2017-01-13 10:52:10 +01:00
Jenkins for ownCloud
4a83f976e1
[tx-robot] updated from transifex
2017-01-13 02:18:27 +01:00
Jenkins for ownCloud
23572aaf77
[tx-robot] updated from transifex
2017-01-12 02:18:33 +01:00
Christian Kamm
48655ff1ec
Doc: Add forceSyncInterval and timeout config file flags
2017-01-11 11:34:36 +01:00
Christian Kamm
ffbf34cb97
Log the auth type being used for accounts
...
There have been hard to track down bugs related to the wrong auth
type being used.
2017-01-11 09:30:59 +01:00
Jenkins for ownCloud
fad690be11
[tx-robot] updated from transifex
2017-01-11 02:18:38 +01:00
Jenkins for ownCloud
355a644020
[tx-robot] updated from transifex
2017-01-10 02:18:34 +01:00
Jenkins for ownCloud
5e6e4e7464
[tx-robot] updated from transifex
2017-01-08 02:18:35 +01:00
Markus Goetz
76fde49282
sqlite: Update bundled version to 3.16.1
...
For OS X and Windows.
2017-01-05 17:27:46 +01:00
Markus Goetz
4ef7d0410d
First iteration ChangeLog for 2.3.0
2017-01-05 16:56:37 +01:00
octotree
a1b4984d14
Symlink Support for Dolphin Plugins ( #5428 )
...
Add Symlink Support to Dolphin Overlay Plugin
2017-01-05 13:24:22 +01:00
Christian Kamm
adbe5ecf55
ownsql: qFatal on prepare errors #5357
2017-01-04 15:15:06 +01:00
Jenkins for ownCloud
ba32571039
[tx-robot] updated from transifex
2017-01-04 02:19:32 +01:00
Christian Kamm
084146756b
Account: Fix displayName() #5413
...
This displayName() seemed to be based on Account::user() which used
to call _credentials->user(). But then we repurposed user() to be
davUser() and this usage wasn't updated to point back to the username
used for the credentials.
2017-01-03 13:54:59 +01:00
ckamm
e1f5a49c21
Don't blacklist 507 Insufficent Storage #5346 ( #5424 )
2017-01-03 13:48:32 +01:00
ckamm
143320341e
Build: Enable Q_ASSERT in release mode ( #5425 )
2017-01-03 13:42:25 +01:00
Christian Kamm
e286bb1b64
Wizard: Don't accidentally pre-fill url field #5412
...
slotUrlEditFinished() is called when the wizard is triggered in
some situations.
2017-01-03 11:53:40 +01:00
Olivier Goffart
d433f0e08e
HTTPCreds: remove all cookies when logging out ( #5383 )
...
Some custom server use persistent cookies with the auth token. So we should
clear all the cookies when disconnecting.
Account::clearCookieJar is only called from the HTTPCredentials. This funciton
is not used for shibboleth.
There is probably no reasons to keep the HTTP cookie anyway.
Issue #5370
2017-01-03 11:39:10 +01:00
Christian Kamm
107149d601
Doc: Improve example #5422
2017-01-03 11:31:51 +01:00
Christian Kamm
fa9b36f829
Wizard: Let the user know if url is invalid #5398
2017-01-03 11:28:56 +01:00
Christian Kamm
6775292d63
Fix compile of tests
2017-01-03 10:52:39 +01:00
Christian Kamm
6835429a28
Sql: Allow prepare fail for PRAGMA quick_check #5357
...
This actually happens in low-disk situations.
2017-01-03 10:43:29 +01:00
Christian Kamm
22135f9f57
Fixup broken authType on load #5408
2017-01-03 10:38:20 +01:00
Jenkins for ownCloud
0fd06a225c
[tx-robot] updated from transifex
2017-01-03 02:19:30 +01:00
Christian Kamm
473dcb0947
Only create a FolderWatcher if the path exists
...
Also retry creating it before each sync.
See #5317
2017-01-02 08:52:26 +01:00
Christian Kamm
e306f4611c
Reschedule a folder regularly with some delay for some errors
...
Like "folder doesn't exist" - such that we will detect when the folder
becomes available and start syncing.
See #5317
2017-01-02 08:52:26 +01:00
Markus Goetz
c6f4f44619
Fix up SSL client certificates #5213 #69 ( #5289 )
...
The re-enables the UI, uses Qt API for importing and
stores the certificate/key in the system keychain.
People who had set up client certs need to re-setup the account. This is ok
since it was an undocumented feature anyway.
2017-01-02 08:34:02 +01:00
Jenkins for ownCloud
0865c63745
[tx-robot] updated from transifex
2017-01-02 02:19:26 +01:00
Jenkins for ownCloud
b81c3a6a67
[tx-robot] updated from transifex
2017-01-01 02:19:32 +01:00
Jenkins for ownCloud
cc56e5639d
[tx-robot] updated from transifex
2016-12-30 02:18:34 +01:00
Jenkins for ownCloud
3ce5b358ae
[tx-robot] updated from transifex
2016-12-25 02:18:27 +01:00
Jenkins for ownCloud
e968284618
[tx-robot] updated from transifex
2016-12-24 02:18:26 +01:00
Jenkins for ownCloud
c7723179d8
[tx-robot] updated from transifex
2016-12-23 02:18:34 +01:00
Jenkins for ownCloud
1872f3f94a
[tx-robot] updated from transifex
2016-12-22 02:18:30 +01:00
Christian Kamm
3b7887ca35
Wizard: Detach saved account from wizard
...
Fixes #5408 #5407 .
The problem was that cleanup of the credentials page set the
credentials of the account back to dummy, thereby overriding
things like shib usernames.
This should be broken since a932eac832 .
2016-12-21 15:31:12 +01:00
Piotr Mrówczyński
d781e63fab
Add capability to disable parallel chunked upload #5364 - technical review ( #5403 )
2016-12-21 15:08:45 +01:00
Kyle Fazzari
d1237cdda3
Correctly handle possible missing GIT_SHA1. ( #5401 )
...
Currently, if get_git_head_revision() doesn't define GIT_SHA1 (which it
doesn't in some cases) it's possible to end up with the following error:
CMake Error at CMakeLists.txt:69 (if):
if given arguments:
"STREQUAL" "GITDIR-NOTFOUND"
Unknown arguments specified
Fix this by making sure both left and right hand arguments to STREQUAL
are always strings, even if GIT_SHA1 is undefined.
Signed-off-by: Kyle Fazzari <kyle@canonical.com >
2016-12-21 14:14:26 +01:00
Christian Kamm
030e3a5d4a
Increase initial bandwidth estimates #4428 #5390
...
To 2 MB/s and 10 files/s.
2016-12-21 08:53:47 +01:00
Jenkins for ownCloud
4fa4a6a5ed
[tx-robot] updated from transifex
2016-12-21 02:18:28 +01:00
Phil Davis
23fb07240b
Fix Mac PATH command
...
Reported in the doc repo owncloud/documentation#1618
This version as suggested by @jturcotte
2016-12-20 20:01:38 +01:00
Christian Kamm
3912dba33a
Move qDeclareMetatype from Folder to SyncEngine
2016-12-20 11:43:39 +01:00
Christian Kamm
d8c479ab1e
Don't wipe db if check fails while disk space is low #5357
...
An experimental fix for the issue, merged because it's low risk and
makes testing easier.
2016-12-20 09:33:59 +01:00
Jenkins for ownCloud
bec67455c1
[tx-robot] updated from transifex
2016-12-20 02:18:27 +01:00
Jenkins for ownCloud
ba6a37a601
[tx-robot] updated from transifex
2016-12-19 02:18:28 +01:00
Jenkins for ownCloud
03f5091e73
[tx-robot] updated from transifex
2016-12-18 02:18:28 +01:00
Jenkins for ownCloud
6b6ff08821
[tx-robot] updated from transifex
2016-12-17 02:18:27 +01:00
Jenkins for ownCloud
35a0ee4893
[tx-robot] updated from transifex
2016-12-16 02:18:29 +01:00
Jenkins for ownCloud
3519391119
[tx-robot] updated from transifex
2016-12-15 02:18:37 +01:00
Olivier Goffart
775a1c9ad8
FolderStatusModel: Fix insert/remove items when there are labels
...
Otherwise it might happen that the model is inconsistant and this can
lead to crash in the worst case.
(For example, if there was a "fetching" label, and we hide it because it
was a 404. In this case, we would not call begin/endRemoveRows, so the
view could still call the model with an index of row 0, that used to be
for the label, but now correspond to the first element of _subs. And
because _subs is empty, this could lead to crashes)
2016-12-14 14:13:47 +01:00
Olivier Goffart
ac95844ebd
Propagator: make sure every network job has a parent
...
This could make sure that the network job gets deleted if the parent job gets
deleted, and would avoid crashes like:
Crash: EXCEPTION_ACCESS_VIOLATION_READ at 0xffffffff8b008a04
File "qiodevice.cpp", line 1617, in QIODevice::errorString
File "propagatedownload.cpp", line 264, in OCC::GETFileJob::slotReadyRead
File "moc_propagatedownload.cpp", line 85, in OCC::GETFileJob::qt_static_metacall
File "qobject.cpp", line 3716, in QMetaObject::activate
File "moc_qiodevice.cpp", line 154, in QIODevice::readyRead
File "qnetworkreplyhttpimpl.cpp", line 1045, in QNetworkReplyHttpImplPrivate::replyDownloadData
(#5329 )
2016-12-14 14:13:47 +01:00
Olivier Goffart
c5b90d9507
Account::slotHandleSslErrors: add guards in case the reply gets deleted in the dialog event loop
...
Since slotHandleSslErrors will show a dialog with an eventloop, it could be
That the reply gets deleted. Guard against that.
(#5329 )
2016-12-14 14:13:47 +01:00
Christian Kamm
d631f2e070
Sync now: Disable on disconnect, rename while running #2158
2016-12-13 15:28:52 +01:00
Jonathan Kawohl
5bae2ed5ef
fixed merge conflicts
2016-12-13 09:12:50 +01:00
Jenkins for ownCloud
5af2a657ca
[tx-robot] updated from transifex
2016-12-13 02:18:28 +01:00
Jenkins for ownCloud
71231026a0
[tx-robot] updated from transifex
2016-12-12 02:18:28 +01:00
Jenkins for ownCloud
dfca67b63a
[tx-robot] updated from transifex
2016-12-11 02:18:27 +01:00
Jenkins for ownCloud
7dc6a3b89f
[tx-robot] updated from transifex
2016-12-10 02:18:32 +01:00
Jocelyn Turcotte
f985111b62
Fix the log window not showing csync logs
...
The csync log level was only set up on startup, and for log files.
Fix the issue by making Logger::isNoop rely on being explicitly activated
for the log window instead of relying on the presence of a connected
signal, and move the csync log level logic in Logger.
2016-12-09 10:03:46 +01:00
Jocelyn Turcotte
e8d734b1c2
Fix the sync direction being wrong on MSVC
...
The compiler seems to use signed enums and we need to reserve an extra
bit for the sign to avoid the 2 value to overflow and being interpreted
as -2 when read, and thus not being correctly compared to the full enum
value.
2016-12-09 10:03:46 +01:00
Jenkins for ownCloud
a38864fcb4
[tx-robot] updated from transifex
2016-12-09 02:18:28 +01:00
Jenkins for ownCloud
47bab51474
[tx-robot] updated from transifex
2016-12-08 02:18:27 +01:00
Jocelyn Turcotte
d0d5b2b4ee
Don't try to deploy the mng image format plugin on macOS
...
Qt now only build it if the system library is available since libmng
isn't active enough to make its security reliable enough. We don't
use that image format ourselves anyway.
2016-12-07 15:26:23 +01:00
Jocelyn Turcotte
36967122db
Rebase Qt patches on 5.6 #3449
...
Also get rid of the list of different version. We always only support one Qt version
for macOS and Windows, and the list of patches will be based on that supported
version.
2016-12-07 15:26:23 +01:00
Jenkins for ownCloud
3fd67b9fb6
[tx-robot] updated from transifex
2016-12-07 02:18:34 +01:00
ckamm
5bef1aa402
Merge pull request #5045 from owncloud/dbjournal_per_account
...
Allow a folder to be synced to several accounts. This changes the path of the sync journal file!
2016-12-06 10:55:58 +01:00
Jenkins for ownCloud
de9ea19e7e
[tx-robot] updated from transifex
2016-12-06 02:18:34 +01:00
Olivier Goffart
4ac2b764a4
libsync: Clear the upload info after several retries ( #5345 )
...
Issue #5344
2016-12-05 17:21:36 +01:00
Jenkins for ownCloud
0614cda337
[tx-robot] updated from transifex
2016-12-05 02:18:32 +01:00
Jenkins for ownCloud
9e895b9b3e
[tx-robot] updated from transifex
2016-12-04 02:18:28 +01:00
Jenkins for ownCloud
f501211c63
[tx-robot] updated from transifex
2016-12-03 02:18:25 +01:00
Jenkins for ownCloud
77ac1b46dd
[tx-robot] updated from transifex
2016-12-02 02:18:35 +01:00
Jenkins for ownCloud
745c21623c
[tx-robot] updated from transifex
2016-12-01 02:18:28 +01:00
Jenkins for ownCloud
b91c116518
[tx-robot] updated from transifex
2016-11-30 02:18:34 +01:00
Felix Tiede
d090a3330a
Generate .desktop file with OEM name directly.
...
Instead of renaming the .desktop file at install time it is now
generated with its OEM name during configure time.
2016-11-29 18:36:26 +01:00
Felix Tiede
d04e7841e2
Fix file installation source path.
...
By default the file is copied from the source and not the build
directory which will fail with the configure-time built file.
2016-11-29 18:36:26 +01:00
Felix Tiede
d7a4726544
Extend OEM configurability to dolphin desktop file.
...
OEM configurability creates binaries with OEM names which the .desktop
file doesn't take into account and thus dolphin integration does not
work if OEM changes the binary's name(s).
These changes are now integrated into the .desktop file at compile time.
2016-11-29 18:36:26 +01:00
Olivier Goffart
19d2677db1
libsync: use the new webdav url if the server reports it
...
The rules to select the webdav url are now:
- If the server reports that the new chunking algorithm is working,
always use remote.php/dav/files/<username>
This capability can be overriden with an environment variable
- Otherwise, use the dav path provided by the theme, which defaults to
remote.php/webdav
This means that with the newer server, the branding can no longer override
the webdav URL. If there is still an usecase for the branding to do so, we
need to find another way to override it. But it is now more complicated to
configure as might need include the username and need different endpoint
depending on the operations (chunks or not)
Issue #4007
2016-11-29 16:16:20 +01:00
Christian Kamm
a139d1a279
FolderWizard: pass AccountPtr by const&
...
For review of #5045
2016-11-29 10:39:20 +01:00
Christian Kamm
13e624c38f
Fix compilation with Qt < 5.1
...
For review of #5045
2016-11-29 10:39:08 +01:00
Christian Kamm
acb155503b
Ensure the 'Sync paused' state is used after pausing #5290
2016-11-29 09:56:45 +01:00
Jenkins for ownCloud
4cb80b08a2
[tx-robot] updated from transifex
2016-11-29 02:18:28 +01:00
Jenkins for ownCloud
cd85b7c6d7
[tx-robot] updated from transifex
2016-11-28 02:18:33 +01:00
Olivier Goffart
109056e676
owncloudcmd: Don't put the password in the URL
...
As the URL might be print on the logs.
Also don't change the scheme from http to owncloud.
This was required before when we were using neon through csync, but now that
we use QNAM for everything we don't need it. The credentials from the account
are used.
2016-11-26 12:57:44 +01:00
Jenkins for ownCloud
51a1bea5de
[tx-robot] updated from transifex
2016-11-26 02:18:36 +01:00
Christian Kamm
68f99bcc27
AccountSettings: Add a "Force sync now" context menu option
2016-11-25 14:23:56 +01:00
Christian Kamm
276985f6c3
Fix perl tests for sync journal db name
2016-11-25 13:21:34 +01:00
Jenkins for ownCloud
7523db354d
[tx-robot] updated from transifex
2016-11-25 02:18:27 +01:00
Jenkins for ownCloud
4919c9e7b1
[tx-robot] updated from transifex
2016-11-24 02:18:38 +01:00
Christian Kamm
045498c71a
Account: Rename user() to davUser()
...
Avoids potential confusion with credentials->user()
2016-11-23 17:08:17 +01:00
Christian Kamm
49f8143f00
Bugfixes for sync journal name generation and usage
...
* Use 'user' value for journal name generation
* Save journal name in settings
* Make owncloudcmd choose the right db
2016-11-23 16:48:15 +01:00
Christian Kamm
bea7241910
Don't wipe each journal on each start
2016-11-23 16:48:15 +01:00
Christian Kamm
61b4da944c
Split folders configuration locations for backwards compatibility
2016-11-23 16:48:15 +01:00
Christian Kamm
6fe1868693
Always migrate .csync_journal to ._sync_xxx
2016-11-23 16:48:15 +01:00
Christian Kamm
9641c7a1e7
Rename sync journal to ._sync_xxx.db.
...
The added underscore means that older clients will also ignore the
file.
2016-11-23 16:48:15 +01:00
Christian Kamm
3e59a9b316
Merge branch 'master' into dbjournal_per_account
2016-11-23 16:47:56 +01:00
Markus Goetz
679ac0d26a
Wizard: Show if server asks for client certificate #2799 #69 ( #5261 )
...
This also nicely displays the 'Untrusted domain' message of oC.
The link to add a trusted domain (via web browser) is clickable.
2016-11-23 11:43:15 +01:00
Markus Goetz
2e3a3bcf84
Folder: Make folder only accessible by user #5282 ( #5315 )
...
Because on OS X the parent folder might not protect
against access.
2016-11-23 11:05:41 +01:00
Jonathan Kawohl
ad437a49f9
Merge branch 'Kawohl-master'
...
fix conflict
2016-11-23 11:01:52 +01:00
Jonathan Kawohl
6b2282bf0d
Merge branch 'master' of https://github.com/owncloud/client into Kawohl-master
...
fix conflict
2016-11-23 10:59:18 +01:00
Jonathan Kawohl
42aed56a5a
Merge branch 'master' of https://gthub.com/Kawohl/client into Kawohl-master
...
fix conflict
2016-11-23 10:56:29 +01:00
Jonathan Kawohl
ca9ec46253
fixed note
2016-11-23 09:17:33 +01:00
Jonathan Kawohl
a92eec160a
fixed review https://github.com/owncloud/client/pull/5259#pullrequestreview-9743725
2016-11-23 09:10:58 +01:00
Jenkins for ownCloud
cc91c42dfa
[tx-robot] updated from transifex
2016-11-23 02:18:37 +01:00
Olivier Goffart
d22d0e7e30
Propagator: don't use dynamic_cast for QObject
...
qobject_cast is better. (no need to use RTTI when we have QMetaObject
2016-11-22 17:37:41 +01:00
Samuel
4998303c42
Fixing a typo on a message
...
This refers to the message shown when copying the list of unsynced items on the activity tab
2016-11-22 12:14:03 +01:00
Christian Kamm
ceef2f2d46
FolderMan: Never schedule paused folders #5290
...
Previously the last folder in the queue was scheduled, regardless
of whether it was paused or not.
2016-11-22 10:53:15 +01:00
Jenkins for ownCloud
8b18600d7e
[tx-robot] updated from transifex
2016-11-22 02:18:29 +01:00
Jonathan Kawohl
6cc63462b3
adjusted minimum version.
2016-11-21 13:53:59 +01:00
Olivier Goffart
a1dc4069c9
libsync: Don't store the remote URI in the csync or in the SyncEngine
...
We are going to change the webdav path depending on the capabilities.
But the SyncEngine and csync might have been created before the capabilities
are retrieved.
The main raison why we gave the path to the sync engine was to pass it to csync.
But the thing is that csync don't need anymore this url as everything is done by the
discovery classes in libsync that use the network jobs that use the account for the urls.
So csync do not need the remote URI.
shortenFilename in folderstatusmodel.cpp was useless because the string is the
_file of a SyncFileItem which is the relative file name, that name never
starts with owncloud://.
All the csync test creates the folder because csync use to check if the folder
exists. But we don't need to do that anymore
2016-11-21 08:09:11 +01:00
Jenkins for ownCloud
86846af59d
[tx-robot] updated from transifex
2016-11-21 02:18:27 +01:00
Jenkins for ownCloud
5bfa02602d
[tx-robot] updated from transifex
2016-11-20 02:18:28 +01:00
Jenkins for ownCloud
9be23984eb
[tx-robot] updated from transifex
2016-11-19 02:18:35 +01:00
Christian Kamm
eb8de8e3c0
Enable clicking on 'not synced' items #5306
2016-11-18 16:19:36 +01:00
ckamm
ec7333a4bf
Merge pull request #5272 from owncloud/licensefix-pending
...
License: Adjust license of GPLv2 source files to GPLv2+
2016-11-18 15:14:47 +01:00
Christian Kamm
e485c5c008
Always send a progress message at the end of a sync #5290
...
Some listeners detect whether a sync is finished by checking
for isUpdatingEstimates and completedFiles >= totalFiles. But
if a sync didn't transfer any files we never sent signal
with these values. Now we do.
2016-11-18 12:33:44 +01:00
Christian Kamm
6451eb3ade
Tray: Add a 'New account...' action if no account is configured #5307
...
Useful when left-clicking the tray icon isn't working for some reason.
2016-11-18 12:17:05 +01:00
Jenkins for ownCloud
01528427b5
[tx-robot] updated from transifex
2016-11-18 02:18:35 +01:00
Jenkins for ownCloud
cec4d7b9ff
[tx-robot] updated from transifex
2016-11-17 02:18:43 +01:00
Olivier Goffart
efa7821dd2
Revert "Discovery: consider also the "shared by me" as shared"
...
This reverts pull request 5313 (commit
2d6e473a40 and
2f3db04e87 )
The problem is that this loads the server too much.
2016-11-16 17:45:40 +01:00
Markus Goetz
89f55cf9df
Folder: Add comments after discussion about pre-selected selective sync
2016-11-16 14:08:05 +01:00
Markus Goetz
52552a4204
Merge pull request #5102 from owncloud/chunking-ng
...
Chunking ng
2016-11-15 15:56:52 +01:00
Olivier Goffart
2f3db04e87
Rename SyncFileStatus::sharedWithMe to shared
...
Last commit for issue #4788 made the meaning to be simply shared
(with the user or from the user)
2016-11-15 14:32:20 +01:00
Olivier Goffart
2d6e473a40
Discovery: consider also the "shared by me" as shared
...
The "S" in the permission is only for the "Shared with me" files.
It is only used to show the shared status in the overlay icons.
But we also wish to show the shared status for files that are shared
"by" the users. We can find that out using the 'share-types' webdav
property. If set, then we are sharing the object.
We fake a 'S' in the permission as for our purpose, they mean the same.
Issue #4788
2016-11-15 14:32:20 +01:00
Olivier Goffart
92027e8692
SyncEngineTestUtils: Do don't allocate a buffer for the whole file
...
As the file can be some hunreds of megabytes, allocating such big arrays may
cause problems.
Also make the timeout a bit bigger so the test can rununder valgrind.
2016-11-15 11:39:40 +01:00
Olivier Goffart
2723cd225e
FolderStatusDelegate: Fix compiler warning.
...
QStyleOptionProgressBarV2 is deprecated in Qt5.
2016-11-15 10:16:41 +01:00
Jenkins for ownCloud
acd151102c
[tx-robot] updated from transifex
2016-11-15 02:18:36 +01:00
Olivier Goffart
77e790d2ee
Merge pull request #5304 from owncloud/Kawohl-linktocentral
...
documnetation.
2016-11-14 12:43:10 +01:00
Olivier Goffart
899c675f0a
Merge pull request #5267 from payload/fix_4608
...
nautilus integration: "share" extension for syncing folders
2016-11-14 12:35:18 +01:00
Olivier Goffart
fb76487e76
Merge pull request #5266 from rmekarni/patch-1
...
Fix find_library FindCMocka.cmake
2016-11-14 12:20:24 +01:00
Tobias Haeussler
0c0a3ca0a5
Add manifest file on Windows to make the application UAC aware.
2016-11-14 12:16:58 +01:00
Olivier Goffart
5377d1e283
Chunking-NG: code cleanup after review
2016-11-14 10:42:07 +01:00
Jenkins for ownCloud
676ad530e7
[tx-robot] updated from transifex
2016-11-14 02:18:26 +01:00
Jenkins for ownCloud
fbcb01ed27
[tx-robot] updated from transifex
2016-11-13 02:18:26 +01:00
Jenkins for ownCloud
c2b006e857
[tx-robot] updated from transifex
2016-11-12 02:18:26 +01:00
Jenkins for ownCloud
0e7ccea588
[tx-robot] updated from transifex
2016-11-11 02:18:27 +01:00
Jenkins for ownCloud
c16deb3e44
[tx-robot] updated from transifex
2016-11-10 02:18:27 +01:00
Jenkins for ownCloud
019544fcfd
[tx-robot] updated from transifex
2016-11-10 01:15:14 +01:00
Jonathan Kawohl
5f0167b19e
removed openssl_version variable,
2016-11-09 10:25:32 +01:00
Jonathan Kawohl
29d3c33eb2
added missing quotes
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
469eca1f5f
added link to central
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
0864d67a9a
fixing wrong files Revert "fix for https://github.com/owncloud/client/issues/1251 "
...
This reverts commit 4f1feab845 .
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
e9503664f5
fix for https://github.com/owncloud/client/issues/1251
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
58cee61624
added info on qtkeychain
...
added installation info on qtkeychain
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
d23d07f99b
Correcting for PR comments
2016-11-09 08:59:14 +01:00
Jonathan Kawohl
d70db810dd
updated link for documentation and added more info to osx build
2016-11-09 08:59:14 +01:00
Jenkins for ownCloud
842129f99d
[tx-robot] updated from transifex
2016-11-09 02:18:28 +01:00
ckamm
36d61ef3a9
Doc: Add sync algorithm overview and comments ( #5277 )
...
* Doc: Add sync algorithm overview and comments
2016-11-08 16:10:55 +01:00
Christian Kamm
f1f27221a7
Conflicts: Use the local mtime for the conflict file name #5273
...
Otherwise local conflict files may be overridden in a restore
situation. See ticket for details.
2016-11-08 14:47:51 +01:00
Christian Kamm
eb012d26ee
FolderStatusModel: Minor cleanups.
2016-11-08 14:01:07 +01:00
Christian Kamm
9ee8187083
Sort folder list alphabetically #5299
2016-11-08 14:01:07 +01:00
Christian Kamm
b0c45cfc89
Test: Don't fail when DST change is near #5284
2016-11-08 11:13:19 +01:00
Christian Kamm
90cea69692
Network: Add "Accept" header for some firewalls #5298
2016-11-08 11:01:49 +01:00
Jenkins for ownCloud
155bdfbffe
[tx-robot] updated from transifex
2016-11-08 02:18:26 +01:00
Christian Kamm
0e2782d369
Terminate sync when pausing from context menu #5290
2016-11-07 12:50:06 +01:00
Jenkins for ownCloud
6b3d0e69aa
[tx-robot] updated from transifex
2016-11-07 02:18:26 +01:00
Jenkins for ownCloud
f30aee6d4e
[tx-robot] updated from transifex
2016-11-06 02:18:34 +01:00
Jenkins for ownCloud
82f86eb019
[tx-robot] updated from transifex
2016-11-05 02:18:29 +01:00
Olivier Goffart
9573c5e64d
Merge remote-tracking branch '2.2' into master
...
For the reanslation. Now transifex should be updated to update master.
This should normally be the last merge from 2.2
Conflicts:
mirall.desktop.in
translations/client_sl.ts
translations/client_th.ts
2016-11-04 16:51:58 +01:00
Olivier Goffart
15f2b911d9
ChunkingNG: remove stale files when resuming
2016-11-04 16:43:01 +01:00
Jenkins for ownCloud
f5aff70398
[tx-robot] updated from transifex
2016-11-04 16:41:40 +01:00
Olivier Goffart
e3a4c3989a
SyncEngine: disable heuristics for backup restoration for server >= 9.1
...
The ownCloud 9.1 server has a data-fingerprint property that the admin must
change in case of backup restoration. When this change, the client understands
that a backup was restored, and will generate conflict files and re-upload
new files.
The heuristics based system checks that there is at least two files wose mtime
is put back in the past and no files that goes forward. In that case we ask the
user before creating the conflicts.
This commit disable the heuristics for newer server that have the data-fingerpint.
And change the heuristics to two hours because we want to avoid false positive due
to some clock error, and that 2 hours of lost due to backup restoration is probably
not so bad.
We only ask the user in the heuristics based aproach so in practice this mean that
the "backup-detected" dialog will no longer appear with newer server.
Relates issues #5260 , #5109
2016-11-04 16:30:58 +01:00
Jenkins for ownCloud
3e954bc17f
[tx-robot] updated from transifex
2016-11-04 02:18:27 +01:00
Jenkins for ownCloud
2527569bb8
[tx-robot] updated from transifex
2016-11-03 02:18:27 +01:00
Jenkins for ownCloud
1e197531cb
[tx-robot] updated from transifex
2016-11-02 02:18:28 +01:00
Jenkins for ownCloud
8b876576eb
[tx-robot] updated from transifex
2016-11-01 02:18:29 +01:00
Piotr Mrówczyński
a2287c9657
Merge pull request #5274 from owncloud/reduce_loops_dirjob
...
Cache the value of last unfinished job in the PropagateDerectory scheduleNextJob
2016-10-31 22:07:50 +01:00
Piotr M
34c59ba9ed
reduce number of loops
2016-10-31 19:45:24 +01:00
Olivier Goffart
c8014a0afd
ChunkingNG: Add Test
2016-10-31 15:16:53 +01:00
Olivier Goffart
456d82715e
Fix compile after merge
2016-10-31 11:29:33 +01:00
Olivier Goffart
8ca3eb7883
Merge remote-tracking branch 'origin/master' into chunking-ng
2016-10-31 11:09:12 +01:00
Jenkins for ownCloud
c110745330
[tx-robot] updated from transifex
2016-10-31 02:18:27 +01:00
Jenkins for ownCloud
19521863a0
[tx-robot] updated from transifex
2016-10-30 02:18:24 +01:00
Jenkins for ownCloud
c256896165
[tx-robot] updated from transifex
2016-10-30 02:18:26 +02:00
Jenkins for ownCloud
ef922f60fa
[tx-robot] updated from transifex
2016-10-29 02:18:28 +02:00
Jenkins for ownCloud
733ea90e6b
[tx-robot] updated from transifex
2016-10-28 02:18:28 +02:00
Jenkins for ownCloud
a4e1fa9dcf
[tx-robot] updated from transifex
2016-10-27 02:18:30 +02:00
Jenkins for ownCloud
1a1684ca2a
[tx-robot] updated from transifex
2016-10-26 02:18:34 +02:00
Gilbert Röhrbein
9c8572e335
nautilus integration: refactored _connectToSocketServer, removed superfluous check
2016-10-25 21:45:47 +02:00
Gilbert Röhrbein
e675a34fbb
nautilus integration: use os.path.join, os.sep and tempfile.gettempdir instead of string concats
2016-10-25 20:15:17 +02:00
Christian Kamm
5f47c01346
Account: Rearrange for readability
2016-10-25 13:20:23 +02:00
Christian Kamm
10644d3568
Move concatUrl and settingsWithGroup to Utility
...
There was little reason to keep them cluttering Account.
2016-10-25 12:05:28 +02:00
Christian Kamm
9ee3144358
Account: Remove wasMigrated/setMigrated
...
It was unused since early in the multi-account work:
a932eac832
2016-10-25 11:43:06 +02:00
Christian Kamm
cf48ea2e00
Remove unused functions
...
Account::changed and AbstractCredentials::changed have not been needed
in a long while.
2016-10-25 11:33:38 +02:00
Christian Kamm
db24f60ae3
License: Adjust license of GPLv2 source files to GPLv2+
...
See #5180
2016-10-25 11:06:54 +02:00
Christian Kamm
6026148692
FolderMan: Clean up API
...
Many public slots didn't need to be public or slots.
2016-10-25 09:44:34 +02:00
Christian Kamm
a2222228c9
FolderMan: Document and clean up folder scheduling
2016-10-25 09:44:34 +02:00
Jenkins for ownCloud
9e2d3f5bc7
[tx-robot] updated from transifex
2016-10-25 02:18:32 +02:00
Marcus Hoffmann
fe984b61d7
Add script to create a caja plugin. ( #5262 )
...
Caja is a fork of nautilus maintained by the Mate project.
This adds a script to create a caja plugin from the nautilus plugin.
It replaces all occurences of nautilus with caja (case sensitive).
This is done in the same way the nemo plugin is generated from the nautilus one.
2016-10-24 15:36:23 +02:00
Jonathan Kawohl
ffac3f6213
fixing wrong files Revert "fix for https://github.com/owncloud/client/issues/1251 "
...
This reverts commit 4f1feab845 .
2016-10-24 15:16:06 +02:00
Jonathan Kawohl
4f1feab845
fix for https://github.com/owncloud/client/issues/1251
2016-10-24 15:09:25 +02:00
Jonathan Kawohl
f738cfd7fe
added info on qtkeychain
...
added installation info on qtkeychain
2016-10-24 09:00:07 +02:00
Jenkins for ownCloud
e6be670e49
[tx-robot] updated from transifex
2016-10-24 02:18:28 +02:00
Jenkins for ownCloud
46ce2f4722
[tx-robot] updated from transifex
2016-10-23 02:18:28 +02:00
Gilbert Röhrbein
166a0f60ca
nautilus integration: "share" extension for syncing folders
...
Issue #4608
* folder state is either OK or SYNC usually
* this extension does not know about if a folder is shareable
* a OK folder is shareable
* a SYNC folder could be uploaded or not uploaded
* this commit looks into file entries below this folder
* if one exists with state OK or SYNC
this folder must have been uploaded
* better would be if the server (gui) tells us
if the folder is uploaded
2016-10-22 23:26:44 +02:00
Romain Mekarni
a9019ccbad
Fix find_library FindCMocka.cmake
2016-10-22 14:52:27 +02:00
Jenkins for ownCloud
0a4806af44
[tx-robot] updated from transifex
2016-10-22 02:18:28 +02:00
Olivier Goffart
e33b89c222
Chunking-NG: Enable if the server supports it
2016-10-21 16:42:27 +02:00
Olivier Goffart
6b899be895
Merge remote-tracking branch 'origin/2.2' into master
2016-10-21 10:27:33 +02:00
Jenkins for ownCloud
641785298f
[tx-robot] updated from transifex
2016-10-21 02:18:31 +02:00
Jonathan Kawohl
092c935422
Correcting for PR comments
2016-10-20 13:05:56 +02:00
Olivier Goffart
273590fdfc
ChunkingNG: Use the 'If' header
...
As discussed in https://github.com/owncloud/core/pull/26368
2016-10-20 11:16:06 +02:00
Olivier Goffart
0960058842
Merge remote-tracking branch 'origin/master' into chunking-ng
2016-10-20 09:25:03 +02:00
Jenkins for ownCloud
1f78ea0fd1
[tx-robot] updated from transifex
2016-10-20 02:18:28 +02:00
Jonathan Kawohl
72d8175032
updated link for documentation and added more info to osx build
2016-10-19 11:12:11 +02:00
Jenkins for ownCloud
2fd9767892
[tx-robot] updated from transifex
2016-10-19 02:18:33 +02:00
Christian Kamm
69a1e46d0c
Progress: Reset lastCompletedItem #5256
...
Otherwise progress listeners think it's still the last-completed
item when the next sync starts. This lead to spurious entries in
the "Recent Changes" list.
2016-10-18 12:29:52 +02:00
Christian Kamm
e020a5327e
Force a remote discovery when upgrading to this version #5242
...
A remote discovery will fix up any lingering problems caused by #5190 .
2016-10-18 11:21:01 +02:00
Christian Kamm
1b04489887
Remove stale commented code
...
These functions don't even exist anymore.
2016-10-18 11:21:01 +02:00
Olivier Goffart
36a19703db
SyncEngine: Permission error in subfolder of a folder that cannnot be added is a SoftError
...
Issue #5059
2016-10-17 12:22:04 +02:00
Jenkins for ownCloud
f3a345a23b
[tx-robot] updated from transifex
2016-10-17 02:18:29 +02:00
Jenkins for ownCloud
826459eae7
[tx-robot] updated from transifex
2016-10-17 01:15:13 +02:00
Jenkins for ownCloud
c2c36b85cb
[tx-robot] updated from transifex
2016-10-16 02:18:28 +02:00
Jenkins for ownCloud
7b2f8ae6f7
[tx-robot] updated from transifex
2016-10-15 02:18:29 +02:00
Markus Goetz
d600fdc89b
OS X: Use monochrome tray icon by default ( #5229 )
2016-10-14 14:26:31 +02:00
Markus Goetz
8c5ea8dc90
Propagator: Also upload more in parallel ( #5230 )
...
Fix for https://github.com/owncloud/client/issues/4986#issuecomment-227071801
This is before we have bundling at some point.
2016-10-14 14:23:55 +02:00
Jenkins for ownCloud
0eddcd6384
[tx-robot] updated from transifex
2016-10-14 02:18:29 +02:00
Klaas Freitag
9f2ae5dd17
Add a note that the source repositories need to be enabled. ( #5239 )
...
* Add a note that the source repositories need to be enabled.
* Fix typo, is => are.
2016-10-13 16:22:54 +02:00
Olivier Goffart
766d9ae1ac
QProgressIndicator: update copy from upstream
...
Update from commit 05ce8a23cdc12e825532dc6de06c267fb8d48b4f from
https://github.com/dragotin/QProgressIndicator
Which itself is forked from commit e5ba0fd09bfd43b067ee3646d70b294c7efcb558 from
upstream, with additional license header.
It was relicensed to MIT according to
14bb9d10e2
Relates to issues #5180 and #5184
2016-10-13 12:05:59 +02:00
Jenkins for ownCloud
21128ed762
[tx-robot] updated from transifex
2016-10-13 02:18:28 +02:00
Markus Goetz
5000d40619
Fixup previous commit
...
Thanks @ogoffart for spotting.
2016-10-12 19:10:56 +02:00
Klaas Freitag
16e28567a6
Folderman: Some comments for the checkPathValidityForNewFolder method.
2016-10-12 18:16:53 +02:00
Klaas Freitag
3bef42db6b
folderman: checkPathValidityForNewFolder - correct file path comparison
...
It now checks based on the correct case sensitivity and also using the new
method for filename comparison.
2016-10-12 14:50:10 +02:00
Klaas Freitag
27d23edacc
Utility: Add a function to check if two filenames are equal plus test.
...
It calls canonical path always and works with the correct case preserving
depending on the platform.
2016-10-12 14:48:00 +02:00
Jenkins for ownCloud
0d321050a6
[tx-robot] updated from transifex
2016-10-12 02:18:34 +02:00
Markus Goetz
fc7aaf792b
Auto Start: Only set on first account setup, not all later ones
2016-10-11 20:28:14 +02:00
Markus Goetz
f6355e15a3
sqlite: Update bundled version to 3.14.2
...
For OS X and Windows.
2016-10-11 20:06:43 +02:00
Olivier Goffart
d80d5a8ee4
SyncEngine: Fix renaming a folder should keep the selective sync state
...
Issue #5224
Two problems:
- In the discovery phase, we need to check the selective sync entries of
the source path in case of renames.
- When the rename is done, we need to actually update the black list in the
database.
2016-10-11 14:38:25 +02:00
Olivier Goffart
e0a36ab313
TestFolderMan: don't pollute user's settings
2016-10-11 14:27:14 +02:00
Olivier Goffart
9d3e78ed54
AccountManager: do not load invalid account
...
Some tests (such as FolderManTest) can polute the config file with invalid
accounts.
(That's because most of the code, (even in libsync) always instentiate a ConfigFile)
2016-10-11 14:27:14 +02:00
Olivier Goffart
b6079bfe4f
Remove usused variable
2016-10-11 12:12:28 +02:00
Olivier Goffart
f75106fd8e
SyncJournalDB: check the return value of the prepare statements in checkConnect
...
Relates to #5199
2016-10-11 11:35:26 +02:00
Olivier Goffart
57fe7b800f
Theme: Fix compiler warning
...
Relates #5227
2016-10-11 10:31:47 +02:00
Jenkins for ownCloud
089ecf8222
[tx-robot] updated from transifex
2016-10-11 02:18:32 +02:00
Klaas Freitag
e1a48e3c33
Move the journal file name generation to the syncjournaldb class.
...
As requested by Olivier.
2016-10-10 16:59:17 +02:00
Olivier Goffart
c2fa9b5bbf
AccoutWizard: Change the set policy of a radio button
...
In an attempt to make sure the button next to it don't get too small.
Issue #5209
2016-10-10 13:27:28 +02:00
Olivier Goffart
86522cbbf0
OwnSQL: avoid crashing in SqlQuery::reset_and_clear_bindings
...
The crash reporter shows a lot of crashes in sqlite3_clear_bindings
which seems to indicate that _stmt is null. We should guard against
a null value in order to avoid crashing.
This should only happen if the prepare call fails. We don't usually
check the return value of the prepare call, but if _stmt is null, the
exec call should return false, not true. We check the result of the
exec call, so this should then abort the sync with an error, rather
than crashing.
2016-10-10 13:27:12 +02:00
Jenkins for ownCloud
d54f8adac5
[tx-robot] updated from transifex
2016-10-10 02:18:29 +02:00
Jenkins for ownCloud
d35ecafa0b
[tx-robot] updated from transifex
2016-10-09 02:18:27 +02:00
Jenkins for ownCloud
2ca807280a
[tx-robot] updated from transifex
2016-10-08 02:18:33 +02:00
Klaas Freitag
5d13f9290f
Fix the folderman test, adopting the checkPathValidity method tests.
2016-10-07 16:24:09 +02:00
Klaas Freitag
c84140d293
checkPathValidityForNewFolder: Catch sync folders underneath sym links.
...
plus some whitespace changes.
2016-10-07 16:23:13 +02:00
Christian Kamm
91b6b88883
Tray: Fix crash on startup for non-OSX oses
2016-10-07 13:32:42 +02:00
Christian Kamm
f36d4562a1
Doc: Remove mention of "F5 to reset database" #5130
2016-10-07 13:22:43 +02:00
Tommy Sparber
67ecca492b
Improve macOS SysTray/StatusBar monochrome icon ( #5227 )
...
- Use a white icon if the context menu is visible.
- Enable `QIcon::setIsMask` if compiled on Qt >= 5.6 to allow automatic
macOS color handling.
- No changes if the colored icons are used.
2016-10-06 17:18:51 +02:00
Markus Goetz
84c925dc58
503: Also parse other server error message ( #5228 )
...
From https://github.com/owncloud/core/pull/26145
2016-10-06 14:45:04 +02:00
Jenkins for ownCloud
e1a01c75d9
[tx-robot] updated from transifex
2016-10-06 02:18:30 +02:00
Jenkins for ownCloud
6a4adbc87e
[tx-robot] updated from transifex
2016-10-05 02:18:30 +02:00
Jenkins for ownCloud
89974ab1d4
[tx-robot] updated from transifex
2016-10-04 02:18:30 +02:00
Jenkins for ownCloud
8d0c313486
[tx-robot] updated from transifex
2016-10-03 02:18:39 +02:00
Jenkins for ownCloud
aab0cdf12a
[tx-robot] updated from transifex
2016-10-02 02:18:29 +02:00
Jenkins for ownCloud
a89520043e
[tx-robot] updated from transifex
2016-10-01 02:18:30 +02:00
Jenkins for ownCloud
6382a142cd
[tx-robot] updated from transifex
2016-10-01 01:15:17 +02:00
Klaas Freitag
838c072ccc
Folder Setup: Allow to set up more sync connects to the same folder.
...
One local folder can now be configured as sync target for multiple
accounts as long as their url and user differ.
Also this patch accepts that the sync folder is behind a symlink.
Also this patch fixes a bug that before the user input was taken
canonically which was not working for the symlink handling.
2016-09-30 14:08:00 +02:00
Jenkins for ownCloud
02c403e360
[tx-robot] updated from transifex
2016-09-30 02:18:34 +02:00
Klaas Freitag
ed6a708460
SyncJournalDb: Migrate the old csync journal to the new name.
...
Migration strategy to the new filename.
2016-09-29 16:41:11 +02:00
Klaas Freitag
0c9dcdafc2
csync: Only free the statedb filename on destroy.
...
The filename must not be wiped in csync_commit as that is
happening after every sync. It is only set once in the
constructor of the SyncEngine in csync_init().
2016-09-29 16:36:14 +02:00
Christian Kamm
5f2b1999f6
Package: Fix nautilus plugin name collision when branded
...
As suggested by @olifre in #5183
2016-09-28 13:10:48 +02:00
Christian Kamm
bd2bcad3ba
ShareDialog: Remove context help button
...
Ticket #5203
2016-09-28 13:00:52 +02:00
Christian Kamm
598a7cec5d
Merge remote-tracking branch 'origin/2.2'
2016-09-28 12:07:45 +02:00
Jenkins for ownCloud
46d934bd95
[tx-robot] updated from transifex
2016-09-28 02:18:31 +02:00
Markus Goetz
e8c8943a30
VERSION.cmake: We're at 2.2.5
2016-09-27 18:21:55 +02:00
Markus Goetz
f1e2e42d99
2.2.4: Set release date
2016-09-27 10:52:18 +02:00
Markus Goetz
95c479aa07
Wizard: Do the system proxy lookup in a thread ( #5160 )
...
This is analogous to the code in ConnectionValidator.
2016-09-26 15:45:30 +02:00
ckamm
035442b6da
Improve the "new big folder" UI #5202 ( #5204 )
...
Instead of using the regular selective-sync UI (where it's unclear what
the "Cancel" button would even mean in this context), provide a
different set of buttons that allow the user to quickly synchronize
all pending big folders, none of them, or perform manual changes
as usual.
2016-09-23 13:47:57 +02:00
ckamm
98efb07535
Tray: Workaround collection ( #5179 )
...
Tray: Workaround collection
* QDBus workaround for Qt 5.5.0 only, there were reports of the tray
working fine with 5.5.1. #5164
* OWNCLOUD_FORCE_QDBUS_TRAY_WORKAROUND to force the workaround on an off
* OWNCLOUD_TRAY_UPDATE_WHILE_VISIBLE to enable or disable updating of
the menu while it's visible - disable by default due to problems on OSX and Xubuntu.
* Track the visibility of the tray menu with aboutToShow/aboutToHide
only on OSX - the aboutToHide signal doesn't trigger reliably on linux
* Refactor such that setupContextMenu is different from updateContextMenu
* Don't use on-demand updating of the tray menu when the qdbus workaround
is active, instead to occasional (30s) updates of the tray menu.
2016-09-23 10:44:54 +02:00
Olivier Goffart
bc04f79959
Missing Inc -> GmbH ( #5181 )
2016-09-22 15:32:12 +02:00
Christian Kamm
e10c97573f
Warning if mailto url fails #5142
2016-09-22 14:16:58 +02:00
Christian Kamm
383479fbfd
Fix Windows build with WITH_UNIT_TESTING
2016-09-22 13:55:48 +02:00
Olivier Goffart
fca5f1b210
owncloudcmd: fix --silent
...
We ignored csync log, but we also need to silent Qt debug output.
We need to ignore it at the very begining because there might be
qDebug also in account creation.
Issue #5196
2016-09-22 10:32:27 +02:00
Christian Kamm
0cea3d85f5
Add log messages for LockWatcher use #5190
2016-09-22 09:57:42 +02:00
Olivier Goffart
85b8ab178e
SyncEngine: Fix renaming of folder when file are changed ( #5195 )
...
Two bugs:
- The change filed are not considered as move, they are re-downloaded
but the old file was not removed from the database. The change in
owncloudpropagator.cpp takes care of removing the old entries.
- Next sync would then remove the file in the server in the old folder
This was not a problem until we start reusing the sync engine, and
that the _renamedFolders map is not cleared. We were before deleting
a non-existing file. But now we delete the actual file.
Also improve the tests to be able to do move on the server.
This include support for file id.
Issue #5192
2016-09-22 09:02:47 +02:00
Jenkins for ownCloud
ea9d17b41d
[tx-robot] updated from transifex
2016-09-22 01:15:16 +02:00
Piotr Mrówczyński
b7eb37dc03
Merge pull request #5170 from owncloud/add_capabilities_owncloudcmd
...
add server capabilities to owncloudcmd
2016-09-21 22:28:41 +02:00
Olivier Goffart
98bfa8d5de
Propagator: properly send the success flag ( #5189 )
...
In case of the root directory, it may happen that the _item
is empty and the _item->_status is NoStatus. But we still need to report
the proper success or error of the whole propagation. We should really
use _hasError for that. However, _hasError is also defined to NoStatus
if there was no error, so in that case we need to set Success.
This fixes the problem in which the data-fingerprint is not saved on the
database because the SyncEngine think that the sync failed. (Issue #5185 )
2016-09-21 16:35:42 +02:00
Olivier Goffart
ff701bd473
ConnectionValidator: properly handle error in status.php ( #5188 )
...
We wwer enot connecting to the right signal from the check server
job, and therefore we were not catching the condition in which the
json was invalid. We would then never terminate the ConnectionValidator job.
Note that instanceNotFound is also emited if there is a network error.
The log looked like this:
10:25:51.247 OCC::CheckServerJob::finished: status.php from server is not valid JSON!
10:25:51.248 OCC::CheckServerJob::finished: status.php returns: QMap() QNetworkReply::NetworkError(NoError) Reply: QNetworkReplyHttpImpl(0x2b6a790)
10:25:51.248 OCC::CheckServerJob::finished: No proper answer on QUrl("http://localhost/~owncloud/status.php ")
10:26:23.235 OCC::AccountState::checkConnectivity: ConnectionValidator already running, ignoring "owncloud@localhost"
10:26:55.235 OCC::AccountState::checkConnectivity: ConnectionValidator already running, ignoring "owncloud@localhost"
[...]
2016-09-20 11:55:43 +02:00
Jocelyn Turcotte
31aaf956f5
Merge pull request #5182 from jturcotte/msvcBuild
...
Fix the MSVC build
2016-09-20 10:39:14 +02:00
Jocelyn Turcotte
a221ac1e4d
Fix unit testing build warning on Linux
...
The compiler complained about the PathComponent reference on the lambdas comes from the anonymous namespace.
2016-09-16 17:55:28 +02:00
Jocelyn Turcotte
2b274e9460
Fix the MSVC build
...
- Replace functions that are provided by MinGW with a Win32-based
implementation
- Explicitly export needed symbols from ocsync.dll
- Rename share.h to sharemanager.h since the name clashes with one
of the Windows headers and get included from there
- Remove the timestamp from the fallback csync stderr logging, it's
not used since we always provide a log callback
2016-09-16 17:43:39 +02:00
Olivier Goffart
da26e59770
Chunking-NG: add some headers when uploading chunks
...
These are not understood by owncloud yet, but were requested for CernBox
OC-Total-Length in the MKCOL: The full lenght of the file
OC-Chunk-Offset in the PUT: The offset within the file in which this chunk belongs
OC-Checksum in the MOVE: The transission checksum
2016-09-16 16:36:46 +02:00
Olivier Goffart
3c24d5a148
Chunking-NG: The MOVE will return the code 204 if the file was already there
2016-09-16 16:20:40 +02:00
Olivier Goffart
c222793525
Chunking-NG: use OC-If-Destination-Match instread of If-Match
...
For the MOVE command, because If-Match in Webdav relates to the source, not
the destination
2016-09-16 16:15:09 +02:00
Olivier Goffart
28018e8590
Chunking-NG: Fix destination URL
2016-09-16 16:14:53 +02:00
Olivier Goffart
4c79ce2ae6
ConnectionValidator: fetch the account name.
...
This is needed for the new webdav path used by the new chunking.
The user might not be the same as the one used to connect
2016-09-16 15:49:43 +02:00
Markus Goetz
aa5d3055be
Folder/Watcher: Fix up #5174 #5153 ( #5186 )
...
It was surprising to have a broken symlink return empty for
canonical path.
2016-09-15 14:56:37 +02:00
Christian Kamm
3e1690ff7a
Improvements to file recall
2016-09-14 15:42:19 +02:00
Jenkins for ownCloud
826a675f32
[tx-robot] updated from transifex
2016-09-27 02:18:32 +02:00
Jenkins for ownCloud
323ebf9bf2
[tx-robot] updated from transifex
2016-09-26 02:18:30 +02:00
Jenkins for ownCloud
e4bf3ec19a
[tx-robot] updated from transifex
2016-09-25 02:18:36 +02:00
Jenkins for ownCloud
f2721aff1d
[tx-robot] updated from transifex
2016-09-24 02:18:33 +02:00
Markus Goetz
29bd8658bb
ChangeLog: 2.2.4
2016-09-22 15:41:30 +02:00
Klaas Freitag
8b9ca63eeb
Dolphin Plugin: Use the Application name for the socket path ( #5172 )
...
do not hardcode.
This should fix #5165
(cherry picked from commit 2d110540ee )
2016-09-22 09:20:47 +02:00
Olivier Goffart
6f1b03c560
SyncEngine: Fix renaming of folder when file are changed ( #5195 )
...
Two bugs:
- The change filed are not considered as move, they are re-downloaded
but the old file was not removed from the database. The change in
owncloudpropagator.cpp takes care of removing the old entries.
- Next sync would then remove the file in the server in the old folder
This was not a problem until we start reusing the sync engine, and
that the _renamedFolders map is not cleared. We were before deleting
a non-existing file. But now we delete the actual file.
Also improve the tests to be able to do move on the server.
This include support for file id.
Issue #5192
(cherry picked from commit 85b8ab178e )
2016-09-22 09:05:09 +02:00
Jenkins for ownCloud
3bd3ffb8e2
[tx-robot] updated from transifex
2016-09-22 02:18:32 +02:00
Olivier Goffart
a810d69daa
ConnectionValidator: properly handle error in status.php ( #5188 )
...
We wwer enot connecting to the right signal from the check server
job, and therefore we were not catching the condition in which the
json was invalid. We would then never terminate the ConnectionValidator job.
Note that instanceNotFound is also emited if there is a network error.
The log looked like this:
10:25:51.247 OCC::CheckServerJob::finished: status.php from server is not valid JSON!
10:25:51.248 OCC::CheckServerJob::finished: status.php returns: QMap() QNetworkReply::NetworkError(NoError) Reply: QNetworkReplyHttpImpl(0x2b6a790)
10:25:51.248 OCC::CheckServerJob::finished: No proper answer on QUrl("http://localhost/~owncloud/status.php ")
10:26:23.235 OCC::AccountState::checkConnectivity: ConnectionValidator already running, ignoring "owncloud@localhost"
10:26:55.235 OCC::AccountState::checkConnectivity: ConnectionValidator already running, ignoring "owncloud@localhost"
[...]
(cherry picked from commit ff701bd473 )
2016-09-21 14:30:36 +02:00
Jenkins for ownCloud
8496817db2
[tx-robot] updated from transifex
2016-09-21 02:18:30 +02:00
Jenkins for ownCloud
3d06f4b7c9
[tx-robot] updated from transifex
2016-09-20 09:12:39 +02:00
Olivier Goffart
b228488eb7
Revert "FolderWatcher: Act on relative paths #5116 ( #5153 )"
...
This is not sufficient as it is not working for the Socket API.
Next commit will fix it in another layer.
Also, not ignoring paths that are not inside the folder is wrong
as it might still happen if the name has a different casing
This reverts commit d5a481f132 .
(cherry picked from commit 904cd46f75 )
2016-09-15 16:26:25 +02:00
Markus Goetz
b7809ded23
OS X: Try to fix tray menu not updating correctly #5158 ( #5177 )
...
I even had this issue long before 2.3 that submenus suddenly disappeared.
Now we refrain from updating while visible.
2016-09-13 14:34:22 +02:00
ckamm
dfb121236c
Excludes: Consider files in hidden folders excluded #5163 ( #5173 )
...
Previously, we only checked the hiddenness of the target file and
ignored the hiddenness of the containing folders. This lead to
undesired behavior when people synced their home folders and there
was a folder watcher notification for a non-hidden file in one of
the hidden folders.
I'm not fully sure why, but sometimes notifications for .foo/bar were
already ignored, but notifications for .foo/bar/car were not. This may
be because of how we set up the FolderWatchers on Linux.
The new behavior is to check all path components for hiddenness, up
until the base path (but excluding the base path, so using a hidden
folder as a sync folder will work).
2016-09-13 14:14:27 +02:00
ckamm
f286493c90
Merge pull request #5174 from owncloud/fix5116_2
...
Better fix for #5116
2016-09-13 10:16:05 +02:00
Olivier Goffart
c2cb729fee
Folder: Cannonicalize the path
...
This is important because we compare the paths from the file system watcher if it
starts with this path.
Same in the SocketAPI where we need to use cannonical paths in the REGISTER_PATH command,
as the plugin themself will do this comparison.
Issue #5116
2016-09-12 16:56:59 +02:00
Olivier Goffart
904cd46f75
Revert "FolderWatcher: Act on relative paths #5116 ( #5153 )"
...
This is not sufficient as it is not working for the Socket API.
Next commit will fix it in another layer.
Also, not ignoring paths that are not inside the folder is wrong
as it might still happen if the name has a different casing
This reverts commit d5a481f132 .
2016-09-12 16:05:55 +02:00
Piotr M
7fd00b2cd5
add server capabilities to owncloudcmd
2016-09-12 14:43:40 +02:00
Klaas Freitag
2d110540ee
Dolphin Plugin: Use the Application name for the socket path ( #5172 )
...
do not hardcode.
This should fix #5165
2016-09-12 14:12:33 +02:00
Markus Goetz
907918dca3
FolderWatcher: Act on relative paths #5116 ( #5153 )
...
(cherry picked from commit d5a481f132 )
2016-09-12 14:09:13 +02:00
Christian Kamm
5ffaf3a90f
Set discovery thread priority to low #5017
...
(cherry picked from commit bd7ec19644 )
2016-09-12 14:09:13 +02:00
Olivier Goffart
1040e7b57b
ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
...
If the folder has different case in the settings and in the FS, we should
not ignore all the files. This is important for the files system watcher.
(cherry picked from commit 98268d102f )
2016-09-12 14:09:12 +02:00
Olivier Goffart
65c49e1de6
CleanupPollsJob: Fix possible leak
...
Missing deleteLater when the CleanupPollsJob aborts.
This is only a problem if the SyncEngine is kept alive a long time. Which is
usually not the case in the configuration where poll jobs are used.
(cherry picked from commit 3465024898 )
2016-09-12 14:09:12 +02:00
Christian Kamm
4abaee7736
Recall: Copy instead of move recalled file #5150
...
That was an unintentional change in
2662203fb7
Also expand the test case to cover this.
(cherry picked from commit af9c4d0e2f )
2016-09-12 14:09:12 +02:00
Markus Goetz
3cdcd8dea0
Selective Sync: Fix request loop and show error in view ( #5154 )
...
I got into a situation where the model would endlessly request the directory
contents from the server because we did not notice yet that the server
is actually in maintenance mode while we were expanding the tree view when
changing the tab to the account or when just expanding it by clicking.
(cherry picked from commit 524220d090 )
2016-09-12 14:09:12 +02:00
Christian Kamm
cb19ebc9e3
ShareLink: Ensure the password line edit is enabled #5117
...
(cherry picked from commit b541fea793 )
2016-09-12 14:09:12 +02:00
Daniel Molkentin
37adaa7872
Update owner to be ownCloud GmbH
...
Fixes #5079
(cherry picked from commit a83c5598e8 )
2016-09-12 14:09:12 +02:00
Christian Kamm
9d93afb2a1
Switch target version of this branch to 2.2.4
2016-09-12 14:07:33 +02:00
Markus Goetz
d5a481f132
FolderWatcher: Act on relative paths #5116 ( #5153 )
2016-09-12 14:03:11 +02:00
Olivier Goffart
1d09f6b60f
Allow to disable Shiboleth to build without QtWebkit ( #5166 )
2016-09-11 16:14:08 +02:00
Olivier Goffart
98268d102f
ExcludeFiles: Fix when the folder casing is not the same in the settings and in the FS
...
If the folder has different case in the settings and in the FS, we should
not ignore all the files. This is important for the files system watcher.
2016-09-11 12:12:10 +02:00
Olivier Goffart
9e895a6ecc
FolderStatusModel: Fix beginInsertRow/endInsertRow
...
We need to do the change between the begin and the end call so the selection
don't get broken
2016-09-11 12:12:10 +02:00
Olivier Goffart
7c75a39bc1
Chunking-NG: Some fixup after feedback from the pull request #5102
2016-09-10 12:30:14 +02:00
Markus Goetz
524220d090
Selective Sync: Fix request loop and show error in view ( #5154 )
...
I got into a situation where the model would endlessly request the directory
contents from the server because we did not notice yet that the server
is actually in maintenance mode while we were expanding the tree view when
changing the tab to the account or when just expanding it by clicking.
2016-09-06 11:11:03 +02:00
Christian Kamm
af9c4d0e2f
Recall: Copy instead of move recalled file #5150
...
That was an unintentional change in
2662203fb7
Also expand the test case to cover this.
2016-09-06 10:42:59 +02:00
Jenkins for ownCloud
7c24ed769e
[tx-robot] updated from transifex
2016-09-06 02:18:30 +02:00
Klaas Freitag
c97d8aa8fd
Show the rename target in the client log file. ( #5149 )
2016-09-05 13:26:49 +02:00
Jenkins for ownCloud
65110f7a91
[tx-robot] updated from transifex
2016-09-05 02:18:30 +02:00
Jenkins for ownCloud
c33abd468d
[tx-robot] updated from transifex
2016-09-04 02:18:30 +02:00
Jenkins for ownCloud
584b205bd5
[tx-robot] updated from transifex
2016-09-03 02:18:31 +02:00
Klaas Freitag
f0dc3b2deb
FolderWatcher: Also ignore the new sync journal file name format.
2016-09-02 16:19:10 +02:00
Klaas Freitag
84ede3f01f
Make sync journal name generating a method of SyncJournal.
...
Before it was in Folder, however, the command line client does not
have the Folder class. To not duplicate code, the function to generate
the sync journal name went to SyncEngine class.
2016-09-02 16:19:10 +02:00
Klaas Freitag
2daf895e43
Documentation: Mention the new format for the journal file.
2016-09-02 16:19:10 +02:00
Klaas Freitag
3b651b2da9
folderman: Clean some comments
2016-09-02 16:19:04 +02:00
Klaas Freitag
6fd930908c
csync_tests: Adopted to new cmocka API.
2016-09-02 15:49:54 +02:00
Klaas Freitag
62125a442d
csync_exclude: Also exclude the new syncjournal filename.
2016-09-02 15:49:21 +02:00
Klaas Freitag
2d54fb2ff9
csync_update: Do not check to exclude .csync_journal.db
...
It is indeed already handled by csync_exclude.
2016-09-02 15:48:45 +02:00
Klaas Freitag
e46fad52bb
Make the sync journal file name a method of the Folder class.
...
The sync journal name has a dependency on the remote url now.
2016-09-02 12:29:21 +02:00
Jenkins for ownCloud
b75f50d62c
[tx-robot] updated from transifex
2016-09-02 02:18:31 +02:00
Jenkins for ownCloud
14457e93e6
[tx-robot] updated from transifex
2016-09-01 02:18:31 +02:00
Olivier Goffart
c41f6ed76b
Chunking-NG: use new dav URL for the move
2016-08-31 12:12:34 +02:00
Olivier Goffart
818b5854ce
Chunking-NG: Qt4 compile
2016-08-31 10:28:44 +02:00
Olivier Goffart
79abb8b4e3
ChunkingNg: enable depending on an environment variable
2016-08-31 10:28:15 +02:00
Olivier Goffart
fad387b6b8
Chunking-Ng: Resume
2016-08-31 10:28:15 +02:00
Olivier Goffart
a1558100b8
WIP: new chunking algorithm
...
Current limitations of this WiP
- No resuming implemented yet
- No parallel chunks
- Hackish way to get the webdav paths
2016-08-31 10:28:15 +02:00
Olivier Goffart
4f3f642da6
Upload: refactor the upload in two classes so the new chuning can be implemented
2016-08-31 10:28:15 +02:00
Olivier Goffart
86eab48981
Qt4 Compile
2016-08-31 10:27:20 +02:00
Olivier Goffart
d2bde5489f
Propagator, remove the QNAM in the name as the alternative has been removed a long time ago
2016-08-31 10:25:06 +02:00
Jenkins for ownCloud
9c0ecad420
[tx-robot] updated from transifex
2016-08-31 02:18:30 +02:00
Jenkins for ownCloud
85b5fdb3d3
[tx-robot] updated from transifex
2016-08-30 02:18:35 +02:00
Jenkins for ownCloud
f2c6669224
[tx-robot] updated from transifex
2016-08-29 02:18:30 +02:00
Jenkins for ownCloud
d8f9bf3a0b
[tx-robot] updated from transifex
2016-08-28 02:18:32 +02:00
Jenkins for ownCloud
d5fa8faa91
[tx-robot] updated from transifex
2016-08-27 02:18:32 +02:00
Christian Kamm
39e93768ea
Account wizard: Enable back button consistently #5107
...
Tested with http auth and shib auth.
2016-08-26 13:12:25 +02:00
Christian Kamm
c1eb9244d1
Shibboleth: Fix detection in account wizard #5138
...
Following redirections generally
(bb5c2cbfa5 ) meant that the special
shib-redirection detection code was no longer being used.
2016-08-26 12:58:06 +02:00
Jenkins for ownCloud
d1a1b95926
[tx-robot] updated from transifex
2016-08-26 02:18:32 +02:00
Jenkins for ownCloud
ee2a67e332
[tx-robot] updated from transifex
2016-08-25 02:18:31 +02:00
Markus Goetz
6ecda6e7f4
Merge branch '2.2'
2016-08-24 11:39:12 +02:00
Jenkins for ownCloud
7362575d64
[tx-robot] updated from transifex
2016-08-24 02:18:30 +02:00
Jenkins for ownCloud
6a9b6c1167
[tx-robot] updated from transifex
2016-08-23 02:18:33 +02:00
Jenkins for ownCloud
8e00fd66de
[tx-robot] updated from transifex
2016-08-22 02:18:31 +02:00
Jenkins for ownCloud
ef035ea7f9
[tx-robot] updated from transifex
2016-08-21 02:18:31 +02:00
Jenkins for ownCloud
77b5c5e963
[tx-robot] updated from transifex
2016-08-20 02:18:31 +02:00
Jenkins for ownCloud
687549c455
[tx-robot] updated from transifex
2016-08-19 09:58:44 +02:00
Jocelyn Turcotte
b28123bed9
Fix the Qt4 unit testing build
2016-08-18 10:34:07 +02:00
Jenkins for ownCloud
677c34fbf8
[tx-robot] updated from transifex
2016-08-18 02:18:30 +02:00
Jocelyn Turcotte
2ff7b63551
Merge pull request #5122 from jturcotte/syncfilestatustrackerTests
2016-08-17 16:04:02 +02:00
Christian Kamm
b541fea793
ShareLink: Ensure the password line edit is enabled #5117
2016-08-17 15:48:25 +02:00
Jocelyn Turcotte
efb6b8c2c9
[overlays] Fix folders appearing as OK even though children are still syncing #4797
...
This would happen if the directory would first need to be created
through an mkdir propagation job. This job's itemCompleted signal
would trigger the directory to show as SYNC even though its children
are still propagating.
Fix the issue by tracking the sync count for each file, affecting
its parents. This allows us to get rid of the O(n) vector lookup
for each status query, and properly track the hierachical sync
status of a directory.
This also removes the itemCompleted signal emission from the
PropagateDirectory job. Since we only needed for overlay icons, and
since this job doesn't do any direct propagation, we can remove it
to ensure that we won't call itemCompleted twice for the item attached
to Propagate*Mkdir jobs (since the PropagateDirectory is backed by
the same SyncFileItem, instruction and status).
2016-08-17 15:40:02 +02:00
Jocelyn Turcotte
e974771796
csync: Use an explicit instruction for should_update_metadata
...
The current way of tracking the need to update the metadata without
propagation using a separate flag makes it difficult to track
priorities between the local and remote tree. The logic is also
difficult to logically cover since the possibilities matrix isn't
100% covered, leaving the flag only used in a few situations
(mostly involving folders, but not only).
The reason we need to change this is to be able to track the sync
state of files for overlay icons. The instruction alone can't be
used since CSYNC_INSTRUCTION_SYNC is used for folders even though
they won't be propagated. Removing this logic is however not possible
without using something else than CSYNC_INSTRUCTION_NONE since too
many codepath interpret (rightfully) this as meaning "nothing to do".
This patch adds a new CSYNC_INSTRUCTION_UPDATE_METADATA instruction
to let the update and reconcile steps tell the SyncEngine to update
the metadata of a file without any propagation. Other flags are left
to be interpretted by the implementation as implicitly needing
metadata update or not, as this was already the case for most file
propagation jobs. For example, CSYNC_INSTRUCTION_NEW for directories
now also implicitly update the metadata.
Since it's not impossible for folders to emit CSYNC_INSTRUCTION_SYNC
or CSYNC_INSTRUCTION_CONFLICT, the corresponding code paths in the
sync engine have been removed.
Since the reconcile step can now know if the local tree needs metadata
update while the remote side might want propagation, the
localMetadataUpdate logic in SyncEngine::treewalkFile now simply use
a CSYNC_INSTRUCTION_UPDATE_METADATA for the local side, which is now
implemented as a different database query.
2016-08-17 15:39:31 +02:00
Jocelyn Turcotte
82ef1bcfe0
Make sure that we invalidate parents on blacklisted items
...
Add a missing call that we currently only do in slotItemCompleted.
This would normally only affect the first sync and would have
gotten properly update at the end of the sync anyway.
2016-08-17 15:39:30 +02:00
Jocelyn Turcotte
b7ff4a76e8
Add TestSyncEngine and TestSyncFileStatusTracker auto tests
...
To be able to test the SyncEngine efficiently, a set of server
mocking classes have been implemented on top of QNetworkAccessManager.
The local disk side hasn't been mocked since this would require adding
a large abstraction layer in csync. The SyncEngine is instead pointed
to a different temporary dir in each test and we test by interacting
with files in this directory instead.
The FakeFolder object wraps the SyncEngine with those abstractions
and allow controlling the local files, and the fake remote state
through the FileModifier interface, using a FileInfo tree structure
for the remote-side implementation as well as feeding and comparing
the states on both side in tests.
Tests run fast and require no setup to be run, but each server feature
that we want to test on the client side needs to be implemented in
this fake objects library. For example, the OC-FileId header isn't
set as of this commit, and we can't test the file move logic properly
without implementing it first.
The TestSyncFileStatusTracker tests already contain a few QEXPECT_FAIL
for what I esteem being issues that need to be fixed in order to catch
up on our test coverage without making this patch too huge.
2016-08-17 15:39:30 +02:00
Jenkins for ownCloud
465639af82
[tx-robot] updated from transifex
2016-08-17 02:18:31 +02:00
Jenkins for ownCloud
7f59dec0bb
[tx-robot] updated from transifex
2016-08-17 01:15:16 +02:00
Jenkins for ownCloud
583f9586aa
[tx-robot] updated from transifex
2016-08-16 02:18:31 +02:00
Jocelyn Turcotte
2507ba9818
tx.pl: Fix each put_to_dir taking 10 seconds
...
The open function expects a URL, passing only the directory name would
lead HTTP::DAV to try looking it as an hostname on the network and
only return after it timed out.
2016-08-15 15:35:53 +02:00
ckamm
88cd5421bf
Tray menu: Update only on demand #4990 #4985 ( #5072 )
...
The tray menu is now only updated when it becomes visible or while
it is visible.
2016-08-15 13:42:56 +02:00
ckamm
7b26e6b8f9
Progress: Don't display unlikely estimates #5046 ( #5066 )
2016-08-15 13:36:53 +02:00
Jenkins for ownCloud
573d942969
[tx-robot] updated from transifex
2016-08-15 02:18:30 +02:00
Jenkins for ownCloud
1a454ec6b2
[tx-robot] updated from transifex
2016-08-15 01:15:15 +02:00
Jenkins for ownCloud
02df088843
[tx-robot] updated from transifex
2016-08-14 02:18:30 +02:00
Jenkins for ownCloud
ce4daaaae2
[tx-robot] updated from transifex
2016-08-13 01:15:24 +02:00
Jenkins for ownCloud
cd9335e043
[tx-robot] updated from transifex
2016-08-12 02:18:30 +02:00
Jenkins for ownCloud
775ad25be3
[tx-robot] updated from transifex
2016-08-12 01:16:28 +02:00
Jenkins for ownCloud
7e43fe599c
[tx-robot] updated from transifex
2016-08-12 01:15:20 +02:00
Jenkins for ownCloud
20531e57a8
[tx-robot] updated from transifex
2016-08-11 02:18:39 +02:00
Jenkins for ownCloud
3e64840e33
[tx-robot] updated from transifex
2016-08-11 01:16:34 +02:00
Jenkins for ownCloud
e6db2ee960
[tx-robot] updated from transifex
2016-08-11 01:15:18 +02:00
Markus Goetz
be34bfb276
issue_template.md: Clarifying comment
2016-08-10 14:44:19 +02:00
Jenkins for ownCloud
e2e16aeaaa
[tx-robot] updated from transifex
2016-08-10 02:18:38 +02:00
Jenkins for ownCloud
6fbeb60d86
[tx-robot] updated from transifex
2016-08-10 01:16:38 +02:00
Thomas Müller
a46a69f250
[2.2] Jenkinsfile: Add win32 build ( #5091 ) ( #5115 )
2016-08-09 16:20:32 +02:00
Daniel Molkentin
bb5c2cbfa5
Always follow redirects in network jobs ( #4905 )
...
This is a move away from the original policy where jobs
would only follow redirects in special cases.
Two restrictions are in place:
1. We do not allow protocol downgrades (https -> http)
2. We stop redirects after we find them looping (e.g. old = new url, or
indirectly when looping 10 times).
This is closer to RFC conforming behavior, although currently
we will treat 301 replies like they were 302. This is for a separate
commit.
Error handling (and display) also needs improvement.
Addresses #2791
2016-08-09 16:01:29 +02:00
Jenkins for ownCloud
60904496d2
[tx-robot] updated from transifex
2016-08-09 15:12:31 +02:00
Thomas Müller
94c9a2cca1
Jenkinsfile: Add win32 build ( #5091 )
2016-08-09 15:06:17 +02:00
Jenkins for ownCloud
3187a22300
[tx-robot] updated from transifex
2016-08-09 02:18:41 +02:00
Markus Goetz
9626021a63
Update ChangeLog for 2.2.3 final
2016-08-08 15:39:49 +02:00
Jenkins for ownCloud
b72a19ad64
[tx-robot] updated from transifex
2016-08-08 02:18:35 +02:00
Markus Goetz
2ae37c6beb
Update ChangeLog
2016-08-07 22:51:16 +02:00
Jenkins for ownCloud
f8f376ac03
[tx-robot] updated from transifex
2016-08-07 02:18:30 +02:00
Jenkins for ownCloud
632d231435
[tx-robot] updated from transifex
2016-08-06 02:18:34 +02:00
Markus Goetz
fc868d89f3
Merge pull request #5108 from owncloud/limit_library_path
...
Limit Qt and OpenSSL Library pathes to the install directory
2016-08-05 16:39:04 +02:00
Daniel Molkentin
5a57e4a7a6
Ensure OpenSSL config file is only read from app dir
2016-08-05 16:38:08 +02:00
Jenkins for ownCloud
70a1671dc1
[tx-robot] updated from transifex
2016-08-05 14:23:25 +02:00
Daniel Molkentin
7de70516f1
Fix module loading
2016-08-05 12:35:52 +02:00
Jenkins for ownCloud
50bd4b8f4f
[tx-robot] updated from transifex
2016-08-05 02:18:30 +02:00
Olivier Goffart
4a7f3cb486
SyncEngine: Fix detection of backup ( #5104 )
...
Once upon a time, the SyncEngine was instantiated once per sync. But now that
the SyncEngine is kept between sync, we need to reset all these variable between
syncs.
2016-08-04 16:06:10 +02:00
Jenkins for ownCloud
b7663d00b9
[tx-robot] updated from transifex
2016-08-04 02:18:35 +02:00
Jocelyn Turcotte
b307f2b65c
Revert "Fix a deadlock when shutting down during discovery" ( #5100 )
...
Reverts commit 622017adcf
Could be the cause of #5092 and the cost is higher than the benefit if this is the case.
A network request taking more than 30 seconds isn't something unlikely in this world
and shouldn't be a good reason to abort. We should try to untangle the threads
dependencies to properly fix this if possible instead.
2016-08-03 16:35:24 +02:00
Jenkins for ownCloud
6c94d56b53
[tx-robot] updated from transifex
2016-08-03 02:18:37 +02:00
Olivier Goffart
73a6939b70
ownsql: handle QByteArray without converting to QString ( #5097 )
...
QByteArray is used for checksum
2016-08-02 11:39:08 +02:00
Olivier Goffart
88e5a9411a
SyncEngine: Reads the data-fingerprint property ( #5056 )
...
When it changes, assume a backup was recovered, and keep conflict files.
Issues: #2325 and https://github.com/owncloud/enterprise/issues/966
2016-08-02 10:30:49 +02:00
Jenkins for ownCloud
c51a80bffa
[tx-robot] updated from transifex
2016-08-02 02:18:35 +02:00
Thomas Müller
87f4f70abb
Merge pull request #5069 from owncloud/Jenkinsfile-2.2
...
[2.2] Add Jenkinsfile (#5041 )
2016-08-01 12:41:04 +02:00
Olivier Goffart
19a52b9e6b
Qt4: don't require a X server in the tests
...
Issue #5069
(cherry picked from commit 927a8b5071 and
a4310f0f5c )
2016-08-01 11:57:21 +02:00
Jenkins for ownCloud
4ea70ebd18
[tx-robot] updated from transifex
2016-08-01 02:48:18 +02:00
Jenkins for ownCloud
d58c392d93
[tx-robot] updated from transifex
2016-08-01 01:16:19 +02:00
Jenkins for ownCloud
b9a6970282
[tx-robot] updated from transifex
2016-07-31 02:50:05 +02:00
Jenkins for ownCloud
a58ef9c586
[tx-robot] updated from transifex
2016-07-30 02:39:29 +02:00
Thomas Müller
cef24da44c
Add Jenkinsfile ( #5041 )
2016-07-29 08:48:28 +02:00
Jenkins for ownCloud
23c7f10b79
[tx-robot] updated from transifex
2016-07-29 02:18:35 +02:00
Klaas Freitag
5ac434a740
Logs: Add the name of the platform we're running on to the log. ( #5082 )
2016-07-28 16:30:40 +02:00
Jenkins for ownCloud
9e514d6cc7
[tx-robot] updated from transifex
2016-07-28 02:18:39 +02:00
Jenkins for ownCloud
4d109e43fa
[tx-robot] updated from transifex
2016-07-27 02:18:42 +02:00
Daniel Molkentin
b575ded464
More GmbH -> Inc Copyright header fixes
2016-07-26 16:53:11 +02:00
Daniel Molkentin
a83c5598e8
Update owner to be ownCloud GmbH
...
Fixes #5079
2016-07-26 16:48:08 +02:00
Jocelyn Turcotte
03a90bf03f
shell/windows: Build 43, add missing 32 bit binaries
...
Also include a minor change from #5025
2016-07-26 14:54:27 +02:00
Jocelyn Turcotte
ff7b2381e9
shell/windows: Add missing Win32 configuration changes
...
The changes in build location were only done on the x64 configuration.
2016-07-26 14:53:14 +02:00
Markus Goetz
24cd8041a8
ChangeLog for 2.2.3
2016-07-26 12:14:00 +02:00
Jenkins for ownCloud
3eaadfe52f
[tx-robot] updated from transifex
2016-07-26 02:43:40 +02:00
Klaas Freitag
ebcec44202
ShibbolethView: Open a debug windows that shows cipher info. ( #5080 )
...
It opens a window and connects to a cipher test
page, showing the output from there, that helps for debugging.
The window is enabled by setting the environment variable
OWNCLOUD_SHIBBOLETH_DEBUG
2016-07-25 17:47:23 +02:00
Jenkins for ownCloud
7b0b7fde51
[tx-robot] updated from transifex
2016-07-25 02:18:34 +02:00
Jenkins for ownCloud
fa9ec12ae7
[tx-robot] updated from transifex
2016-07-24 02:18:36 +02:00
Jenkins for ownCloud
54aa4dce46
[tx-robot] updated from transifex
2016-07-23 02:18:47 +02:00
Jenkins for ownCloud
7c19f748b7
[tx-robot] updated from transifex
2016-07-22 02:18:44 +02:00
Jenkins for ownCloud
5aa82944a4
[tx-robot] updated from transifex
2016-07-21 02:18:38 +02:00
Jenkins for ownCloud
0d9cf26890
[tx-robot] updated from transifex
2016-07-20 08:18:40 +02:00
Christian Kamm
eadecc5802
Excludes: Fix a Windows specific bug #5039
...
It meant that almost nothing was being excluded.
Broken since 87b4693a9d
2016-07-19 15:38:57 +02:00
Christian Kamm
39bde6f3e4
Revert "Add 'open in browser' to account menu #4824 "
...
This reverts commit 3c575a2f37 .
One can already open the account in the browser by clicking the
link in the settings dialog!
2016-07-19 11:19:40 +02:00
Jenkins for ownCloud
a4837e9291
[tx-robot] updated from transifex
2016-07-19 08:18:37 +02:00
Jenkins for ownCloud
5672557a84
[tx-robot] updated from transifex
2016-07-18 09:29:56 +02:00
Jenkins for ownCloud
0b31f2601d
[tx-robot] updated from transifex
2016-07-18 08:18:44 +02:00
Klaas Freitag
f3cfd2b70b
csync: Free statedb file member before realloc
2016-07-17 21:13:17 +02:00
Klaas Freitag
78caa1a712
Fix tests for syncjournaldb
2016-07-17 21:10:07 +02:00
Jenkins for ownCloud
a5850d4515
[tx-robot] updated from transifex
2016-07-17 08:18:34 +02:00
Jenkins for ownCloud
c39eb315dd
[tx-robot] updated from transifex
2016-07-16 08:18:34 +02:00
Jenkins for ownCloud
6c8e88e2ed
[tx-robot] updated from transifex
2016-07-15 08:18:36 +02:00
Olivier Goffart
3465024898
CleanupPollsJob: Fix possible leak
...
Missing deleteLater when the CleanupPollsJob aborts.
This is only a problem if the SyncEngine is kept alive a long time. Which is
usually not the case in the configuration where poll jobs are used.
2016-07-14 09:23:22 +02:00
Jenkins for ownCloud
eeea255104
[tx-robot] updated from transifex
2016-07-14 08:18:43 +02:00
Jenkins for ownCloud
8e2af57b57
[tx-robot] updated from transifex
2016-07-13 02:18:41 -04:00
Olivier Goffart
7c671756e6
Merge remote-tracking branch 'origin/2.2'
...
Conflicts:
src/libsync/syncfilestatustracker.cpp
2016-07-12 17:38:15 +02:00
Olivier Goffart
f3f387c36b
Merge pull request #5016 from owncloud/overrideurl
...
AccountManager: Don't force the server URL while loading the config.
2016-07-12 14:33:28 +02:00
Olivier Goffart
b53ce78eb6
Merge pull request #5025 from ArthurChiao/bugfix_#5015
...
fix #5015 overlay icon not show: compare folder paths with no case-se…
2016-07-12 14:32:54 +02:00
Markus Goetz
0c6788f03d
conffile.rst #5052
2016-07-12 14:29:05 +02:00
ckamm
bc4753e938
Sharing: Fix bug with file names containing percent encodes #5042 ( #5043 )
2016-07-12 14:25:33 +02:00
Thomas Müller
6bd4de19a8
Add Jenkinsfile ( #5041 )
2016-07-12 13:24:35 +02:00
Olivier Goffart
927a8b5071
Qt4: don't require a X server in the tests
...
Previous commit was not enough
2016-07-12 11:07:12 +02:00
Jenkins for ownCloud
aefbca0787
[tx-robot] updated from transifex
2016-07-12 02:18:39 -04:00
Olivier Goffart
a4310f0f5c
Qt4: don't require a X server in the tests
2016-07-11 14:04:58 +02:00
Olivier Goffart
cb64ba22b3
Fix Qt4 build
2016-07-11 12:27:59 +02:00
Jenkins for ownCloud
653b42216f
[tx-robot] updated from transifex
2016-07-11 02:18:33 -04:00
Klaas Freitag
0884ad6517
owncloudcmd: Adopt to new syncJournalDb MD5 based name schema.
2016-07-10 13:05:09 +02:00
Klaas Freitag
37fc4e4332
SyncJournalDb: Cleanup of Constructor interface.
...
The parameter path is not longer needed.
2016-07-10 13:04:29 +02:00
Klaas Freitag
9cc90159f1
FolderMan: ensureJournalGone needs to know the exact journal name, WIP
2016-07-10 12:57:35 +02:00
Klaas Freitag
4ceee86c66
SyncEngine: Calculate a uniq journal name using the remote account.
...
That should allow to sync the same local folder to multiple remote destinations.
see #3764
2016-07-10 12:56:43 +02:00
Klaas Freitag
b9ea7c3414
csync: Do not compute the journal name in csync_update any more.
...
Rely on the name that was passed to csync_init()
2016-07-10 12:54:33 +02:00
Klaas Freitag
3033e693be
Folder: For wipe reuse the journal name from SyncEngine.
...
Do not compute on its own any more.
2016-07-10 12:52:47 +02:00
Klaas Freitag
a1bc01d3b1
SyncJournalDb: Add a method to set the name of the db file.
2016-07-10 12:51:42 +02:00
Jenkins for ownCloud
3ec9cd1d9e
[tx-robot] updated from transifex
2016-07-10 02:18:47 -04:00
Jenkins for ownCloud
b21e3e0fdc
[tx-robot] updated from transifex
2016-07-10 01:15:58 -04:00
Jenkins for ownCloud
20d0c835b6
[tx-robot] updated from transifex
2016-07-09 02:18:51 -04:00
arthurchiao
3335c733d7
be case insensitive for MacOSX, too
2016-07-08 15:53:11 +08:00
arthurchiao
4da55b69df
ignore case-sensitivity only on windows
2016-07-08 15:12:37 +08:00
Jenkins for ownCloud
b7085987b8
[tx-robot] updated from transifex
2016-07-08 02:18:52 -04:00
Jenkins for ownCloud
a1b44cd82a
[tx-robot] updated from transifex
2016-07-07 02:18:42 -04:00
ckamm
11b44358f6
Windows: Skip symlinks and junctions again #5019 ( #5036 )
...
Fixes an accidental behavior change introduced in
055c2ef73f
Affects #4056 and owncloud/enterprise#1225 .
2016-07-07 08:07:19 +02:00
Jenkins for ownCloud
4979181e85
[tx-robot] updated from transifex
2016-07-07 01:15:57 -04:00
Jenkins for ownCloud
651cc25e3f
[tx-robot] updated from transifex
2016-07-06 02:19:04 -04:00
Christian Kamm
699d1ba13b
owncloudcmd: Make source_dir absolute #5035
...
Fixes a problem with relative paths on Windows.
2016-07-05 15:40:32 +02:00
Christian Kamm
3c575a2f37
Add 'open in browser' to account menu #4824
2016-07-05 14:48:51 +02:00
Christian Kamm
bd7ec19644
Set discovery thread priority to low #5017
2016-07-05 13:53:57 +02:00
Daniel Molkentin
a338b9f269
Merge pull request #5034 from owncloud/fix-5033
...
Only accept notification API Capability if endpoint is OCS-enabled
2016-07-05 12:46:20 +02:00
Jenkins for ownCloud
81ff4e02c5
[tx-robot] updated from transifex
2016-07-05 02:18:32 -04:00
Daniel Molkentin
8a1a2eb5b3
Only accept notification API Capability if endpoint is OCS-enabled
...
Fixes #5033
2016-07-04 18:33:02 +02:00
Jenkins for ownCloud
0c646b974f
[tx-robot] updated from transifex
2016-07-04 02:18:34 -04:00
Jenkins for ownCloud
e661bf2324
[tx-robot] updated from transifex
2016-07-03 02:18:29 -04:00
Jenkins for ownCloud
2abb5c95bb
[tx-robot] updated from transifex
2016-07-02 02:19:18 -04:00
Jenkins for ownCloud
c3ef1a996f
[tx-robot] updated from transifex
2016-07-01 02:18:37 -04:00
arthurchiao
7a2a439426
fix #5015 overlay icon not show: compare folder paths with no case-sensitivity
2016-07-01 13:03:42 +08:00
Jenkins for ownCloud
ce26afb262
[tx-robot] updated from transifex
2016-06-30 02:18:34 -04:00
Jenkins for ownCloud
56e1737c61
[tx-robot] updated from transifex
2016-06-29 02:18:33 -04:00
Olivier Goffart
dff57362f9
AccountManager: Don't force the server URL while loading the config.
...
While loading the account, only override the server url if Theme::forceConfigAuthType
is set. This restore the behavior from the client 2.1 for theme that did not
use Theme::forceConfigAuthType.
Issue: owncloud/enterprise#1418
2016-06-28 14:32:03 +02:00
Olivier Goffart
3f3a679f81
Fix the URL from previous commit
...
The pull request was merged too early and did not contain the URL change
(Issue #4877 )
2016-06-28 14:17:16 +02:00
Olivier Goffart
cde9017340
GUI: Show link to the page that allow to add a new token ( #4963 )
...
If owncloud >= 9.1 is detected:
and add a link to the ownCloud page that allow to add device token.
Issue #4877
2016-06-28 12:25:04 +02:00
Jenkins for ownCloud
05a7c18635
[tx-robot] updated from transifex
2016-06-28 02:19:16 -04:00
Jocelyn Turcotte
3a77074b97
Merge pull request #5007 from owncloud/rebuildWinShellIntegration
...
Rebuild win shell integration
2016-06-27 18:02:42 +02:00
Jocelyn Turcotte
446e7cbd93
Fix a QAction leak ( #5008 )
...
Attach the accout menu QAction to the menu rather than the
ownCloudGui since it should be destroyed when the context
menu is cleared.
2016-06-27 16:22:51 +02:00
ckamm
b4d26ba952
Fix windows HiDPI #4994 ( #4998 )
...
This was removed in 0194ebb222
because it breaks on Linux. However, it looks like it is correct
for Windows. In the meantime the surrounding ifdef has changed
from !Q_OS_MAC to Q_OS_WIN, so reverting it makes sense.
2016-06-27 16:17:58 +02:00
Jocelyn Turcotte
622017adcf
Fix a deadlock when shutting down during discovery ( #4993 )
...
Since the SyncEngine now quits and waits for the discovery thread,
the main thread can enter a deadlock where the discovery thread waits
for its directory result.
Add a 2 seconds timer to the discovery thread wait condition
to limit the deadlock time.
2016-06-27 16:12:39 +02:00
Jocelyn Turcotte
088a4f0bbe
binaries: Update to build 42 owncloud/client#4977
2016-06-27 15:30:03 +02:00
Jocelyn Turcotte
ba96fb89a5
shell_integration/windows: Set VS output directory in the binary submodule
...
This allows creating a new build simply by hitting F7 in visual studio
and then committing the changed files in the binary submodules without
having to know which files to move where.
2016-06-27 15:23:37 +02:00
Jocelyn Turcotte
70ae11fcad
shell_integration/windows: Add a manually-increased build number
...
Since this isn't yet built together with the rest, we can't reliably
use the client version without having to rebuilt the extension manually
on each release. But it would still be nice to be able to tell if a user
has the right version or not loaded, so instead just tag each update of
the DLLs with a separate release version.
This means that every time we update those binaries we'll have to manually
increment the number in the header, but worst case we'll forget from time
to time but we'll be able to know if we didn't, and know if we can rely on
the number or not.
2016-06-27 15:13:47 +02:00
ckamm
86fd982b00
SocketAPI: Use different pipe name #4977 ( #4997 )
...
Named pipe names that contain backslashes sometimes lead to problems.
2016-06-27 15:13:08 +02:00
ckamm
bdb304f8ec
Share: Permissions for federated shares on servers >=9.1 #4996 ( #5001 )
...
This disables the workaround 487e1fdca5ee04fc98c1ed77898df70d740967c8
for servers that are new enough to support fine grained permissions
on federated shares.
The consequence is that the 'reshare' permission is now granted by
default and that users can edit permissions on the usual fine-grained
level again.
The way the client deals with servers <9.1 is unchanged.
2016-06-27 11:09:51 +02:00
Jenkins for ownCloud
001075daf0
[tx-robot] updated from transifex
2016-06-27 02:18:35 -04:00
Jenkins for ownCloud
2a98aa7130
[tx-robot] updated from transifex
2016-06-26 02:18:40 -04:00
Jenkins for ownCloud
9904fb200e
[tx-robot] updated from transifex
2016-06-25 02:18:39 -04:00
Jenkins for ownCloud
6822ae5bec
[tx-robot] updated from transifex
2016-06-24 02:18:52 -04:00
Christian Kamm
440a804836
Tray: Add minimal mode as workaround and testing tool #4985 #4990
2016-06-23 10:22:43 +02:00
Jenkins for ownCloud
9b66dd7166
[tx-robot] updated from transifex
2016-06-23 02:18:31 -04:00
Christian Kamm
7601783553
Fix Qt4 build
2016-06-22 15:47:33 +02:00
Christian Kamm
6e9df8673f
Merge remote-tracking branch 'origin/2.2'
2016-06-22 15:41:37 +02:00
Christian Kamm
c0b0bd5b63
owncloudcmd: Fix --exclude regression
...
It's ok if the system exclude file is missing when --exclude is
specified explicitly.
2016-06-22 15:30:20 +02:00
Jenkins for ownCloud
28d86cee17
[tx-robot] updated from transifex
2016-06-22 02:18:48 -04:00
ckamm
32bb8295a2
csync: Use the full file stat destructors ( #4992 )
...
* For csync_file_stat_t and csync_vio_file_stat_t
* Add original_name to the vio file stat destructor
2016-06-21 12:06:21 +02:00
Jocelyn Turcotte
5d71ad83ec
Fix the Qt4 build
...
QSharedPointer::reset doesn't exist in Qt4.
2016-06-21 12:04:26 +02:00
Markus Goetz
ab24980001
Merge pull request #4979 from jturcotte/2.2
...
Memory improvements during propagation
2016-06-21 10:00:41 +02:00
ckamm
07dea72c37
Setup csync logging earlier ( #4991 )
...
We were missing some csync related log output during startup.
Discovered in #4967
2016-06-21 09:58:53 +02:00
Jenkins for ownCloud
a734be347b
[tx-robot] updated from transifex
2016-06-21 02:18:36 -04:00
Daniel Molkentin
1443ddc7c9
This branch is headed towards 2.2.3 now
2016-06-20 17:42:19 +02:00
Klaas Freitag
191177ff22
excludes: Only log if the pattern was really logged. ( #4989 )
2016-06-20 15:50:20 +02:00
ckamm
43a2aec92b
Performance: Don't redundantly add the same exclude files #4967 ( #4988 )
...
Excludes: Don't redundantly add the same exclude files #4967 , Never accept duplicate exclude patterns #4967
2016-06-20 15:14:13 +02:00
ckamm
681243277e
Share dialog: Add 'Mail link' button #3261 ( #4961 )
2016-06-20 13:06:57 +02:00
Jenkins for ownCloud
c848097c6b
[tx-robot] updated from transifex
2016-06-20 02:18:29 -04:00
Jenkins for ownCloud
096e2cf233
[tx-robot] updated from transifex
2016-06-19 02:18:34 -04:00
Jenkins for ownCloud
7181aedb4b
[tx-robot] updated from transifex
2016-06-18 02:18:33 -04:00
Jocelyn Turcotte
edfd75949d
Reduce the memory usage of the StopWatch during propagation
...
Use a QMap to avoid using a full hashtable for only a few entries, and
clear the QMap once we're done with the measuring. This saves a few
hundred bytes per job during propagation that would otherwise only be
freed at the end of the sync.
2016-06-17 19:20:53 +02:00
Jocelyn Turcotte
7fb134b4e0
Delete the ComputeChecksum object when the job is finished
...
Each object takes almost 1k and we don't need it once the propagation is
done.
2016-06-17 19:20:53 +02:00
Jocelyn Turcotte
87e3553c85
Prevent the sync protocol widget from over-using memory
...
During propagation, we create a line for each file, taking memory, but
we delete all lines passed 2000 right at the beginning of the next sync.
Since the user has little chances of being able to read past those 2000
lines in the log, we might as well keep it capped at 2000 also during
propagation to prevent it from eating memory.
2016-06-17 19:20:53 +02:00
Jocelyn Turcotte
6f3aaecb78
Fix a crash on if shutting down during propagation
...
The SyncRunFileLog owned by the Folder must be destroyed after the
SyncEngine since the SyncEngine will abort during destruction, resulting
in all jobs being aborted.
It's possible that this crash only happens with a debug build.
2016-06-17 19:20:52 +02:00
Markus Goetz
40e3653722
VERSION.cmake: This is 2.2.2
2016-06-17 10:31:30 +02:00
Jenkins for ownCloud
5a4f50a0ff
[tx-robot] updated from transifex
2016-06-17 02:19:00 -04:00
Jocelyn Turcotte
3342ebfcc5
SocketAPI: Push new status of dirty files regardless when not synced ( #4970 )
...
The FolderWatcher inserts files to be marked as SYNC and we
currently assume that all file statuses will be updated by the
following sync. It's however possible that the FolderWatcher
notify us of a change that csync won't consider necessary to
propagate, in which case a new status wouldn't be pushed and
the file manager would continue showing this file as syncing.
Re-push the file status when emptying the dirty files list
before propagating to avoid this issue, most likely the OK
status.
2016-06-16 15:27:10 +02:00
Olivier Goffart
b4900d60b7
Checksum speedup. ( #4968 )
...
No need to allocate (and initialize to 0) a 10 MiB buffer for each files, even
when most files are much smaller than that.
So make sure the buffer that we allocate is not bigger than the file size.
And Also 10 MiB is a bit big for a buffer. 500 KiB should be more than enough.
(Too big allocations can cause problem because of memory fragmentation and such)
2016-06-16 08:28:30 +02:00
Olivier Goffart
92309013da
SyncEngine: make abort and closing more robust
...
We first need to set the abort flag to csync and then aborting the discovery
job, otherwise, the discovery thread could start a new job in the mean time.
We also need to make sure that the thread has existed before we destroy the
exclude list.
2016-06-16 08:26:33 +02:00
Jenkins for ownCloud
4895589e4d
[tx-robot] updated from transifex
2016-06-16 02:18:46 -04:00
Jocelyn Turcotte
cb50fae0a7
SocketAPI: Move the normalization closer to the data entrance ( #4972 )
...
Follow-up for #4884
2016-06-15 21:03:21 +02:00
Jocelyn Turcotte
05d199881e
Merge pull request #4971 from owncloud/fixAccountHandleSslErrorsCrash
...
Attempt to fix the Account::slotHandleSslErrors crash
2016-06-15 18:53:47 +02:00
Jocelyn Turcotte
147cf798a6
Attempt to fix the Account::slotHandleSslErrors crash
...
Events from the crash reporter suggest that the QNAM and its
child replies might get deleted before returning from this method
and the only possible cause we can see is that the inner event
loop has something to do with it.
Try keeping a ref on the QNAM while in this method to make sure
that it won't get deleted by the inner event loop.
2016-06-15 18:12:02 +02:00
Jocelyn Turcotte
d40c56eda5
Account: Use smart pointers to hold its credentials and QNAM objects
...
Also make sure that both use QObject::deleteLater as their delete
function.
2016-06-15 18:12:01 +02:00
Olivier Goffart
6dade0b114
PropagateUpload: fix crash in PUTFileJob::slotTimeout
...
Same fix as in commit 60c101d9
From the crash reporter:
Crash
EXCEPTION_ACCESS_VIOLATION_READ at 0x4
qnetworkreply.cpp in QNetworkReply::request at line 476
propagateupload.cpp in OCC::PUTFileJob::slotTimeout at line 100
moc_abstractnetworkjob.cpp in OCC::AbstractNetworkJob::qt_static_metacall at line 98
qobject.cpp in QMetaObject::activate at line 3716
moc_qtimer.cpp in QTimer::timeout at line 192
qtimer.cpp in QTimer::timerEvent at line 247
qobject.cpp in QObject::event at line 1267
qapplication.cpp in QApplicationPrivate::notify_helper at line 3722
qapplication.cpp in QApplication::notify at line 3505
qcoreapplication.cpp in QCoreApplication::notifyInternal at line 932
2016-06-15 14:32:25 +02:00
Jenkins for ownCloud
5de44407bf
[tx-robot] updated from transifex
2016-06-15 02:18:44 -04:00
Jenkins for ownCloud
2df741e456
[tx-robot] updated from transifex
2016-06-14 02:18:36 -04:00
Olivier Goffart
8b5f71f49e
Fix docker build instruction for windows
2016-06-13 15:30:39 +02:00
Jenkins for ownCloud
77791ccb34
[tx-robot] updated from transifex
2016-06-13 02:18:35 -04:00
Jenkins for ownCloud
a6e4f9939c
[tx-robot] updated from transifex
2016-06-12 02:18:35 -04:00
Jenkins for ownCloud
523cdff1cf
[tx-robot] updated from transifex
2016-06-11 02:18:33 -04:00
Jenkins for ownCloud
c4d6277ce3
[tx-robot] updated from transifex
2016-06-10 02:18:39 -04:00
Jenkins for ownCloud
73cc3a4fd4
[tx-robot] updated from transifex
2016-06-10 01:15:55 -04:00
Christian Kamm
d655074f85
Log: Include start of propagation and lap duration
2016-06-09 14:28:15 +02:00
Christian Kamm
85a173e174
Log: Write the sync log during propagation #3108
...
...instead of when done with the sync. This way we get information
even if the client crashes.
2016-06-09 14:10:47 +02:00
Christian Kamm
87b4693a9d
Add error message for trailing spaces on Windows #4878
2016-06-09 12:41:02 +02:00
ckamm
28c12a3ca0
Move touched-files tracking to SyncEngine #4927 ( #4946 )
2016-06-09 12:07:18 +02:00
Jenkins for ownCloud
70196eb48c
[tx-robot] updated from transifex
2016-06-09 02:26:12 -04:00
Jenkins for ownCloud
9b249716a3
[tx-robot] updated from transifex
2016-06-08 02:19:30 -04:00
Jürgen Weigert
a4b46db91e
Merge pull request #4949 from owncloud/jnweiger-tray-patch-patch-patch
...
Update accountsettings.cpp fixing the tray-patch
2016-06-07 15:59:53 +02:00
Jürgen Weigert
ebc44fa494
Update accountsettings.cpp
2016-06-07 14:21:50 +02:00
ckamm
355a8a0a27
Workaround for Ubuntu 16.04 tray issue #4944 ( #4947 )
2016-06-07 11:48:25 +02:00
Christian Kamm
66f041f74c
Fix Qt4 build
2016-06-07 10:05:57 +02:00
Christian Kamm
6d02d76cfd
Fix compile warnings in tests
2016-06-07 09:43:04 +02:00
Christian Kamm
48efbcb8ca
Merge remote-tracking branch 'origin/2.2'
2016-06-07 09:39:44 +02:00
Jenkins for ownCloud
ab050f9093
[tx-robot] updated from transifex
2016-06-07 02:19:44 -04:00
Jenkins for ownCloud
bf9cffe4b3
[tx-robot] updated from transifex
2016-06-06 02:19:25 -04:00
Carla Schroder
43f727cf69
fix win install instructions: build path and docker image name ( #4901 )
2016-06-05 10:56:56 +02:00
Jenkins for ownCloud
256331fbaa
[tx-robot] updated from transifex
2016-06-05 02:18:37 -04:00
Jenkins for ownCloud
32e6585ae6
[tx-robot] updated from transifex
2016-06-04 02:19:18 -04:00
Olivier Goffart
d072e4a678
Fix compilation on windows
2016-06-03 13:28:53 +02:00
Olivier Goffart
b99c8fe28b
Folder: fix removing folder with escaped characters ( #4943 )
...
FolderDefinition::save and load escapes the alias. We also need to escape
it when we remove it.
New folder can't be created with alias that needs escaping, but old folder
from old config may still exist, and we must allow user to delete them.
2016-06-03 13:10:01 +02:00
Olivier Goffart
5a3120bd52
Folder: Ignore change from the watcher if the file has not changed its mtime or size ( #4942 )
...
For issue #4927 :
On Windows 10, we get a notification after the sync is finished for file that were
just downloaded. The guard we have against our "own changes" are only working when
the sync is running and the OwncloudPropagator still alive.
2016-06-03 13:06:11 +02:00
Jenkins for ownCloud
9ea69be6ab
[tx-robot] updated from transifex
2016-06-03 02:19:51 -04:00
Jenkins for ownCloud
86680a53e0
[tx-robot] updated from transifex
2016-06-03 01:15:59 -04:00
Daniel Molkentin
801cb42d57
Merge pull request #4939 from owncloud/osx_filewatcher_fix
...
OS X filewatcher fix
2016-06-02 18:37:38 +02:00
Markus Goetz
51f8a59a9a
OS X: White-list the folder watcher enums
...
I got syncs triggered for even opening a file by double clicking it in Finder
and having launched Preview.app (e.g. for JPEG files).
2016-06-02 18:20:07 +02:00
Daniel Molkentin
ebbe5acf2b
Merge pull request #4938 from owncloud/fix_4840
...
GUI: don't force the environment variable for high DPI on linux.
2016-06-02 18:13:25 +02:00
Olivier Goffart
6ccd9e872d
GUI: don't force the environment variable for high DPI on linux.
...
Setting the Environment variable only for owncloud makes in inconsistant with
other Qt application running at the same time.
The users can still set it themself for the whole desktop if they wish.
Addresses #4840
2016-06-02 17:57:10 +02:00
Daniel Molkentin
da69756bb0
Merge pull request #4935 from owncloud/fix_updater_memleak
...
Fix memleak in updater
2016-06-02 15:36:49 +02:00
Daniel Molkentin
1787da8a9d
Fix memleak in updater
2016-06-02 15:03:52 +02:00
Giovanni Capuano
f0f82d02ff
Fix link to the binary packages in README.md
2016-06-02 14:55:48 +02:00
Jenkins for ownCloud
ff20cd4d57
[tx-robot] updated from transifex
2016-06-02 02:19:35 -04:00
Jenkins for ownCloud
9ab812f89b
[tx-robot] updated from transifex
2016-06-01 02:19:17 -04:00
Jenkins for ownCloud
e031f7d090
[tx-robot] updated from transifex
2016-06-01 01:18:50 -04:00
Markus Goetz
de82d8fcdb
QNAM: Try to workaround missing Qt patches #4720 #3888 #4051
...
We try this on all platforms now so we have more consistent behaviour.
2016-05-31 10:26:52 +02:00
Stephen Colebrook
af2b712dc6
Search results are filtered by server. Don't filter a second time.
...
Also allows searching on attributes other than displayname in ldap
configurations. Search results match web and mobile apps.
2016-05-31 09:46:52 +02:00
Stephen Colebrook
d4b72132d6
Search results are filtered by server. Don't filter a second time. Also allows searching on attributes other than displayname in ldap configurations. Search results match web and mobile apps. ( #4902 )
2016-05-31 09:45:38 +02:00
Markus Goetz
a507558dee
Connectivity: Reduce ETag job timeout to 60 sec #4275
...
Before it used the default job timeout
2016-05-31 09:35:47 +02:00
Jenkins for ownCloud
e73c3199c0
[tx-robot] updated from transifex
2016-05-31 02:20:28 -04:00
Markus Goetz
d88ab4653b
Connectivity: Delete job on timeout #4275
...
This was not done if there was no reply
2016-05-30 18:15:41 +02:00
Klaas Freitag
9a2450c4c1
Update changelog for 2.2.1
2016-05-30 17:19:40 +02:00
Daniel Molkentin
3c1f5e662f
Remove stray file
2016-05-30 12:05:22 +02:00
Daniel Molkentin
100ee69ddd
Merge pull request #4923 from RobinGeuze/2.2
...
Fix Qt4 build
2016-05-30 11:50:50 +02:00
Robin Geuze
d45d6ca9da
Fix Qt4 build
2016-05-30 09:55:45 +02:00
Daniel Molkentin
2608c7007e
Merge pull request #4922 from owncloud/fix_4840
...
Don't try to determine pixel ratio with Qt < 5.6.0
2016-05-30 09:20:50 +02:00
Jenkins for ownCloud
06a88ea9a4
[tx-robot] updated from transifex
2016-05-30 02:41:51 -04:00
Daniel Molkentin
0194ebb222
Don't try to determine pixel ratio with Qt < 5.6.0
...
This seems to be broken. Worst case users can still
set it manually
Addresses #4840
2016-05-30 08:27:57 +02:00
Jenkins for ownCloud
dc654ac846
[tx-robot] updated from transifex
2016-05-29 02:18:52 -04:00
Jenkins for ownCloud
370fd5062c
[tx-robot] updated from transifex
2016-05-28 02:19:09 -04:00
Daniel Molkentin
763016bd8f
Merge pull request #4916 from mwleeds/patch-1
...
Fix typo in folder.cpp
2016-05-27 18:13:05 +02:00
Daniel Molkentin
00d20b4a42
Merge pull request #4913 from owncloud/normalize_name_in_filestatus
...
Undo regression caused by 727e73d
2016-05-27 18:08:08 +02:00
Matthew Leeds
7f0cc5b699
Fix typo in folder.cpp
2016-05-27 11:13:18 -04:00
Daniel Molkentin
a2b238e2e5
Undo regression caused by 727e73d
...
normalization to NFC is still required. Mac OS API will not take
care of that by default.
Resolves #4884
2016-05-27 16:03:59 +02:00
ckamm
0e2c16e827
Certs: Re-ask for different cert after rejection #4898 ( #4911 )
...
Previously rejecting any kind of certificate meant that the user
was never asked again, even if the certificate changed.
Now we keep track of which certificates were rejected and ask again
if the ones mentioned in the ssl errors change.
mitmproxy is excellent for testing this.
2016-05-27 12:08:42 +02:00
ckamm
b9fdae6d67
Progress: Don't count items without propagation jobs #4856 ( #4910 )
...
* Progress: Don't count dirs without propagation jobs #4856
These directory SyncFileItems are necessary for bookkeeping
but should not influence the progress display at all.
* Progress: Skip ignored files #4856
2016-05-27 10:52:00 +02:00
Jenkins for ownCloud
c34115610e
[tx-robot] updated from transifex
2016-05-27 02:19:21 -04:00
Jenkins for ownCloud
d3a93cbaeb
[tx-robot] updated from transifex
2016-05-27 01:15:50 -04:00
Olivier Goffart
275ad1e157
Utility: Better fix for the translation of minutes, seconds, ...
...
The plural was not translated because of QTBUG-3945. Work around it.
Issue #4855
2016-05-26 12:17:16 +02:00
Daniel Molkentin
85d3c7a263
Merge remote-tracking branch 'origin/2.2'
2016-05-26 10:19:50 +02:00
Jenkins for ownCloud
1855950fa1
[tx-robot] updated from transifex
2016-05-26 02:33:30 -04:00
Olivier Goffart
159535fe90
Merge branch '2.2'
2016-05-25 16:30:17 +02:00
Olivier Goffart
fff5c280b3
SyncEngine: cleanup setting isDirectory
2016-05-25 16:27:40 +02:00
Olivier Goffart
e960b265a8
Merge remote-tracking branch '2.1' into 2.2
2016-05-25 16:23:58 +02:00
Olivier Goffart
f6b35e5d58
SyncEngine: invalid the blacklist entry when the rename destination change
...
The problem in this case is if we rename the file "xxx" to "invalid\file".
The rename will fail because the new filename constains a slash, and it
will be blacklisted.
But then if the user re-rename the file to "valid_name", then we should
invalidate the blacklist entry and retry to upload. But we did not do
that because renaming don't change the mtime and we did not store the
rename target in the database
IL issue 558
2016-05-25 15:32:45 +02:00
Markus Goetz
088a294fac
Update issue_template.md
...
Use 2.2 link
2016-05-25 11:33:10 +02:00
Jenkins for ownCloud
1d93af5f64
[tx-robot] updated from transifex
2016-05-25 02:19:18 -04:00
Markus Goetz
75efa8b252
sqlite: Update bundled version to 3.13.0
...
For OS X and Windows.
2016-05-24 17:27:31 +02:00
Markus Goetz
009a0b03da
Add ChangeLog for 2.2.1
2016-05-24 17:04:04 +02:00
Jenkins for ownCloud
8379a36a75
[tx-robot] updated from transifex
2016-05-24 07:40:14 -04:00
Daniel Molkentin
2f1a40ff7c
Travis coverity: Enforce Ubuntu 14.04 env, fix repo
2016-05-24 11:30:03 +02:00
Daniel Molkentin
c041ca6163
Fix pot. mem leak found by coverity (CID 96004)
2016-05-24 11:21:33 +02:00
Daniel Molkentin
eacc0c8bd6
Fix pot. mem leak found by coverity (CID 12900)
2016-05-24 11:21:33 +02:00
Jenkins for ownCloud
171de99e00
[tx-robot] updated from transifex
2016-05-24 02:19:53 -04:00
ckamm
bf02ccc1e8
Remember to upload files that are locked during a sync run ( #4865 )
...
See owncloud/enterprise#1342
2016-05-23 09:03:03 +02:00
Jenkins for ownCloud
7ba961c21a
[tx-robot] updated from transifex
2016-05-23 02:19:05 -04:00
Jenkins for ownCloud
cb7be78352
[tx-robot] updated from transifex
2016-05-22 02:19:13 -04:00
Jenkins for ownCloud
813bc15a78
[tx-robot] updated from transifex
2016-05-22 01:15:47 -04:00
Jenkins for ownCloud
6cb194e0d5
[tx-robot] updated from transifex
2016-05-21 02:19:09 -04:00
Markus Goetz
552ba94c41
SyncEngine: Set isDirectory before syncItemDiscovered
...
(cherry picked from commit fc1933803e )
2016-05-20 17:00:22 +02:00
Markus Goetz
fc1933803e
SyncEngine: Set isDirectory before syncItemDiscovered
2016-05-20 16:58:44 +02:00
Markus Goetz
46e4ec3183
Checksums: Use SHA1 like in >=2.2
2016-05-20 16:31:47 +02:00
Olivier Goffart
03e3b3bf50
Upload: put the job in the active list while doing the checksum computation.
...
This fixes an issue in which too many jobs are started un parallel
while uploading many files, which could cause too much memory usage as the
chunks are stored in memory.
Probably the fix for #4611
2016-05-20 16:28:27 +02:00
Christian Kamm
9aed8dbce8
Checksums: Compute content checksum on download #4375
...
Cherry-picked from d6d35029
2016-05-20 16:06:30 +02:00
ckamm
c6794cd338
Progress info: Reset between syncs #4856 (PR #4872 )
2016-05-20 15:07:54 +02:00
Jenkins for ownCloud
65ec1b74d5
[tx-robot] updated from transifex
2016-05-20 02:19:16 -04:00
ckamm
567fe87e98
Use natural sorting for filenames if available #4859 ( #4864 )
2016-05-19 15:36:46 +02:00
Christian Kamm
a1ba23eea9
Activity: When a new notification arrives, switch to that tab #4805
2016-05-19 14:13:07 +02:00
Jenkins for ownCloud
1a3c9a9c1a
[tx-robot] updated from transifex
2016-05-19 02:19:20 -04:00
Markus Goetz
a038c99232
Upload: Remove bandwidth quota debug message #4837
2016-05-18 16:18:13 +02:00
Olivier Goffart
30c8fa1c93
Utility: Fix translation of second, minute, hour
...
Issue #4855
A typo in the context string made the translation lookup fail.
But also the %Ln was not recognized as a plural form by transifex, so only
the singular was translated
2016-05-18 10:52:22 +02:00
Olivier Goffart
010649f997
FolderWizard: remove dead code and fix the alias
...
Remove a bunch of dead code.
And also set the root folder name properly since alias is gone.
Fix the warning:
QWizard::field: No such field 'alias'
2016-05-18 10:52:22 +02:00
Jenkins for ownCloud
597f2a4dfc
[tx-robot] updated from transifex
2016-05-18 02:19:16 -04:00
Olivier Goffart
cf1fe690a3
Shibboleth: Show the inspector if OWNCLOUD_SHIBBOLETH_DEBUG is set
...
Help to debug https://github.com/owncloud/enterprise/issues/1265
2016-05-17 12:29:20 +02:00
Olivier Goffart
194db066b6
Merge remote-tracking branch 'origin/2.2'
2016-05-17 10:04:31 +02:00
Jenkins for ownCloud
31b27bea38
[tx-robot] updated from transifex
2016-05-17 02:18:59 -04:00
Jenkins for ownCloud
04f99f3bd7
[tx-robot] updated from transifex
2016-05-15 02:19:07 -04:00
Jenkins for ownCloud
fbf92ac239
[tx-robot] updated from transifex
2016-05-14 02:19:15 -04:00
hefee
669a72f0e1
A final release version number breaks this regex ( #4835 )
...
f.ex. a valid verson nr: 2.2.0
-> fist \d+ = 2
-> second \d+ = 2
-> the last \d+ = 0
-> .+ in not matching, because there is nothing to match
2016-05-13 16:55:11 +02:00
Jenkins for ownCloud
2f0e65d37c
[tx-robot] updated from transifex
2016-05-13 02:25:05 -04:00
Olivier Goffart
5676685f58
SyncEngine: Add a compile option so we rename to restoring a move we don't have the permission to do
...
IL issue 550
2016-05-12 13:15:30 +02:00
Christian Kamm
db9ccb40a4
Fix compile with strict C flags
2016-05-12 13:14:40 +02:00
Christian Kamm
d4c15d2c38
Ignores: expand escapes #4568
...
(cherry picked from commit d7bd1300a8 )
2016-05-12 11:53:17 +02:00
Hefee
edb3759684
For tests we do not need a xserver running.
...
Use for tests QTEST_GUILESS_MAIN and QTEST_APPLESS_MAIN.
2016-05-12 11:34:21 +02:00
Christian Kamm
0f9c32452c
Protocol: Increase width of timestamp column #4721
...
Since the font metrics aren't reliable on windows, we add some
extra space there.
2016-05-12 10:24:34 +02:00
Daniel Molkentin
45dd1d0acf
Bump to 2.2.1
2016-05-12 09:58:12 +02:00
Daniel Molkentin
552af7b94d
2.2.0 final
2016-05-12 09:58:12 +02:00
Christian Kamm
8934979ba1
timeAgo test: Fix for qt4, clean up
2016-05-12 09:25:15 +02:00
Daniel Molkentin
b3e16e0eb0
Merge pull request #4825 from owncloud/22-user-manual
...
[Doc] 2.2 user manual updates
2016-05-12 08:20:55 +02:00
Carla Schroder
7773380deb
update file manager screenshot
2016-05-11 12:44:27 -07:00
Carla Schroder
e22050a434
updates to 2.2 user manual
2016-05-11 12:37:40 -07:00
Daniel Molkentin
7b0231bfce
Merge pull request #4821 from owncloud/notification_doc
...
Documentation draft to introduce notifications.
2016-05-11 21:16:35 +02:00
Jocelyn Turcotte
edc58c045f
Fix assert on restore after propagation ( #4823 )
...
The assert was there to make sure that this case wasn't happening
to eventually be properly tested. Remove the assert for now but this
codepath should eventually be unit tested using this specific situation.
2016-05-11 18:16:46 +02:00
Klaas Freitag
035058934f
Documentation draft to introduce notifications.
...
Also added a screenshot.
2016-05-11 11:16:08 +02:00
Klaas Freitag
9b1f46e560
Fix exclude unit test, adopt to new Iface of isExcluded.
2016-05-10 16:46:08 +02:00
Klaas Freitag
9e7a8e619b
Fix utility test: Pass a command name to do the version check.
2016-05-10 16:26:42 +02:00
Klaas Freitag
9c0cd2b13e
Added Changelog for 2.2.0
2016-05-10 15:39:44 +02:00
Daniel Molkentin
58ad781bd4
Update binary submodule
2016-05-10 14:39:22 +02:00
Daniel Molkentin
9d6701ecbe
Windows Shell Integration: Fix another spot where the pipe path was constructed manually
2016-05-10 13:49:14 +02:00
Daniel Molkentin
d659c54798
Update binary sub module
2016-05-10 10:36:49 +02:00
Daniel Molkentin
0e9170cb36
Windows Shell Integration: Unify path lookups
2016-05-10 10:18:53 +02:00
Markus Goetz
8820bc1c17
Windows: Fix Share menu #4781
2016-05-09 14:37:46 +02:00
Jenkins for ownCloud
74f67c97a9
[tx-robot] updated from transifex
2016-05-09 02:19:15 -04:00
Jenkins for ownCloud
fd96b482c5
[tx-robot] updated from transifex
2016-05-07 02:19:16 -04:00
Jocelyn Turcotte
727e73d640
[shell/windows] Fix the windows status push not working ( #4784 )
...
Since the windows implementation first does cache lookups using the
path string, directories need to be passed identically as through
RETRIEVE_FILE_STATUS.
Change the convention to never have a trailing slash for directories
in the protocol. This allows the convention to be applied without
having to access the disk (since we'd need to know if the path is
represented by a directory) and also matches the convention of the
rest of the sync engine. Individual file manager plugins are then
responsible of handling pushed paths as not ending with a trailing
slash.
This also:
- Moves the trailing slash removal logic from the SyncFileStatusTracker
to the SocketApi class
- Remove the unneeded QString::normalized call in fileStatus, since
this should already be done by the FolderWatcher and plugins
2016-05-06 12:32:01 +02:00
Jenkins for ownCloud
d7804d8df3
[tx-robot] updated from transifex
2016-05-06 02:19:00 -04:00
Olivier Goffart
3d9d106bb1
Dolphin plugin: fix build with branding
...
Make sure that the name of the _export.h file is the same no matter the plugin
2016-05-04 14:19:18 +02:00
Jenkins for ownCloud
15dc3408ef
[tx-robot] updated from transifex
2016-05-04 02:19:15 -04:00
Markus Goetz
928643f597
NSIS: Properly uninstall both x64 and x86 DLLs #4762
...
Viel hilft viel ;-)
2016-05-03 18:35:01 +02:00
Markus Goetz
7110091fdd
Qt patches: Update with information about Qt 5.6
2016-05-03 15:16:07 +02:00
Jocelyn Turcotte
064c2b678a
Merge branch 'overlayIconFixes' into 2.2 ( #4765 )
2016-05-03 13:04:34 +02:00
Jocelyn Turcotte
e58739de00
[osx] Fix missing overlay icons on client startup
...
Since the statuses are cached and that we can't invalidate the cache,
sending NOP would need to be overwritten by the default OK status
once the client successfully connected. But instead of remembering
which files we NOPed, rather wait until we are ready to sync before
sending the REGISTER_PATH message to the socket API client. It will
also prevent the client from sending unnecessary RETRIEVE_FILE_STATUS
requests.
Also remove AccountState::canSync, since it does the same as
isConnected and syncing is not an account responsibility.
2016-05-03 13:01:51 +02:00
Jocelyn Turcotte
7c2fdee78b
Avoid a SyncFileStatusTracker private overload with the same name
...
Having an overload as a private function in the same class makes the
code harder to follow. Rename the private fileStatus to syncFileItemStatus.
2016-05-03 13:01:51 +02:00
Jocelyn Turcotte
7bfe46962f
Simplify the root status logic
...
Go through fileStatus like other cases to make sure that all use
cases go through the same code path. This also makes sure to use
lookupProblem which will use lower_bound which is more efficient
for larger sets of sync problems.
This also fixes the issue with lookupProblem that prevented it to
properly match an empty pathToMatch, caused by the fact that the
problem map contains relative paths not starting with a slash.
2016-05-03 13:01:51 +02:00
Jocelyn Turcotte
32b3023a8e
Fix the root item sync status #4682
...
Make sure that we push the new status when the status of the SyncEngine
changed. SyncEngine::started comes a bit late, only when the propagation
starts, although it's better in this case since child folders will
only switch to Sync in aboutToPropagate.
Also fix an issue with SyncEngine::findSyncItem when using an empty
fileName; this would match and return the wrong item, even though
not currently happening with the code since fileStatus won't call
it with an empty fileName anymore.
2016-05-03 13:01:51 +02:00
Jocelyn Turcotte
a5df44c757
Fix the sync status push for parent directories #4682
...
As before, we rely on metadata-update SyncFileItem entries for parent
directories to notify us that a directory contains files to propagate,
and to know when all children were propagated through its itemCompleted
signal.
Those metadata SyncFileItems however have a None direction and we need
to add a explicit directory check to show them as Sync.
This fix also handles new files as well as existing ones, so no need
to keep a separate logic for new files.
2016-05-03 13:01:51 +02:00
Jocelyn Turcotte
129c17651a
Revert "Overlay icon fixes ( #4765 )"
...
The pull request should have been done against the 2.2 branch, and
the branch would better be merged instead of squashed to keep the
history easier to lookup.
This reverts commit 0469236d80 .
2016-05-03 12:59:17 +02:00
Klaas Freitag
641125eac1
Fix nautilus and nemo plugin branding strings. ( #4780 )
...
* Fix nautilus and nemo plugin branding strings.
Fix for owncloud/enterprise#1314
* nautilus plugin: Add a comment why the line needs to stay unchanged.
2016-05-03 11:36:56 +02:00
Jenkins for ownCloud
d340017a0a
[tx-robot] updated from transifex
2016-05-03 02:19:16 -04:00
Olivier Goffart
a67173610d
Propagator: fix qt4 build
...
propagatedownload.cpp:712:35: error: 'seenLockedFile' is a protected member of 'OCC::OwncloudPropagator'
Signals are protected in Qt4 but public in Qt5, mark the class accessing it
as friend when compiling with Qt4
2016-05-02 17:34:21 +02:00
Jocelyn Turcotte
0469236d80
Overlay icon fixes ( #4765 )
...
* Fix the sync status push for parent directories #4682
As before, we rely on metadata-update SyncFileItem entries for parent
directories to notify us that a directory contains files to propagate,
and to know when all children were propagated through its itemCompleted
signal.
Those metadata SyncFileItems however have a None direction and we need
to add a explicit directory check to show them as Sync.
This fix also handles new files as well as existing ones, so no need
to keep a separate logic for new files.
* Fix the root item sync status #4682
Make sure that we push the new status when the status of the SyncEngine
changed. SyncEngine::started comes a bit late, only when the propagation
starts, although it's better in this case since child folders will
only switch to Sync in aboutToPropagate.
Also fix an issue with SyncEngine::findSyncItem when using an empty
fileName; this would match and return the wrong item, even though
not currently happening with the code since fileStatus won't call
it with an empty fileName anymore.
* Simplify the root status logic
Go through fileStatus like other cases to make sure that all use
cases go through the same code path. This also makes sure to use
lookupProblem which will use lower_bound which is more efficient
for larger sets of sync problems.
This also fixes the issue with lookupProblem that prevented it to
properly match an empty pathToMatch, caused by the fact that the
problem map contains relative paths not starting with a slash.
* Avoid a SyncFileStatusTracker private overload with the same name
Having an overload as a private function in the same class makes the
code harder to follow. Rename the private fileStatus to syncFileItemStatus.
* [osx] Fix missing overlay icons on client startup
Since the statuses are cached and that we can't invalidate the cache,
sending NOP would need to be overwritten by the default OK status
once the client successfully connected. But instead of remembering
which files we NOPed, rather wait until we are ready to sync before
sending the REGISTER_PATH message to the socket API client. It will
also prevent the client from sending unnecessary RETRIEVE_FILE_STATUS
requests.
Also remove AccountState::canSync, since it does the same as
isConnected and syncing is not an account responsibility.
2016-05-02 16:33:17 +02:00
Daniel Molkentin
e833d01288
Re-Apply: Disambiguate socket API pathes on Windows with user name
...
Addresses #3411
2016-05-02 16:09:48 +02:00
Olivier Goffart
3047682223
ShareDialog: show the error message in red
...
Do the visual stuff from designer.
The previous code that was ment to change the color in red did not work
and changed it to gray instead.
Also I don't see why there should be a frame.
Issue #4773
2016-05-02 14:12:04 +02:00
Jenkins for ownCloud
c91dd94728
[tx-robot] updated from transifex
2016-05-02 02:19:41 -04:00
Jenkins for ownCloud
52f9f44b51
[tx-robot] updated from transifex
2016-05-01 02:19:18 -04:00
Olivier Goffart
93e0d52dd3
Merge pull request #4769 from orion1024/curl-check-in-perl-tests
...
Adding CURL check in t6.pl
2016-04-30 14:25:21 +02:00
orion1024
9f3e576348
Adding CURL check in t6.pl
...
Aborts immediately if CURL not found, to avoid misleading errors later.
2016-04-30 11:44:16 +02:00
Jenkins for ownCloud
49748191a9
[tx-robot] updated from transifex
2016-04-30 02:19:14 -04:00
ckamm
e6b937f508
LockWatcher: Keep an eye on Windows file locks ( #4758 )
...
When a conflict-rename or a temporary-rename fails, notify the
LockWatcher. It'll regularly check whether the file has become
accesible again. When it has, another sync is triggered.
owncloud/enterprise#1288
2016-04-29 16:14:18 +02:00
Roeland Douma
31c13f74fb
Add spinner during sharee search ( #4764 )
...
Fixed #4740
When searching for sharees we should display a loading spinner.
2016-04-29 14:11:27 +02:00
Olivier Goffart
be466b47b7
Merge remote-tracking branch 'origin/2.1' into 2.2
2016-04-29 08:52:17 +02:00
Olivier Goffart
11b144957b
PropagateDownload: Throw an error if the file is empty while it should not have been ( #4753 )
...
If the downloaded file is empty but the PROPFIND previously announced it
should not have been empty, this might mean the file was somehow corrupted
because of a bug on the server and that we should therefore not accept
the file.
Normaly we accept a change between the actual size of the file and what we
got during discovery because the file might have been updated to a new version
inbetween. But after this patch we won't accept the file if it was replaced
by an empty file.
Will help for issue #4583
Also requested by IL for issue 548
2016-04-29 08:49:27 +02:00
Jenkins for ownCloud
817e97c148
[tx-robot] updated from transifex
2016-04-29 02:19:14 -04:00
Olivier Goffart
5479aaeb5b
Merge remote-tracking branch 'origin/2.2'
2016-04-28 16:38:46 +02:00
Markus Goetz
29932004ae
Shibboleth: Load username from config for UI ( #4751 )
...
For https://github.com/owncloud/enterprise/issues/1034
2016-04-28 14:55:29 +02:00
Daniel Molkentin
6d83e841a9
Merge pull request #4756 from owncloud/revert-4738-fix_3411
...
Revert "Disambiguate socket API pathes on Windows with user name"
2016-04-28 13:53:06 +02:00
Daniel Molkentin
b43a9421d2
Revert "Disambiguate socket API pathes on Windows with user name"
2016-04-28 13:52:15 +02:00
Klaas Freitag
e70b78d14b
Merge pull request #4738 from owncloud/fix_3411
...
Disambiguate socket API pathes on Windows with user name
2016-04-28 13:46:10 +02:00
Klaas Freitag
6814342d1f
Merge pull request #4748 from owncloud/win_stat_revisited
...
vio for windows: Use more graceful create file params.
2016-04-28 13:45:30 +02:00
Christian Kamm
68126dcff6
Checksums: Skip uploads of .eml files only #4754
...
This is a workaround. A correct solution would still update file metadata
such as the mtime. See #4755 .
2016-04-28 12:59:39 +02:00
Christian Kamm
e7f00339e6
Fix perl tests #4722
...
* The dav auth realm is "sabre/dav" for newer server versions
* Content checksums are enabled generally, so conflict detection
is smarter
2016-04-28 10:44:37 +02:00
Christian Kamm
a36b4ec863
FolderWizard: Sort remote folders #4612
2016-04-28 09:29:07 +02:00
Christian Kamm
074f8eadb1
Selective sync: Sort folders in FolderStatusModel #4612
2016-04-28 09:29:07 +02:00
Jenkins for ownCloud
6a51ae5b1b
[tx-robot] updated from transifex
2016-04-28 02:19:20 -04:00
Christian Kamm
af5f2d3860
Protocol: Make timestamp column width fit the text #4721
2016-04-28 07:37:42 +02:00
ckamm
38bad564a0
Merge pull request #4739 from ckamm/trackdirty
...
Overlay icons: Track touched files #4730
2016-04-28 07:17:17 +02:00
Christian Kamm
c2fa3fb4c8
Overlay icons: Track touched files #4730
...
This uses the file watcher to keep track of files that were modified
in order to assign them the blue icon.
This is transient state that's not persisted across restarts.
2016-04-28 07:16:49 +02:00
Markus Goetz
f7082ee3df
sqlite: Update to version 3.12.2
...
For OS X and Windows
2016-04-27 12:22:12 +02:00
Markus Goetz
f7c6efb391
ConnectionValidator: Also set short timeout for capabilities job
...
Default timeout was 5 min.
2016-04-27 12:19:49 +02:00
Klaas Freitag
051a348afd
Vio for windows: Removed the overlap param again.
...
After discussion and studying docs again we agreed that
the parameter is not neccessary here as it only affects
the process that opens the handle. And we do not want to
do async stuff.
2016-04-27 11:37:21 +02:00
Olivier Goffart
d0af3ede05
AccountSettings: context menu: don't rely on the alias
...
Don't rely on the alias to know weather we shuld show a context menu or not.
Use the classify function to know if it's a root folder instead
2016-04-27 11:21:58 +02:00
Olivier Goffart
0da2adcbe0
Workaround ubuntu 16.04 systemtray bug ( #4693 ) ( #4747 )
2016-04-27 11:21:13 +02:00
Klaas Freitag
07bdd519e9
vio for windows: Use more graceful create file params.
2016-04-27 11:17:42 +02:00
Christian Kamm
0829a94c92
Remote folder selection: improve path typing #4745 #4746
...
* Scroll to the target typed path
* Show non-404 errors that were triggered by typing paths
2016-04-27 10:37:17 +02:00
Jenkins for ownCloud
faf2514be2
[tx-robot] updated from transifex
2016-04-27 02:19:20 -04:00
Markus Goetz
4ea2edcf4a
Merge pull request #4741 from owncloud/fix-alias
...
Accountsettings: Generate an alias for new folders
2016-04-26 17:34:10 +02:00
Olivier Goffart
cd29875b76
Folder: Generate an alias for new folders
...
Before commit 1a51b6718a , the wizard was
making sure folder had an alias but this is no longer the case.
So generate still an unique alias.
Alias is not used in the UI any longer, it's just use for internal purposes.
For issue #4737
2016-04-26 16:53:24 +02:00
Markus Goetz
85bc3b276f
Merge pull request #4744 from owncloud/fixAliasesOnceMore2
...
UI: Fix account name/alias display oddities #4577
2016-04-26 16:53:23 +02:00
Markus Goetz
ce5ca8a42e
UI: Fix account name/alias display oddities #4577
2016-04-26 16:47:47 +02:00
Daniel Molkentin
ce6a365328
Disambiguate socket API pathes on Windows with user name
...
Addresses #3411
2016-04-26 14:49:45 +02:00
Christian Kamm
09eea7f5f2
Checksums: Use the first supported type if nothing is preferred
2016-04-26 13:10:53 +02:00
ckamm
043350f49d
Merge pull request #4736 from ckamm/socketapi_nautilus_invalidate
...
Overlay icons: Fix invalidation with nautilus #3249
2016-04-26 12:04:53 +02:00
Christian Kamm
f657bd0cd9
Overlay icons: Fix invalidation with nautilus #3249
...
This avoids an extra socketapi call after invalidate_extension_info
is called from a STATUS message.
2016-04-26 11:49:56 +02:00
Christian Kamm
b4cf17d99d
Overlay icons: Fix duplicate icons in nautilus #3249
2016-04-26 11:02:59 +02:00
Christian Kamm
12bf6e39b7
Share link: Consistent order of options owncloud/core#24122
...
(cherry picked from commit 8dc178a9f3 )
2016-04-26 10:44:29 +02:00
Olivier Goffart
4e7c09de83
QTokenizer: fix Qt4 build
...
QSharedPointer::reset is new in Qt5
2016-04-26 10:38:20 +02:00
Jenkins for ownCloud
31f2c3e76a
[tx-robot] updated from transifex
2016-04-26 02:19:11 -04:00
Christian Kamm
8dc178a9f3
Share link: Consistent order of options owncloud/core#24122
2016-04-26 07:45:41 +02:00
Jenkins for ownCloud
64b6486327
[tx-robot] updated from transifex
2016-04-25 08:26:49 -04:00
Klaas Freitag
35d4b96339
Set base version to 2.3.0. For 2.2, please use the branch 2.2
2016-04-25 14:15:17 +02:00
Jenkins for ownCloud
335e333e28
[tx-robot] updated from transifex
2016-04-24 02:19:04 -04:00
Jenkins for ownCloud
41eb5f0a3f
[tx-robot] updated from transifex
2016-04-24 01:15:28 -04:00
Carla Schroder
030184fad9
Merge pull request #4704 from owncloud/doc_overlay_icons
...
Doc: Draft overlay icons
2016-04-22 08:40:09 -07:00
Roeland Douma
7d285d0225
Merge pull request #4717 from owncloud/fix_webdav_property
...
Only 1 : between namespace and property
2016-04-22 14:40:55 +02:00
Roeland Jago Douma
d3a93322d2
Only 1 : between namespace and property
2016-04-22 14:38:43 +02:00
Jenkins for ownCloud
8694db1c49
[tx-robot] updated from transifex
2016-04-22 06:16:18 -04:00
Daniel Molkentin
19eca84d4f
Merge pull request #4715 from owncloud/translate-desktop-ini
...
Adding new resource for the desktop.ini file
2016-04-22 12:05:15 +02:00
Daniel Molkentin
665c3f40e1
Fix search & replace error in Dockerfile
2016-04-22 11:26:46 +02:00
Thomas Müller
f8f394eb0a
Adding new resource for the desktop.ini file
2016-04-22 10:58:57 +02:00
Olivier Goffart
0711abbf56
Theme: missing virtual keyword
2016-04-22 10:09:07 +02:00
Olivier Goffart
84ac2e64e0
Quota: Add branding option for the base folder ( #4714 )
...
As discussed on issue ##4460
Having the quote to be queried on subfolder is wrong in the generic case,
so add a branding option to configure it.
This partially reverts commit ff4cdc3161
2016-04-22 10:05:50 +02:00
Klaas Freitag
57f0603e0e
Doc: Applied review feedback for overlay icon docs.
2016-04-22 09:56:53 +02:00
Klaas Freitag
b61ae351dd
Merge pull request #4713 from owncloud/fix_win-sis
...
Fix sync to Windows deduplication enabled storages
2016-04-22 09:47:06 +02:00
Jenkins for ownCloud
277a1cfb5a
[tx-robot] updated from transifex
2016-04-22 02:19:11 -04:00
Klaas Freitag
6ba7c6e2d3
Windows VIO: Remove unused variable.
2016-04-21 17:40:01 +02:00
Klaas Freitag
055c2ef73f
local_vio_win: Fix handling files that have been deduplicated
...
as part of Windows SIS or Data Deduplication. Fixes #4056
2016-04-21 17:38:43 +02:00
Klaas Freitag
e5a5b95b9a
Merge pull request #4689 from owncloud/overlays_handle_root
...
SyncFileStatusTracker: Add a method to handle the root folder of the sync.
Also, handle new files put in the sync in the statustracker logic.
2016-04-21 15:01:11 +02:00
Klaas Freitag
7acdf50a2c
SocketAPI: Code simplifications as asked for in the review.
2016-04-21 14:54:13 +02:00
Klaas Freitag
361ebf5464
SyncFileStatusTracker: Remember the state of new files.
...
In the before-propagate slot, new files that wait to be
pushed to the server are remembered in the _syncProblems
map. That way, the parents show a sync icon properly as
asked for in #4682 .
After the item has been transfered properly, the item is
removed from the map again because success is the default.
2016-04-21 13:56:08 +02:00
Olivier Goffart
7a82fac0d5
owncloudcmd: Save the selective sync list on the first run
...
For issue #4690
In the first run, the journal might not exist, we should not cancel
setting the selective sync list
2016-04-21 12:58:10 +02:00
Daniel Molkentin
8b39c6e6ce
Merge pull request #4709 from owncloud/fix_4691
...
Use QTokenizer to properly parse netrc
2016-04-21 12:50:43 +02:00
Daniel Molkentin
e29d7e0128
Use QTokenizer to properly parse netrc
...
Addresses #4691
2016-04-21 12:46:03 +02:00
Daniel Molkentin
dbcb94e7d4
Update doc and Dockerfile for 2.2 builds
2016-04-21 12:25:12 +02:00
Olivier Goffart
522f7afa9e
Merge pull request #4663 from 'ckamm/disabletransmissionchecksum'
...
Disable validation of transmission checksums by default
2016-04-21 11:46:01 +02:00
Olivier Goffart
fa69d089cf
Checksums: remove the downloadChecksumValidationEnabled option
...
Added in previous commit from pull request #4663
As discussed, we do not need this option so no need to introduce
a new dependency on the config file in the sync engine
2016-04-21 11:43:44 +02:00
Jenkins for ownCloud
1935c78f17
[tx-robot] updated from transifex
2016-04-21 02:19:12 -04:00
Klaas Freitag
b56919d0c4
SocketAPI: Return NOP state if folder is diconnected or paused.
...
Later, we can send a specific state for that.
2016-04-20 17:14:12 +02:00
Klaas Freitag
f72c7f43bf
Nautilus plugin: Be more robust against new states from socketapi
...
Do not bail out if an unknown state comes from SocketApi
2016-04-20 17:13:06 +02:00
Klaas Freitag
add29befee
Nautilus plugin: Remove the bogus logging
2016-04-20 17:12:21 +02:00
Markus Goetz
f9fb7a59dd
Merge pull request #4708 from owncloud/aliasGui
...
UI: Remove alias from more places #4577 #4695
2016-04-20 15:54:05 +02:00
Markus Goetz
1a51b6718a
UI: Remove alias from more places #4577 #4695
2016-04-20 14:27:50 +02:00
Jenkins for ownCloud
a3a9417630
[tx-robot] updated from transifex
2016-04-20 02:19:08 -04:00
Carla Schroder
53a72148d3
a bit of editing on new section
2016-04-19 10:28:46 -07:00
Klaas Freitag
c379593c0f
Doc: Draft overlay icons
2016-04-19 18:20:23 +02:00
Klaas Freitag
bd37eab3ad
SocketAPI: Display a warning on the directory if there are errors
...
Errors with individual files within a directory now result in
a warning label on the parent directories.
2016-04-19 18:18:00 +02:00
Markus Goetz
edb942ba61
Merge pull request #4696 from owncloud/issue4573_negative_content_length
...
Discovery: Be more explicit about files with unknown size #4573
2016-04-19 16:09:48 +02:00
Markus Goetz
a17f37d8ae
Discovery: Be more explicit about files with unknown size #4573
...
Also related https://github.com/owncloud/core/issues/23468
2016-04-19 15:31:16 +02:00
Roeland Douma
33459b48c8
Merge pull request #4700 from owncloud/fix_4409
...
Use expireDate if returned by the OCS Share API
2016-04-19 13:14:04 +02:00
Roeland Jago Douma
598941948c
Use expireDate if returned by the OCS Share API
...
If an app modifies the expiration date (for example the password policy
app) then on more recent versions of the server we will get the share
object back REST style. We should use that info!
Fixes #4409
2016-04-19 11:22:32 +02:00
Jenkins for ownCloud
038b7db606
[tx-robot] updated from transifex
2016-04-19 02:19:15 -04:00
Roeland Douma
9f30e83413
Merge pull request #4687 from owncloud/fix_share-permissions-namespace
...
The share-permissions namespace was moved
2016-04-18 21:29:26 +02:00
Klaas Freitag
2ab4caf007
ProtocolWidget: Display the recalculated number of issues.
...
Should fix #3222
2016-04-18 16:48:37 +02:00
Klaas Freitag
11d3aa3c4f
Protocolwidget: Removed some leftovers from refactoring.
2016-04-18 16:47:14 +02:00
Jenkins for ownCloud
93ad61aeef
[tx-robot] updated from transifex
2016-04-18 02:19:02 -04:00
Jenkins for ownCloud
6a36d1b4fb
[tx-robot] updated from transifex
2016-04-17 02:19:07 -04:00
Daniel Molkentin
c0ec481436
No need for WebKitWidgets in libsync anymore
2016-04-16 10:58:12 +02:00
Jenkins for ownCloud
df0833d7f9
[tx-robot] updated from transifex
2016-04-16 02:19:16 -04:00
Markus Goetz
6a9655aab6
OS X: Fix overlay installation on El Capitan #4650
...
The sleep is somehow needed, probably for pkg to rebuild its DB?
The case fix fixes a warning but did not fix the issue itself.
2016-04-15 16:58:58 +02:00
Klaas Freitag
0f3d6d4160
SyncFileStatusTracker: Add a method to handle the root item.
2016-04-15 15:02:02 +02:00
Markus Goetz
c4577cb2a1
Merge pull request #4683 from owncloud/fix4657
...
OS X: Allow ampersand in APPLICATION_NAME #4657
2016-04-15 14:28:38 +02:00
Olivier Goffart
fafca26144
AccountManager: take theURL from the Theme rather than from the config if the theme specify it ( #4591 )
...
That way an upgrade of the client can actually change the URL
Issue https://github.com/owncloud/enterprise/issues/1113
https://github.com/owncloud/enterprise/issues/1126
In addition to restoring commit 7e5d89293d , this
add a way to override the auth type
2016-04-15 13:16:49 +02:00
Markus Goetz
06c19b0b6f
sqlite: Update to version 3.12.1
...
For OS X and Windows.
2016-04-15 12:02:00 +02:00
Markus Goetz
d1649ce4df
OS X: Allow ampersand in APPLICATION_NAME #4657
2016-04-15 11:30:49 +02:00
Christian Kamm
ea40e314d4
Add server capabilities for checksums #4638
...
* Add checksums/supportedTypes and checksums/preferredUploadType
capabilities. The default is that no checksum types are supported.
* Remove the transmissionChecksum config option. Servers must now
use the capabilities to indicate that they are fine with the
client sending checksums.
Note: This intentionally breaks brandings that overrode
Theme::transmissionChecksum. The override must be removed and the
server's capabilities must be adjusted to include the new values.
2016-04-15 10:58:14 +02:00
Klaas Freitag
e2622310df
Merge pull request #4670 from owncloud/implement_ep_1136_2nd_attempt
...
Make postfixlineedit more userfriendly, rename email id string to "Email"
2016-04-15 10:17:03 +02:00
Klaas Freitag
4ad8e04bc3
Merge pull request #4684 from owncloud/less_socket_api_updates
...
Less socket api updates
2016-04-15 10:15:07 +02:00
Roeland Jago Douma
74301e4373
The share-permissions namespace was moved
...
See https://github.com/owncloud/core/pull/24017
This was done since other services we want to intergrate with don't use
the ownCloud namespace.
2016-04-15 10:14:05 +02:00
Markus Goetz
053dcbf1f5
Merge pull request #4686 from owncloud/allow_0_mtime_files
...
CSync: Allow files with 0 mtime #1603
2016-04-15 09:22:39 +02:00
Jenkins for ownCloud
700c7bcbc6
[tx-robot] updated from transifex
2016-04-15 02:19:14 -04:00
Markus Goetz
bc6c57aa0b
Exclude: .Trash-* trash folders #4600
2016-04-14 18:27:33 +02:00
Markus Goetz
a0521caf52
CSync: Allow files with 0 mtime #1603
...
I don't see a reason we should not allow this. We detect
a "failed stat reply" in other ways. Maybe this was a legacy
csync decision somewhow that is not valid anymore?
2016-04-14 18:15:16 +02:00
Klaas Freitag
8007331462
SocketAPI: Remove unneeded logging.
2016-04-14 15:39:46 +02:00
Klaas Freitag
12330b38e9
Folderman: Remove one call to updateFolderView.
...
The reason is that updateFolderView is invoked by the
emitted signal folderSyncStateChange() anyway.
This will reduce the traffic over the SocketAPI nicely,
maybe this was the reason why it was slower than before.
2016-04-14 15:26:11 +02:00
Klaas Freitag
8eb53fa9ae
nautilus integration: Handle NOP as empty.
2016-04-14 15:24:46 +02:00
Christian Kamm
dfd7d4d2f9
Activity tab visibility fixes #4651
2016-04-14 11:35:16 +02:00
Christian Kamm
484a2c800d
Fix typo
2016-04-14 10:59:40 +02:00
Christian Kamm
8d300b049f
ShareDialog: Tell a user early if resharing is impossible #4679
2016-04-14 10:16:37 +02:00
ckamm
48e594ebbf
Merge pull request #4673 from ckamm/shareperm
...
Disable unavailable sharing permissions #4383
2016-04-14 09:44:58 +02:00
Christian Kamm
910c61b492
Disable unavailable sharing permissions #4383
...
Users can't reshare with more permissions than they have themselves.
2016-04-14 09:44:37 +02:00
Jenkins for ownCloud
8155c1c426
[tx-robot] updated from transifex
2016-04-14 02:19:23 -04:00
Daniel Molkentin
97a6d3df82
document Theme::wizardUrlHint()
2016-04-13 15:59:25 +02:00
Olivier Goffart
f7aafb081f
Dolphin Plugin: rename the files to the branded name #4669 ( #4672 )
2016-04-13 15:05:04 +02:00
Daniel Molkentin
9cc981c8c7
Make postfixlineedit more userfriendly, rename email id string to "Email".
2016-04-13 14:56:49 +02:00
Klaas Freitag
ed3203d25d
Merge pull request #4659 from owncloud/fix_client_4651
...
Fix client #4651
2016-04-13 12:02:45 +02:00
Jenkins for ownCloud
a4f606ceab
[tx-robot] updated from transifex
2016-04-13 02:19:05 -04:00
Klaas Freitag
15988c6fda
SocketAPI: Use NOP only, not NONE in the share api protocol.
...
Otherwise, plugins might brake, as the linux one did.
2016-04-12 18:28:27 +02:00
Klaas Freitag
f443377978
Merge pull request #4664 from ckamm/hiddenfiles
...
Fix hidden file handling #4655
2016-04-12 17:14:47 +02:00
Olivier Goffart
fdcdddca16
CMakeLists: move QtKeychain detection in client
2016-04-12 14:43:26 +02:00
Klaas Freitag
bf99306a53
Merge branch 'do_not_close_db_on_done'
2016-04-12 14:36:46 +02:00
Christian Kamm
844777d43f
Fix unit test build
2016-04-12 13:43:17 +02:00
Christian Kamm
4f79f1b5e8
Explicitly depend on Qt5Test.
2016-04-12 12:45:55 +02:00
Christian Kamm
6f454feb39
Fix hidden file handling #4655
...
There were two issues:
* With the refactoring of how Folder and SyncEngine relate, the
ignore_hidden_files flag on the CSync context was reset after
each sync run and not updated from the configuration again.
* The folder watcher failed to enumerate hidden folders and thus
didn't watch for changes inside them. (linux only)
2016-04-12 11:59:07 +02:00
Olivier Goffart
68b7437afb
Merge pull request #4658 from owncloud/fix-qt4-build
...
Fix qt4 build
2016-04-12 10:36:48 +02:00
Christian Kamm
41b950b7e6
Don't call reset() on a query after close() #4662
2016-04-12 10:30:46 +02:00
Jenkins for ownCloud
2d08754f91
[tx-robot] updated from transifex
2016-04-12 02:19:13 -04:00
Klaas Freitag
868edb1f0d
SyncJournalDb: Only close the db if the return code is not SQLITE_DONE
...
SQLITE_DONE is the indicator for not more query results, which is a legal
thing and not an error condition.
Also, check _getFileRecordQuery for null pointer, as close() wipes it.
2016-04-11 17:38:16 +02:00
Klaas Freitag
aaf43bd0d3
SyncJournalDb: Handle empty filename and avoid a bogus db query.
2016-04-11 17:36:15 +02:00
Klaas Freitag
d5f1d1c6b2
SqlQuery: Add method errorId() to get the numeric error code.
2016-04-11 17:34:59 +02:00
Klaas Freitag
6cb94e8849
Merge pull request #4656 from owncloud/close_journal_fix
...
Close journal fix - do not keep the journal open or reopen on error.
2016-04-11 16:14:17 +02:00
Klaas Freitag
d433c24186
Check if the record returned from getFileRecord is valid.
...
Handle database fails properly.
2016-04-11 16:04:20 +02:00
Olivier Goffart
c48b5c4f61
ActivityWidget: use a QHash for _widgetsToRemove
...
The problem with QSet is that the QDateTime was part of
the hash, but that does not make sens as it should be unique
per widget and not per <date, widget>
Instead make it a QHash so there is only one entry per widget.
2016-04-11 15:49:24 +02:00
Olivier Goffart
976f4dfabe
ActivityWidget: Fix Qt4 build
...
Don't use API added in Qt5
2016-04-11 15:49:24 +02:00
Olivier Goffart
f8dc263338
CMakeLists: fix Qt4 build
...
Only the src subdirectory needs Qt.
Otherwise it activates Qt4 also for the dolphin plugin which always need Qt5
2016-04-11 15:49:18 +02:00
Klaas Freitag
e896d16f32
ActivityWidget: Make sure Notification are visible if Activity disabled
...
This is the fix for #4651
2016-04-11 15:39:25 +02:00
Klaas Freitag
2ec642aadb
ActivityWidget: Properly set widget for the Scrollview.
...
Also fixed some SizePolicy settings.
2016-04-11 15:38:25 +02:00
Olivier Goffart
bd3a079a7b
Merge pull request #4648 from owncloud/handle-database-errors
...
Handle setFileRecord errors #4632
2016-04-11 15:36:46 +02:00
Olivier Goffart
6ee7e82913
Handle setFileRecord errors #4632
2016-04-11 14:11:11 +02:00
Klaas Freitag
648328fbe2
SyncJournalDb: Close the db on error in getFileRecord()
...
The idea is that the next call to any database operation will try to
reopen the database through the checkConnect() method. So even if there
was a disconnect trom the db file, this will reestablish the connection.
2016-04-11 12:40:19 +02:00
Klaas Freitag
ee58cc3b66
SyncEngine: Close the sync journal after the sync run has finished.
2016-04-11 11:31:54 +02:00
Jenkins for ownCloud
74a75f6399
[tx-robot] updated from transifex
2016-04-11 02:19:03 -04:00
Jenkins for ownCloud
a0baca25ff
[tx-robot] updated from transifex
2016-04-10 02:18:57 -04:00
Jenkins for ownCloud
4b5c9c5ee5
[tx-robot] updated from transifex
2016-04-09 02:19:05 -04:00
ckamm
4ce97633cd
Merge pull request #4630 from ckamm/folderwatchwin
...
Graceful termination of folderwatcher_win #4620
2016-04-09 06:55:30 +02:00
Jenkins for ownCloud
f1732d66d6
[tx-robot] updated from transifex
2016-04-08 02:19:09 -04:00
Jenkins for ownCloud
329f512a40
[tx-robot] updated from transifex
2016-04-08 01:15:47 -04:00
Markus Goetz
c64720eac5
Merge pull request #4605 from RealRancor/RealRancor-patch-1
...
Change note to warning in documentation
2016-04-07 15:50:32 +02:00
Klaas Freitag
8f7b833c12
Not Synced Tab: Use tr rather than string concat
2016-04-07 09:18:51 +02:00
Klaas Freitag
48bfcde97d
Merge pull request #4640 from owncloud/numberInProtocolTab
...
ProtocolWidget: Show number of non synced files in tab label.
2016-04-07 09:15:06 +02:00
Klaas Freitag
42439490cc
Merge pull request #4645 from owncloud/fix_4633
...
SelectiveSync: Verify if the list could be read from journal.
If not handle the error rather than assuming the selective sync list is empty.
2016-04-07 09:14:33 +02:00
Jenkins for ownCloud
4dd8d61e4e
[tx-robot] updated from transifex
2016-04-07 02:19:10 -04:00
Daniel Molkentin
271bea39ff
Update binary subdir
2016-04-06 18:07:35 +02:00
Daniel Molkentin
a0827c5ef2
Remove deleted icons from resource file
2016-04-06 17:59:34 +02:00
Klaas Freitag
058cd33324
Not Synced: Display only the number of not synced items in parathesis.
...
This was Jans wish.
2016-04-06 17:53:42 +02:00
Klaas Freitag
e4604b406f
SyncEngine: finalize properly on error with syncjournal
2016-04-06 17:20:48 +02:00
Klaas Freitag
7b1f02fcda
SelectiveSync: Verify if the list could be read from journal.
...
If there is a read error from the database while trying to get
the list from database, make sure to not behave badly because
the list is empty.
2016-04-06 15:01:28 +02:00
Klaas Freitag
52a5234122
Merge pull request #4641 from owncloud/bubbleUpConflicts
...
Bubble up conflicts: Show a tray notification on conflicts and show the conflicts in the not-synced list.
2016-04-06 13:45:47 +02:00
Klaas Freitag
4e17dabcb6
Folder: Fixed a couple of plural translation issues.
2016-04-06 12:22:29 +02:00
Jenkins for ownCloud
15bdb7be64
[tx-robot] updated from transifex
2016-04-06 02:19:26 -04:00
Klaas Freitag
9bdc84c6f4
NotificationJobs: Set ocs header to maintain the session.
...
This is needed by the server.
2016-04-05 16:52:51 +02:00
Klaas Freitag
252aea25da
ProgressDispatcher: Improve wording about conflicts.
2016-04-05 16:38:18 +02:00
Klaas Freitag
efb0faa14e
Folder: After sync, fire up tray notification if conflicts happened.
...
If there were conflicts, users want to have a tray notification that warn
about.
This will help for #3222
2016-04-05 16:37:54 +02:00
Klaas Freitag
5b40921587
ProtocolWidget: Show number of non synced files in tab label.
2016-04-05 13:57:38 +02:00
Klaas Freitag
7994b3d91a
ProtocolWidget: handle Conflicts as not-synced items
2016-04-05 11:13:12 +02:00
Jenkins for ownCloud
65e740301a
[tx-robot] updated from transifex
2016-04-05 02:19:38 -04:00
Jenkins for ownCloud
f495daf1cf
[tx-robot] updated from transifex
2016-04-05 01:15:46 -04:00
Olivier Goffart
3334067d9f
Merge branch '2.1'
...
Conflicts:
src/gui/socketapi.cpp
2016-04-04 16:58:49 +02:00
Klaas Freitag
73e2a503d7
NotificationWidget: Some ui refinements.
2016-04-04 12:46:00 +02:00
Klaas Freitag
bc6eebddf4
NotificationWidget: Handle empty message and subject properly.
2016-04-04 12:45:39 +02:00
Olivier Goffart
434d16941b
SyncEngine: fixed restoring files when they are moved in a new directory
...
Imagine tgus scenario on a read only share that you move file from
one location to a new directory in the read only share.
Creating the read only directory fails for permission error.
But we should also restore the files that have been moved.
IL issue 542
2016-04-04 10:41:12 +02:00
Klaas Freitag
6b0d535120
Merge branch 'notifications'
2016-04-04 10:40:33 +02:00
Jenkins for ownCloud
8b3ea7aa97
[tx-robot] updated from transifex
2016-04-04 02:19:12 -04:00
Jenkins for ownCloud
84ad0d234e
[tx-robot] updated from transifex
2016-04-02 02:19:13 -04:00
Jenkins for ownCloud
87e4370bf4
[tx-robot] updated from transifex
2016-04-01 02:19:45 -04:00
Christian Kamm
fa1bb309ca
Graceful termination of folderwatcher_win #4620
2016-03-31 15:44:42 +02:00
Christian Kamm
e05819370b
Fix invalid read on account removal
2016-03-31 09:00:32 +02:00
Jenkins for ownCloud
d65808b1e1
[tx-robot] updated from transifex
2016-03-31 02:19:30 -04:00
Jocelyn Turcotte
a115f4b9d0
Merge pull request #4625 from owncloud/trivialFixes
...
Trivial fixes
2016-03-30 18:41:56 +02:00
Daniel Molkentin
9ea191f63d
Scale correctly with HiDPI displays on Linux with Qt 5.6
2016-03-30 18:25:30 +02:00
Jocelyn Turcotte
17c645ce43
Hide environment variables when running the FinderSync icns script
...
This otherwise shows up in the console for each incremental build.
2016-03-30 18:00:22 +02:00
Jocelyn Turcotte
f427955512
Simplify the build of auto tests
...
Remove all configure_files:
- Move all tests to cpp files
- Use the QTEST_MAIN macro instead of a generated main.cpp
- Include test*.moc in the cpp to let CMAKE_AUTOMOC call moc
- Pass info through add_definitions instead of generating oc_bin.h with them
This makes sure that build errors points to the original test source
file instead of the generated one in the build directory to be able to
jump and fix errors directly from the IDE's error pane.
2016-03-30 18:00:22 +02:00
Markus Goetz
dd8b0c3e4a
Merge pull request #4623 from owncloud/share_menu_icon_osx
...
OS X: Use app icon for "Share with ..." Finder menu #4472
2016-03-30 15:53:54 +02:00
Markus Goetz
6c283c7a48
OS X: Use app icon for "Share with ..." Finder menu #4472
...
This works for both plain ownCloud and themed clients.
2016-03-30 15:26:43 +02:00
Christian Kamm
c150350096
SyncFileStatusTracker: Fix compilation with older Qt
2016-03-30 13:42:08 +02:00
Christian Kamm
c35e74d264
Theme: Enable link sharing by default
...
Was disabled by accident.
2016-03-30 13:33:12 +02:00
Olivier Goffart
cdbc25ede8
Merge pull request #4615 from owncloud/socketApiRefactor
...
Socket API refactor
2016-03-30 13:24:10 +02:00
Jocelyn Turcotte
a0260c29c0
Fix the build on Windows
2016-03-30 12:19:09 +02:00
Jocelyn Turcotte
2c0caf8b75
Fix the SocketApi status of CSYNC_FILE_SILENTLY_EXCLUDED files
...
Bring back the hardcoded status logic for excluded files.
Since the activity log doesn't even mention those files on purpose,
we can't rely on the SyncEngine to notify us about the status of those files.
2016-03-30 12:10:51 +02:00
Jocelyn Turcotte
56064c9366
Fix sibbling directories showing up as warning
...
Looking up a/aa while an error is present in a/aab/aaba would return
a warning status since a/aa is a substring of a/aab.
Fix the issue by checking if the following character is a slash.
2016-03-30 11:22:01 +02:00
ckamm
98995f45e6
Merge pull request #4618 from ckamm/progressui
...
Progress layout adjustments
2016-03-30 09:22:27 +02:00
Christian Kamm
5636dc1386
Tooltip updater: Fix compile with Qt4
2016-03-30 09:21:28 +02:00
Jenkins for ownCloud
127291e35d
[tx-robot] updated from transifex
2016-03-30 02:19:15 -04:00
Klaas Freitag
885f8b382f
ActivityWidget: Handle plural properly in translations.
...
Even for the case where the number is fixed.
Also fix the translators comments.
2016-03-29 18:01:54 +02:00
Klaas Freitag
8166c52f4a
NotificationHandling: Use QByteArray for the verb.
2016-03-29 18:01:49 +02:00
Jocelyn Turcotte
ef57d4ae11
Move the SyncFileStatusTracker directory slash suffix logic in a method
2016-03-29 17:55:02 +02:00
Jocelyn Turcotte
fbf23b6abb
Cleanup after the SyncFileStatusTracker change
...
- Add missing explicit keywords
- Add doc
- Comment out verbose and partly redundant qDebug statements
2016-03-29 17:39:30 +02:00
Jocelyn Turcotte
47a552f8c2
Use a std::map for SyncFileStatusTracker problems
...
This prevents having to define a Problem structure with dubious
operator overloads to accomplish the same.
Also use std::map::lower_bound to quickly iterate over the
list of problems.
2016-03-29 17:29:36 +02:00
Klaas Freitag
cd3f612857
ActivityWidget: Rename blacklistActivities to blacklistNotifications.
2016-03-29 16:50:58 +02:00
Klaas Freitag
2e30a0e5bc
Remove superflous iterator increment
2016-03-29 16:50:15 +02:00
Klaas Freitag
9f438cb768
Doc: Add milliseconds unit to notificationRefreshInterval doc
2016-03-29 14:39:12 +02:00
Klaas Freitag
cacb751ab8
Cleaups based on review feedback.
2016-03-29 14:38:11 +02:00
Klaas Freitag
4d59f5ec66
ActivityData: Declare operators outside the class
2016-03-29 14:09:19 +02:00
Klaas Freitag
69e8e15884
Remove explicit time spec specification as it is not needed.
2016-03-29 13:59:08 +02:00
Daniel Molkentin
1730569f77
No Q_NULLPTR in Qt 4.8
2016-03-29 13:28:11 +02:00
Olivier Goffart
98091aeab7
Theme: document forceSystemNetworkProxy ( #4458 )
2016-03-29 13:08:33 +02:00
Christian Kamm
c5fbde412c
Folder info layout adjustments #3403
...
* Remove duplicate remote path
* Use thin progress bar
* Move bandwidth and file info to tooltip
* Shorten overall progress message
This also fixes #4562 by making the layout not dependent on the
width of the displayed text.
2016-03-29 12:45:01 +02:00
Christian Kamm
10a7128d1a
Update QTreeView tooltips as they change #3403
2016-03-29 12:26:09 +02:00
Christian Kamm
41f43feecf
Add utility function for shorter time duration strings #3403
2016-03-29 12:26:09 +02:00
Christian Kamm
4915bbf8f3
Adjust size description strings #3403
...
@jancorchardt suggested to not have decimal places on file
sizes, except for GB.
2016-03-29 12:26:09 +02:00
Christian Kamm
ffbd5df25f
Account UI: Fix log out button text #4578
2016-03-29 12:14:53 +02:00
Jocelyn Turcotte
82190eaa81
Refactor the overlay icon logic to show errors as a warning for parent folders #3634
...
This also remove all smartness from the SocketApi about the status
of a file and solely use info from the current and last sync.
This simplifies the logic a lot and prevents any discrepancy between
the status shown in the activity log and the one displayed on the
overlay icon of a file.
The main benefit of the additional simplicity is that we are able
to push all new status of a file reliably (including warnings for
parent folders) to properly update the icon on overlay implementations
that don't allow us invalidating the status cache, like on OS X.
Both errors and warning from the last sync are now kept in a set,
which is used to also affect parent folders of an error.
To make sure that errors don't become warning icons on a second
sync, SyncFileItem::_hasBlacklistEntry is also interpreted as an error.
This also renames StatusIgnore to StatusWarning to match this semantic.
SyncEngine::aboutToPropagate is used in favor of SyncEngine::syncItemDiscovered
since the latter is emitted before file permission warnings are set on the
SyncFileItem. SyncEngine::finished is not used since we have all the
needed information in SyncEngine::itemCompleted.
2016-03-28 14:29:48 +02:00
Jocelyn Turcotte
69aa39f1f6
Don's use SyncFileStatus for Folder::createGuiLog
...
SyncFileStatus' purpose is to track overlay icon status.
Instead of putting comments and default: clauses in switch
on both sides about unused enums, use different enums.
This also remove STATUS_NEW which is the equivalent of
STATUS_SYNC in all shell extension implementations, and
remove STATUS_UPDATED and STATUS_STAT_ERROR which have
the same semantic as STATUS_UPTODATE and STATUS__ERROR.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
ea5e6d367b
Connect the SocketApi directly to the SyncFileStatusTracker
...
Don't go through the Folder->ProgressDispatcher->SocketApi route and
keep the path logic in SyncFileStatusTracker.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
da7b9916e5
Move the SocketApi business logic to a libsync SyncFileStatusTracker class
...
This will allow testing this code and avoid going through too many
layers to get notified and a file status changed.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
dac4bd8370
Remove null-checks for FolderMan::_socketApi
...
It's now created in the constructor and won't be null.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
6e16e34799
Remove SocketApi::dbFileRecord_capi in favor of JournalDB::getFileRecord
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
6d3fe9d865
Remove the tainted folder logic
...
This currently is no-op code since the socket API isn't notified
that the tainted folder list changed, and the result is the same
since a sync will be triggered within the next 5 seconds and the
modified folder will be shown as SYNC at that point anyway.
Removing the dependency to the file watcher allows moving the
status estimation logic to libsync.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
c090a511fd
Remove OwnCloud6 specific sharing code
...
If users encounter this situation, the share icon will simply not show.
This simplifies the transition to move this code in libsync.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
a4e0899af4
Remove the mutex from ExcludedFiles
...
It's always accessed from the main thread.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
2d2c7bc9b8
Move the SyncEngine construction to the Folder constructor
...
The SyncEngine is now created only once, at construction of the
Folder, instead of being reconstructed on each sync.
2016-03-28 13:26:38 +02:00
Jocelyn Turcotte
df386b64ba
Make the AccountState a construction argument of the Folder
...
This will help moving the SyncEngine construction in the constructor
and allow moving functionalities from Folder to SyncEngine or its
delegated objects.
2016-03-28 13:07:28 +02:00
Jenkins for ownCloud
80bd86a305
[tx-robot] updated from transifex
2016-03-28 02:18:50 -04:00
Jenkins for ownCloud
d55c31d93b
[tx-robot] updated from transifex
2016-03-27 02:19:06 -04:00
Jenkins for ownCloud
68cbaf1bd6
[tx-robot] updated from transifex
2016-03-26 02:18:41 -04:00
Jenkins for ownCloud
6867c2ffb3
[tx-robot] updated from transifex
2016-03-25 02:19:21 -04:00
Jenkins for ownCloud
ecb34f60f2
[tx-robot] updated from transifex
2016-03-25 01:15:43 -04:00
Jocelyn Turcotte
5989a07339
[Win-shellex] Make sure to unregister obsolete CLSIDs #4595
...
If the user tries to install an older version of a branded client
with shell extensions, and also install the 2.1 ownCloud client
side-by-side, both shell extensions DLLs will be registered and might
lead to both DLLs versions being loaded by exlorer, causing a system
crash.
Since we don't support both branded and non-branded shell extensions
to work at the same time, at least make sure to unregister any legacy
CLSID that could cause explorer to load the previous version DLL.
2016-03-24 16:35:38 +01:00
Daniel Molkentin
7730e826b0
Merge pull request #4580 from owncloud/implement_ep_1136
...
Implement EP 1136
2016-03-24 14:58:09 +01:00
Daniel Molkentin
2d24585a8f
Implement enforcing a static URL postfix.
...
Second part of EP 1136
2016-03-24 14:18:52 +01:00
Jenkins for ownCloud
84a6d1e920
[tx-robot] updated from transifex
2016-03-24 02:19:22 -04:00
RealRancor
05fae8ee7f
Change note to warning in documentation
2016-03-23 18:19:44 +01:00
Klaas Freitag
1fe5d6bb0c
Notifications: Handle Notifications without an action.
...
The policy that was said is that if a notification has no action, the
client can and should display a close-button. This patch does it.
In additon to that, the client needs a blacklist of closed notifcations
otherwise they would re-appear next time the server notifications are
fetched again.
Also, changed the cleanup of not-longer-used widgets to be more robust.
2016-03-23 17:02:13 +01:00
Klaas Freitag
0c944a06f9
NotificationWidgetUI: Fix sizing and sizePolicy
2016-03-23 16:49:25 +01:00
Klaas Freitag
1bb3a4a45d
NotificationWidget: Remove accountName() and add activity() method.
2016-03-23 16:48:38 +01:00
Klaas Freitag
161d21904a
ActivityData: Add source file for implementation details
...
Add the ident() method and operators.
2016-03-23 16:47:13 +01:00
Klaas Freitag
ea2f19b78a
Docs: Add new config option for the notification sync interval.
2016-03-22 11:38:44 +01:00
Klaas Freitag
f70c6282ca
Notifications: Remove unused variable.
2016-03-22 11:38:10 +01:00
Klaas Freitag
ad60e8ac89
Notifications: Fix handling of notifications to remove from the list.
...
If a notification is not longer in the list of notifications coming from
the server, it needs to be removed from the widget list.
2016-03-22 10:35:24 +01:00
Klaas Freitag
d03fcc95e4
Notifications: Maintain a timeSinceLastCheck for every Account.
...
In multi-account environment every account needs the own counter.
2016-03-22 09:58:30 +01:00
Jenkins for ownCloud
588646f7a2
[tx-robot] updated from transifex
2016-03-22 02:19:22 -04:00
Daniel Molkentin
fb75adcd57
Wizard: Implement alternative forms of inquiring about the userID
...
Settable in the theme.
2016-03-21 23:50:48 +01:00
Klaas Freitag
d407aacc4a
Notifications: remove notification widgets if the notification is gone.
...
If a notification is not longer in the list that comes from the
server, the notification is removed.
That is mainly for the notifications that are created by the
announcement application
2016-03-21 16:32:37 +01:00
Markus Goetz
02a69d5487
Exclude: Weird GoogleDrive "My Saved Places." file #4573
2016-03-21 15:15:59 +01:00
Markus Goetz
57acde758b
Documentation: promptDeleteAllFiles #4389
2016-03-21 15:05:49 +01:00
Klaas Freitag
f587f35ef0
Fix plural translation handling, remove the superflous arg()
2016-03-21 15:03:28 +01:00
Jenkins for ownCloud
8c00d5e1ee
[tx-robot] updated from transifex
2016-03-21 02:19:11 -04:00
Jenkins for ownCloud
f02148e8ca
[tx-robot] updated from transifex
2016-03-20 02:18:46 -04:00
Jenkins for ownCloud
476d628c01
[tx-robot] updated from transifex
2016-03-19 02:19:17 -04:00
Jocelyn Turcotte
c55ac504a3
Merge pull request #4584 from lultimouomo/fix-destruction-order
...
Fix crash due to destruction order
2016-03-18 18:58:23 +01:00
Luca Niccoli
6735126c09
Fix crash due to destruction order
2016-03-18 16:41:48 +01:00
Klaas Freitag
b9663456d8
Notifications: Refresh the notifications based on a config value.
...
Pulls a timer that polls for new notifications regularly. Add
Config file method for the interval value.
2016-03-18 16:28:20 +01:00
Daniel Molkentin
cabeeba7c5
Merge pull request #4582 from owncloud/nsis_uninstall_test
...
NSIS: Force uninstall before install #4543
2016-03-18 16:01:41 +01:00
Markus Goetz
6c517638d0
NSIS Silent mode: Force uninstall before install #4543
2016-03-18 16:00:29 +01:00
Klaas Freitag
0e1b9a346d
Fix plural translation handling, remove the superflous arg()
2016-03-18 15:28:00 +01:00
Christian Kamm
03db1894d8
Fix wizardSelectiveSyncDefaultNothing #4581
2016-03-18 13:52:45 +01:00
Christian Kamm
ff4cdc3161
Quota: Change quota path if single folder #4460
...
Since the quota is a per-folder value, this will make the displayed data
more useful when a single sync folder is configured.
Of course each subfolder could have a different quota again.
2016-03-18 13:34:49 +01:00
Christian Kamm
0febe9b0df
Revert "Utility: Make sure to use UTC timestamp to compare in timeAgoInWords"
...
This reverts commit 41b43bf961 .
Using now in UTC should make no difference, but that assert might
trigger...
2016-03-18 13:15:35 +01:00
Christian Kamm
ceb4a23dab
Fix compile with strict C flags
2016-03-18 12:41:57 +01:00
Klaas Freitag
7f22a07312
Notifications: Check if the account is connected before querying.
...
Also avoid memory leaks if it is not connected.
2016-03-18 12:29:09 +01:00
Klaas Freitag
328d254f7f
Notifications: Remove "done" notification widgets after fife seconds.
2016-03-18 11:25:14 +01:00
Markus Goetz
15f6e133a5
sqlite: Update to version 3.11.1
...
For OS X and Windows.
2016-03-18 10:17:41 +01:00
Klaas Freitag
0a590b7cbe
Notifications: Give feedback if notifcation request succeeded.
...
Also display a time stamp.
2016-03-18 10:02:11 +01:00
Klaas Freitag
f04895a407
Utility: Fix plural translation.
2016-03-18 08:31:13 +01:00
Klaas Freitag
41b43bf961
Utility: Make sure to use UTC timestamp to compare in timeAgoInWords
...
This should help to fix the problems we see in #4521
2016-03-18 08:31:03 +01:00
Klaas Freitag
05de710b67
Notifications: Display timestamp of the notification in the widget
2016-03-18 08:21:54 +01:00
Klaas Freitag
f71fdab997
Fix timeAgoInWords
2016-03-18 08:20:23 +01:00
Jenkins for ownCloud
6d8e570420
[tx-robot] updated from transifex
2016-03-18 02:19:21 -04:00
Christian Kamm
d7bd1300a8
Ignores: expand escapes #4568
2016-03-17 14:31:53 +01:00
Christian Kamm
2bba68e059
Handle server timezone data correctly #4521
...
The date we receive from the server is an ISO8601 datetime that
includes the offset from UTC. Qt does correctly parse this
information and creates the appropriate QDateTime object.
Calling setTimeSpec(UTC) will force the timezone offset to 0 and
thereby change the referenced point in time to an incorrect one.
2016-03-17 13:04:18 +01:00
Christian Kamm
4b19cdeca0
Propfind: Treat broken XML response as failure #4575
...
Soldiering on with a broken or incomplete response could lead to
incorrect sync behavior.
Since discovery uses LsCol jobs which already handle errors
correctly, this should not have a significant impact.
2016-03-17 11:32:19 +01:00
Olivier Goffart
3d157cbb02
User-Agent: put the actual version string in there
...
It contains the build id in addition
(cherry picked from commit e0e793fb14a5c32b21db95a63ebf48084621ff4d)
2016-03-17 10:52:55 +01:00
Olivier Goffart
80b5f3f43d
Never overwrite the size from the db when updating the metadata
...
the size on the server might be different from the size on the client
with certain backend so it should be ignored.
(cherry picked from commit 9222db6df9b19a21e1bea5a238d745d96a6385e3)
2016-03-17 10:48:49 +01:00
Olivier Goffart
254361cb87
Shared dialog: move the error label up ( #4348 )
2016-03-16 18:06:46 +01:00
Klaas Freitag
f7f412007e
Activity: Some documentation and better varialbe names
2016-03-16 16:31:52 +01:00
Klaas Freitag
45c32ec0b1
NotificationWidget: Remove not needed method.
2016-03-16 16:21:20 +01:00
Jenkins for ownCloud
97e323ac3a
[tx-robot] updated from transifex
2016-03-16 02:19:14 -04:00
Christian Kamm
04faee4a0f
Doc: low disk space #4443
2016-03-15 15:20:23 +01:00
Christian Kamm
4900703970
SqlQuery: Write NULL when intended #4548
...
In SQLite bindings are not cleared by sqlite3_reset() calls, so
skipping a sqlite3_bind call to create a NULL value doesn't work,
instead the previous value will be written.
To fix this, I clear all bindings in SqlQuery::reset and make sure
to explicitly bind NULL when desired in SqlQuery::bind.
To make sure there's no confusion about SqlQuery::reset and
sqlite3_reset, I rename our method to reset_and_clear_bindings().
(cherry picked from commit 7bd4f95b8c )
2016-03-15 15:17:35 +01:00
Christian Kamm
7bd4f95b8c
SqlQuery: Write NULL when intended #4548
...
In SQLite bindings are not cleared by sqlite3_reset() calls, so
skipping a sqlite3_bind call to create a NULL value doesn't work,
instead the previous value will be written.
To fix this, I clear all bindings in SqlQuery::reset and make sure
to explicitly bind NULL when desired in SqlQuery::bind.
To make sure there's no confusion about SqlQuery::reset and
sqlite3_reset, I rename our method to reset_and_clear_bindings().
2016-03-15 14:38:31 +01:00
Markus Goetz
ecd44f70de
Submodule: Use https path
...
Else I got a git hickup here
2016-03-15 11:55:28 +01:00
Markus Goetz
9d5307d04c
Propagator: On remove move, take size from DB
...
Some servers can claim different sizes for on-the-fly protected/encrypted
MS Office files during discovery.
2016-03-15 10:28:47 +01:00
Jenkins for ownCloud
6e697bae97
[tx-robot] updated from transifex
2016-03-15 02:19:11 -04:00
Jenkins for ownCloud
366abb5350
[tx-robot] updated from transifex
2016-03-15 01:15:43 -04:00
Markus Goetz
9460aa7f21
SyncEngine: Also emit item in other code path
...
Else a user of this library cannot build a complete list of items.
2016-03-14 18:12:07 +01:00
Klaas Freitag
a4dcc2784a
Notification: Fix plural handling for tray message
2016-03-14 16:21:04 +01:00
Klaas Freitag
9a2f1456c5
ocs jobs: Add a define for OCS job success.
2016-03-14 15:41:20 +01:00
Klaas Freitag
9d219a18f3
ActivityListModel: Code cleanups
...
based on review feedback.
2016-03-14 15:40:39 +01:00
Klaas Freitag
97f1694f7e
ActivityData: Simplified implementation.
...
Use QVariantHash and removed ActivityList object in favour
of a typedef
2016-03-14 15:39:07 +01:00
Klaas Freitag
73cd5a9c27
Notifications: Cleaner notification string build
2016-03-14 14:41:21 +01:00
ckamm
25baa995ec
Merge pull request #4532 from ckamm/content-checksum
...
Enable content checksums #4375
2016-03-14 09:49:31 +01:00
Jenkins for ownCloud
39a95d3bd5
[tx-robot] updated from transifex
2016-03-14 02:19:15 -04:00
Jenkins for ownCloud
22acc004cc
[tx-robot] updated from transifex
2016-03-12 02:19:25 -05:00
Markus Goetz
6c07f08175
Proxies: Enable ownBrander to force system proxy usage #4458
2016-03-11 16:21:40 +01:00
Markus Goetz
62d4ed8087
Protocol: Show by default instead of server activity #4395
2016-03-11 16:08:56 +01:00
Klaas Freitag
adf9570a92
Notification: Enhance the tray message
...
Add the hostname from where the notification comes, as well as
the name of the application to the header.
2016-03-11 12:48:31 +01:00
Klaas Freitag
2c2a18af43
Activitiy: Refactor - move classes to their own source files.
...
Created a activitydata.h header (only) for the basic data, plus
a separate file for the model. Cleans up the widget source.
2016-03-11 11:41:19 +01:00
Klaas Freitag
2d1ab27cb5
Notifications: Refactor - create a notification handler class
...
That cleans the ActivityWidget class
2016-03-11 10:48:34 +01:00
Klaas Freitag
903e79a7c4
Notifications: Do a GUI tray notification if new notifciations arrive.
...
Show a GUI notification once an hour if no new notifications arrive
to not annoy users.
2016-03-11 10:15:28 +01:00
Jenkins for ownCloud
6b8636f79b
[tx-robot] updated from transifex
2016-03-11 02:19:14 -05:00
Klaas Freitag
8a0ce463da
Notifications: Properly delete the notification check job.
2016-03-10 17:46:00 +01:00
Klaas Freitag
7d13a1d8e1
Notifications: Check capabilities if the notifications are enabled
...
If not, do not query for them.
2016-03-10 17:46:00 +01:00
Klaas Freitag
b97c832306
Capabilities: Add isValid check and check for notifications
...
The isValid check should be used everywhere the capabilities
are used as the loading of the capabilities is happening
in parallel of the startup, so it is not guaranteed to be
available always.
2016-03-10 17:46:00 +01:00
Klaas Freitag
4a4dac22e2
Notifications: Add a Progress indicator and handle job results.
...
Parse the replyCode from the button action calls and disable
buttons accordingly.
2016-03-10 17:46:00 +01:00
Klaas Freitag
32e16b323c
Display server notifications on the client ( #3733 )
...
As interaction is required, the notifications are displayed in a
separate widget above the server activity list.
Note that design and also where we display the notifications can
still be discussed and changed.
2016-03-10 17:46:00 +01:00
Klaas Freitag
688c5502a8
New GUI class NotificationWidget.
...
It displays a server notification that can come with a dynamic
set of buttons next to a message and a subject (=header)
2016-03-10 17:22:36 +01:00
Klaas Freitag
eb00b34191
Minor wording fixes
2016-03-10 17:22:36 +01:00
Klaas Freitag
a831b7417f
Added temporar icon for notifications.
2016-03-10 17:22:36 +01:00
Klaas Freitag
0eb1041290
AbstractNetworkJob: Add a delete job.
...
It is needed to easily send delete requests which happen
through the notify API.
2016-03-10 17:22:36 +01:00
Jenkins for ownCloud
c0623295e0
[tx-robot] updated from transifex
2016-03-10 02:19:25 -05:00
Jenkins for ownCloud
e82a13803d
[tx-robot] updated from transifex
2016-03-10 01:15:45 -05:00
Markus Goetz
5cb45bf738
Merge pull request #4549 from owncloud/fix_4545
...
Add account name to warning message boxes in Folder
2016-03-09 19:12:34 +01:00
Markus Goetz
a14b495864
Old servers: Don't nag if version still undetected #4523
2016-03-09 15:57:45 +01:00
Markus Goetz
ad1c343cd7
Merge pull request #4552 from owncloud/hide_activity_tab
...
Activities: Hide if non of the accounts has the app enabled.
2016-03-09 15:34:12 +01:00
Christian Kamm
17003cec19
Settings: Hide update info if skipUpdateCheck #4397
...
(cherry picked from commit 93de378fb21e934d324d621f66eec98e53f1637a)
2016-03-09 15:32:32 +01:00
Markus Goetz
2843214d09
Merge pull request #4531 from ckamm/old-server
...
Add warnings for old server versions #4523
2016-03-09 15:16:48 +01:00
Daniel Molkentin
b456ded5e7
Show full path in warning message boxes before folder removal
...
Fixes #4545
2016-03-09 14:07:34 +01:00
Roeland Douma
d4848880e1
Merge pull request #4553 from owncloud/add_spinner
...
Add spinner to show we are creating the share
2016-03-09 09:39:48 +01:00
Jenkins for ownCloud
e41bb8af6d
[tx-robot] updated from transifex
2016-03-09 02:19:14 -05:00
Jenkins for ownCloud
3a608dda8f
[tx-robot] updated from transifex
2016-03-09 01:15:44 -05:00
Roeland Jago Douma
41d38b37cf
Add spinner to show we are creating the share
...
Fixes #3737
2016-03-08 20:54:14 +01:00
Olivier Goffart
54612455e6
Merge pull request #4513 from owncloud/csyncContextToSyncEngine
...
Move the csync_context creation in SyncEngine
2016-03-08 18:12:31 +01:00
Klaas Freitag
9c5b9f932b
Activities: Hide if non of the accounts has the app enabled.
...
If the ownCloud server does not have the activity app enabled,
it returns 999 as status code. If all the configured accounts
do that, this code hides the entire tab with the server
activities.
This is supposed to fix #4533
2016-03-08 18:01:42 +01:00
Jenkins for ownCloud
debaff6f7a
[tx-robot] updated from transifex
2016-03-08 02:19:06 -05:00
Jenkins for ownCloud
25ce5f1c22
[tx-robot] updated from transifex
2016-03-06 02:18:40 -05:00
Jenkins for ownCloud
a441e4e30d
[tx-robot] updated from transifex
2016-03-05 02:19:40 -05:00
Jenkins for ownCloud
50c32f45ac
[tx-robot] updated from transifex
2016-03-05 01:15:44 -05:00
Jenkins for ownCloud
5f24575ed9
[tx-robot] updated from transifex
2016-03-04 02:19:10 -05:00
Jocelyn Turcotte
e91a5c85ff
Move the Logger reference back into src/gui
2016-03-03 20:26:48 +01:00
Jocelyn Turcotte
7561f5c717
Add comment and cleanup the csync exclude list code
...
Removed the csync_add_exclude_list function that isn't use anywhere
anymore.
2016-03-03 20:26:48 +01:00
Christian Kamm
c554f5383c
Downloads: Preserve group ownership #4330
2016-03-03 12:02:06 +01:00
Christian Kamm
4f48c888ef
Don't use QVector::removeOne, added in Qt 5.4
...
A QList makes sense there and makes the rest of the code
work with earlier Qt versions.
2016-03-03 10:03:41 +01:00
Jenkins for ownCloud
4ff6dc2992
[tx-robot] updated from transifex
2016-03-03 02:19:13 -05:00
Markus Goetz
266508b691
Merge pull request #4529 from owncloud/dynamic_parallelism_scaling
...
Propagator: Pump in more requests if we think current ones are quick
2016-03-02 15:23:58 +01:00
Markus Goetz
d78c3679e7
Propagator: Pump in more requests if we think current ones are quick
...
Helps with small file sync #331
When I benchmarked this, it went up to 6 parallelism and
was about 1/3 faster than the previous fixed 3 parallelism.
Doing more than 6 is dangerous because QNAM limits to 6 TCP
connections and also the server might become a bottleneck.
Should also help for #4081
2016-03-02 15:22:21 +01:00
Christian Kamm
d6d3502960
Checksums: Compute content checksum on download #4375
2016-03-02 14:28:41 +01:00
Christian Kamm
7ed7512f27
Checksums: Content checksums for all uploads #4375
2016-03-02 14:28:20 +01:00
ckamm
ffa78b99d9
Merge pull request #4512 from owncloud/add-checksum-to-database
...
Checksums: keep the transfer checksum in the database as the content …
2016-03-02 14:04:37 +01:00
Christian Kamm
f66c28900a
Add warnings for old server versions #4523
...
* A tray message on every start up
* Red message in account settings
* Folders are paused when the server version switches to
an unsupported one
2016-03-02 12:54:22 +01:00
Christian Kamm
40c109597e
Improve folder pausing API
...
Previously one could accidentally call Folder::setSyncPaused() and miss
some expected side effects. Before, the correct call was to FolderMan::
slotSetFolderPaused(). Now the setter on Folder has the expected effect.
2016-03-02 11:06:03 +01:00
ckamm
6e9019120f
Merge pull request #4527 from ckamm/account-pause
...
Account pausing #3829
2016-03-02 10:35:40 +01:00
Jenkins for ownCloud
17f40f7efd
[tx-robot] updated from transifex
2016-03-02 02:19:13 -05:00
Roeland Douma
b0db709960
Merge pull request #4501 from owncloud/fix_4481
...
Do not send reshare permissions when creating a federated share
2016-03-01 17:03:00 +01:00
Roeland Douma
216956da4a
Merge pull request #4493 from owncloud/fix_4185
...
Disable sharing dialog if account state is not connected
2016-03-01 16:59:40 +01:00
Roeland Jago Douma
e4ec09dd87
Do not send reshare permissions when creating a federated share
...
See https://github.com/owncloud/core/issues/22122#issuecomment-185637344
2016-03-01 16:58:47 +01:00
Roeland Jago Douma
ba42d40df9
Disable sharing dialog if account state is not connected
...
Fixes #4185
2016-03-01 16:55:56 +01:00
Christian Kamm
d521232587
AccountState: Allow storing state in settings
...
This will be useful if we ever want to store account-level gui state.
I built this originally because I thought a paused account would be
this kind of state.
2016-03-01 16:08:23 +01:00
Christian Kamm
10e8f03ea4
Add 'pause all' tray menu entry #3829
2016-03-01 16:07:11 +01:00
Roeland Douma
8877f04835
Merge pull request #4497 from owncloud/fix_4469
...
Lock the sharee input when sharing
2016-03-01 15:40:29 +01:00
Roeland Douma
f24fa46789
Merge pull request #4496 from owncloud/fix_4325
...
Add theming options control sharing operations
2016-03-01 15:33:04 +01:00
Christian Kamm
a9b00a7489
Don't make files read-only when server is too old #4450
2016-03-01 10:11:20 +01:00
Jenkins for ownCloud
3f462403a9
[tx-robot] updated from transifex
2016-03-01 02:18:58 -05:00
Jenkins for ownCloud
6aa418f7c4
[tx-robot] updated from transifex
2016-02-29 12:10:28 -05:00
Carla Schroder
6493421109
Merge pull request #4509 from owncloud/build-client
...
improve client build instructions
2016-02-29 08:00:12 -08:00
Jocelyn Turcotte
49f00499f7
Fix a crash when syncing
2016-02-26 18:05:04 +01:00
Carla Schroder
0052386b41
correct OBS url for client building
2016-02-26 08:41:33 -08:00
Carla Schroder
e1909c3bd1
add OBS link for client building
2016-02-26 08:37:54 -08:00
Carla Schroder
8ce9388d29
corrections to client building instructions
2016-02-26 08:32:52 -08:00
Jocelyn Turcotte
b8227afcaa
Move the csync_context creation in SyncEngine
...
The creation doesn't need to be separated from the SyncEngine anymore.
This allows the SyncEngine to be created in fewer steps if we want to
use it in tests.
This moves most of the direct csync code from Folder into the SyncEngine.
The exclude file logic for the context has been wrapped using the
existing ExcludedFiles class as well.
2016-02-25 20:53:13 +01:00
Jocelyn Turcotte
b8dee63d7a
Remove superfluous error checking from csync_create and csync_init
...
Given that we control all call sites, the only way that this can fail is during
OOM. Also remove the code in csync itself to make sure that it's obvious that
any new error case wouldn't be handled by call sites.
2016-02-25 20:53:13 +01:00
Jocelyn Turcotte
75c99bf2b1
Fix TestXmlParse::testParser1
2016-02-25 20:53:13 +01:00
Olivier Goffart
e6f81d3965
Checksums: keep the transfer checksum in the database as the content checksum
...
Currently, we only use this for .eml files. But we can just store this checksum
in the database if it was computed anyway.
Issue #4487
2016-02-25 17:17:14 +01:00
Olivier Goffart
1fafb1325b
Revert "AccountManager: take theURL from the Theme rather than from the config if the theme specify it"
...
The URL may change from shiboleth to normal authentication method.
Also some people were changing the config file manually to test stuff
Issue https://github.com/owncloud/enterprise/issues/1113
This reverts commit 7e5d89293d .
2016-02-25 11:33:26 +01:00
Jocelyn Turcotte
8222295ab1
Merge pull request #4508 from owncloud/fix-crash
...
PropagatorDownload: fix possible crash
2016-02-25 10:46:45 +01:00
Jenkins for ownCloud
744464aca6
[tx-robot] updated from transifex
2016-02-25 01:15:43 -05:00
Carla Schroder
c13637b105
improve client build instructions
2016-02-24 13:31:19 -08:00
Olivier Goffart
60c101d90b
PropagatorDownload: fix possible crash
...
Backtrace seen from the crash reporter where reply() is null.
2016-02-24 19:52:14 +01:00
Olivier Goffart
b685f6b6b6
Chunking: change the default chunk size to 10MB
...
As discussed with Klaas, this seems to be a better compromise.
10MB * 3 prarralel jobs = 30MB in memory, and to retry in case of
disconnection. Which is still reasonable. And might make the upload
almost twice as fast on fast network where the amount of chunk is the
bottleneck (because of more server processing)
Relates to issue #4354
2016-02-24 16:25:45 +01:00
Carla Schroder
424bf6f06a
Merge pull request #4503 from owncloud/client-regkeys
...
Add note that branded clients have custom windows registry key names
2016-02-23 09:47:10 -08:00
Carla Schroder
46c3c9e0fc
fix formatting
2016-02-23 09:45:30 -08:00
Carla Schroder
85f6c5fda8
Add note that branded clients have custom windows registry key names
2016-02-23 09:42:40 -08:00
Olivier Goffart
7e5d89293d
AccountManager: take theURL from the Theme rather than from the config if the theme specify it
...
That way an upgrade of the client can actually change the URL
Issue https://github.com/owncloud/enterprise/issues/1113
2016-02-23 18:10:11 +01:00
Markus Goetz
fe7630954e
Propagator: Remove 100msec delay between jobs
2016-02-23 14:27:35 +01:00
Markus Goetz
47ce4bd9e5
SelectiveSync: Improve menu #4378
2016-02-23 11:28:03 +01:00
Olivier Goffart
8fe4f1f0d7
Selective sync: Don't show negative size
...
Relates to issue #4491
2016-02-22 17:26:09 +01:00
Olivier Goffart
b3d57f3c7c
Cleanup syncengine after the new option not to ask confirmation when everything is removed
...
Cleanup after pull reuqest #4389
Do not make the SyncEngine depends on the ConfigFile
2016-02-22 16:14:22 +01:00
Markus Goetz
a76ba06817
Merge pull request #4389 from Bottswana/deleteprompt
...
Add option to disable the delete all files prompt
2016-02-22 15:44:50 +01:00
Markus Goetz
86fb83261a
Merge pull request #4470 from RealRancor/chunksize_config
...
Add chunkSize config to documentation
2016-02-22 15:43:12 +01:00
Roeland Jago Douma
cf0762a067
Lock the sharee input when sharing
...
This prevents accidentally sharing with the same sharee multiple times.
Because creating shares is not instance.
Fixes #4469
2016-02-22 15:14:05 +01:00
Roeland Jago Douma
99b3b752e3
Add theming options control sharing operations
...
Fixes #4325
2016-02-22 13:53:45 +01:00
Markus Goetz
5d7aa792e7
SyncEngine: Improve error message for ignored files/folders #4143
2016-02-22 11:13:29 +01:00
Hefee
28b694b170
Merge branch '2.1'
2016-02-20 10:34:34 +01:00
Hefee
74f74e0363
fix typo occured->occurred
2016-02-20 10:33:13 +01:00
Jenkins for ownCloud
64ca8a668a
[tx-robot] updated from transifex
2016-02-20 01:15:28 -05:00
Daniel Molkentin
bd72408e7a
Merge pull request #4488 from owncloud/21-updates
...
doc updates for 2.1.1 release
2016-02-19 09:16:37 +01:00
Carla Schroder
a32381a2a4
doc updates for 2.1.1 release
2016-02-18 10:31:51 -08:00
Daniel Molkentin
841973d399
Use correct values for items in version.rc
2016-02-17 14:16:29 +01:00
Jenkins for ownCloud
cf47523b2c
[tx-robot] updated from transifex
2016-02-17 02:19:09 -05:00
Daniel Molkentin
2918e45343
Add comment, transliterate copyright symbol
2016-02-16 17:56:51 +01:00
Daniel Molkentin
e3b56fb559
Add file description, copyright to win32 VERSIONINFO struct
2016-02-16 16:19:12 +01:00
Jenkins for ownCloud
667f2a7c4c
[tx-robot] updated from transifex
2016-02-16 02:19:01 -05:00
Klaas Freitag
e846b36bf6
Tests: Add a test for the timeAgoInWords function
2016-02-15 17:59:24 +01:00
Klaas Freitag
7f18d087e6
Utility: Make the timeAgoInWords method a bit more verbose
2016-02-15 17:59:24 +01:00
Klaas Freitag
3cc9019b37
ActivityWidget: Set timespec to UTC for JSON values.
...
This will fix the problem in #4439 that the time display
jumps if the timezone is changed on windows.
2016-02-15 17:59:24 +01:00
Daniel Molkentin
37924b9c7f
Win32: More complete resource specification
...
Add application and vendor name
Addresses #4473
2016-02-15 15:51:48 +01:00
Jenkins for ownCloud
a6c2ccc6cc
[tx-robot] updated from transifex
2016-02-15 02:19:06 -05:00
Jenkins for ownCloud
c84051c737
[tx-robot] updated from transifex
2016-02-14 02:18:43 -05:00
Jenkins for ownCloud
fe24ba55c4
[tx-robot] updated from transifex
2016-02-13 02:18:44 -05:00
RealRancor
ed06fc51a0
Add chunkSize config to documentation
2016-02-12 11:34:27 +01:00
Jenkins for ownCloud
14de3b460b
[tx-robot] updated from transifex
2016-02-12 02:18:46 -05:00
Olivier Goffart
dd89ab59e4
Use oc:size instead of quota-used-bytes to get the sizes of folder ( #4459 )
2016-02-11 15:09:47 +01:00
Olivier Goffart
cd83772112
SyncJounral: add an index on the error blacklist table
...
https://github.com/owncloud/enterprise/issues/1035
2016-02-11 14:38:38 +01:00
Jenkins for ownCloud
83adb7b55b
[tx-robot] updated from transifex
2016-02-11 02:19:16 -05:00
Daniel Molkentin
49ba58e991
Merge pull request #4461 from owncloud/bump-year-to-2016
...
Bump year to 2016
2016-02-10 20:01:54 +01:00
Lukas Reschke
7db3bc91b5
Bump year to 2016
...
My yearly contribution to the client 😉
2016-02-10 19:52:55 +01:00
Olivier Goffart
c93ecfbfb5
Merge branch restore_backup
2016-02-10 17:47:06 +01:00
Olivier Goffart
893e22691d
ConnectionValidator: Make sure we intercept propfind error
...
If the PROPFIND return an invalid code (like 200) then we would
not recieve the error signal and we would never sync again.
Found while investigating https://github.com/owncloud/enterprise/issues/1068
2016-02-10 15:38:21 +01:00
Daniel Molkentin
41d8d77535
Merge remote-tracking branch 'origin/2.1'
2016-02-10 12:57:03 +01:00
Olivier Goffart
e9307bb797
Use a constant for ConnectionValidator::DefaultCallingIntervalMsec
...
So there is no runtime initialization
2016-02-10 12:36:09 +01:00
Daniel Molkentin
c98bf174ed
ChangeLog: Set release date
2016-02-09 15:57:01 +01:00
Klaas Freitag
ae3b9f112c
Linux shell integration: Do not call sed from absolute path.
...
sed is in /bin/ rather than in /usr/bin on some systems, which
makes the scripts fail in the build environment. sed should be
in the PATH tough.
2016-02-09 13:01:03 +01:00
Jenkins for ownCloud
7fd9e751e0
[tx-robot] updated from transifex
2016-02-09 02:18:41 -05:00
Klaas Freitag
96f50d0c47
Nautilus integration: Remove Shebang from plugin source.
...
This fixes #4436
2016-02-08 17:00:39 +01:00
Jenkins for ownCloud
95a58e74ca
[tx-robot] updated from transifex
2016-02-08 10:11:58 -05:00
Klaas Freitag
b70a95ba30
nsi translations: finally escape the NSIS lineends correctly.
...
This will now finally fix #3519
2016-02-08 16:11:18 +01:00
Daniel Molkentin
72e14643f7
Update ChangeLog
2016-02-08 15:55:29 +01:00
Olivier Goffart
93308faeb9
Merge remote-tracking branch 'origin/2.1'
...
Conflicts:
doc/building.rst
2016-02-08 14:28:25 +01:00
Jocelyn Turcotte
f140d3447c
OS X: Fix the file system watcher ignoring unicode paths #4424
...
Add a missing string normalization when fetching the path
from the file system event.
2016-02-08 13:30:08 +01:00
Olivier Goffart
16ab3ca6a6
Merge pull request #4437 from owncloud/dev/doninstalltests
...
Don't install tests and cmocka lib
2016-02-08 12:35:29 +01:00
Olivier Goffart
6b643c7501
Discovery: don't ignore recall file #4420
...
The ".sys.admin#recall#" is the recall file and should not be ignored
even if hidden.
The remote discovery do not need to detect hidden files because it
is already detected by csync in all cases. So this avoid code duplication
2016-02-08 12:07:34 +01:00
Daniel Molkentin
24920a4ad1
update Changelog
2016-02-08 00:21:57 +01:00
Daniel Molkentin
65655584e9
Doc: Instruct to use sha256 for Authenticode signing
2016-02-06 15:01:31 +01:00
Klaas Freitag
e397056d2e
Enable replacement of strange substrings also for nsh files.
2016-02-05 17:59:34 +01:00
James Botting
f442195b8a
Remove option from GUI, leaving config option only.
2016-02-05 15:48:17 +00:00
Olivier Goffart
54a278edb9
fix compilation with TOKEN_AUTH_ONLY
2016-02-05 15:30:29 +01:00
Daniel Molkentin
b0acc475b0
Bring build documentation up to date, use docker for Win32 xbuild
2016-02-05 14:55:29 +01:00
Hefee
aa8b772bff
Don't install tests and cmocka lib.
...
Neither tests nor the libcmocka needs to be installed globally.
2016-02-05 14:14:07 +01:00
Daniel Molkentin
834a971e2a
Add Dockerfile that allows cross compiling the client
2016-02-05 12:17:31 +01:00
Daniel Molkentin
6701927840
Move ocdoc to current documentation master to catch up with new design
2016-02-04 14:21:23 +01:00
Jocelyn Turcotte
e4ae279f7b
Fix the crash reporter not launching
...
The proper path needs to be returned from CopyFramework
in order for install_name_tool to be run on the destination.
2016-02-02 10:43:52 +01:00
Jenkins for ownCloud
25e0d1eac3
[tx-robot] updated from transifex
2016-02-02 02:18:29 -05:00
Jenkins for ownCloud
d42faa80a6
[tx-robot] updated from transifex
2016-02-01 02:18:22 -05:00
Jenkins for ownCloud
a92c756fa9
[tx-robot] updated from transifex
2016-01-30 02:18:35 -05:00
Klaas Freitag
4cf94ed62a
Merge pull request #4396 from owncloud/fix_enum_csync
...
Use the proper enum representations of file types in csync.
2016-01-29 12:49:54 +01:00
Klaas Freitag
57c7727479
csync_update: Remove unneeded checks of previous commit.
2016-01-29 10:43:31 +01:00
Jenkins for ownCloud
8480fc7ae5
[tx-robot] updated from transifex
2016-01-29 02:18:55 -05:00
Klaas Freitag
5ae81aa96c
Nemo Shell Integration: Add missing conversion script.
...
This script creates the Nemo plugin out of the Nautilus plugin.
Both are source compatible, but need to include the right modules
depending on the name of the file manager.
The script is called by cmake.
2016-01-28 11:44:13 +01:00
Klaas Freitag
28907ec0c3
csync_update: Handle comparision of file types properly.
...
Note that the structs use different enums for the file types, unfortunately.
2016-01-27 14:11:37 +01:00
Klaas Freitag
7ddfa79950
csync_update: Use the csync defines rather than plain numbers.
2016-01-27 14:10:52 +01:00
Daniel Molkentin
dd76d72d61
Merge remote-tracking branch 'origin/2.1'
2016-01-26 14:09:38 +01:00
Jenkins for ownCloud
ba87178dee
[tx-robot] updated from transifex
2016-01-25 02:18:23 -05:00
James Botting
d8af949a6a
Alter sync engine to check new setting before displaying prompt
2016-01-24 18:45:29 +00:00
James Botting
74a8c4aae8
Add additional configuration option to toggle display of delete prompt
2016-01-24 18:45:12 +00:00
Jenkins for ownCloud
8de21cc37f
[tx-robot] updated from transifex
2016-01-24 02:18:22 -05:00
Jenkins for ownCloud
063444801a
[tx-robot] updated from transifex
2016-01-23 02:18:34 -05:00
Jocelyn Turcotte
46e384a2f2
OS X: The --strict option isn't supported on the build machine
...
XCode is too old.
2016-01-22 18:13:25 +01:00
Jocelyn Turcotte
5092243080
OS X: Fix macdeployqt not to embed symlinks when ran multiple times
...
ln has a special syntax to create the symlink inside the last path if it's
a directory (or a symlink to a directory).
Also pass --strict to codesign --verify to catch this kind of error.
2016-01-22 18:04:46 +01:00
Jocelyn Turcotte
110f3710be
OS X: Make sure Qt frameworks have the right structure
...
This fixes the codesign verification by making sure that the Qt
framework bundles follow the required structure described at:
https://developer.apple.com/library/ios/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html
2016-01-22 16:58:41 +01:00
Jocelyn Turcotte
6096a836a4
Do a codesign --verify before running spctl
...
codesign is less strict than spctl and gives more output.
codesign -d alone doesn't verify but only prints.
2016-01-22 16:54:04 +01:00
Jocelyn Turcotte
c3724068e5
Fix gen_sym_files.py trying to process non-macho files
...
Since it processes all files under PlugIns uncondisionally, it would
now try to process the Info.plist file in the FinderSyncExt bundle.
2016-01-22 16:48:53 +01:00
Christian Kamm
7eba784b0c
Share dialog: More error handling with password policy #4209
2016-01-22 14:49:30 +01:00
Jocelyn Turcotte
8486a2fd2b
Bring back the automatic authentication popups
...
Users have complained that they don't see the notification when it is
shown and are not aware that their files aren't syncing.
Remove the non-interactive credentials fetch logic and add make sure
that the shibboleth popup will flash in the taskbar instead.
This will still not allow the popup to show in front in all cases,
but this is a compromise that we have to chose.
This reverts commit dcb687929f .
Issue https://github.com/owncloud/enterprise/issues/990
2016-01-22 14:25:36 +01:00
Jenkins for ownCloud
f15f4aa886
[tx-robot] updated from transifex
2016-01-22 02:18:44 -05:00
Christian Kamm
3b60f6e238
Sharing: Fix resharing items with limited permissions #4357 #4358
2016-01-21 14:21:25 +01:00
Klaas Freitag
c23ae5aa14
Win Admin: Added script to create stable toolchain prj. in OBS
2016-01-21 11:40:53 +01:00
Jenkins for ownCloud
93986e0234
[tx-robot] updated from transifex
2016-01-21 02:18:29 -05:00
Olivier Goffart
47710d167a
SyncEngine: fix inode after move if the file has moved on the file system
...
This is the fix for issue #4370
Step to reproduce the bug:
1) have lots of files in directory "dir1"
2) do mkdir dir2 && mv dir1/* dir2
3) DURING the sync (which takes time because of the many moves) do mkdir dir3 && mv dir2/* dir3/
4) observe that files are PUT in the next sync
The problem is that SyncJournalFileRecord::SyncJournalFileRecord will fail to
get the inode after the forst move because the files are already moved on the
filesystem. Normaly it should use the inode from the discovery phase in that
case but that is not working because it comes from the remote node in case of
moves, so the code in SyncEngine::treewalkFile would not set the inode.
Test in https://github.com/owncloud/smashbox/pull/143
2016-01-20 13:49:12 +01:00
Christian Kamm
62ded39416
Update: Check checksum for renamed files #2983
...
This currently doesn't do much because we only compute content
checksums for .eml files.
2016-01-20 13:21:48 +01:00
Christian Kamm
1534dad5b2
Sharing: Allow only one share dialog per path #3184
2016-01-20 13:17:54 +01:00
Christian Kamm
f705c56cb3
AccountSettings: Auto-expand only single folders #4283
2016-01-20 12:41:52 +01:00
Christian Kamm
4d52838e2b
Share dialog: Error reporting with password policy #4209
2016-01-20 09:49:10 +01:00
Christian Kamm
7f44e83cc7
Share dialog: Remove unintended spinner when password required
2016-01-20 09:49:10 +01:00
Jenkins for ownCloud
2c6546f46f
[tx-robot] updated from transifex
2016-01-20 02:18:29 -05:00
Jenkins for ownCloud
76bf93e3de
[tx-robot] updated from transifex
2016-01-20 01:15:17 -05:00
Olivier Goffart
7a676a748a
AccountSettings: fix Add Folder button size #4373
2016-01-19 17:39:43 +01:00
Christian Kamm
17895f3a30
Win: Fix filesystem detection for exFAT workaround #2701
2016-01-19 10:00:12 +01:00
Daniel Molkentin
21e3df4f34
Add mac system tray fix as deployed on the build machine
...
Fixes #3918
2016-01-18 16:18:53 +01:00
Markus Goetz
f03f845d04
Changelog for 2.1.1
2016-01-18 13:34:00 +01:00
Jocelyn Turcotte
a87727844c
shell: Update binaries to fix the Directory Opus warning
2016-01-18 11:37:19 +01:00
Jenkins for ownCloud
e88410d07b
[tx-robot] updated from transifex
2016-01-18 02:18:25 -05:00
Jenkins for ownCloud
3f704a7a0e
[tx-robot] updated from transifex
2016-01-17 02:18:45 -05:00
Jenkins for ownCloud
81204ee0db
[tx-robot] updated from transifex
2016-01-16 02:18:48 -05:00
Olivier Goffart
d12c0939b9
Upload: Chunk size can be changed in the config file
...
Added a new "chunkSize" entry in the General group of the owncloud.cfg
which can be set to the size, in bytes, of the chunks.
This allow user with hude bandwidth to select more optimal chunk size
Issue #4354
2016-01-15 13:16:52 +01:00
Klaas Freitag
a41fbc0454
csync_private: Fix comment about size of file id buffer
2016-01-15 12:14:46 +01:00
Jenkins for ownCloud
9d6d14d623
[tx-robot] updated from transifex
2016-01-15 02:18:51 -05:00
Jocelyn Turcotte
439eddb523
OS X shell: Don't allow sharing sync roots #3505
2016-01-14 16:25:19 +01:00
Jocelyn Turcotte
7beb6f2234
Windows shell: Remove unneeded Winsock code #4356
2016-01-14 15:02:56 +01:00
Jocelyn Turcotte
19a3a10524
Windows: Fix the progress text being cut but a few pixels
...
QFontMetrics::boundingRect doesn't return the right size for this
font size for some reason, while it works well if we remove the
smaller point size adjustment for the progress font.
To avoid having to debug the font system in Qt just increase the
existing +2px adjustment to +5px so that it renders fine.
2016-01-14 13:01:18 +01:00
Jenkins for ownCloud
2e5f28d7c1
[tx-robot] updated from transifex
2016-01-14 02:19:05 -05:00
Olivier Goffart
bbedeed1c5
SyncEngine: For server older than 8.1, ignore invalid char in new directories
...
Server older than 8.1 cannot cope with invalid char in the filename
so we must not send them from the client. We were already checking
for new files, but not for renames or new directories.
https://github.com/owncloud/enterprise/issues/1009
2016-01-13 17:53:12 +01:00
Olivier Goffart
a18b13d56e
FolderDelegate: fix positions and margin
...
- Fix the margin of the progressbar to let some room for the '...' button
- Fix the size of the "Add Folder" button
2016-01-13 11:57:15 +01:00
Jocelyn Turcotte
31da3e98c9
Fix the folder option button click
...
The height adjustment done to place the button in the middle of the
non-error area was only done for rendering. Make sure that we do the
same adjustment when mapping click events as well.
Also replace some wrong occurences of aliasMargin*2 for margin.
2016-01-13 11:44:36 +01:00
Olivier Goffart
272755e1ec
ConfigFile: Create the directory when using --confdir and it does not exist
...
Previously we would fail to start if the directory was not existing.
This was working for relative directory, but it should also work for
absolute ones
https://github.com/owncloud/enterprise/issues/970
2016-01-13 10:31:02 +01:00
Jenkins for ownCloud
580b6e2349
[tx-robot] updated from transifex
2016-01-13 02:19:20 -05:00
Olivier Goffart
9800101748
Sharing: feedback when there is no result while searching for an user #4348
2016-01-12 14:36:13 +01:00
Olivier Goffart
1ed02f6494
Sharing: Display the error from the server when trying to share with users or group
2016-01-12 14:36:13 +01:00
Jocelyn Turcotte
bb5c370575
Windows: Update the overlay icon graphics #3105
...
The bug seems to be in Windows when it upscales an smaller icon for
HiDPI displays. It works fine if we provide a 256x256 size in the
ico files.
Use the new square icons also used on OS X that removes the share badge
and instead has a share icon only for the OK state. This means that we
can also remove 3 icons and release 3 slots in the registry for
overlay icons (only the first few are actually loaded by explorer).
This also adds a script that uses ImageMagick to convert our SVG icons
to Windows ico files. Since ImageMagick seems to have issue doing
proper antialiasing with pixels on the edge of icons, this also
slightly scale the icons to leave 2px on each edge, out of its
logical 128px width.
2016-01-12 11:46:05 +01:00
Jenkins for ownCloud
74b0d2d9f1
[tx-robot] updated from transifex
2016-01-12 02:19:07 -05:00
Jenkins for ownCloud
8c531873a8
[tx-robot] updated from transifex
2016-01-12 01:15:38 -05:00
Markus Goetz
9c9b9f3931
Activities: Fix color when row is selected
2016-01-11 16:52:37 +01:00
Markus Goetz
95615eaca7
Merge pull request #4338 from owncloud/mtimes
...
add note re mtime syncing
2016-01-11 16:44:56 +01:00
Jocelyn Turcotte
54c2c9ac4e
Windows: Fix HiDPI #3414
...
Use QT_DEVICE_PIXEL_RATIO=auto on Qt<=5.5 to enable automatic
scale factor settings on Windows. Also move the existing
Qt::AA_EnableHighDpiScaling logic to use the equivalent
QT_AUTO_SCREEN_SCALE_FACTOR=1 environment variable just to
keep the 5.5 and >=5.6 code at the same place.
2016-01-11 15:41:08 +01:00
Klaas Freitag
ea03f9da13
NSIS: Escape line endings for NSIS correctly.
...
This is supposed to fix #3519
2016-01-11 15:36:24 +01:00
Jenkins for ownCloud
536fd105ae
[tx-robot] updated from transifex
2016-01-11 02:19:09 -05:00
Klaas Freitag
d89edc35d2
csync-tests: Added some directory wildcard tests.
...
This was to verify client issue #1558
2016-01-10 12:04:07 +01:00
Jenkins for ownCloud
4d8f81d802
[tx-robot] updated from transifex
2016-01-10 02:19:07 -05:00
Jenkins for ownCloud
ed6f76ca28
[tx-robot] updated from transifex
2016-01-10 01:15:43 -05:00
Jenkins for ownCloud
63bc383dfa
[tx-robot] updated from transifex
2016-01-09 02:19:19 -05:00
Markus Goetz
0f658e5ca9
OS X: Don't install legacy Finder plugin on >= 10.10 #3587 (v2)
2016-01-08 17:54:10 +01:00
Jenkins for ownCloud
49824b930d
[tx-robot] updated from transifex
2016-01-08 02:19:04 -05:00
Christian Kamm
abf5a5ad1e
Propagation: Fix dir <-> file changes propagating to server #4302
...
* Ensure every time a file becomes a directory or the other way around
the item is flagged as INSTRUCTION_TYPE_CHANGE.
* Delete the badly-typed entity if necessary in the propagation jobs.
2016-01-08 05:38:08 +01:00
Christian Kamm
d4b6b5cb1d
Propagator: Remove warning when moving out of deleted folder
2016-01-08 05:38:08 +01:00
Jocelyn Turcotte
ce6f90397a
Fix the rendering of the red error box text
...
QPainter::drawText uses the top of the font for the y position of its
rect argument, but uses the baseline when using a point argument.
Also use the margin variable that matches the font used instead of
the aliasMargin and make sure that the margin is only added between
the box and the text once.
2016-01-07 18:02:35 +01:00
Olivier Goffart
bb6a50be02
SettingsDialog: show "Account" for the tab name for branded client
...
https://github.com/owncloud/enterprise/issues/863
2016-01-07 17:59:21 +01:00
Jocelyn Turcotte
e7e918dafe
Only clean the Not Synced list for the current account #3171
2016-01-07 16:14:18 +01:00
Olivier Goffart
81b7798ac2
HttpCredentials::slotAuthentication: fix comment
...
The recent revert did no fix the comment
2016-01-07 14:58:02 +01:00
Olivier Goffart
868d4c781a
HTTP creds: Fix GUI blocking for 5 seconds when entering wrong password
...
The Qt HTTP thread calls authenticationRequired (indirectly) using a
BlockingQueuedConnection. So when we call invalidateToken from slot
connected to this signal and end up calling QNAM::clearAccessCache which
waits on the thread for 5 seconds
Backtraces:
Qt HTTP thread:
#0 0x00007ffff20c707f in pthread_cond_wait@@GLIBC_2.3.2 ()
#1 0x00007ffff43f0c0b in QWaitConditionPrivate::wait
#2 QWaitCondition::wait
#3 0x00007ffff43ea06b in QSemaphore::acquire
#4 0x00007ffff45dcf6f in QMetaObject::activate
[...]
#9 0x00007ffff45dd607 in QMetaObject::activate
#10 0x00007ffff4edbaf7 in QHttpNetworkReply::authenticationRequired
#11 0x00007ffff4e0b2b4 in QHttpNetworkConnectionPrivate::handleAuthenticateChallenge
#12 0x00007ffff4e10753 in QHttpNetworkConnectionChannel::handleStatus
#13 0x00007ffff4e11cc9 in QHttpNetworkConnectionChannel::allDone
#14 0x00007ffff4e14605 in QHttpProtocolHandler::_q_receiveReply
Main Thread:
#0 0x00007ffff20c7428 in pthread_cond_timedwait@@GLIBC_2.3.2 ()
#1 0x00007ffff43f0b56 in QWaitConditionPrivate::wait_relative (time=5000, this=0x136c580)
#2 QWaitConditionPrivate::wait (time=5000, this=0x136c580)
#3 QWaitCondition::wait (this=this@entry=0x136c788, mutex=mutex@entry=0x136c760, time=time@entry=5000)
#4 0x00007ffff43efa6e in QThread::wait (this=<optimized out>, time=time@entry=5000)
#5 0x00007ffff4e1edd3 in QNetworkAccessManagerPrivate::clearCache
#6 0x00007ffff7b6fb03 in OCC::HttpCredentials::invalidateToken()
#7 0x000000000057adb4 in OCC::AccountState::slotInvalidCredentials()
#8 0x000000000057ac76 in OCC::AccountState::slotConnectionValidatorResult(OCC::ConnectionValidator::Status, QStringList const&) ()
#9 0x00000000005ab45c in OCC::AccountState::qt_static_metacall(QObject*, QMetaObject::Call, int, void**)
#10 0x00007ffff45dcd30 in QMetaObject::activate
#11 0x00007ffff7b78671 in OCC::ConnectionValidator::connectionResult(OCC::ConnectionValidator::Status, QStringList) ()
#12 0x00007ffff7ae2514 in OCC::ConnectionValidator::reportResult(OCC::ConnectionValidator::Status) ()
#13 0x00007ffff7ae39b7 in OCC::ConnectionValidator::slotAuthFailed(QNetworkReply*) ()
#14 0x00007ffff7b784a9 in OCC::ConnectionValidator::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#15 0x00007ffff45dcd30 in QMetaObject::activate
#16 0x00007ffff7b766dc in OCC::AbstractNetworkJob::networkError(QNetworkReply*)
#17 0x00007ffff7af9f6e in OCC::AbstractNetworkJob::slotFinished()
#18 0x00007ffff7b7654d in OCC::AbstractNetworkJob::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#20 0x00007ffff45dd607 in QMetaObject::activate
#21 0x00007ffff4edd143 in QNetworkReply::finished
#22 0x00007ffff4e3fec7 in QNetworkReplyHttpImplPrivate::finished
#23 0x00007ffff4e41818 in QNetworkReplyHttpImpl::close
#24 0x00007ffff7b7047b in OCC::HttpCredentials::slotAuthentication(QNetworkReply*, QAuthenticator*) ()
#25 0x00007ffff7b79092 in OCC::HttpCredentials::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#27 0x00007ffff45dd607 in QMetaObject::activate
#28 0x00007ffff4e1d6fb in QNetworkAccessManager::authenticationRequired
#29 0x00007ffff4e1ea07 in QNetworkAccessManagerPrivate::authenticationRequired
#30 0x00007ffff4e3c784 in QNetworkReplyHttpImplPrivate::httpAuthenticationRequired
Another case of Main Thread:
#5 0x00007ffff4e1edd3 in QNetworkAccessManagerPrivate::clearCache
#6 0x00007ffff7b6fb03 in OCC::HttpCredentials::invalidateToken()
#7 0x000000000057b1e4 in OCC::AccountState::slotInvalidCredentials() ()
#8 0x00000000005abb8a in OCC::AccountState::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#9 0x00007ffff45dcd30 in QMetaObject::activate
#10 0x00007ffff7b76ed5 in OCC::Account::invalidCredentials() ()
#11 0x00007ffff7ad55f5 in OCC::Account::handleInvalidCredentials()
#12 0x00007ffff7afa69a in OCC::AbstractNetworkJob::slotFinished()
#13 0x00007ffff7b7654d in OCC::AbstractNetworkJob::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#15 0x00007ffff45dd607 in QMetaObject::activate
#16 0x00007ffff4edd143 in QNetworkReply::finished
#17 0x00007ffff4e3fec7 in QNetworkReplyHttpImplPrivate::finished
#18 0x00007ffff4e41818 in QNetworkReplyHttpImpl::close
#19 0x00007ffff7b7047b in OCC::HttpCredentials::slotAuthentication(QNetworkReply*, QAuthenticator*) ()
#20 0x00007ffff7b79092 in OCC::HttpCredentials::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#22 0x00007ffff45dd607 in QMetaObject::activate
#23 0x00007ffff4e1d6fb in QNetworkAccessManager::authenticationRequired
2016-01-07 14:46:49 +01:00
Christian Kamm
71ad94ddb2
Fix crash when deleting account while sync is running #4337
2016-01-07 13:54:26 +01:00
Olivier Goffart
06ffc44073
Fix RTL languages in sync dialog #4336
2016-01-07 13:37:46 +01:00
Jocelyn Turcotte
e9ba7c612e
Keep only active entries in the Not Synced list #3171
...
Now that we have a separate list for files that could not be synced,
we can make sure that it only shows entries for files that are still
not in sync with the server. This allows the user to treat this list
as action items in order to get everything synced, including the
blacklist.
Simply remove the keep-errors logic that was used when the lists were
merged to achieve this result.
2016-01-07 11:37:50 +01:00
Jenkins for ownCloud
fd7afa87b7
[tx-robot] updated from transifex
2016-01-07 02:19:23 -05:00
Daniel Molkentin
51a70cee3d
Document all owncloudcmd switches in man page/doc
...
Fixes #4290
2016-01-06 22:33:39 +01:00
Carla Schroder
aafab73a82
add note re mtime syncing
2016-01-06 12:45:23 -08:00
Daniel Molkentin
e3c1d96519
Update German translation
...
Changes performed on transifex.
Resolves #4255
2016-01-06 17:03:39 +01:00
Daniel Molkentin
9c7066ac47
Translation cleanups
...
- Disambiguation
- Remove potentially illigitmate concatenations
2016-01-06 16:50:59 +01:00
Daniel Molkentin
cede7ec971
Work around layouting issue for RTL languages
...
This has been fixed in the meanwhile, but we are still shipping
with Qt 5.4. Also, some Linux Distros will still have older Qt
versions.
Addresses issue #4301
2016-01-06 12:52:58 +01:00
Jocelyn Turcotte
2f355c473a
Don't show parent folders in the error list #3796
...
The error status of children should only be used for the etag logic.
The SocketApi uses a path matching system to do this and the UI should
report errors only for individual involved files/directories.
2016-01-06 12:37:35 +01:00
Jocelyn Turcotte
a63ebe0904
Bring back the red box for errors #3796
...
This use the previous code by resetting the progress to hide
the progress back and then return errors in the FolderErrorMsg
data role of the folder model.
This also remove the unused FolderRemotePath role, remove FolderStatus
in favor of invalidating all roles in dataChanged and make sure
that the SyncRunning role is transfered properly from the SyncResult
to show the warning icon during sync.
2016-01-06 12:37:35 +01:00
Markus Goetz
ef9483c82d
Revert "HTTP Creds: Do not send the password at every request"
...
We need this for #4326
This reverts commit ae17f58b80 .
2016-01-06 11:50:52 +01:00
Jenkins for ownCloud
10f1ed771a
[tx-robot] updated from transifex
2016-01-06 02:19:20 -05:00
Markus Goetz
93e8bbab10
OS X: Don't install legacy Finder plugin on >= 10.10 #3587
2016-01-05 17:43:48 +01:00
Jocelyn Turcotte
62df938465
Rename SyncFileStatus::STATUS_SYNC to STATUS_UPTODATE
...
Also use STATUS_UPDATED instead to match SyncFileItem::Success in the SocketAPI.
2016-01-05 15:41:15 +01:00
Markus Goetz
634dad033f
Debug: Attempt to make log more useful
2016-01-05 15:12:00 +01:00
Jocelyn Turcotte
6e3809528e
Fix OK statuses not being broadcasted during a sync #3944
...
Since the presence of any path in SyncEngine::_syncedItems
would translate in a SYNC status, platforms that don't refresh
all their status cache after an UPDATE_VIEW message like OS X
or Windows would keep displaying that status even after all
files are successfully synchronized.
- Read SyncFileItem::_status to determine the status to display mid-sync
- Match moved paths also to _renameTarget since this might be the
path to match
- Make sure that PropagateDirectory jobs also set SyncFileItem::_status
properly
2016-01-05 15:08:26 +01:00
Markus Goetz
60a6b2b0c3
OS X: Also show desktop notifications when app is active
2016-01-05 13:33:05 +01:00
Christian Kamm
2662203fb7
Windows: Fix deleting and replacing of read-only files #4308
2016-01-05 13:15:59 +01:00
Olivier Goffart
1bb76f5343
Attempt to recover from backup restoration on the server
...
If all the files bring us to past timestamp, it is possibly a backup
restoration in the server. In which case we want don't want to just
overwrite newer files with the older ones.
Issue #2325
2016-01-05 12:14:18 +01:00
Christian Kamm
d4edab02b0
Propagator: Deal with directories becoming files #4302
...
Note, in particular the revised order of directory deletion jobs.
2016-01-05 10:26:41 +01:00
Christian Kamm
5cc4c03b6a
Propagator: Deal with files becoming directories #4302
...
This needed adjustments in reconcile, to mark the item as SYNC
as well as additions to the LocalMkdir job.
2016-01-05 10:26:41 +01:00
Jenkins for ownCloud
5382901859
[tx-robot] updated from transifex
2016-01-05 03:04:45 -05:00
Jocelyn Turcotte
2e7a3f9e37
Fix a missing sync-exclude.lst file not failing the sync
...
After c3cf6aef7d the invokeMethod calls
should be adjusted to pass the new method arguments.
The result was currently a passing sync with this error message on
the console:
QMetaObject::invokeMethod: No such method OCC::Folder::slotSyncFinished()
2016-01-04 17:01:21 +01:00
Markus Goetz
c8b3df6668
OS X: Fix alignment of "Copy" button in protocol #4207
2016-01-04 16:16:15 +01:00
Grigorii Horos
69d9840b89
Dolphin integration: use system icons for labels in KDE
...
Cherry-picked from https://github.com/owncloud/client/pull/4252
2016-01-04 12:57:24 +01:00
Olivier Goffart
639301e9e9
Merge remote-tracking branch 'origin/2.1'
...
Conflicts:
VERSION.cmake
2016-01-04 12:38:59 +01:00
Olivier Goffart
970cdcfdbb
SocketAPI: SHARE: Fix the paths when creating the share dialog
...
The socket api uses native folder separator. We need to use QDir::cleanPath
for anything else so we only work with '/' everywhere else in the code
This fixes the sharing dialog on window.
Issue #4311
2016-01-04 12:06:09 +01:00
Daniel Molkentin
0ef9bd9e23
Remove bearer plugins
...
Causes regressions due to constant Wifi scanning
2016-01-04 11:54:11 +01:00
Daniel Molkentin
16030a61eb
Enable HiDpi scaling with Qt 5.6
2016-01-04 11:50:00 +01:00
Daniel Molkentin
5487fc1f9c
Ensure Qt translator does always get loaded.
2016-01-04 11:50:00 +01:00
Jenkins for ownCloud
92677da3e4
[tx-robot] updated from transifex
2016-01-04 02:19:22 -05:00
Jenkins for ownCloud
6d38d4e085
[tx-robot] updated from transifex
2016-01-03 02:19:00 -05:00
Jenkins for ownCloud
a16361e823
[tx-robot] updated from transifex
2015-12-31 02:19:14 -05:00
Jenkins for ownCloud
03415b286c
[tx-robot] updated from transifex
2015-12-29 02:18:39 -05:00
Jenkins for ownCloud
72a503e93f
[tx-robot] updated from transifex
2015-12-28 02:19:02 -05:00
Jenkins for ownCloud
6a6bce4bef
[tx-robot] updated from transifex
2015-12-25 02:19:06 -05:00
Jenkins for ownCloud
e64833a217
[tx-robot] updated from transifex
2015-12-23 02:19:07 -05:00
Klaas Freitag
a759ba1d9e
Do not use nullptr, old compilers die on it.
2015-12-22 15:07:51 +01:00
Klaas Freitag
7ed243d3cd
Move version to 2.1.1 git.
2015-12-22 11:18:20 +01:00
Klaas Freitag
afa8d671be
shell integration: Create a plugin for nemo out of the nautilus one.
2015-12-22 11:05:00 +01:00
Klaas Freitag
c607707580
Backport of #4245
2015-12-22 10:26:13 +01:00
Klaas Freitag
8f26bb698d
Merge pull request #4245 from masoudcs/masoudcs-patch-1
...
Fixing bug in opening Activity log from tray icon menu 'Recent Changes/Details...'
2015-12-22 10:15:14 +01:00
Olivier Goffart
a0b913f65d
gui: Word Wrap in QInputDialog ( #4197 )
2015-12-22 10:08:17 +01:00
Jenkins for ownCloud
271b2f8c5b
[tx-robot] updated from transifex
2015-12-22 02:19:06 -05:00
Olivier Goffart
cf5b1e401c
csync_vio_local_stat: Win: fetch mtime and size if not previously fetched
...
Since owncloud 2.1, csync_vio_local_stat was optimized because readdir
would already fetch most of the info. This works for the discovery,
but not later. And we used this function later for symliks and co.
So this fixes the .lnk on windows
Issue #4300
2015-12-21 14:25:30 +01:00
Olivier Goffart
11174ddf4c
PropagateLocalRemove: Make it possible to remove read only files ( #4277 )
2015-12-21 13:25:10 +01:00
Olivier Goffart
48a0ffdc9e
Systray: Use the original name for the rename notification #4295
...
Otherwise it shows twice as "newname was renamed to newname".
Because _file is set to the new name in PropagateLocalRename::start
2015-12-21 11:06:39 +01:00
Jenkins for ownCloud
3664be1480
[tx-robot] updated from transifex
2015-12-21 02:18:42 -05:00
Jenkins for ownCloud
c5cd584b63
[tx-robot] updated from transifex
2015-12-19 02:19:06 -05:00
Jenkins for ownCloud
ca1c8a0121
[tx-robot] updated from transifex
2015-12-17 02:19:04 -05:00
Jenkins for ownCloud
3649c90605
[tx-robot] updated from transifex
2015-12-16 02:19:03 -05:00
Jenkins for ownCloud
89cb27f224
[tx-robot] updated from transifex
2015-12-13 02:18:46 -05:00
Jenkins for ownCloud
0d808114b6
[tx-robot] updated from transifex
2015-12-11 02:19:06 -05:00
Christian Kamm
0555c88425
User Sharing: Match user names and case insensitive #4269
2015-12-10 14:56:15 +01:00
Christian Kamm
e2d1a5a41d
Share UI: Allow typing in a sharee
...
Previously you *had* to select one of the completion options, even
if the text in the lineedit was identical to one of the options.
2015-12-10 13:49:47 +01:00
Christian Kamm
df1b309b36
FolderWatcher: Remove IN_DONT_FOLLOW #3475
...
This fixes the case of the root folder being symlinked.
2015-12-10 13:05:43 +01:00
Christian Kamm
e3b53b7e74
Log: Remove scary messages :)
2015-12-10 11:50:19 +01:00
Christian Kamm
d8d9fcf2f4
Silence warning about zorder in .ui file.
2015-12-10 11:10:49 +01:00
Christian Kamm
ae806e8214
Merge remote-tracking branch 'origin/2.1'
2015-12-10 11:07:20 +01:00
Christian Kamm
8b5474ff67
SocketAPI: Don't use ERROR for SoftErrors #3944
2015-12-10 11:02:38 +01:00
Christian Kamm
f65a29df5d
SocketAPI: Ensure messages are consistent #3944
...
Before we blindly broadcasted the result of a sync action. That was
often different from what a subsequent FILE_STATUS query would report.
2015-12-10 10:43:17 +01:00
Christian Kamm
fd18c565b0
SocketAPI: Fix file error cache #3944
2015-12-10 10:43:17 +01:00
Christian Kamm
fbb85fab81
Activity tab doesn't vanish with too many accounts #4188
...
The bug was introduced by a bad merge.
2015-12-10 09:43:16 +01:00
Jenkins for ownCloud
db0674dc76
[tx-robot] updated from transifex
2015-12-10 02:40:19 -05:00
Christian Kamm
3572e7ffa4
Activity: Improve formatting of copied data #3498
2015-12-09 15:49:30 +01:00
Christian Kamm
fe75c6ad28
Wizard: Find user:pw even if redirected #4265
2015-12-09 14:48:51 +01:00
Christian Kamm
3de8f27a02
Force account wizard when last account is deleted #4266
2015-12-09 11:41:43 +01:00
Christian Kamm
4dfce57a58
Creds: Forget password on explicit sign-out #4241
2015-12-09 11:31:37 +01:00
Christian Kamm
179b25d289
AccountWizard: Don't crash when sync is running #4221
...
Running FolderMan::setupFolders() is redundant and just a leftover
from before multiaccount.
2015-12-09 09:08:21 +01:00
Jenkins for ownCloud
230b6bc547
[tx-robot] updated from transifex
2015-12-09 02:19:07 -05:00
Christian Kamm
a2eee7e349
Share UI: Hide 'allow editing' for files #4211
2015-12-08 15:37:17 +01:00
Christian Kamm
cec4b803cf
Share UI: Hide 'can share' if capability missing #4231
2015-12-08 12:58:56 +01:00
Christian Kamm
1a519ac1fb
Share UI: Respect enfore-expire #4235
2015-12-08 12:16:05 +01:00
Christian Kamm
d92c8bec86
UI: Sign in/out -> Log in/out #4249
2015-12-08 12:05:14 +01:00
Christian Kamm
eb28d171f3
Doc: Add checksum overview
2015-12-08 10:59:42 +01:00
Jenkins for ownCloud
fdeb7ccda6
[tx-robot] updated from transifex
2015-12-08 02:21:51 -05:00
Daniel Molkentin
73acad2c92
FF doc subrepo to adjust to new .org theming
2015-12-08 01:02:46 +01:00
Jenkins for ownCloud
7eca3c9d3b
[tx-robot] updated from transifex
2015-12-07 02:18:25 -05:00
Jenkins for ownCloud
64ca94d960
[tx-robot] updated from transifex
2015-12-05 02:18:34 -05:00
Jenkins for ownCloud
c01220fd95
[tx-robot] updated from transifex
2015-12-04 02:18:36 -05:00
Daniel Molkentin
4d175ae77b
Merge pull request #4247 from owncloud/desktopshare
...
added desktop sharing
2015-12-03 20:19:47 +01:00
Carla Schroder
78df3a35b4
added desktop sharing
2015-12-03 10:29:44 -08:00
Olivier Goffart
68057c1c5a
Sharee.cpp: Get rid of lambdas because we still need to support GCC 4.4
2015-12-03 14:47:59 +01:00
Jürgen Weigert
e67bb1c5ce
Merge pull request #4201 from owncloud/jnweiger-patch-1
...
improved linux build instructions.
2015-12-03 14:05:24 +01:00
Jürgen Weigert
f2c9a49c50
fixed formatting lines 212 215
2015-12-03 14:04:43 +01:00
Masoud Kazemi
903dd8acef
Fixing bug in opening Activity log from tray icon menu 'Recent Changes/Details...'
2015-12-03 15:25:59 +03:30
Daniel Molkentin
480861efb6
Editorial changes to ChangeLog
2015-12-03 10:06:06 +01:00
Daniel Molkentin
9a252995c2
Merge pull request #4243 from owncloud/more21update
...
more updates to 2.1 user manual
2015-12-03 09:47:02 +01:00
Jenkins for ownCloud
9a9446d13d
[tx-robot] updated from transifex
2015-12-03 02:18:58 -05:00
Carla Schroder
3d71d6c96f
more image fixes
2015-12-02 12:10:20 -08:00
Carla Schroder
41c3c107d4
clean up screenshot
2015-12-02 12:06:43 -08:00
Carla Schroder
24cad42a86
corrections to 2.1 user manual
2015-12-02 12:02:55 -08:00
Carla Schroder
1a564b1672
more updates to 2.1 user manual
2015-12-02 11:52:42 -08:00
Markus Goetz
c4006795cc
OS X: Attempt to fix account add oddities #4237
2015-12-02 17:59:41 +01:00
Klaas Freitag
cf06083d1b
Utilities: Include math.h because of floor()
2015-12-02 17:56:37 +01:00
Jenkins for ownCloud
89004437c5
[tx-robot] updated from transifex
2015-12-02 11:47:06 -05:00
Jenkins for ownCloud
f0e3eca8a1
[tx-robot] updated from transifex
2015-12-02 11:24:47 -05:00
Markus Goetz
d15cf0c2ff
Sharing: Remove mentioning of remote users from dialog #4234
2015-12-02 16:44:29 +01:00
Klaas Freitag
770ad54229
AccountSettings: Update the visibility of the add account button.
...
That fixes #4238
2015-12-02 16:33:37 +01:00
Markus Goetz
a75209d104
Account: Invalidate credentials when clicking "Sign out" #4241
2015-12-02 16:31:58 +01:00
Daniel Molkentin
ab5e543099
Use user-readable short folder path in the context menu
2015-12-02 15:46:42 +01:00
Klaas Freitag
451ebd447b
Merge pull request #4169 from owncloud/2.1_file_exists_before_share
...
[Sharing] Make sure the file is actually synced to the server
2015-12-02 13:40:42 +01:00
Olivier Goffart
1f8af40361
Dolphin plugin: Fix compiler warnings
2015-12-02 13:14:15 +01:00
Olivier Goffart
685f2a259f
csync: remove PLUGIN install patch from cmake files
...
This conflicts with the KDE_INSTALL_PLUGINDIR and prevent the
dolphin plugin to be installed at the right location.
Since csync no longer have plugin, this can be removed
2015-12-02 13:13:41 +01:00
Olivier Goffart
e27374324d
AccountSettings: Remove the F5 reset folder shortcut
...
This secret key was used to wipe the database. In the past this was
usefull because of many bugs, but now this is not usefull anymore.
And cause trouble because it also erase the selective sync list.
Issue #4182
2015-12-02 12:27:53 +01:00
Klaas Freitag
4a2b5f7cc8
Merge pull request #4228 from owncloud/enforce_password-block
...
[Sharing] Do not allow users to uset the password if it is enforced
2015-12-02 10:07:04 +01:00
Klaas Freitag
52dc55d044
ShareLinkWidget: Stop editing progress animation if passwd is required.
2015-12-02 10:06:34 +01:00
Klaas Freitag
e6ab047751
ShareLinkWidget: Set state of passwd checkbox always.
2015-12-02 10:05:56 +01:00
Jenkins for ownCloud
4f5cf01cbc
[tx-robot] updated from transifex
2015-12-02 02:19:01 -05:00
Jenkins for ownCloud
442cc63d22
[tx-robot] updated from transifex
2015-12-02 01:15:38 -05:00
Markus Goetz
c24a8ba208
Account removal: More crash fixes for Windows
...
Seems things happen a bit different here, maybe because of paint events.
For #4229 #4202
2015-12-01 19:21:52 +01:00
Markus Goetz
db7d70a929
Account removal: Do it inside global application object
...
For #4229 #4202
2015-12-01 16:32:04 +01:00
Daniel Molkentin
d2f1c141d8
Merge pull request #4224 from owncloud/21update
...
updates for 2.1 release
2015-12-01 15:48:35 +01:00
Roeland Jago Douma
01faf102ba
[Sharing] Do not allow users to uset the password if it is enforced
2015-12-01 12:43:14 +01:00
Olivier Goffart
76d1296053
Disable some code that needs lambda with old GCC
...
It's just a feature that was not there in 2.0
It means that removed folder stay on the undecided list if it is removed
from the server until the user press apply in the selective sync widget.
Not a very bad bug anyway.
2015-12-01 10:30:11 +01:00
Jenkins for ownCloud
559bf75189
[tx-robot] updated from transifex
2015-12-01 02:19:24 -05:00
Carla Schroder
339caf9dc8
updates for 2.1 release
2015-11-30 17:09:27 -08:00
Klaas Freitag
b26c36b4bf
Merge pull request #4219 from owncloud/fix_link_share_stable8
...
[Sharing] Default capabilitie for link sharing
Fixes #4218
2015-11-30 18:13:34 +01:00
Roeland Jago Douma
c79879aa07
[Sharing] Default capabilitie for link sharing
...
Required to fix sharing for pre 8.1 servers
2015-11-30 16:55:06 +01:00
Klaas Freitag
e85475780f
Merge pull request #4217 from owncloud/sane_file_permissions
...
[Sharing] Files should not have create permissions
Fixes #4216
2015-11-30 15:52:24 +01:00
Roeland Jago Douma
b033a8e731
[Sharing] Files should not have create permissions
2015-11-30 15:47:10 +01:00
Jenkins for ownCloud
0b5b4a5eea
[tx-robot] updated from transifex
2015-11-30 02:22:16 -05:00
Daniel Molkentin
af0d0bd2ac
CMake: Fix typo
2015-11-30 01:05:18 +01:00
Daniel Molkentin
48097467f9
CMake: fix CMake 2.6 compatibility
...
... by replacing CONFIG by NO_MODULE option in find package
From the manual: "The CONFIG option may be used to skip Module mode
explicitly and switch to Config mode. It is synonymous to using
NO_MODULE."
2015-11-30 01:05:12 +01:00
Daniel Molkentin
895f0b29aa
Merge remote-tracking branch 'origin/2.1'
2015-11-30 00:47:10 +01:00
Jenkins for ownCloud
499400916d
[tx-robot] updated from transifex
2015-11-29 02:19:01 -05:00
Jenkins for ownCloud
3f0d575df7
[tx-robot] updated from transifex
2015-11-28 02:19:04 -05:00
Roeland Douma
4cb9d6763b
Merge pull request #4213 from owncloud/fix-share-dialog-displaynames-2.1
...
show displaynames of users in share dialog instead of userid
2015-11-27 15:37:54 +01:00
Arthur Schiwon
d62c51890e
show displaynames of users in share dialog instead of userid
2015-11-27 15:19:39 +01:00
Jenkins for ownCloud
10707c8288
[tx-robot] updated from transifex
2015-11-27 02:19:17 -05:00
Klaas Freitag
b896d8aa15
ActivityWidget: Fix type ( #4204 )
2015-11-26 21:41:31 +01:00
Christian Kamm
9e66a6bec6
Settings dialog: Fix crash when deleting account #4202
2015-11-26 13:27:20 +01:00
Klaas Freitag
17566febe9
Updated Changelog
2015-11-26 13:24:36 +01:00
Jürgen Weigert
f54f48615d
Update building.rst
...
ah, and the instructions miss the 'cd client' before git submodule init.
2015-11-26 12:06:32 +01:00
Jürgen Weigert
06bb97e6d9
Update building.rst
2015-11-26 12:02:23 +01:00
Jürgen Weigert
0763f65329
improved linux build instructions.
...
I am using :: lists, as the `` versions mangle multi-line commands all in one long line.
The cmake command should just end in .., not in ../client
2015-11-26 11:55:23 +01:00
Jenkins for ownCloud
db5a86bc06
[tx-robot] updated from transifex
2015-11-26 02:19:03 -05:00
Daniel Molkentin
2d604cee25
Qt: Add Windows-specific patches OBS, also a QNAM fix
2015-11-25 22:36:37 +01:00
Klaas Freitag
e3a846bb1f
SyncJournalTest: Use valid time for the tests.
2015-11-25 22:16:29 +01:00
Klaas Freitag
aaa5c1bc5f
Test syncjournaldb: Fix comparison of two QDateTime objects.
...
Only compare full seconds as milliseconds may float.
2015-11-25 21:13:50 +01:00
Klaas Freitag
1ad8e539aa
SyncJournalFileRecord: Fix comparison operator
...
Compare only full seconds, as milliseconds can disappear during storage
of the database.
This is needed to fix the syncjournaldb test reliably. And maybe
elsewhere.
Also see
http://www.qtcentre.org/threads/13618-Problem-with-comparing-two-QDateTime-objects
2015-11-25 21:11:58 +01:00
Klaas Freitag
29e2877d35
NautilusPlugin: Fix behaviour with files with a colon in the name.
2015-11-25 15:11:12 +01:00
Klaas Freitag
a708f8d8ad
NautilusPlugin: Fix detection of the OK status
...
Consider OK+SHW also as ok, and enable the ownCloud actions.
2015-11-25 15:11:12 +01:00
Klaas Freitag
8777982629
NautilusPlugin: Fix detection of top level sync folder.
2015-11-25 15:11:12 +01:00
Roeland Douma
f1435c86ed
Merge pull request #4199 from owncloud/permission_dropdown
...
[Sharing] Permissions now in dropdown menu
2015-11-25 14:04:39 +01:00
Roeland Jago Douma
ece164f679
[Share] Use more icon
2015-11-25 14:02:45 +01:00
Christian Kamm
698f47d5ad
Blacklist: Treat all 403s the same #4071
...
We can't detect firewall errors due to error message localization.
2015-11-25 12:49:57 +01:00
Christian Kamm
1aa570326e
Tests: Add a perl test for eml checksums #3235
2015-11-25 12:48:24 +01:00
Daniel Molkentin
1cc9070a50
Qt patches: Tweak more for Qt 5.4.0
2015-11-25 12:42:58 +01:00
Daniel Molkentin
127c107094
Ensure patches apply cleanly, drop patch 14
2015-11-25 11:49:34 +01:00
Roeland Jago Douma
f1faf8745a
[Sharing] Permissions now in dropdown menu
...
As discusses with jan.
* Detailed permissions displayed in qtoolboxmenu
* Made share rows slightly smaller
Bug fix:
* Do not show delete permissions for file shares
2015-11-25 11:26:21 +01:00
Daniel Molkentin
60a51f8085
Add more Qt patches
2015-11-25 10:40:41 +01:00
Christian Kamm
df63579071
Blacklist: Firewall errors are silenced for up to 1h only #4071
2015-11-25 10:39:43 +01:00
Christian Kamm
5216648d0b
Share dialog: Work around painting bug #4189
2015-11-25 10:09:41 +01:00
Roeland Jago Douma
fcdab1e804
[Sharing] Also add sync status to SHARE_STATUS command
2015-11-25 09:40:21 +01:00
Roeland Jago Douma
9f15ba3972
[Sharing] Make sure the file is actually synced to the server
...
Before we attemt any sharing make sure the file is synced to the server.
2015-11-25 09:22:20 +01:00
Jenkins for ownCloud
c6a65c692e
[tx-robot] updated from transifex
2015-11-25 02:19:03 -05:00
Jenkins for ownCloud
b468767184
[tx-robot] updated from transifex
2015-11-25 01:15:38 -05:00
Markus Goetz
76ce9ff8c4
Activity List: Improve double click handling on filenames #4168
2015-11-24 14:25:16 +01:00
Christian Kamm
23ed68c8dd
Re-apply ee69ab2021
2015-11-24 13:45:02 +01:00
Christian Kamm
2982c79444
Settings: Fix "Choose what to sync" #4187
...
There was a duplicate connect() due to a merge problem (?) in
7e4c0bd515
2015-11-24 13:41:00 +01:00
Christian Kamm
7e56408331
SelectiveSync: Show Apply/Cancel less
...
Before the selective sync status text and apply/cancel buttons
were shown as soon as any folder was expanded. This changes it
to only show when the model is dirty (or a big folder confirmation
is needed).
This is nice because we auto-open the folder list sometimes
and having the apply/cancel buttons visible makes users think a
decision is needed.
2015-11-24 13:01:10 +01:00
Christian Kamm
bcfdcec3ee
Share dialog: Adjust layout #4119
2015-11-24 12:30:53 +01:00
Christian Kamm
f96d94f143
ShareDialog: Only link share if capabilities allow #4179
2015-11-24 11:58:10 +01:00
Christian Kamm
adea301e5b
Blacklist: Clear on successful chunk upload #3934
2015-11-24 10:09:55 +01:00
Christian Kamm
f9dc569b0a
Share dialog: Don't close on enter
...
Setting default=false was not enough.
2015-11-24 09:58:18 +01:00
Christian Kamm
f7932bb0c7
ShareDialog: Completion uses MatchContains #4123
...
For Qt 5.2.0+ only.
2015-11-24 09:10:26 +01:00
Jenkins for ownCloud
f20e052ad7
[tx-robot] updated from transifex
2015-11-24 02:19:20 -05:00
Jenkins for ownCloud
02daca9cb9
[tx-robot] updated from transifex
2015-11-24 01:15:44 -05:00
Markus Goetz
b52a3a415c
Connectivity: Improve reconnecting after network change/disconnect #4167
2015-11-23 21:48:26 +01:00
Markus Goetz
33dcb0c8d9
PropagateLocalRemove: Add debug
...
Was not in log so far
2015-11-23 21:48:25 +01:00
Markus Goetz
709da37be2
Activities: Only emit debug when actually refreshing
2015-11-23 21:48:25 +01:00
Christian Kamm
2458f07ca1
Checksums: Reuse the discovery checksum where possible
2015-11-23 14:13:10 +01:00
Christian Kamm
6cf5fc7f7d
Permissions: Keep more user permissions
...
t4.pl discovered that it'd needlessly override permissions sometimes
2015-11-23 13:24:05 +01:00
Christian Kamm
10db6cee6c
Rename files
2015-11-23 12:09:25 +01:00
Christian Kamm
3b7927366a
csync_update: Remove disabled inode check
2015-11-23 12:01:42 +01:00
Christian Kamm
a25f094c4c
Checksums: Don't reupload if size and checksum are unchanged #3235
...
* Compute the content checksum (in addition to the optional
transmission checksum) during upload (.eml files only)
* Add hook to compute and compare the checksum in csync_update
* Add content checksum to database, remove transmission checksum
2015-11-23 11:59:56 +01:00
Christian Kamm
bdf830f691
Add an experimental ProppatchJob #3235
2015-11-23 11:59:56 +01:00
Christian Kamm
bd72642a58
ShareLink: Always initialize expire date #4075
2015-11-23 09:42:16 +01:00
Jenkins for ownCloud
b3f5885a50
[tx-robot] updated from transifex
2015-11-23 02:18:23 -05:00
Jenkins for ownCloud
aa168ec8b9
[tx-robot] updated from transifex
2015-11-22 02:18:42 -05:00
Olivier Goffart
d89cb3e575
Dolphin plugin: build by default
2015-11-21 12:17:26 +01:00
Olivier Goffart
9e1f215f22
Dolphin plugin: build with QStringBuilder
2015-11-21 12:17:26 +01:00
Jenkins for ownCloud
ffd0b19660
[tx-robot] updated from transifex
2015-11-21 02:18:42 -05:00
Olivier Goffart
0020211857
owncloudcmd: Don't do a check that file are older than 2s ( #4160 )
...
This is required for the smashbox test to pass
2015-11-20 15:16:09 +01:00
Jenkins for ownCloud
1a59b4e208
[tx-robot] updated from transifex
2015-11-20 02:18:48 -05:00
Klaas Freitag
94e7c762bf
ActivityWidget: display if the server does not support acitivities.
...
If the server does not have the activities app enabled, it says so now.
Fix for #4163
2015-11-19 16:01:51 +01:00
Klaas Freitag
421c6a92f3
NetworkJobs: JSON network job now reports OCS reply code.
...
The signal jsonReceived() now not only delivers the raw json string, but
also the status code that came as OCS reply.
Also, fixed a typo in the signals name (recieved => received).
2015-11-19 16:01:51 +01:00
Olivier Goffart
d6aa667971
ShareDialog: remove the "Premissions" label and adjust the size of the scrollarea ( #3737 )
2015-11-19 12:32:50 +01:00
Olivier Goffart
575fc9acbd
ShareDialog: show an error if the sharing API is disabled ( #4126 )
2015-11-19 12:00:53 +01:00
Olivier Goffart
d581550130
Fix compilation warning
2015-11-19 10:50:52 +01:00
Olivier Goffart
952a134745
Sharing: document that the two Type enum are linked
2015-11-19 10:50:21 +01:00
Olivier Goffart
887aa952fe
ShareDialog: Keep default server permissions by default ( #4152 )
2015-11-19 10:49:39 +01:00
Jenkins for ownCloud
5f715a7af7
[tx-robot] updated from transifex
2015-11-19 02:19:06 -05:00
Klaas Freitag
eea982fb14
Merge pull request #4162 from owncloud/phil-davis-patch-1
...
tagLastSuccessfullETagRequest comment wording
2015-11-19 07:36:44 +01:00
Jenkins for ownCloud
5a7eebe16e
[tx-robot] updated from transifex
2015-11-19 01:15:40 -05:00
Phil Davis
55a96af7cc
tagLastSuccessfullETagRequest comment wording
...
Improve this to say what I think it means.
2015-11-19 11:02:15 +05:45
Klaas Freitag
8abaf92083
Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060
2015-11-18 17:00:19 +01:00
Klaas Freitag
b0c29d5c66
Merge pull request #4159 from owncloud/fix_3490
...
csync updater: Handle file firewall reply codes correctly: Ignore the files.
Fixes #3490
2015-11-18 16:55:53 +01:00
Olivier Goffart
41a6f6df84
FolderStatusModel: add hints for translators ( #4158 )
2015-11-18 16:35:11 +01:00
Olivier Goffart
4984da7e0d
Activity Widget: Fix runtime warning
...
Fix the warning:
QLayout: Attempting to add QLayout "" to OCC::ActivitySettings "", which already has a layout
It was caused because one layout was created with the wrong parent
2015-11-18 15:32:39 +01:00
Klaas Freitag
be88e5a2c3
csync_update: refactor a bit and remove redundant code.
2015-11-18 15:31:55 +01:00
Klaas Freitag
e7ad7d405c
csync_update: Add missing comment about 403 forbidden handling.
2015-11-18 15:31:55 +01:00
Klaas Freitag
62d26814b2
SyncEngine: Handle 403 Forbidden properly.
...
A 403 is a reply code sent from the file firewall to indicate that
this directory is forbidden to use for the user.
The patch handles it by setting the state to IGNORED.
This addresses #3490
2015-11-18 15:31:55 +01:00
Markus Goetz
f2d8143511
Activity View: Update only if visible and when becoming visible #4083
2015-11-18 15:25:29 +01:00
Markus Goetz
3c1a605f62
Connectivity: Also accept SyncEngine etag as received ETag
...
Avoids requests on startup.
For #3964
2015-11-18 14:51:28 +01:00
Klaas Freitag
300c1c2055
Merge remote-tracking branch 'origin/depclean' into 2.1
...
Conflicts:
cmake/modules/QtVersionAbstraction.cmake
2015-11-18 14:43:41 +01:00
Klaas Freitag
fb42183bc7
Merge remote-tracking branch 'origin/patches_list' into 2.1
2015-11-18 14:33:32 +01:00
Markus Goetz
65ec8a9e94
Connectivity: Decrease debug logging
...
For #3964
2015-11-18 12:13:21 +01:00
Klaas Freitag
60598c0d34
Use the configuration value of remotePollInterval rather than hardcoded.
2015-11-18 11:40:29 +01:00
Klaas Freitag
3d7fc711ca
AccountState: Avoid ConnectionCheck if ETag job was just done.
...
This patch lets a successful etag job check mark a timestamp.
If next time a connection check is requested, it is checked if
the last ETag happened within the last 30 seconds and if so the
connection check can be checked.
This way we avoid half of the PROPFINDs if all goes well.
2015-11-18 11:40:29 +01:00
Klaas Freitag
46dbca1bf5
ShareDialog: Remove Qt4 incompatible property of QScrollView.
2015-11-18 10:30:02 +01:00
Klaas Freitag
f5da95a5b7
ActivityWidget: Make compile with Qt4
2015-11-18 10:30:01 +01:00
Daniel Molkentin
b37361e21c
Remove spacer that would constrain a vertical resize
...
Fixes #4157
2015-11-18 10:06:38 +01:00
Jenkins for ownCloud
32a208a176
[tx-robot] updated from transifex
2015-11-18 02:18:50 -05:00
Markus Goetz
40395bdc0e
VERSION.cmake: master is now 2.2
2015-11-17 15:47:46 +01:00
Klaas Freitag
5ec4fd94e0
ActivityWidget: No progress indic. for non connected accounts.
2015-11-17 15:05:54 +01:00
Klaas Freitag
c9ef4d5fa0
ActivityWidget: Detect new items in the list to refetch the activities.
...
On refresh, remove the activity list object from the models list.
2015-11-17 14:46:25 +01:00
Klaas Freitag
1cdf0e8597
ActivityWidget: Always combine the final activity list.
...
In cases where the activity app is not activated on the server, the
returned list of activities is empty, so it is better this way.
2015-11-17 14:46:25 +01:00
Daniel Molkentin
7ba88cc9e3
Merge remote-tracking branch 'origin/2.0'
2015-11-17 12:57:31 +01:00
Daniel Molkentin
914df32587
Documentation: Fix PDF logo, version number
2015-11-17 12:55:41 +01:00
Olivier Goffart
e0f54428d0
ShareDialog: softer line separator ( #3737 )
2015-11-17 12:02:20 +01:00
Markus Goetz
52a11b0835
Activities: Fix on Mac #4083
2015-11-17 11:53:49 +01:00
Markus Goetz
ef17dc6482
Connectivity: Improve log output
2015-11-17 11:02:53 +01:00
Markus Goetz
9978dc3f6c
QNAM: Use invalid configuration instead of default configuration
...
For #3969 and others.
2015-11-17 11:02:53 +01:00
Olivier Goffart
f618ed3dfb
gui: Fix some icons in highdpi
...
QIcon does not need to use Theme::hidpiFileName because QIcon takes care
of the @2x images
2015-11-17 10:48:45 +01:00
Olivier Goffart
ef915fb2e5
SharedDialog: Fix the delete icon on windows and mac ( #3737 )
2015-11-17 10:40:45 +01:00
Olivier Goffart
6e42405113
ShareDialog: remove the search button ( #3737 )
2015-11-17 10:24:35 +01:00
Olivier Goffart
11ef07c74a
ActivityWidget: fix compiler warnings
2015-11-17 09:54:38 +01:00
Jenkins for ownCloud
486d7690c4
[tx-robot] updated from transifex
2015-11-17 02:19:08 -05:00
Daniel Molkentin
b3c2c594bd
Add the set of currently used patches
2015-11-16 18:35:50 +01:00
Klaas Freitag
8852911f67
Merge branch 'master' of github.com:owncloud/mirall
2015-11-16 18:16:58 +01:00
Klaas Freitag
e38bc6eab8
AcitivityWidget: Moved timespan-in-words method to utility.
...
Also added a second parameter, fixed plural translation and added
a less-than-a-minute-ago term.
2015-11-16 18:08:25 +01:00
Olivier Goffart
459e200ac0
ShareDialog: add a QScrollArea (issue #4125 )
2015-11-16 18:01:11 +01:00
Klaas Freitag
c781155b60
General Settings page: Remove the add account button.
...
It is now in the toolbox on the account page.
2015-11-16 17:07:05 +01:00
Klaas Freitag
87aa1de67a
Merge branch 'newactivity'
2015-11-16 17:02:05 +01:00
Klaas Freitag
ccb871c30b
ActivityWidget: Show the subject in the Tooltip.
...
the original text might be elided.
2015-11-16 16:44:52 +01:00
Klaas Freitag
74ed0b4f09
Merge pull request #4139 from owncloud/account_toolbox
...
AccountSettings: Add a toolbox button for the account specific actions.
2015-11-16 15:53:30 +01:00
Klaas Freitag
becbb7b284
AccountSettings: Address jans suggestions in #4139
...
- Changed sequence of menu items
- lowercased entries
- removed the "Account" from entries, its in the toolbox button already
- added a little space between toolbox button label and the rectangle.
2015-11-16 15:50:32 +01:00
Klaas Freitag
ff76a842d0
Added some documentation.
2015-11-16 15:38:08 +01:00
Klaas Freitag
a56926b8d9
ActivityWidget: open local file in file manager if exists.
2015-11-16 15:31:24 +01:00
Olivier Goffart
0d21503ee5
ShareDialog: fix auto completion to actualy auto complete
2015-11-16 15:23:02 +01:00
Klaas Freitag
631cb095dd
ActivityWidget: Show the local path in a tooltip.
...
Note that the activity has also entries of files that are not synced so
that not every activity entry has to have a local pendant.
Also, one activity entry can reference multiple files, so only the first
one is shown.
2015-11-16 15:07:02 +01:00
Klaas Freitag
caba719950
Folderman: Added method to find local files for a rel. server path.
2015-11-16 15:04:59 +01:00
Roeland Douma
786b602c26
Merge pull request #4133 from owncloud/sharedialog_uit_improvements
...
[Sharedialog] Fix UI stuff
2015-11-16 13:36:00 +01:00
Jenkins for ownCloud
f4bfce153d
[tx-robot] updated from transifex
2015-11-16 02:18:48 -05:00
Jenkins for ownCloud
e1ab50b17c
[tx-robot] updated from transifex
2015-11-14 02:19:03 -05:00
Klaas Freitag
7e4c0bd515
AccountSettings: Add a toolbox button for the account specific actions.
...
Also move the 'Add Account' button from the General Tab, where it
is not properly found, to the new account toolbox.
2015-11-13 14:50:07 +01:00
Klaas Freitag
ddcec2971e
ActivityDelegate: Gray out font if account is not connected.
...
This gives a visual indication of the account not being connected
and as a result maybe outdated activity data.
2015-11-13 12:48:25 +01:00
Roeland Jago Douma
72d119a05f
[Sharing] Delete animation when share is removed
2015-11-13 11:03:51 +01:00
Roeland Jago Douma
d423cf2c7f
[Sharedialog] Fix UI stuff
...
Implemented suggestions form
https://github.com/owncloud/client/issues/3737#issuecomment-156036279
* Removed Shares text
* Permissions now next to username
* Simplified permissions by default
* Button to get more detailed permissions
2015-11-13 10:27:26 +01:00
Jenkins for ownCloud
3d847b50cf
[tx-robot] updated from transifex
2015-11-13 02:19:01 -05:00
Klaas Freitag
731a13cfd1
ActivityWidget: Take the account state (connected or not) in account.
...
Display the activity entries in a different mode if the account is not
longer connected.
2015-11-12 17:52:00 +01:00
Klaas Freitag
81296fae9d
AccountManager: new method to return AccountStatePtr from the name.
...
It uses the Account displayName to destinguish.
2015-11-12 17:50:00 +01:00
Klaas Freitag
aa38f7a4f2
ActivityWidget: implement removeAccount.
2015-11-12 15:39:07 +01:00
Jenkins for ownCloud
bac69f9984
[tx-robot] updated from transifex
2015-11-12 02:19:14 -05:00
Klaas Freitag
c46547592c
sync excludes: Add .directory files to be ignored
2015-11-11 17:27:01 +01:00
Klaas Freitag
6123fab091
CMake version abstractions: Remove some dependencies.
...
That lets us get rid of the hard dependency on Qt tools which are
not easily available everywhere.
2015-11-11 15:24:02 +01:00
Markus Goetz
fd4a5100a6
NSIS: Include Qt bearer management DLLs #3969
2015-11-11 15:19:15 +01:00
Klaas Freitag
ff4a8c9202
GeneralSettings: Remove references to protocolwidget.
...
The ProtocolWidget is now the Activitytab Widget
2015-11-11 14:49:11 +01:00
Christian Kamm
c871d721fd
Tray tooltip: Use aliasGui #4096
2015-11-11 14:35:56 +01:00
Christian Kamm
05d1cc9a94
Sharing: Fix crash with share deletion #4111
...
The problem was that Share could be deleted *before*
the OcsShareJob itself finished. Since Share was the
parent of the network job, its object would be deleted
too early.
In general, it's unnecessary to assign parents to the OcsJobs
because they delete themselves when finished.
2015-11-11 13:28:20 +01:00
Christian Kamm
196ee05fcc
Share dialog: Initialize expected expire date #4075
2015-11-11 13:01:12 +01:00
Christian Kamm
e50cfa4e1b
Recent Activity: Don't reset for no reason #3889
2015-11-11 12:48:15 +01:00
Daniel Molkentin
3224a959a4
Forward-declare QModelIndex. Fixes Qt4 builds.
2015-11-11 11:52:10 +01:00
Christian Kamm
2ccb3648c7
Recent Activity: Filter metadata updates #3963
2015-11-11 11:19:04 +01:00
Christian Kamm
01aa647527
FolderMan: Fix infinite wait on pause #4093
...
If a folder was paused while being the next item in the scheduling
queue, the whole scheduling could get stuck.
This also fixes the progress information of paused folders possibly
getting stuck.
2015-11-11 10:59:04 +01:00
Christian Kamm
eb3388de68
Fix OwnSql test
...
3993a7f636 added asserts for failing
prepare() calls
2015-11-11 09:42:31 +01:00
Christian Kamm
beb970646b
Fix csync_exclude test
...
The exclude file was reorganized in
b6aa18bfbc
2015-11-11 09:42:31 +01:00
Christian Kamm
25c177ca3b
SyncJournalFileRecord: Remove unused mode field
2015-11-11 09:42:31 +01:00
Daniel Molkentin
1d9c591c08
Fix OS X compilation: use mode_t instead of __mode_t
2015-11-11 09:36:17 +01:00
Jenkins for ownCloud
f753960add
[tx-robot] updated from transifex
2015-11-11 02:19:02 -05:00
Klaas Freitag
5e98894a97
ActivityView: Add a progress indicator widget to indicate action.
2015-11-10 18:10:58 +01:00
Markus Goetz
15fe3b569b
Merge pull request #4100 from mnutt/credentials-from-url
...
Populate account setup credentials from server URL
2015-11-10 16:12:34 +01:00
Klaas Freitag
0e0b6026fc
Activity: Unify the GUI, and reactivate copy to clipboard for all.
2015-11-10 15:12:35 +01:00
Christian Kamm
17dd199cba
Checksums: Treat more carefully in db #4034
...
In particular, preserve them on local rename or remote move.
2015-11-10 15:05:00 +01:00
Christian Kamm
8f7dbe71a1
CleanupPollsJobs: Preserve more journal data
2015-11-10 14:26:25 +01:00
Christian Kamm
4b5c3d8f09
Tray: Show settings dialog on click if it's not active
...
Before, you often had to click twice to bring the window
to the front, because the first click would close it.
2015-11-10 12:33:36 +01:00
Christian Kamm
9955b0756a
Settings: Show first account page on startup #4036
2015-11-10 12:20:08 +01:00
Christian Kamm
76d9b9c0e2
Rename env variables to include unit #2939
2015-11-10 12:07:10 +01:00
Christian Kamm
175ad6fb77
Reflect read-only permissions in filesystem #3244
2015-11-10 10:14:25 +01:00
Christian Kamm
51896902e3
Silence warning by removing extra semicolon
2015-11-10 10:06:49 +01:00
Jenkins for ownCloud
b55220905e
[tx-robot] updated from transifex
2015-11-10 02:19:10 -05:00
Michael Nutt
bd65eb32b7
SetupWizard: populate credentials from HTTP server URL
...
If a user enters a server URL in the form of
https://user:pass@example.com/ , pre-populate the following credentials
page with those values.
2015-11-09 18:21:33 -05:00
Olivier Goffart
b29d1e94b5
ShareDialog: fix autocompletion took the wrong user
2015-11-09 17:22:17 +01:00
Olivier Goffart
b74e812671
Share dialog: a few layout adjustements
2015-11-09 17:22:17 +01:00
Olivier Goffart
aa27b5db14
Discovery: silent static analysis warning
...
We do a check one line earlier that the size is smaller than the buffer
Then we don't need to call strncpy, strcpy is enough
2015-11-09 17:22:17 +01:00
Markus Goetz
81e3a62360
Account: Show local path in tooltip
2015-11-09 16:39:08 +01:00
Jenkins for ownCloud
b0dc264369
[tx-robot] updated from transifex
2015-11-09 02:22:38 -05:00
Jenkins for ownCloud
ac3f179420
[tx-robot] updated from transifex
2015-11-08 02:18:58 -05:00
Jenkins for ownCloud
d9af837974
[tx-robot] updated from transifex
2015-11-07 02:19:09 -05:00
Markus Goetz
4784b327e7
Folder Status: Use same fat ... icon as web
2015-11-06 16:10:50 +01:00
Markus Goetz
1a1541ecd6
macdeployqt: Forgot comma
2015-11-06 15:18:14 +01:00
Klaas Freitag
cf9fec73cf
ActivityView: Add a second treeview for sync issues.
...
So there are three views now: One displaying the server activities, one for
the sync protocol and a third one for ignored files and issues.
2015-11-06 11:43:43 +01:00
Klaas Freitag
a1551ef6ab
ActivityDelegate: Make the row height public accessible.
...
Now it can be used to be set on the other two treeviews.
2015-11-06 11:41:32 +01:00
Markus Goetz
0163839cfb
OS X: Fix toolbar oddity #3719
2015-11-06 10:18:09 +01:00
Roeland Douma
914a942e33
Merge pull request #4055 from owncloud/user_group_sharing
...
User group sharing
2015-11-06 09:35:42 +01:00
Jenkins for ownCloud
5e482ad4f7
[tx-robot] updated from transifex
2015-11-06 02:19:01 -05:00
Markus Goetz
6901fc9e38
macdeployqt: Also copy bearer plugins
...
See #3449
2015-11-05 18:15:45 +01:00
Markus Goetz
0070835330
macdeployqt: Hack to make Qt 5.5 work
2015-11-05 17:19:49 +01:00
Roeland Jago Douma
6431a2aa46
[Sharing] Build sharee list on every search
2015-11-05 15:01:29 +01:00
Niels van Adrichem
572d9bdf1a
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/gui/share.h
2015-11-05 14:42:26 +01:00
Roeland Jago Douma
4cf2422a83
[Sharing] Clear completer on activation
2015-11-05 13:16:52 +01:00
Roeland Jago Douma
806ec98eab
[Sharing] Properly delete widget
2015-11-05 13:10:32 +01:00
Roeland Jago Douma
20fd349e17
[Sharing] Filter sharee list properly
...
You can't share with a user/group that you've already shared with
You can't share with yourself
2015-11-05 12:30:34 +01:00
Markus Goetz
dae724b21c
QtVersionAbstraction: Quick not neeed on OS X
2015-11-05 11:35:42 +01:00
Roeland Jago Douma
3e4612a1f0
[Sharing] Reorganized sharedialog code
...
Now we have 1 simple dialog that includes 2 widgets.
* ShareLinkWidget (for link shares)
* ShareUserGroupWidget (for user/group shares)
The ShareUserGroupWidget is only included if the server version is >=
8.2.0
For <8.2.0 the old behavior is preserved
2015-11-05 09:58:16 +01:00
Jenkins for ownCloud
6052e49bcc
[tx-robot] updated from transifex
2015-11-05 02:19:06 -05:00
Roeland Jago Douma
90cbd461ab
[Sharing] Allow sharing with users/groups from desktop
2015-11-04 22:00:35 +01:00
Lukas Reschke
517f2ed03d
Add coverity badge
2015-11-04 21:06:48 +01:00
Daniel Molkentin
5fccc25f36
Fix Qt4 build
2015-11-04 19:28:54 +01:00
Klaas Freitag
cb1571c6c5
ActivityWidget: Rather use accountState pointer directly.
...
Do not use it via a smart pointer class.
2015-11-04 16:40:22 +01:00
Markus Goetz
99b0d659bd
Merge pull request #4073 from RealRancor/backport_4052_2.0
...
Backport #4052 to 2.0
2015-11-04 16:32:34 +01:00
RealRancor
854264c3d2
Backport #4052 to 2.0
2015-11-04 15:55:07 +01:00
Markus Goetz
d2a6cae695
Merge pull request #4052 from RealRancor/fix_autoupdate
...
Make registry key a code block in autoupdate docs.
2015-11-04 15:11:45 +01:00
Markus Goetz
be9ed2f6a9
Merge pull request #4058 from owncloud/client-updates
...
some doc fixes & updates
2015-11-04 15:11:28 +01:00
Markus Goetz
3ee8beb8a3
Exclude: Add .nfs*
...
From eltrai at #4017
2015-11-04 15:06:05 +01:00
Jenkins for ownCloud
f816e5e2af
[tx-robot] updated from transifex
2015-11-04 08:32:32 -05:00
Jenkins for ownCloud
448d8bff18
[tx-robot] updated from transifex
2015-11-04 08:30:20 -05:00
Daniel Molkentin
b82ffb52c7
Merge remote-tracking branch 'origin/2.0'
2015-11-04 14:25:14 +01:00
Klaas Freitag
3bccfb8993
ActivityView: Add information about the account.
2015-11-04 13:22:03 +01:00
Roeland Jago Douma
6fb4e59120
[Sharing] First step towards proper group sharing
2015-11-04 12:56:06 +01:00
Roeland Jago Douma
309be57a12
[Sharing] Add user/group sharing dialog
...
Dialog can now retrive current shares for path, set the permissions on
those shares and delete the share.
2015-11-04 12:53:07 +01:00
Roeland Jago Douma
37098c96f9
[Sharing] Add setpermission to sharing code
...
For user/group/remote shares we were just missing the setPermissions
functionality
2015-11-04 12:53:02 +01:00
Jenkins for ownCloud
03cc67a2b1
[tx-robot] updated from transifex
2015-11-04 02:19:04 -05:00
Klaas Freitag
cb4fba7658
ActivityWidget: Created a delegate for prettier display of the activities
2015-11-03 17:54:37 +01:00
Niels van Adrichem
0bcb13f02e
Fixxed compile error on src/gui/share.h
2015-11-03 13:44:59 +01:00
Niels van Adrichem
42ef09e3bb
Updated documentation for Non Shibboleth authentication and customized WebDAV Paths
2015-11-03 13:43:26 +01:00
Niels van Adrichem
1ab44655e0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/cmd/cmd.cpp
2015-11-03 11:58:45 +01:00
Jenkins for ownCloud
89734b95c4
[tx-robot] updated from transifex
2015-11-03 02:19:04 -05:00
Niels van Adrichem
8f5658bc01
Added Non Shibboleth WebDAV authentication and Dav Path customization to owncloudcmd
2015-11-02 22:57:17 +01:00
Carla Schroder
a59c3ef278
some doc fixes & updates
2015-11-02 11:18:31 -08:00
Klaas Freitag
b600ac882a
ActivityListModel: Add method to refresh one Account (WIP)
2015-11-02 17:52:04 +01:00
Klaas Freitag
71849c4372
ActivityListModel: Add the page and pagesize parameter to ocs query.
2015-11-02 17:51:12 +01:00
Klaas Freitag
9545af0d43
JSONApiJob: Add method to add additional query parameter.
2015-11-02 17:37:23 +01:00
Klaas Freitag
6c6ee358d4
ActivityListModel: Check if the account is connected when fetching more.
2015-11-02 16:39:33 +01:00
Klaas Freitag
060f4f291b
SettingsDialog: Add a tab with the SyncProtocol to ActivityWidget.
2015-11-02 15:46:00 +01:00
Klaas Freitag
3fb43d2322
ActivityWidget UI: Remove the preconfigured tabs from the tabwidget.
...
It is better to create the tabs from the code in SettingsDialog.
2015-11-02 15:45:17 +01:00
Klaas Freitag
4895683bab
ActivityWidget: Do a proper asynchronous model to display the activity.
2015-11-02 15:44:13 +01:00
Klaas Freitag
43800e3d1c
Merge pull request #4049 from Naereen/patch-1
...
Reviewing, improved style, and a initializing message
2015-11-02 10:14:07 +01:00
Klaas Freitag
3b8e1dcd89
SettingsDialog: Make ActivityWidget a member.
2015-11-01 22:30:46 +01:00
Klaas Freitag
302d6b321e
ActivityWidget: Add a job to fetch activities, Activity object added
2015-11-01 22:30:37 +01:00
Jenkins for ownCloud
3f85694394
[tx-robot] updated from transifex
2015-11-01 02:18:55 -05:00
RealRancor
8c5ef2f1c3
Make registry key a code block in autoupdate docs.
2015-10-31 19:05:21 +01:00
Lilian Besson
aa1a2d1247
Reviewing, improved style, and a initializing message
...
- Add an "Initializing owncloud-client-nautilus extension" message
2015-10-31 13:07:18 +01:00
Olivier Goffart
3993a7f636
OwnSQL: add asserts in case of error that should not happen
2015-10-30 14:05:58 +01:00
Olivier Goffart
aaf16ff0e8
SyncJournalDB, clear all the queries before closing the database
2015-10-30 14:03:08 +01:00
Olivier Goffart
16c078963b
owncloudcmd: add --max-sync-retries #4037
...
And limit by default to 3 retries
2015-10-30 13:36:31 +01:00
Klaas Freitag
9279bcdba4
Add a tabwidget to Settings dialog for activity.
2015-10-30 13:26:27 +01:00
Olivier Goffart
0c467ef5b4
Sync engine: fix signal/slot connection
2015-10-30 13:21:34 +01:00
Olivier Goffart
49cd53ee44
FolderStatusModel: attempt to detect removed undecided files #3612
2015-10-30 12:43:33 +01:00
Olivier Goffart
0e6a463564
Discovery: Don't leak DiscoveryDirectoryResult in case of error
...
Also remove redundent Q_FUNC_INFO
2015-10-30 12:43:33 +01:00
Roeland Douma
d38b190317
Merge pull request #4033 from owncloud/share_object
...
Add share manager and the share objects
2015-10-30 11:01:03 +01:00
Klaas Freitag
29558cb7bb
Merge pull request #4040 from owncloud/phil-davis-changelog-master
...
ChangeLog typos that reverted in merge from 2.0
2015-10-30 10:36:38 +01:00
Jenkins for ownCloud
d2cd237e25
[tx-robot] updated from transifex
2015-10-30 02:19:00 -04:00
Roeland Jago Douma
c7b814337a
Use proper QFlags
...
Now the ShareTypes and Permissions are part of the Share class (which is
a bit better abstracted away).
2015-10-29 21:47:47 +01:00
Phil Davis
ced51813c7
ChangeLog typos that reverted in merge from 2.0
...
Hopefully the last place I need to submit this again :)
2015-10-29 23:35:48 +05:45
Roeland Jago Douma
dd8d02b8ef
Act properly if OCS endpoint returned an error (OCS error)
...
For now pass it on to the gui. So at least they know something is wrong.
2015-10-29 16:56:23 +01:00
Olivier Goffart
c3cf6aef7d
SyncEngine: Don't whipe the white list if the sync was aborted
...
Issue #4018
2015-10-29 16:47:39 +01:00
Olivier Goffart
38a8e5ee03
Discovery: conding style: use const references for function parameters
2015-10-29 16:47:36 +01:00
Klaas Freitag
46269dac4e
Merge branch '2.0'
...
Conflicts:
ChangeLog
2015-10-29 16:34:15 +01:00
Roeland Jago Douma
8c0297f688
Use QLatin1Char
2015-10-29 16:03:47 +01:00
Klaas Freitag
bc5890d8b5
Add version suffix git.
2015-10-29 15:46:02 +01:00
Klaas Freitag
ee65315520
Merge branch '2.0.2' into 2.0
...
Conflicts:
ChangeLog
2015-10-29 15:44:56 +01:00
Roeland Jago Douma
12f7cfde87
Shares do not have parents
...
Also some pointer cleanups
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
6d80f3d756
Proper foreach
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
b32f752d31
Properly cleanup OCS jobs
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
cf8be7de91
Proper const usage
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
30a3498c22
Fix typos
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
239603e24c
Make sure enforced passwords are properly respected
...
Fixes for old and new servers
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
390daed3de
Added getPublicUpload to LinkShare
...
so the gui does not have to know abou the internal permissions
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
918c06aba3
Add share manager and the share objects
2015-10-29 15:42:20 +01:00
Klaas Freitag
726be08917
Revert "Config: Use monochrome icons per default on MacOSX."
...
This reverts commit 546cab3f62 .
For OEMs this patch causes an empty tray icon set.
2015-10-29 15:37:31 +01:00
Olivier Goffart
a127debc54
Quota: handle special negative value for the quota #3940
...
Don't show a progress bar if there is an unkown or unlimited total
2015-10-29 14:33:29 +01:00
Olivier Goffart
6aa26654f6
Merge remote-tracking branch 'origin/2.0'
2015-10-29 12:44:28 +01:00
Olivier Goffart
0fde7f0e6b
Propagator: Keep a meaningfull error with old server and invalid file names
...
We changed the discovery code not to ignore files whose filename contains
charachter invalid on windows. (Because newer versions of the server
supports them)
Servers older than 8.1 will just say "Bad Request" as an error and it's a
regression against previous client version. So keep nice error even with
older server.
Relates to #3736
2015-10-29 12:44:08 +01:00
Christian Kamm
d9f8edd259
Hidden files: Consider .* hidden everywhere #4023
...
This seems to be the only place where we did this only on
non-windows OSes.
2015-10-29 11:59:46 +01:00
ckamm
251679253a
Merge pull request #3951 from ckamm/checksum
...
Checksums stored in database #3735
2015-10-29 10:40:24 +01:00
Christian Kamm
64756c5dce
--version also shows Qt version
...
That makes it much easier for people reporting bugs.
2015-10-29 09:48:36 +01:00
Christian Kamm
9788055147
Propagator: Add blacklisting of disk space errors #2939
2015-10-29 09:36:59 +01:00
Jenkins for ownCloud
4d7fde59c2
[tx-robot] updated from transifex
2015-10-29 02:18:59 -04:00
Daniel Molkentin
4737c16996
State application name in update notification
...
Fixes #4020
2015-10-28 20:45:57 +01:00
Markus Goetz
c97dfbf60c
ChangeLog: Mention propagator removal
2015-10-28 17:03:47 +01:00
Christian Kamm
496b1e907d
Checksum: Don't lose it on metadata update #3735
...
Also improve tests.
2015-10-28 14:49:55 +01:00
Christian Kamm
566131209d
Checksum: Fixes after review
2015-10-28 14:46:20 +01:00
Christian Kamm
b7823dc648
Checksum: Put checksum type into separate column #3735
2015-10-28 14:46:20 +01:00
Olivier Goffart
6d28a1b645
Fix Qt4 compilation
2015-10-28 13:26:35 +01:00
Markus Goetz
b6aa18bfbc
sync-exclude.lst: More likely matching files first
2015-10-28 11:25:02 +01:00
Markus Goetz
d91ffc216a
Exclude: Add .fuse_hidden #3999
...
No matter if we sync hidden files or not, those are files we should not sync
2015-10-28 11:18:44 +01:00
Markus Goetz
a6c9e8c5b4
Merge branch 'kill_legacy_propagator'
2015-10-28 11:06:50 +01:00
Markus Goetz
9337927722
legacy propagator: Remove more code
2015-10-28 10:59:02 +01:00
Christian Kamm
c81b02c7d9
csync tests: Remove unused function
2015-10-28 10:04:15 +01:00
Christian Kamm
5ea09d2668
Checksum: Disallow ADLER32, use Adler32 #3735
2015-10-28 09:59:33 +01:00
Christian Kamm
b9fc4c5994
Checksum: Fix recomputation when forced in cfg file #3735
...
Don't recompute the checksum on each upload when the server does not
advertise supporting checksums.
2015-10-28 09:56:39 +01:00
Christian Kamm
f1b500d3e0
Checksum: Add env variables to disable #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
dff37e11eb
Propagate: Store computed checksums in db during upload #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
b1387f801b
Propagate: On download store checksum header in db #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
60b2312ab6
SyncJournal: Add checksumHeader column to metadata table #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
0354289795
Checksums: Improvement in async computation and validation #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
c11c35c459
Revert "In case of empty checksum type, emit validated."
...
This reverts commit b05ca526a4 .
The checksum type setting should not matter for downloads.
2015-10-28 09:56:39 +01:00
Christian Kamm
7c5e70ac3c
PropagateUpload: Fix double-emission of finished #3844
2015-10-28 09:53:54 +01:00
Christian Kamm
d2e5ba123d
Fix compile after pull request merge
...
It conflicted with the optimization in
f18b40f7e7
2015-10-28 09:53:06 +01:00
Klaas Freitag
0c9568f6dc
Merge pull request #4004 from owncloud/fix_hidden_detection
...
Fix hidden detection
2015-10-28 09:28:35 +01:00
Olivier Goffart
f1d48a9356
Folder Model: The item needs to be selectable for the currenIndex to appear selected
...
And we set the current index in AccountSettings::slotLinkActivated
2015-10-27 17:37:12 +01:00
Olivier Goffart
89f2a9e6dc
Account Settings: A link should make sure all the parents are expanded
2015-10-27 17:37:12 +01:00
Klaas Freitag
a203da3919
FolderStatusModel: Check for null argument at start.
2015-10-27 17:37:12 +01:00
Klaas Freitag
1c1ef52cf1
AccountSettings: Display a link for undecided dirs in the sub text.
...
This only works in case the index is known. If not, no link is
shown, but we wait for the next update of the model.
2015-10-27 17:37:12 +01:00
Klaas Freitag
40c82c5c36
AccountSettings: Add index to undecided folder to be able to select it.
2015-10-27 17:37:12 +01:00
Klaas Freitag
81f0c6535e
Enable external links in the label.
2015-10-27 17:37:12 +01:00
Klaas Freitag
46558d79a5
Add slot to handle clicks on folder names.
2015-10-27 17:37:12 +01:00
Olivier Goffart
e86b4203b9
IgnoreFiles: Fix the socket API would not load the new custom ignored files #3496
...
We did not flush or closed the file after having modified it from the UI.
So when the socket api was reloading it, it wouldn't be able to load
the newly added rules
2015-10-27 16:07:59 +01:00
Olivier Goffart
05dd9554f9
SocketApi: Fix returning ignore for the root item all the time
2015-10-27 16:06:38 +01:00
Olivier Goffart
30a0423f81
Dolphin integration: fix error icons
2015-10-27 15:19:10 +01:00
Olivier Goffart
26e1223f9a
FolderStatusModel: reset also if a folder was renamed #4011
2015-10-27 13:51:56 +01:00
Olivier Goffart
84a04de7be
Settings Dialog: don't put padding on the toolbar extension
...
Otherwise the extension just disapear with some styles (see Issue #3795 )
2015-10-27 13:42:25 +01:00
Olivier Goffart
3ff7fa0092
Merge pull request #3997 from owncloud/phil-davis-patch-1
...
ChangeLog 2.0.2 minor typos for 2.0 branch
2015-10-27 12:58:59 +01:00
Olivier Goffart
3f2a2cb14b
FolderDelegate: put the progressbar in place of the remote or local folder #3403 #3569
...
So the size of the delegate does not change
2015-10-27 12:52:33 +01:00
Olivier Goffart
fac00348d9
Use the term folder sync connection in more places #3757
2015-10-27 12:12:21 +01:00
Olivier Goffart
3c93fd4fb7
AccountSettings: don't disable pause when offline ( #4010 )
2015-10-27 10:32:33 +01:00
Klaas Freitag
6b71273380
Discovery: Fix detection of hidden files.
...
In the discovery phase we want to detect that dot-files are hidden
on Linux and Mac.
This fixes strange behaviour seen in issue #3980
2015-10-26 14:24:05 +01:00
Olivier Goffart
dccf4e9c34
Download: Soft errors for error while resuming ( #4000 )
2015-10-26 12:31:07 +01:00
Olivier Goffart
39289a3164
SocketAPI: don't trim the command #3297
2015-10-26 10:15:50 +01:00
Jenkins for ownCloud
6611d878ea
[tx-robot] updated from transifex
2015-10-25 02:19:01 -04:00
Jenkins for ownCloud
c3fc711095
[tx-robot] updated from transifex
2015-10-24 02:18:59 -04:00
Olivier Goffart
84f1bdbc87
Folder::wipe: We need to shut the socket API down before removing the DB
...
Because the DB stays open and locked.
Should fix #3824
2015-10-23 17:43:01 +02:00
Phil Davis
2eb5715599
ChangeLog 2.0.2 minor typos for 2.0 branch
...
These changes were committed to 2.0.2-rc1 branch https://github.com/owncloud/client/pull/3957/files 6da2139a1b but that branch was never merged up into 2.0 (or 2.0.2-rc2) so the changes never went anywhere.
These changes could also be applied on 2.0.2-rc2 and 2.0.2 branch for completeness - then they would be in every branch in which they have appeared.
2015-10-23 21:21:31 +05:45
Olivier Goffart
c93defc82d
SyncEngine: remove unused functions
2015-10-23 17:11:19 +02:00
Olivier Goffart
bd39c64798
Delete all files: make the 'Keep' on by default
...
On windows, we need to specify at least one AcceptRole.
Otherwise the DestructiveRole might become the default
Issue #3824
2015-10-23 17:06:14 +02:00
Olivier Goffart
42a6b242c7
SettingsDialog: use QWidgetAction for the toolbar so the extension works
...
When the toolbar is full because there is no enough room, make the extension
of the toolbar work, by using QWidgetAction::createWidget instead of
QToolBar::insertWidget
There should not be prolem when the window is too narrow.
Relates #3832
2015-10-23 16:23:37 +02:00
Markus Goetz
e5570c24f2
Merge pull request #3995 from owncloud/return-code-of-version-and-help
...
owncloudcmd: Make returncode 0 for --version and --help
2015-10-23 15:36:01 +02:00
Joas Schilling
6d87bd15cd
Make returncode 0 for --version and --help
2015-10-23 15:17:29 +02:00
Olivier Goffart
d657c00b11
FolderStatusModel: fix getting the size of the folder in the selective sync ( #3986 )
...
Regressed since d610693af1 . The problem
is that the _size vector contains the pathToRemove and that it was removed
before.
Reorganize a bit the code so there is only one loop that has still all the
information.
2015-10-23 15:13:15 +02:00
Jenkins for ownCloud
6fae06f1d0
[tx-robot] updated from transifex
2015-10-23 02:19:00 -04:00
Olivier Goffart
f18b40f7e7
csync_vio: reuse the information from readdir in stat
...
On unix we don't safe much (otherwise csync would have been
designed differently).
On windows however, the readdir already fetch all the info, so we
can as well use it.
We still have to query for the file id but we might optimize that later
2015-10-22 18:46:41 +02:00
Olivier Goffart
6a0633083d
Network Settings: Adjust the bandwidth limit option with old Qt
...
- Disable the whole group box
- Add a tooltip explaining why it is disabled
- Make sure it is disabled in the settings in case of upgrade
- Do a runtime check in case the running Qt is greater
2015-10-22 17:57:34 +02:00
Daniel Molkentin
899f52be4f
Revert "Settings dialog: remove the close button #3713 "
...
This reverts commit ebee6f0bc2 .
Unix window managers do not have a reliable way of hinting buttons,
so we need the close button.
2015-10-22 16:20:59 +02:00
Olivier Goffart
91525a7d33
csync_exclude: Don't ignore invalid char client side ( #3736 )
...
If the server does not support it, then the server will reply with an error
2015-10-22 12:32:53 +02:00
Olivier Goffart
455c3ae57d
test/CMakeLists.txt: remove comments
2015-10-22 12:32:53 +02:00
Jenkins for ownCloud
b5390b5aa2
[tx-robot] updated from transifex
2015-10-22 02:19:02 -04:00
Olivier Goffart
a608b4e9e0
Folder: set csync verbosity to 0 if the Logger is not there
...
csync_log was still accounting for 8% of the local discovery (because
of vsnprintf and asprintf)
2015-10-22 01:13:35 +02:00
Olivier Goffart
f6a543ada3
Logger: speedup the sync discovery when the log is innactive
...
The sync throw a lot of log message, and QDateTime::fromCurrentTime is
quite expensive. So don't call it if it's not needed.
2015-10-22 00:22:25 +02:00
Daniel Molkentin
c7bf09c3d4
Merge remote-tracking branch 'origin/2.0'
2015-10-21 18:49:58 +02:00
Daniel Molkentin
c8ae54d9e8
Merge pull request #3982 from owncloud/20-update
...
update 3-dot menu
2015-10-21 18:49:38 +02:00
Carla Schroder
daf6d8772f
update 3-dot menu
2015-10-21 09:44:38 -07:00
Olivier Goffart
c80e72da83
Sharing: change coding style of enum
...
From all upper case to camel case
This hopefully fix the Windows build which fails because DELETE seems
to be a macro
2015-10-21 18:40:04 +02:00
Roeland Douma
ec351e00ad
Merge pull request #3773 from owncloud/split_sharedialog
...
Split sharedialog code
2015-10-21 16:55:59 +02:00
Olivier Goffart
cf242871ea
SyncEngine: keep a static pointer to the codec
...
The QTextCodec for UTF-8 is not going to change during the application life time.
So no need to look it up for every file
2015-10-21 16:38:26 +02:00
Olivier Goffart
597d36dcf2
csync_statedb: Use the index in csync_statedb_get_below_path
...
Make an index from the path, and make a query that uses the index
2015-10-21 16:38:26 +02:00
Olivier Goffart
9c388787bb
csync_update: Don't fetch the etag in the local discovery from the DB
...
We don't need it, and it's slow.
This saves a lot of DB queries
(Also replaced a strlen>0 with a faster check)
2015-10-21 16:38:26 +02:00
Markus Goetz
f739d8fdd3
sqlite: Update to version 3.9.1
...
For OS X and Windows.
This is in line with the tests/benchmarks Olivier is doing on ArchLinux.
2015-10-21 15:55:41 +02:00
Daniel Molkentin
78d782601e
2.0.2 final
2015-10-21 09:54:02 +02:00
Daniel Molkentin
86a83dc32c
Finalize ChangeLog, adjust formatting
2015-10-21 09:53:34 +02:00
Daniel Molkentin
c67e53c7b2
set version suffix back to git
2015-10-21 09:48:18 +02:00
Jenkins for ownCloud
5659e04e89
[tx-robot] updated from transifex
2015-10-21 02:19:02 -04:00
Olivier Goffart
8ff3055b47
sync-exclude.lst: Remove entries that are hardcoded anyway
...
The more item in the sync-exclude.lst, the slower is the sync.
Many items are already hardcoded. Some are files that no longer
exist.
2015-10-20 18:38:47 +02:00
Olivier Goffart
71827549d6
csync_exclude: Use PathMatchSpecA instead of PathMatchSpecW
...
So we avoid lots of memory allocation.
We can work with char* directly since both the pattern and the file
name are in UTF-8 and there is no need to understand unicode for
such pattern.
(In fact, '?' would not match anyore non-ascii characters, but I
don't think that's a problem. I don't think anyone use '?' in its
exclude list. And the two allocations per call to csync_fnmatch are
really worth getting rid of)
2015-10-20 18:38:47 +02:00
Olivier Goffart
de5de7acc5
csync_exclude: Optimize
...
Avoid alocations as much as possible
2015-10-20 18:38:47 +02:00
Markus Goetz
c8590c4468
Remove legacy propagator and neon
...
The code was already uneeded/unbuilt on Windows and OS X.
2015-10-20 17:57:43 +02:00
Markus Goetz
5f43c9cfad
Merge tag 'v2.0.2-rc2' into 2.0
...
Second RC of ownCloud Client 2.0.2
2015-10-20 15:46:09 +02:00
Markus Goetz
98b966d274
OS X: Use Cocoa Pasteboard instead of QClipBoard #3300
2015-10-20 15:42:43 +02:00
Olivier Goffart
674b6f2373
Account Settings: clear the focus of the "Sign In" button when clicked
...
So that the focus does not go to the "Remove Account" button instead
which would be wierd
2015-10-20 13:56:35 +02:00
Olivier Goffart
407ff0a99d
Theme: cache the QIcon::fromTheme
...
We are calling that every time we draw the folder delegate.
Which is a lot when the sync is runing and the progress bar is moving
2015-10-20 13:24:11 +02:00
Olivier Goffart
0b6d21e3d5
Logger: don't call qFormatLog when unessesary
...
That's a lot of string operations that can be avoided if the log window
is not shown
2015-10-20 13:22:48 +02:00
Markus Goetz
4c9bc42b69
Revert libqsqlite changes for now
...
QtWebKit depends on it unfortunately
2015-10-20 13:04:33 +02:00
Olivier Goffart
557b704069
Fix compilation warning
...
shibbolethcredentials.h:59:10: warning: 'askFromUser' overrides a member
function but is not marked 'override' [-Winconsistent-missing-override]
2015-10-20 11:35:25 +02:00
Klaas Freitag
d09de79491
Bump version to RC2
2015-10-20 11:30:00 +02:00
Olivier Goffart
4369e31a49
Folder Model: don't try to fetch data if the account is disconnected
...
Now that it expands automatically, it would do lots of query to the
server when the account is disconnected. (all resulting in 401)
2015-10-19 18:32:34 +02:00
Olivier Goffart
23b5a74c17
Account Settings: Don't expand while clicking on the '...' button
2015-10-19 18:23:56 +02:00
Olivier Goffart
ee69ab2021
Account Settings: Don't disable double click expanding for sub folders
...
The root folder open on simple click, but the sub folder don't, so keep
this behaviour which is the native behaviour
2015-10-19 18:12:49 +02:00
Olivier Goffart
374f29c4d3
Account Settings: Fix crash for acocunts withour folder
...
Was broken by 027a865fbc
2015-10-19 18:08:11 +02:00
Markus Goetz
67910e7d60
Discovery: Call it "Checking for changes in" in UI
...
For #3431
2015-10-19 15:59:16 +02:00
Markus Goetz
c80b033466
VERSION.cmake: fixup
2015-10-19 15:57:13 +02:00
Olivier Goffart
671af9f8fe
Merge branch 'master'
2015-10-19 15:53:58 +02:00
Olivier Goffart
6ea05ff6e3
Dolphin shell integration: use the owncloud icons
2015-10-19 15:53:40 +02:00
Markus Goetz
00485e133f
VERSION.cmake: This is git not rc1
2015-10-19 15:51:33 +02:00
Olivier Goffart
c520ee4eab
Dolphin Shell Extension: renamove the kf5 in the name
2015-10-19 15:43:42 +02:00
Olivier Goffart
5408ec79f7
Dolphin shell extention: Remove the KDE4 based plugin
2015-10-19 15:42:41 +02:00
Olivier Goffart
f8e68ae823
Merge branch 'dolphin-plugin'
2015-10-19 15:41:47 +02:00
Olivier Goffart
184412d88e
Dolphin shell integration: Renames the plugins
...
And put the helper in a shared library so it is shared accross both plugins
2015-10-19 15:40:11 +02:00
Olivier Goffart
82d1d04774
Dolphin shell integration: share code between two plugins
2015-10-19 15:40:11 +02:00
Olivier Goffart
731d4b3d4d
Dolphin shell extention: adapt to the change in KDE Frameworks
2015-10-19 15:39:51 +02:00
Markus Goetz
ccec186b98
ETagJob: Depth 0 for server >= 8.1 #3730
2015-10-19 15:31:27 +02:00
Klaas Freitag
c66c259447
SettingsDialog: Add new widet called ActivityWidget.
...
This is the new widget to display server activity.
2015-10-19 14:41:53 +02:00
Klaas Freitag
4ad165ce26
Utility: add method fileNameForGuiUse(), pimp up filename for GUI
...
Currently, this one only replaces colons by / on Mac platform. This makes
the function resuseable.
2015-10-19 14:36:55 +02:00
Markus Goetz
24a801dfd3
CMake/NSIS: We don't need QtSql (more)
2015-10-19 13:56:36 +02:00
Markus Goetz
af79bc9211
CMake/NSIS: We don't need QtSql
...
The NSIS change also had a redundant libsqlite3 DLL entry
2015-10-19 13:46:46 +02:00
Klaas Freitag
a3904f4d32
Theme: Revert logic of singleAccount switch.
...
To use the same logic as the other clients and unify ownBrander
implementations, the switch is now called multiAccount() rather
than singleAccount() with a reverse logic.
Desktop Client stays with the default of having multiaacount
enabled.
Note that existing brandings need to rename the switch.
https://github.com/owncloud/ownbrander/issues/443
2015-10-19 12:26:42 +02:00
Olivier Goffart
5cac90b3eb
SelectiveSyncTreeView: show the size for the root item ( #3755 )
2015-10-19 10:58:54 +02:00
Olivier Goffart
df135a0bb2
Merge branch '2.0'
...
Conflicts:
src/gui/folder.cpp
2015-10-19 10:57:37 +02:00
Olivier Goffart
b7c927f349
csync: Fix warning the bit field need to be unsigned
2015-10-19 10:13:11 +02:00
Jenkins for ownCloud
64718fe567
[tx-robot] updated from transifex
2015-10-19 01:15:39 -04:00
Jenkins for ownCloud
79f14e0933
[tx-robot] updated from transifex
2015-10-18 01:15:40 -04:00
Jenkins for ownCloud
3ad8c692a4
[tx-robot] updated from transifex
2015-10-17 02:19:01 -04:00
Klaas Freitag
546cab3f62
Config: Use monochrome icons per default on MacOSX.
2015-10-16 18:55:07 +02:00
Roeland Jago Douma
4a04dc1a3e
Typos
2015-10-16 12:51:24 +02:00
Roeland Jago Douma
0e97fbb730
Use overloaded functions
2015-10-16 12:48:48 +02:00
Olivier Goffart
83edb7fb8a
csync: fix compilation error with -pedentic
2015-10-16 11:45:36 +02:00
Olivier Goffart
0c59c85127
SyncEngine: Folders with ignored files should not count when counting none files
...
If there is a any none files, we do not show the dialog saying that all
files have been removed. If a directory contiains ignored files, we still
want to show this message box even if the directory will not be deleted
2015-10-16 11:43:52 +02:00
Klaas Freitag
d6098c39dc
Update Changelog and bump version to 2.0.2rc1
2015-10-16 11:12:50 +02:00
Klaas Freitag
af721118cd
Merge branch '2.0' of github.com:owncloud/mirall into 2.0
2015-10-16 10:08:27 +02:00
Markus Goetz
0d5f2b5d31
Propagator: Reset upload blacklist if a chunk suceeds
...
For #3934
2015-10-16 10:06:45 +02:00
Klaas Freitag
1790a128aa
Merge tag 'v2.0.1' into 2.0
...
Version 2.0.1
2015-10-16 10:06:38 +02:00
Olivier Goffart
87fa1794a1
Updater: remove unused function
...
It was even throwing a warning because it is an infinite recursion
2015-10-16 09:56:26 +02:00
Olivier Goffart
4df828d0b0
csync_file_stat_s: Save a bit of memory
2015-10-16 09:56:26 +02:00
Hugo Gonzalez Labrador
4d1d6dff3b
Increased fileID size to 36 bytes
...
This is the size used by UUIDs
2015-10-16 09:27:19 +02:00
Olivier Goffart
81e30cd8d2
Merge pull request #3695 from owncloud/nomkpath3692
...
Folder: Do not create the sync folder if it does not exist #3692
2015-10-16 09:21:15 +02:00
Markus Goetz
983671c8cb
Shibboleth: Add our base user agent to WebKit
...
For #3913
2015-10-16 09:15:47 +02:00
Roeland Jago Douma
40ab3ee751
Now only 1 constructor to ocssharejob
...
* Pass the share_id to the functions that need it
2015-10-16 08:28:13 +02:00
Jenkins for ownCloud
eb6b254dc5
[tx-robot] updated from transifex
2015-10-16 02:19:02 -04:00
Roeland Jago Douma
f95fea9866
Move permissions to OcsShareJob
2015-10-16 08:09:57 +02:00
Roeland Jago Douma
03719334ea
Remove unused members
2015-10-15 22:27:55 +02:00
Roeland Jago Douma
4441053b1c
Thumbnailjob fixes
...
* Comments
* Use the path of the abstractnetworkjob
2015-10-15 22:18:22 +02:00
Roeland Jago Douma
a34b663828
Now add parameters in a less crappy way
2015-10-15 21:58:16 +02:00
Roeland Jago Douma
db1f4d4016
OCSJob -> OcsJob and more docs
2015-10-15 20:54:52 +02:00
Roeland Jago Douma
3ea944d1b3
Added setPublicUpload to OcsShareJob
2015-10-15 20:34:56 +02:00
Roeland Jago Douma
b293aa762c
Split sharing code
...
There is now a generic OCSJob which must be inherited by other jobs. This is in
prepartion for the other OCS job that will come (for the Sharee API endpoint
for example).
More logic is moved from the sharedialog to the OcsShareJob. So in the GUI code
we now only say what we want (a new share, set the password etc). And the code
in libsync will make that happen. Error handling is for now still done in the
GUI part.
For now the ocsjob and ocssharejob live in gui but probabaly we should
create a libshare or libocs at some point.
2015-10-15 20:05:47 +02:00
Markus Goetz
b5e75afc17
General settings: Align checkbox #3758
2015-10-15 19:15:50 +02:00
Markus Goetz
027a865fbc
Account Settings: Show selective sync buttons after list load
...
Especially nice when having a slower network.
For #3839
2015-10-15 18:52:16 +02:00
Markus Goetz
132b5f5130
Account Settings: Expand selective sync on show #3585
2015-10-15 17:27:38 +02:00
Markus Goetz
c3754e1fdd
folderstatusmodel.h: Fix warning
2015-10-15 17:27:29 +02:00
Markus Goetz
963eb1f29b
VERSION.cmake: master is 2.1
2015-10-15 16:51:29 +02:00
Christian Kamm
c418d67920
Merge remote-tracking branch 'origin/2.0'
2015-10-15 15:54:09 +02:00
Christian Kamm
6e09e3af86
Fix test compile
...
I regularly fix errors in the copies of the test sources that are
made in build/. Refactoring how these tests work could be worthwhile.
2015-10-15 15:52:58 +02:00
Christian Kamm
67e9a06d30
Progress estimation: Adjust low-transfer detection #3942
...
Progress estimation is usually based on transfer speed. That makes no
sense when we're doing operations like deletes, that need very little
data transfer but nevertheless take a long time.
This hack attempts to detect this case better and switches to a
different estimate.
We should rewrite this to maintain and update estimates for the
transfer speed, per-file overhead and chunk-assembly overhead each
time an item finishes. Then we could provide more consistent progress
estimates without ad-hoc fixes like this one.
Also, there's an issue where resuming a partial download will lead
to exaggerated transfer speed estimates.
2015-10-15 15:04:11 +02:00
Christian Kamm
abd63035c1
ETag: Allow parsing of weak tags #3946
2015-10-15 14:57:34 +02:00
Markus Goetz
745cf55abb
SelectiveSync: Increase folder list timeout to 60
...
Already done for 2.1 in 05eee16959
For #3524
2015-10-15 14:43:11 +02:00
Olivier Goffart
e1c634d000
Don't show the settings if another instance is started less than 10 secs after the apps.
...
Issue #3273
isSessionRestored was not set correctlty so ignore it
2015-10-15 14:25:23 +02:00
Jenkins for ownCloud
49a3a3ba7b
[tx-robot] updated from transifex
2015-10-15 02:19:02 -04:00
Carla Schroder
9982211ced
Merge pull request #3950 from owncloud/revert-3931-phil-davis-3dot-menu-doc-20
...
Revert "Update "..." menu documentation for 2.0"
2015-10-14 09:04:06 -07:00
Carla Schroder
10f59bf3ad
Revert "Update "..." menu documentation for 2.0"
2015-10-14 09:03:08 -07:00
Roeland Douma
df2418d9c5
Merge pull request #3661 from rullzer/public_upload
...
Allow setting of public upload on link shares
2015-10-14 15:34:25 +02:00
Roeland Jago Douma
2fdae6d72f
Allow setting op public upload on link shares
2015-10-14 15:30:28 +02:00
Roeland Jago Douma
05471d0acd
Also parse capabilitie for public uploads
2015-10-14 15:30:23 +02:00
Christian Kamm
05eee16959
SelectiveSync: Show in-progress label #3524
...
We now show 'Fetching data...' after a second.
This also increased the timeout to 60s, making the error
condition much less likely.
2015-10-14 13:05:53 +02:00
Roeland Douma
a752eadd0f
Merge pull request #3923 from owncloud/check_shareapi_available
...
Provide information about share availablity for files
2015-10-14 12:38:03 +02:00
Roeland Jago Douma
028dc8d6c3
Add SHARE_STATUS socketAPI command
...
This command allows to retrieve the share status of a file. In other
words if it can be shared.
2015-10-14 12:36:32 +02:00
Roeland Jago Douma
4a7242c8f9
Extended capabilities API
...
* Naming of capabilities is now a bit more consistent
2015-10-14 11:45:34 +02:00
Christian Kamm
efdb29d2f9
AccountSettings: Show disabled 'Add Folder' tooltip on click #3645
2015-10-14 11:34:30 +02:00
Jenkins for ownCloud
7487d02a70
[tx-robot] updated from transifex
2015-10-14 02:19:00 -04:00
Christian Kamm
225da68832
ExcludedFiles: Add test
2015-10-13 15:01:59 +02:00
Christian Kamm
51a2e6c580
Exclusion: Fix confusion with relative and absolute paths
2015-10-13 12:53:38 +02:00
Christian Kamm
7fe03c715d
SelectiveSync: Don't adjust removed path
2015-10-13 12:37:27 +02:00
Jenkins for ownCloud
c39f6c3fae
[tx-robot] updated from transifex
2015-10-13 02:19:01 -04:00
Jenkins for ownCloud
f4365dcca0
[tx-robot] updated from transifex
2015-10-12 02:18:57 -04:00
Jenkins for ownCloud
fd75d5c679
[tx-robot] updated from transifex
2015-10-11 02:18:57 -04:00
Jenkins for ownCloud
014a53f990
[tx-robot] updated from transifex
2015-10-10 02:19:00 -04:00
Klaas Freitag
419d18c128
FileSystem: Reuse the FileInfo object that is created in the caller.
...
With that, a lot of stats can be avoided, ie. in SocketAPI
2015-10-09 13:02:02 +02:00
Jenkins for ownCloud
da76ba6c64
[tx-robot] updated from transifex
2015-10-09 02:18:57 -04:00
Jenkins for ownCloud
afeb9e07e2
[tx-robot] updated from transifex
2015-10-09 01:15:36 -04:00
Klaas Freitag
74a7755ad9
SocketAPI: String concat optimization as learned on QtWS.
2015-10-08 18:26:30 +02:00
Klaas Freitag
c1ba927b37
Propagatorjobs: Removed superflous semicolon.
2015-10-08 16:20:42 +02:00
Daniel Molkentin
f22535e18a
Merge pull request #3931 from owncloud/phil-davis-3dot-menu-doc-20
...
Update "..." menu documentation for 2.0
2015-10-08 08:53:41 +02:00
Phil Davis
0f4e88eeaa
Update "..." menu documentation for 2.0
...
This menu in 2.0.* now has 4 options.
The small screenshot needs updating also. @carlaschroder it is probably best if you take a new screen shot from whatever client version you have been using for screen shots. That way they will all have a consistent look.
2015-10-08 12:28:15 +05:45
Jenkins for ownCloud
70476c332a
[tx-robot] updated from transifex
2015-10-08 02:18:57 -04:00
Klaas Freitag
a8eb913535
SyncLogDialog: Do not delete SyncLogDialog after close.
...
Keep one instance for the lifetime of the generalsettings widget.
2015-10-07 18:59:48 +02:00
Jenkins for ownCloud
79145ff9fd
[tx-robot] updated from transifex
2015-10-07 02:19:00 -04:00
Jenkins for ownCloud
a0eb4b9c85
[tx-robot] updated from transifex
2015-10-07 01:15:35 -04:00
Klaas Freitag
cb3a301f2c
Merge pull request #3899 from sebasje/sebas/cmake
...
fix multiarch library path for Debian/Ubuntu
2015-10-06 15:36:43 +02:00
Klaas Freitag
6d6903ef62
Merge pull request #3919 from phil-davis/libsynctypos
...
libsync comment and message typos for master
2015-10-06 14:49:54 +02:00
Klaas Freitag
f5daf50dc4
Merge pull request #3920 from phil-davis/guitypos
...
GUI comment and message typos for master
2015-10-06 14:46:00 +02:00
Klaas Freitag
f6631443a1
Merge pull request #3922 from RealRancor/backport_3916_2.0
...
Backport #3916 to 2.0 - thanks
2015-10-06 14:42:40 +02:00
Jenkins for ownCloud
87ad4dd264
[tx-robot] updated from transifex
2015-10-06 02:18:57 -04:00
Jenkins for ownCloud
bb289f63f1
[tx-robot] updated from transifex
2015-10-06 01:15:38 -04:00
RealRancor
67a71ff10f
Backport #3916 to 2.0
2015-10-05 16:22:11 +02:00
Phil Davis
b8ccbbc72a
GUI comment and message typos for master
2015-10-05 10:06:19 +05:45
Phil Davis
f0e17fd9c0
libtypos comment and message typos for master
2015-10-05 09:05:09 +05:45
Klaas Freitag
b09f1d591c
Merge pull request #3916 from RealRancor/fix_rst_syntax
...
Fix linkname in architecture.rst.
2015-10-04 17:59:45 +02:00
Jenkins for ownCloud
6b1bfb4474
[tx-robot] updated from transifex
2015-10-04 02:18:56 -04:00
RealRancor
8fd2b8d829
Fix linkname in architecture.rst.
2015-10-03 21:42:23 +02:00
Jenkins for ownCloud
8158984ad6
[tx-robot] updated from transifex
2015-10-03 02:19:01 -04:00
Jenkins for ownCloud
7b61bcfe10
[tx-robot] updated from transifex
2015-10-03 01:15:41 -04:00
Christian Kamm
d610693af1
SelectiveSync: Apply excludes #3876
2015-10-02 15:56:39 +02:00
Christian Kamm
7d1886684e
FolderWatcher: Use csync exclude code #3805
...
Introduce a global ExcludedFiles instance to avoid loading the global
exclude lists several times.
One could still add per-folder exclude lists by checking these after
the global ones.
2015-10-02 15:56:39 +02:00
Christian Kamm
95fc792745
Tray: Change texts #3657
2015-10-02 15:48:44 +02:00
Christian Kamm
efefc2d986
Merge branch '2.0'
...
Conflicts:
doc/images/menu.png
doc/images/settings_network.png
2015-10-02 15:44:50 +02:00
Christian Kamm
9f8d109a7e
Network errors: Use exception name, if message is empty #2718
2015-10-02 15:25:34 +02:00
Christian Kamm
cf9e5ffb0b
Remove dead code
...
no_recursive_propfind does not exist anymore.
2015-10-02 15:17:19 +02:00
Christian Kamm
3cbd63a77a
Propagation: Try another sync on 423 Locked #3387
...
(cherry picked from commit 24c41ed0da )
2015-10-02 14:49:38 +02:00
Christian Kamm
62eeed5201
Propagation: Make 423 Locked a soft error #3387
...
(cherry picked from commit 20ea9015ca )
2015-10-02 14:49:30 +02:00
Christian Kamm
1383023b2e
Fix the Qt4 build.
2015-10-02 11:05:15 +02:00
Jenkins for ownCloud
9558822a7c
[tx-robot] updated from transifex
2015-10-02 02:19:01 -04:00
Klaas Freitag
afd081f40b
Settings: Move synclog widget to a seperate dialog.
...
This a first step to integrate the server activity view, see #3732
2015-10-01 16:57:37 +02:00
Christian Kamm
7bf31e56ab
Ignores: Sync after update #3876
2015-10-01 15:39:28 +02:00
Christian Kamm
3812fd0866
Checksums: Prepare 'supported checksums' capability #3735
...
It currently always returns the empty list and thus has no effect.
2015-10-01 15:00:33 +02:00
Christian Kamm
24c41ed0da
Propagation: Try another sync on 423 Locked #3387
2015-10-01 13:05:07 +02:00
Christian Kamm
36e8e9ebf5
Propagator: Download disk space checks #2939
...
* There's a critical 50 MB threshold under which syncs abort
(OWNCLOUD_CRITICAL_FREE_SPACE)
* The sync client always keeps 250 MB free
(OWNCLOUD_FREE_SPACE)
2015-10-01 12:59:05 +02:00
Christian Kamm
12dc372b21
Sync: An initial diskspace check #2939
...
* Before each sync, check that there are at least
250 MB of space available and abort otherwise.
* Can be overridden with OWNCLOUD_MIN_FREE_SPACE
2015-10-01 10:25:35 +02:00
Jenkins for ownCloud
d8c5e58fa1
[tx-robot] updated from transifex
2015-10-01 02:18:59 -04:00
Christian Kamm
20ea9015ca
Propagation: Make 423 Locked a soft error #3387
2015-09-30 14:00:53 +02:00
Klaas Freitag
0c148025a3
SyncLog Dialog WIP
2015-09-30 12:02:05 +02:00
Christian Kamm
d0c2ce276a
Application: Fix crash on early shutdown #3898
2015-09-30 11:40:33 +02:00
Jenkins for ownCloud
9e813c7dcf
[tx-robot] updated from transifex
2015-09-30 02:19:15 -04:00
Klaas Freitag
440687af21
AccountSettings: Disable context menu of sync folders when not connected.
...
This is the second part to fix #3860
2015-09-29 18:19:26 +02:00
Klaas Freitag
77a9b28e14
SetupWizard: Removed unused member variables.
2015-09-29 09:30:40 +02:00
Jenkins for ownCloud
f84654c9b3
[tx-robot] updated from transifex
2015-09-29 02:19:10 -04:00
Sebastian Kügler
a7cf1b04ad
Simplify creating the library path
...
Instead of checking whether the library path ends up somewhere in /usr,
set the architecture prefix, anyway. The library path mechanism is also
used in custom prefixes, without this change, the library gets installed
globally on Debian and Ubuntu, leading to non-standard behaviour and
cross-build problems, as multiple architecture builds of this library
can't be installed alongside each other.
This is the minimal change to correct this behaviour from upstream cmake.
2015-09-29 00:15:39 +02:00
Markus Goetz
641dece89a
Linux: Don't show settings dialog always when launched twice
...
For #3273 #3771 #3485
See also d503221b2e
2015-09-28 23:00:19 +02:00
RealRancor
2c9d418423
Fix registry key syntax in FAQ.
2015-09-27 20:38:53 +02:00
Daniel Molkentin
a08a90a718
Merge pull request #3892 from RealRancor/fix_faq
...
Fix registry key syntax in FAQ.
2015-09-27 20:38:13 +02:00
RealRancor
1cb518cb13
Fix registry key syntax in FAQ.
2015-09-27 20:19:06 +02:00
Jenkins for ownCloud
a897a1805e
[tx-robot] updated from transifex
2015-09-26 02:19:01 -04:00
Jenkins for ownCloud
fe88b48fb1
[tx-robot] updated from transifex
2015-09-26 01:15:34 -04:00
Markus Goetz
574c699382
GUI: Change tray menu order #3657
2015-09-26 00:25:06 +02:00
Klaas Freitag
7b97b96115
Merge pull request #3884 from owncloud/fix_3860
...
AccountSettings: Do not allow to expand folder list when disconnected.
2015-09-25 17:52:39 +02:00
Klaas Freitag
e7e0e5b57f
win32 vio: Add the OPEN_REPARSE_POINTS flag to the CreateFileW call.
...
Otherwise win32 api simply does not open reparse points at all,
such as junctions.
This will improve the user experience of #3813 as we now identify
the junctions as symlinks.... and ignore them properly.
2015-09-25 17:36:41 +02:00
Klaas Freitag
b72e2b146d
AccountSettings: only expand root elements on single click.
...
Also, toggle expanding on single click for root elements.
2015-09-25 13:57:44 +02:00
Klaas Freitag
a1421ff74f
AccountSettings: Do not allow to expand the folder list when disconnected.
...
This is supposed to fix #3860
2015-09-25 12:22:51 +02:00
Klaas Freitag
57f10c0c8e
Use application SHORT name for the name of the MacOSX pkg file.
...
THis is because of https://github.com/owncloud/ownbrander/issues/445
2015-09-24 16:02:08 +02:00
Jenkins for ownCloud
1f5834b74a
[tx-robot] updated from transifex
2015-09-23 02:19:00 -04:00
Jenkins for ownCloud
836d7e1e5d
[tx-robot] updated from transifex
2015-09-23 01:15:36 -04:00
Carla Schroder
48df009cea
Merge pull request #3868 from owncloud/moardocupdates
...
perty new screenies and updates
2015-09-22 08:22:55 -07:00
Jenkins for ownCloud
6343417def
[tx-robot] updated from transifex
2015-09-22 02:19:03 -04:00
Carla Schroder
8c02034838
corrections
2015-09-21 10:19:49 -07:00
Jenkins for ownCloud
290cc58a63
[tx-robot] updated from transifex
2015-09-21 02:18:40 -04:00
Jenkins for ownCloud
5274b2485f
[tx-robot] updated from transifex
2015-09-20 02:18:33 -04:00
Jenkins for ownCloud
fc95e47790
[tx-robot] updated from transifex
2015-09-19 02:19:12 -04:00
Carla Schroder
caaf8c841e
perty new screenies and updates
2015-09-18 14:36:00 -07:00
Carla Schroder
6816cdd1c3
Merge pull request #3866 from owncloud/fixpr
...
restore missing image to fix build failure of PR 3838
2015-09-18 09:09:26 -07:00
Carla Schroder
5f857a49b8
restore missing image to fix build failure of PR 3838
2015-09-18 09:03:32 -07:00
Carla Schroder
70ab7f04b3
Merge pull request #3838 from owncloud/docfixes
...
move new features to introduction, fix missing images
2015-09-18 08:09:11 -07:00
Christian Kamm
c1045af500
FolderMan: Fix for removing a syncing folder #3843
...
We can't schedule the next folder if we aren't notified that
the removed folder has finished syncing...
2015-09-18 14:34:40 +02:00
Christian Kamm
c5c1a7a1c3
ConnectionMethodDialog: Don't be insecure on close #3863
2015-09-18 12:12:53 +02:00
Christian Kamm
4144d4672f
Updater: Ensure folders are not removed #3747
2015-09-18 11:59:49 +02:00
Jenkins for ownCloud
9cfa63eed8
[tx-robot] updated from transifex
2015-09-18 02:19:38 -04:00
Carla Schroder
68ed64e11d
remove ugly images
2015-09-17 17:44:21 -07:00
Carla Schroder
043655bd7a
nice new screenshots from windows pc
2015-09-17 17:41:22 -07:00
Daniel Molkentin
c71058980a
Revert "NSIS: Try to ignore (invalid) errors from NSIS UAC"
...
This reverts commit 38eaf241fa .
2015-09-17 14:47:54 +02:00
Christian Kamm
68947525a0
Settings: Add debug output #3820
2015-09-17 13:49:00 +02:00
Daniel Molkentin
38eaf241fa
NSIS: Try to ignore (invalid) errors from NSIS UAC
2015-09-17 13:40:02 +02:00
Christian Kamm
8f8bf98ca6
Folder settings: Ensure path is cleaned #3811
...
Paths with a trailing backslash lead to a failing sync beforehand.
These paths can appear in some migration scenarios.
2015-09-17 12:31:37 +02:00
Christian Kamm
ef0ab93e05
Propagator: Simplify sub job finished counting #3844
2015-09-17 10:12:23 +02:00
Jenkins for ownCloud
95e370b70c
[tx-robot] updated from transifex
2015-09-17 02:19:04 -04:00
Jenkins for ownCloud
5f06e3f738
[tx-robot] updated from transifex
2015-09-17 01:15:41 -04:00
Carla Schroder
3ba4e38693
new screenshots and revised installation page
2015-09-16 09:45:50 -07:00
Markus Goetz
c09b4e1477
Share dialog: Hide settings dialog before showing #3783
2015-09-16 11:17:00 -04:00
Markus Goetz
ca95276298
UI: Only expand 1 level in folder list #3585
2015-09-16 11:06:32 -04:00
Jenkins for ownCloud
5caf1ffb17
[tx-robot] updated from transifex
2015-09-16 03:44:15 -04:00
Markus Goetz
c2431f2c3b
ConnectionValidator: Fix warning
2015-09-15 21:10:21 -04:00
Markus Goetz
15e4d9e317
UI: Allow folder expanding from button click #3585
2015-09-15 21:10:14 -04:00
Markus Goetz
ef607e29de
UI: Expand folder treeview on single click #3585
2015-09-15 20:59:27 -04:00
Carla Schroder
25d1defd73
move new features to introduction, fix missing images
2015-09-15 16:34:45 -07:00
Daniel Molkentin
abfd97949d
Merge pull request #3810 from owncloud/phil-davis-remove-all
...
Remove all files text edit
2015-09-14 14:06:56 +02:00
Daniel Molkentin
5347a991cf
Merge pull request #3806 from owncloud/phil-davis-sync-remove
...
Adjust message box text for sync removal
2015-09-14 14:05:39 +02:00
Daniel Molkentin
f1a9e669b4
SyncEngine: fix typo
2015-09-14 13:57:51 +02:00
Jenkins for ownCloud
2d4bb31beb
[tx-robot] updated from transifex
2015-09-14 02:19:02 -04:00
Jenkins for ownCloud
57e9f96836
[tx-robot] updated from transifex
2015-09-14 01:15:35 -04:00
Markus Goetz
5a791ec11e
Merge pull request #3818 from owncloud/phil-davis-patch-1
...
OCUpdater description text
2015-09-14 00:46:55 +02:00
Jenkins for ownCloud
9dc9a7eac4
[tx-robot] updated from transifex
2015-09-13 02:19:13 -04:00
Jenkins for ownCloud
e695144cd8
[tx-robot] updated from transifex
2015-09-13 01:15:38 -04:00
Markus Goetz
cb6522e735
ConnectioNValidator: Fix redundant error message
...
For #3794
2015-09-12 20:57:49 -04:00
Jenkins for ownCloud
78a3453953
[tx-robot] updated from transifex
2015-09-12 02:19:07 -04:00
Jenkins for ownCloud
a08cb3846c
[tx-robot] updated from transifex
2015-09-12 01:15:36 -04:00
Phil Davis
d0aef138c3
OCUpdater decription text
...
Make it say something understandable. Looking at previous versions with git blame, the word "not" fits here.
2015-09-12 07:25:59 +05:45
Klaas Freitag
6930cd6687
csync_update: Handle error if current_fs is zero.
2015-09-11 18:12:45 +02:00
Jenkins for ownCloud
7bafc92df3
[tx-robot] updated from transifex
2015-09-11 09:32:57 -04:00
Daniel Molkentin
223a162a8b
NSIS: all strings must use $\r$\n rather than \r\n
...
Part of fix for #3519
2015-09-11 15:31:56 +02:00
Daniel Molkentin
1f6efab318
Add changes theme.qrc
...
Those were supposed to go in in an earlier commit
2015-09-11 15:31:56 +02:00
Daniel Molkentin
7128b0122e
Merge pull request #3807 from owncloud/phil-davis-remove-account
...
Adjust message box text for account removal
2015-09-11 14:44:42 +02:00
Daniel Molkentin
ba542cacb8
Run optipng on existing non-mono state icons
2015-09-11 13:45:57 +02:00
Daniel Molkentin
2f20c15824
Add complete list of monochrome state icons
...
This tries to address #3069
2015-09-11 13:45:31 +02:00
Phil Davis
6058b507c8
Remove all files text edit
2015-09-11 15:04:53 +05:45
Jenkins for ownCloud
0d55562869
[tx-robot] updated from transifex
2015-09-11 02:19:09 -04:00
Jenkins for ownCloud
c2fd708ce9
[tx-robot] updated from transifex
2015-09-11 01:15:36 -04:00
Phil Davis
1aff9bca95
Adjust message box text for account removal
...
Since the context menu text was changed to "Remove Account" it seems sensible to also change the title of this message box to match.
https://github.com/owncloud/client/issues/3793
2015-09-11 08:46:53 +05:45
Phil Davis
d76f76f429
Adjust message box text for sync removal
...
Since the context menu text was changed to "Remove Sync" it seems sensible to also change the title of this message box to match.
https://github.com/owncloud/client/issues/3745
2015-09-11 08:42:02 +05:45
Markus Goetz
1de4d96ab1
Account: Also display non-standard port in tray menu
...
For #3658
2015-09-10 19:27:16 -04:00
Markus Goetz
78ed4866ce
Merge pull request #3803 from owncloud/phil-davis-logout
...
Adjust log out description
2015-09-11 01:08:29 +02:00
Jocelyn Turcotte
d061a4b434
Merge pull request #3799 from phil-davis/srcstuff
...
Minor shell integration typos
2015-09-10 18:31:20 +02:00
Phil Davis
429f8229b3
Adjust log out description
...
Note: This whole doc needs review and updating of text and screen shots for 2.0 multi-account client.
2015-09-10 22:12:24 +05:45
Klaas Freitag
eb154de2a1
Merge pull request #3802 from owncloud/alt_webdav_url2
...
Branding option: Alternative WebDAV URL
2015-09-10 17:44:46 +02:00
Klaas Freitag
8c2b5af7f0
Account: Fixed typo in comment.
2015-09-10 17:44:20 +02:00
Klaas Freitag
9004fd6d11
Utility: Fix the size display back to JEDEC standard.
...
Also updated the test.
2015-09-10 17:36:28 +02:00
Klaas Freitag
5f660bf080
GUI: Replace term "sign in" with "Log in" and friends.
...
Also with doc changes.
2015-09-10 17:36:28 +02:00
Daniel Molkentin
1f55598010
Merge pull request #3801 from phil-davis/src2
...
Minor typos in client test section
2015-09-10 17:04:52 +02:00
Klaas Freitag
9eec45f9c4
SetupPage: Fix crash caused by uninitialized Account object.
...
Since the webdav path is read from account now, it needs to be
initialized first thing.
2015-09-10 16:03:22 +02:00
Klaas Freitag
cf7726353a
Always use the webdav path from the Account object.
...
The Account object has the themed webdav path if it is branded.
2015-09-10 15:39:37 +02:00
Klaas Freitag
93e1ad088c
Account: Make sure that davPath() always comes with trailing slash.
2015-09-10 15:38:40 +02:00
Phil Davis
13b6b3989a
Minor typos in client test section
...
Note: I am not sure that nostoredpasswd even exists in the current
version. Maybe the stuff in testplan.txt is old and not relevant anyway?
2015-09-10 18:11:44 +05:45
Daniel Molkentin
2a8aa8a108
Merge pull request #3800 from phil-davis/src1
...
cmd and crashreporter minor typos
2015-09-10 13:58:26 +02:00
Phil Davis
b490be2267
cmd and crashreporter minor typos
...
nothing important here
2015-09-10 17:34:26 +05:45
Olivier Goffart
cac219aca8
Dolphin shell integration: Add a Share with owncloud action
2015-09-10 13:41:45 +02:00
Olivier Goffart
a159dfc7ec
Dolphin shell integration: Make it work with dolphin master
2015-09-10 13:41:45 +02:00
Daniel Molkentin
593ad20e69
Remove shadow from ownCloud icon
...
Fixes #3693
2015-09-10 13:41:36 +02:00
Phil Davis
bae552f386
Minor shell integration typos
...
all in comments or other places that have no effect on the user.
2015-09-10 17:14:08 +05:45
Klaas Freitag
16d6418d10
Use a themable WebDAV path all over.
...
This is needed for enterprise#481
2015-09-10 13:04:26 +02:00
Klaas Freitag
995b42d0fc
Units: Back to the "usual" mix units.
...
Now we display units again numerically wrong (based on 1024) but back
to how it was before in ownCloud.
2015-09-10 12:08:20 +02:00
Daniel Molkentin
c0f8ff1030
Account: Display non-standard port as part of the hostname
...
Addresses #3658
2015-09-10 10:17:31 +02:00
Daniel Molkentin
8e2b9c6f12
Merge pull request #3797 from phil-davis/minorstuff
...
Minor build etc typos
2015-09-10 09:49:16 +02:00
Phil Davis
7d191763b5
Minor build etc typos
...
Just some random stuff I noticed while looking at how this beast is put
together.
2015-09-10 13:20:11 +05:45
Jenkins for ownCloud
144a1a1922
[tx-robot] updated from transifex
2015-09-10 02:19:05 -04:00
Daniel Molkentin
be3529ebcb
Adjust strings in settings dialogs
...
Implements #3745 & #3793
2015-09-10 01:46:28 +02:00
hh.lohmann
e00cc4ed5b
/doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"
...
Registry keys are no directories; you would not "migrate" to keys if you are just about to switch to them; resembling formulas as "Edit these / this Registry key/s" ease fast reading, for that also ":" instead of "::" at the end (formatting what follows)
2015-09-10 01:37:40 +02:00
Daniel Molkentin
b7061618b1
Merge pull request #3789 from hh-lohmann/Terminology
...
/doc/autoupdate.rst: "32-/64-bit" => "32-/64-bit-Windows"
2015-09-10 01:37:10 +02:00
Phil Davis
613736aa41
Coin the term 'folder sync connection'
...
Proposed wording for issue
https://github.com/owncloud/client/issues/3757
2015-09-10 01:35:58 +02:00
Daniel Molkentin
d823809021
Merge pull request #3781 from phil-davis/FSC
...
Coin the term 'folder sync connection'
2015-09-10 01:35:25 +02:00
Daniel Molkentin
b83c723e3f
Allow (partial) translations even when run from build dir
...
Makes it easier to catch translation issues earlier
2015-09-10 01:25:16 +02:00
Individual IT Services
6b222c3db7
fix unicode issue #3753
...
fixes the unicode issue #3753
I don't know much CPP and Qt but after some google research I found this http://wiki.qt.io/Strings_and_encodings_in_Qt
it does mention trUtf8() that has done the trick for me on Linux with Gnome 3.16.
Haven't tested it on other systems
2015-09-10 01:24:11 +02:00
Klaas Freitag
088c0d471a
AccountSettings: Do not prepend the folder alias to the undecided folders
...
This fixes bug #3685
2015-09-09 17:52:39 +02:00
Jocelyn Turcotte
5e657aadee
Fix Finder crashing when showing the context menu on OS X <= 10.9
...
OwnCloudFinderRequestManager::_shareMenuTitle was not retained anymore
after the FinderSync refactoring which would cause it to contain any
kind of garbage value for some reason.
Fix the issue by also enabling ARC for RequestManager.m.
We can't enable ARC for the whole project since Finder.h is included
by many .m files and it's not trivial to port to ARC.
2015-09-09 17:45:24 +02:00
Klaas Freitag
98e6d61d1b
General settings: Set left margin of layout to zero.
...
This fixes the vertical alignment of the checkboxes, see bug #3758
2015-09-09 15:52:22 +02:00
Klaas Freitag
df534753b1
csync_update: Handle permission denied as soft error in discovery.
...
For that, treat the not accessible directory as if it were ignored.
This will fix #3767
2015-09-09 14:12:13 +02:00
Klaas Freitag
02c077e3f8
vio_local_win: Properly set errno in case of error happened.
...
Without a proper errno value, the calling function can not detect
the kind of problem.
2015-09-09 14:10:23 +02:00
hh.lohmann
0329a8be2e
/doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"
...
Registry keys are no directories; you would not "migrate" to keys if you are just about to switch to them; resembling formulas as "Edit these / this Registry key/s" ease fast reading, for that also ":" instead of "::" at the end (formatting what follows)
2015-09-09 12:33:25 +02:00
hh.lohmann
79f64abfc3
/doc/autoupdate.rst: "32-/64-bit" => "32-/64-bit-Windows"
...
Should be stated clearly that there are no alternative 32- / 64-bit-ownCloud-Clients, but just a 32-bit-ownCloud-Client that is treated differently in 32- / 64-bit-Windows
2015-09-09 12:10:10 +02:00
Jenkins for ownCloud
ba2145032e
[tx-robot] updated from transifex
2015-09-09 02:19:02 -04:00
Markus Goetz
63636aca9b
Merge pull request #3777 from owncloud/individual-it-utf8-patch
...
fix unicode issue #3753
2015-09-08 16:06:42 +02:00
Markus Goetz
bff9d646f7
Merge pull request #3691 from individual-it/2.0
...
Nautilus: don't show share menu item for top level folders
2015-09-08 16:03:48 +02:00
Phil Davis
fdfab07d07
Coin the term 'folder sync connection'
...
Proposed wording for issue
https://github.com/owncloud/client/issues/3757
2015-09-08 17:22:57 +05:45
Individual IT Services
cc5f8e5122
fix unicode issue #3753
...
fixes the unicode issue #3753
I don't know much CPP and Qt but after some google research I found this http://wiki.qt.io/Strings_and_encodings_in_Qt
it does mention trUtf8() that has done the trick for me on Linux with Gnome 3.16.
Haven't tested it on other systems
2015-09-08 13:59:43 +05:45
Jenkins for ownCloud
8495d097bb
[tx-robot] updated from transifex
2015-09-08 02:19:14 -04:00
Olivier Goffart
21dbf97a02
Merge remote-tracking branch 'origin/2.0'
2015-09-07 10:32:16 +02:00
Daniel Molkentin
66f340734c
Consistency: Use folder instead of directory in user visible strings
2015-09-07 08:51:40 +02:00
Jenkins for ownCloud
794f071561
[tx-robot] updated from transifex
2015-09-07 02:18:55 -04:00
Christian Kamm
c6794afc3a
Tray: Enable workaround for Qt5 only #3765
2015-09-07 07:44:07 +02:00
Jenkins for ownCloud
8920ba3de2
[tx-robot] updated from transifex
2015-09-06 02:19:00 -04:00
Olivier Goffart
39bff056a6
Merge remote-tracking branch 'origin/2.0'
2015-09-05 18:14:30 +02:00
Jocelyn Turcotte
128d46e19a
Remove *Credentials::_fetchJobInProgress
...
Now that fetchFromKeychain is solely called from AccountState::slotInvalidCredentials
and that this one already protects the fetch call using _waitingForNewCredentials,
we can remove that extra check.
2015-09-05 16:00:45 +02:00
Jocelyn Turcotte
6d027ebd40
Separate the credential dialog from their fetch #3350
...
This moves the responsibility of asking the user or not for
credentials from the Credentials classes back to the AccountState.
fetch() now only extract credentials from the keychain, reports
the result to the AccountState which then decides if askFromUser()
should be called or not. The result is once more reported to the
AccounState.
This also replaces the HttpCredentials::queryPassword virtual
which now lets HttpCredentialsGui and HttpCredentialsText do it
the way that they prefer.
2015-09-05 16:00:45 +02:00
Jocelyn Turcotte
89f69209dd
Simplify the authentication code paths #3350
...
The AccountState is now the only class responsible for triggering credentials
fetching from the keychain or from the user.
With the ShibbolethRefresher out of the question it's possible
to remove the invalidateAndFetch virtual and manually call invalidateToken.
This also allows us to move that code from Account to AccountState.
In the end this also allows us to move the fetch() call from the
ConnectionValidator and use the same code path as for invalid credentials.
2015-09-05 16:00:45 +02:00
Jocelyn Turcotte
94a57fe8d5
Get rid of ShibbolethRefresher
...
This is only for neon and not necessary if we want to show a notification
instead of a login window when the network reports invalid credentials.
2015-09-05 15:45:54 +02:00
Jenkins for ownCloud
14c55083f3
[tx-robot] updated from transifex
2015-09-05 02:19:05 -04:00
Christian Kamm
c832a9eee5
csync io: Fix UNC path conversion on Win #3748
...
Paths that were already in UNC form don't need to be prefixed.
2015-09-04 15:57:21 +02:00
Christian Kamm
699acc99e4
Tray: Don't use the tray workaround with the KDE theme #3706
...
That just triggers another bug...
2015-09-04 15:31:36 +02:00
Christian Kamm
90338499d3
ShareDialog: Fix folder display #3659
...
Sometimes having a double starting / broke the display logic.
2015-09-04 15:16:25 +02:00
Christian Kamm
641f56664e
FolderStatus: Show 'waiting for other folder' #3619
...
We monitor the scheduling queue and show messages like
"Waiting for 5 other folders...".
2015-09-04 10:42:21 +02:00
Christian Kamm
419deff861
AccountSettings: Restore from legacy only once #3565
...
And also introduce a Accounts/version int at the same time. That
may make future account settings migrations easier to manage.
2015-09-04 09:25:12 +02:00
Jenkins for ownCloud
69f8dd896f
[tx-robot] updated from transifex
2015-09-04 02:19:10 -04:00
Olivier Goffart
e49a8a9ffe
SSL Certificate Error Dialog: show account name #3729
...
Change the wording of the certificate error dialog to include the
account URL and be a bit more accurate.
(Do not mention "SSL" in user facing messages)
2015-09-03 16:19:53 +02:00
Olivier Goffart
b6e0802203
Doc for owncloudcmd: we only use the config of the gui client for the crendential #3293
2015-09-03 11:18:02 +02:00
Jenkins for ownCloud
e03fe8bcbf
[tx-robot] updated from transifex
2015-09-03 02:19:02 -04:00
Christian Kamm
7bfbc21770
Settings: Allow adding at least one account #3721
...
We always show the 'Add Account' button when no account exists,
even When the 'singleAccount' option is enabled.
2015-09-03 06:14:49 +02:00
Olivier Goffart
d853b4f083
FolderDefinition: Escape the alias of a folder before writing to the config
...
Issue #3707
2015-09-02 16:07:34 +02:00
Christian Kamm
d8939184db
Tray: Clicks work even with Qt 5.5.0 workaround #3722
2015-09-02 15:51:23 +02:00
Olivier Goffart
e54253d845
PropagateLocalRemove: remove entries from the DB even if there was an error.
...
Previously, in case of an error while deleting a directory, we would not
remove the entries from the local db, despite most of the files would
be deleted.
Which means that if the files re-appear on the server with the same etag,
we would think the file were deleted from the client and propagate the change.
In 1.8.0 we had this bug that we would not see some directory in the server in
some cases. This would lead us to delete the file on the client. Normaly the
files are deleted from the local database and next sync would re-download the files.
But in the cases where there was an error deleting one of the file (for example
if it was locked) we would then propagate the delete to the server.
Fix this by always deleting from the database the files that we deleted.
Issue #3206
2015-09-02 15:26:50 +02:00
Jenkins for ownCloud
141d43a1ee
[tx-robot] updated from transifex
2015-09-02 07:09:38 -04:00
Jenkins for ownCloud
0fac72f3b3
[tx-robot] updated from transifex
2015-09-01 14:04:35 -04:00
Jenkins for ownCloud
cc4bc2e47a
[tx-robot] updated from transifex
2015-09-01 13:02:24 -04:00
Jocelyn Turcotte
dcb687929f
Show a notification instead of a login window on startup #3350
...
The original problem is that showing a popup not originated
from the main settings window while it's focused won't be
shown in front to the user.
This try not to highjack the user's attention of the user
by showing a notification when checking the connection for
valid credentials, and require the user to sign in through
the UI. There are still issues with showing that popup from
the tray icon, but the user will most likely be looking for
the popup in that case. The new sign in button directly in
the settings account works properly.
2015-09-01 18:40:20 +02:00
Jocelyn Turcotte
628957de21
Remove the _readPwdFromDeprecatedPlace codepath
...
This was introduced in 1.6.2 to read the password from earlier versions.
People upgrading from 1.5 to 2.1 will sadly need to re-enter their password.
2015-09-01 18:40:20 +02:00
Jocelyn Turcotte
bcfc16c0f6
Add a sign in button in the settings window
...
It's not obvious for users that they should sign in through
the tray icon, especially if they were automatically signed out.
2015-09-01 18:40:20 +02:00
Olivier Goffart
3ba5e27d02
Merge branch '2.0'
2015-09-01 17:57:56 +02:00
Olivier Goffart
0fa4353841
Remove the accountmigrator.cpp It is not used
...
This was used to convert the config from the community client to
the branded client. But we don't need this feature anymore
https://github.com/owncloud/client/issues/3515#issuecomment-133394443
2015-09-01 17:03:58 +02:00
Klaas Freitag
58ea498a62
Update changelogs date and version.
2015-09-01 15:50:21 +02:00
Jocelyn Turcotte
688aaadb60
Don't show a sync success status toolip when signed out
2015-09-01 15:35:10 +02:00
Olivier Goffart
f77ae28ed1
AccountSettings: Fix coverity warning
...
FolderMan::folder might return null
2015-09-01 11:39:55 +02:00
Olivier Goffart
0d08bbec74
AccountSettings: remove unused member
...
Fix a coverity warning
2015-09-01 11:37:47 +02:00
Olivier Goffart
ebee6f0bc2
Settings dialog: remove the close button #3713
2015-09-01 11:32:59 +02:00
Olivier Goffart
db8f9586cb
Tray notification: Don't show a message about modified folder #3613
2015-09-01 11:29:37 +02:00
Jocelyn Turcotte
35318ea9b5
Fix the Windows build
...
Use an iterator variable declared outside of the loop condition
expression.
MinGW doesn't support C99 very easily and it's easier to keep
our C code C89 compliant.
2015-08-31 17:23:25 +02:00
Daniel Molkentin
7aeb27d5ee
Bump 2.0 brancht to 2.0.2 after creation of 2.0.1 branch
2015-08-31 16:50:07 +02:00
Daniel Molkentin
322288bf6c
2.0.1rc1
2015-08-31 16:39:37 +02:00
Daniel Molkentin
6b7bfc75a8
Update ChangeLog
2015-08-31 16:39:17 +02:00
Daniel Molkentin
abe96135ff
Bump to 2.0.1
2015-08-31 16:37:22 +02:00
Olivier Goffart
8bf2db27dd
AccountWizard: fix when the theme specify a override URL #3699
2015-08-31 16:37:00 +02:00
Olivier Goffart
950bc578d0
Merge branch '2.0'
2015-08-31 14:34:04 +02:00
Jocelyn Turcotte
c48c5b9286
Move the progress bar to the right of the quota label
...
Also change the label to show the free space and show
the used and total space only on a tooltip of the bar.
Related to #3644
2015-08-31 12:33:21 +02:00
Markus Goetz
d503221b2e
Desktop file: Add X-GNOME-Autostart-Delay #3686 #1739
2015-08-31 12:01:00 +02:00
Carla Schroder
b3a462d452
more typos
2015-08-31 11:12:47 +02:00
Carla Schroder
916f522010
typo correction
2015-08-31 11:03:14 +02:00
Carla Schroder
967b533e37
typo corrections, cross-refs
2015-08-31 10:48:43 +02:00
Olivier Goffart
9172a5fc4c
FolderStatusModel: add a function to get a QModelIndex from the path
...
Will be usefull to solve #3704
2015-08-31 10:14:58 +02:00
Jenkins for ownCloud
17e9b65cad
[tx-robot] updated from transifex
2015-08-31 02:19:06 -04:00
Jocelyn Turcotte
a976f75783
Merge pull request #3709 from owncloud/fix/mac
...
Fix/mac
2015-08-30 17:55:32 +02:00
Felix Böhm
3ebc422bb5
Fix qtmacgoodies submodule
...
* was broken by 514372db6b
2015-08-30 17:51:43 +02:00
Felix Böhm
9f765c940e
update documentation link to build for version 2.0
2015-08-30 17:41:51 +02:00
Olivier Goffart
1a0d0c0a31
Account Settings: rework the toolbar
...
Modifications ask by Jan:
- Elide the label in the actions
- Minimum sizes for the actions
- No separatcions between the accounts
Issue #3516
2015-08-30 15:31:13 +02:00
Jenkins for ownCloud
ce769cb1ef
[tx-robot] updated from transifex
2015-08-30 02:19:04 -04:00
Olivier Goffart
8fb4adf40d
AccountWizard: fix when the theme specify a override URL #3699
2015-08-29 18:51:27 +02:00
Carla Schroder
03954b5918
Merge pull request #3702 from owncloud/updates2-0
...
updates for 2.0 release
2015-08-29 17:08:03 +02:00
carla schroder
ab4fa905fc
updates for 2.0 release
2015-08-29 16:26:48 +02:00
Jenkins for ownCloud
530552820d
[tx-robot] updated from transifex
2015-08-29 02:19:05 -04:00
Jocelyn Turcotte
cb1bcdc8e0
Tweak the settings UI
...
- Move the cancel and apply buttons side by side
- Hide the notification label when empty
- Clamp elements at the top together a bit
2015-08-28 15:51:11 +02:00
Olivier Goffart
1f43c47861
Folder: Do not create the sync folder if it does not exist #3692
2015-08-28 14:40:45 +02:00
Individual IT Services
5414c65442
don't show share menu item for top level folders
...
Top level folders cannot be shared. If you try you receive an 403 error.
So we should not show the "Share with Owncloud" menu item for them
2015-08-28 16:24:52 +05:45
Jocelyn Turcotte
f38deb44fb
Don't disable the selective sync cancel button
...
This makes its interaction more consistent versus other
kinds of dialogs or versus when the selective sync config
has been changed or not.
2015-08-28 12:14:56 +02:00
Jenkins for ownCloud
937526b881
[tx-robot] updated from transifex
2015-08-28 02:19:15 -04:00
Jenkins for ownCloud
7ba97d88d5
[tx-robot] updated from transifex
2015-08-28 01:15:38 -04:00
Carla Schroder
ccfcdff190
Merge pull request #3665 from owncloud/2-0updates
...
1st batch of updates for 2.0
2015-08-27 10:28:03 +02:00
Carla Schroder
45835f1cf9
Update navigating.rst
2015-08-27 10:25:19 +02:00
Carla Schroder
cf543d1eb0
Update navigating.rst
2015-08-27 10:20:15 +02:00
Carla Schroder
9f24f10186
Update installing.rst
2015-08-27 10:07:54 +02:00
Jenkins for ownCloud
64b211f5db
[tx-robot] updated from transifex
2015-08-27 02:19:42 -04:00
Jenkins for ownCloud
32c636a471
[tx-robot] updated from transifex
2015-08-26 02:19:06 -04:00
Klaas Freitag
2d421a8275
Push version on to 2.0.1 git
2015-08-25 10:24:52 +02:00
Christian Kamm
ed28a21cb0
Tray: Hide while modifying menus #3656 #3672
...
This may help workaround the dbus tray issue in Qt 5.5.0.
2015-08-25 09:46:03 +02:00
Jenkins for ownCloud
3db0db451e
[tx-robot] updated from transifex
2015-08-25 02:19:17 -04:00
Christian Kamm
035e57cf37
AddFolder: Improve remote path selection error handling #3573
2015-08-24 15:08:35 +02:00
Christian Kamm
07ca0be3c5
csync_excluded: Another speedup #3638
...
Build a list of path components outside of the exclude pattern loop.
2015-08-24 15:08:06 +02:00
Christian Kamm
e71cca128d
csync_update: Use excluded_traversal() to improve performance #3638
2015-08-24 15:08:06 +02:00
Christian Kamm
fe49255bff
csync_excluded: Add fast _traversal() function #3638
...
This function only checks the full path and the basename and is thus
around 7x faster. It is very useful in a csync_update context where
we know that the leading dirs have already been checked for exclusion.
2015-08-24 15:08:06 +02:00
Christian Kamm
20f4ec6b67
csync_exclude: Speed up siginificantly #3638
...
The performance test indicates a speedup of around 3x for paths
with around 12 components.
2015-08-24 15:08:06 +02:00
Christian Kamm
92f6134ed3
AccountSettings: Adjust quota info design #3644 #3651
2015-08-24 15:06:11 +02:00
Christian Kamm
a0f9b834b6
Adjust buttons on remove folder/account questions #3654
2015-08-24 15:05:40 +02:00
Klaas Freitag
2ad57ee8ab
Bump version to 2.0.0 final, some Changlog addings
2015-08-24 14:23:54 +02:00
Christian Kamm
6c5328e4ca
Utility: Fix constants for 32-bit arch #3670
2015-08-24 13:56:10 +02:00
Christian Kamm
6cf1caeaf3
Theme: Fix wizardSelectiveSyncDefaultNothing #3671
2015-08-24 12:55:44 +02:00
Jenkins for ownCloud
ce233105b6
[tx-robot] updated from transifex
2015-08-24 02:19:03 -04:00
Jenkins for ownCloud
30033cdd7d
[tx-robot] updated from transifex
2015-08-23 02:19:02 -04:00
Jenkins for ownCloud
18f54ad758
[tx-robot] updated from transifex
2015-08-22 02:19:05 -04:00
Carla Schroder
bc37668e9f
1st batch of updates for 2.0
2015-08-21 13:19:15 -07:00
Klaas Freitag
4eadaeafc9
Bump version to rc2
2015-08-21 15:59:27 +02:00
Christian Kamm
3414b58b99
Systray: Workaround for issue with Qt 5.5.0 #3656
2015-08-21 09:45:02 +02:00
Jenkins for ownCloud
14d1919139
[tx-robot] updated from transifex
2015-08-21 02:19:05 -04:00
Christian Kamm
7aae5e494a
AccountSettings: Fix margins on 'Add folder' button #3650
2015-08-20 13:25:19 +02:00
Christian Kamm
0711a2fc12
SettingsDialog: Fix typo in showFirstPage()
2015-08-20 11:57:44 +02:00
Jenkins for ownCloud
577eb1f609
[tx-robot] updated from transifex
2015-08-20 02:19:09 -04:00
Olivier Goffart
92fc902e0c
Account Settings: Hide the add folder button when Theme::singleSyncFolder is set
2015-08-19 18:00:11 +02:00
Christian Kamm
791c550a8e
FolderStatusDelegate: Add margin to button #3650
2015-08-19 16:58:27 +02:00
Christian Kamm
344d3565f8
Another account deletion wording update #3649
2015-08-19 15:55:29 +02:00
Christian Kamm
73785d0473
SettingsDialog: Activate the first page on startup
2015-08-19 15:51:48 +02:00
Christian Kamm
b155503fa2
FolderStatusModel: Undo accidental debug change
2015-08-19 15:05:30 +02:00
Christian Kamm
2c011dcae6
FolderStatusModel: Fix typo in error message #3524
2015-08-19 15:04:39 +02:00
Christian Kamm
0e0af1da07
FolderStatusModel: No italic text #3524
2015-08-19 15:02:08 +02:00
Christian Kamm
a7d0f0cdd4
Adjust wording of delete account/folder message #3643
2015-08-19 10:59:34 +02:00
Jenkins for ownCloud
488d57d81c
[tx-robot] updated from transifex
2015-08-19 02:19:12 -04:00
Olivier Goffart
38aa4cf304
Folder Model: add an error item when one cannot fetch the list of folders #3524
2015-08-18 13:21:02 +02:00
Olivier Goffart
0638f99b79
Selective Sync dialog: add the quota-used-bytes to the request
...
Mentioned in https://github.com/owncloud/client/issues/3524#issuecomment-132144532
2015-08-18 12:26:52 +02:00
Daniel Molkentin
da93f37067
doc: Update Windows build instructions
2015-08-18 11:53:57 +02:00
Individual IT Services
9a0fba5f5e
checking if file or folder is to be shared to fix issue #3556
2015-08-18 11:46:29 +02:00
Daniel Molkentin
22d87218b7
Merge pull request #3601 from individual-it/master
...
checking if file or folder is to be shared to fix issue #3556
2015-08-18 11:45:31 +02:00
Daniel Molkentin
bd39543542
Merge pull request #3623 from owncloud/phil-davis-conffile-20
...
Conffile doc typo 2.0
2015-08-18 11:13:46 +02:00
Daniel Molkentin
49949084fb
Merge pull request #3628 from owncloud/phil-davis-FAQ-20
...
FAQ Doc typo 2.0
2015-08-18 11:13:26 +02:00
Daniel Molkentin
b584f37906
Merge pull request #3627 from owncloud/phil-davis-troubleshooting-20
...
Troubleshooting Doc minor typos 2.0
2015-08-18 11:13:17 +02:00
Daniel Molkentin
70f3b91a1e
Merge pull request #3626 from owncloud/phil-davis-architecture-20
...
Architecture Doc typos and formatting 2.0
2015-08-18 11:10:54 +02:00
Daniel Molkentin
15545168d4
Merge pull request #3625 from owncloud/phil-davis-building-20
...
Building Doc minor corrections 2.0
2015-08-18 11:10:38 +02:00
Daniel Molkentin
2d797c9408
Merge pull request #3624 from owncloud/phil-davis-autoupdate-20
...
Autoupdate Doc bullet point rendering 2.0
2015-08-18 11:10:35 +02:00
Daniel Molkentin
8d5ffccaf1
Merge pull request #3622 from owncloud/phil-davis-navigating-20
...
Navigating doc typos 2.0
2015-08-18 11:10:29 +02:00
Daniel Molkentin
855947751e
Merge pull request #3621 from owncloud/phil-davis-installing-20
...
Installing doc typo 2.0
2015-08-18 11:10:04 +02:00
Markus Goetz
9dd9a9a524
Exclude file: Add syncform files #3640
2015-08-18 11:06:26 +02:00
Jenkins for ownCloud
554e5b8f73
[tx-robot] updated from transifex
2015-08-18 02:19:12 -04:00
Jenkins for ownCloud
f368c0e379
[tx-robot] updated from transifex
2015-08-18 01:15:36 -04:00
Olivier Goffart
f0e6864639
FolderModel: Refresh the tree when new folder are added or removed. #3570
2015-08-17 12:50:22 +02:00
Markus Goetz
6c57d71ca4
Settings dialog: Move more common hostname prefixes in toolbar
...
For #3577
2015-08-17 12:39:32 +02:00
Olivier Goffart
64bd6b204b
Folder Wizard: always make an alias that does not conflict with anything
2015-08-17 11:54:01 +02:00
Olivier Goffart
7ca8040788
Show a shortened version of the path in the account settings and activity
...
Issue #3576 , #3567
2015-08-17 11:43:30 +02:00
Jenkins for ownCloud
c98ee987cd
[tx-robot] updated from transifex
2015-08-17 02:18:50 -04:00
Jenkins for ownCloud
bd16ad4783
[tx-robot] updated from transifex
2015-08-17 01:15:27 -04:00
Jenkins for ownCloud
6aea40534e
[tx-robot] updated from transifex
2015-08-16 02:18:46 -04:00
Jenkins for ownCloud
309e0c5902
[tx-robot] updated from transifex
2015-08-15 02:19:01 -04:00
Daniel Molkentin
7317e9af61
No beta note in nightly builds
2015-08-15 02:56:30 +02:00
Olivier Goffart
bfb637e64d
Fix build with old cmake
...
DIRECOTRY is new in 2.8.12.
Uses PATH instead
2015-08-14 14:21:40 +02:00
Phil Davis
e54bbcd15f
FAQ Doc typo
2015-08-14 17:48:37 +05:45
Phil Davis
149d6c32c1
Troubleshooting Doc minor typos 2.0
2015-08-14 17:46:42 +05:45
Olivier Goffart
0da6184f84
Setup Wizard: adjust the layout #3588
2015-08-14 14:01:01 +02:00
Phil Davis
0ca3df917e
Architecture Doc typos and formatting 2.0
2015-08-14 17:43:36 +05:45
Phil Davis
12fe59e3ce
Building Doc minor corrections
2015-08-14 17:41:02 +05:45
Phil Davis
3bfb8f6906
Autoupdate Doc bullet point rendering 2.0
...
A space at the start of the bullet point about "Locate and open the following file" seems to be causing that bullet point to not line up nicely on the rendered page.
2015-08-14 17:38:41 +05:45
Phil Davis
7527ee0cd3
Conffile doc typo
2015-08-14 17:35:18 +05:45
Phil Davis
080ec49fae
Navigating doc typos
...
Some "downloading" that should be "uploading".
Some bullet points with "code" items were rendering with bold, italics on the published page. These seemed to be bullet points that had 3 spaces at the start of their 2nd line of text. Other bullet points that rendered correctly had only 2 spaces. So I removed the extra space. I hope it renders nicely in the published form - it is a bit hard to know in the GitHub Preview, because that is trying to show change-sidebars and differences also.
2015-08-14 17:32:32 +05:45
Phil Davis
fe92186ce0
Installing doc typo 2.0
2015-08-14 17:28:47 +05:45
Olivier Goffart
ab52c8bcd7
Merge #3611
2015-08-14 13:32:48 +02:00
Markus Goetz
62d64acd7b
Merge pull request #3589 from owncloud/sharedir
...
Use SHAREDIR for i18n dir
2015-08-13 16:02:11 +02:00
Kirill Bychkov
1fe82ac70c
define OpenBSD
2015-08-13 09:54:53 +03:00
Kirill Bychkov
7786f1f9a9
Fix linking with libinotify on OpenBSD.
2015-08-13 09:44:55 +03:00
Individual IT Services
c6ff73f3e5
checking if file or folder is to be shared to fix issue #3556
2015-08-12 21:48:04 +05:45
hefee
a87602af3f
use SHAREDIR for i18n
...
SHAREDIR is used in src/gui/application.cpp and should also use that in
CMakeLists.txt.
2015-08-11 15:14:59 +02:00
Daniel Molkentin
3ce210f298
Merge pull request #3578 from owncloud/LukasReschke-patch-1
...
Use HTTPS links
2015-08-10 12:29:23 +02:00
Lukas Reschke
f74053f8ed
Use HTTPS links
...
No need to have an additional redirect
2015-08-10 12:15:45 +02:00
Olivier Goffart
68cff5cd10
Merge branch '2.0'
2015-08-07 11:31:44 +02:00
Jenkins for ownCloud
ee75d37983
[tx-robot] updated from transifex
2015-08-07 02:18:51 -04:00