Camila San
e0b32c19e4
Bump version to 2.6.0
...
Signed-off-by: Camila San <hello@camila.codes >
2019-09-27 17:01:24 +02:00
Camila San
a2bfd5039c
Revert "Fix White Window issue on Windows after Qt 5.12.4 upgrade"
...
This reverts commit aeba2e4de6 .
2019-09-27 15:04:14 +02:00
Camila San
a9ee7472b9
Improve wording of the context menu in the file manager extension.
...
'Share...' -> 'Share options'
'private link' -> 'internal link'
Removes 'to clipboard' from 'copy link' options.
Signed-off-by: Camila San <hello@camila.codes >
2019-09-26 13:24:10 +02:00
Michael Schuster
211d6cb162
UI improvement: Message box: Delete / Keep all files
...
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-09-26 12:05:34 +02:00
Mariusz Wasak
501c353291
Fix for #1382 "linux client crashes for no discernable reason"
...
There in no "return" in
PropagateUploadFileCommon::slotStartUpload in if (prevModtime != _item-
>_modtime) {... }
There is possibility that
PropagateItemJob::done(status, errorString)
maybe called two times from PropagateUploadFileCommon::slotStartUpload
1. in if (prevModtime != _item->_modtime) {... }
2. in if (fileIsStillChanging(*_item)) {..}
if changes in files are frequent the second call is possible.
This two calls has effect in PropagatorCompositeJob::slotSubJobFinished
and job is removed two times in _runningJobs.remove(i);
(the second time with argumetnt -1 (because first call removed job).
This return was removed in commit
efc039863b - by accident I think.
Good simulation is to synchronize firefox profile with frequent page
refresh.
Signed-off-by: Mariusz Wasak <mawasak@gmail.com >
2019-09-26 12:03:20 +02:00
Michael Schuster
aeba2e4de6
Fix White Window issue on Windows after Qt 5.12.4 upgrade
...
Qt 5.12.4 seems to introduce a new bug on Windows, causing the settings window
to not be redrawn when re-opening it, for example by clicking at the tray icon.
As a workaround this fix starts a 100 ms timer to be fired once upon
QDialog::showEvent is called.
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-09-26 11:29:49 +02:00
Camila Ayres
2f9f84c1f2
Merge pull request #1447 from nextcloud/backport/1438/stable-2.6
...
[stable-2.6] Changes wording in the share context menu.
2019-09-26 11:16:17 +02:00
Camila San
33646b1775
Changes wording in the share context menu.
...
Instead of only Nextcloud it says "Share via Nextcloud".
Signed-off-by: Camila San <hello@camila.codes >
2019-09-26 09:12:28 +00:00
Camila Ayres
acb9fc7c8e
Merge pull request #1408 from nextcloud/flow2-ui-qt5-compat
...
Qt5.5 compatiblity patch for login flow V2 + UI improvement
2019-09-06 17:56:09 +02:00
Camila Ayres
081f9741e4
Merge branch 'master' into flow2-ui-qt5-compat
2019-09-06 17:32:40 +02:00
Camila Ayres
a70b7d5852
Merge pull request #1405 from DominiqueFuchs/w10-start-logo
...
Full-Scaled new logo in Windows 10 start menu tile
2019-09-06 17:22:10 +02:00
Michael Schuster
8b2c47cdcb
Remove old Qt 5.5 patch for Xenial
...
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-09-06 17:05:18 +02:00
Camila Ayres
a3beb9ba41
Merge branch 'master' into w10-start-logo
2019-09-06 17:02:06 +02:00
Camila Ayres
c4dfe576d0
Merge pull request #1399 from DominiqueFuchs/master
...
Integrated registry check on windows when hasDarkSystray is called.
2019-09-06 17:01:53 +02:00
Camila Ayres
0841fe8dd3
Merge branch 'master' into master
2019-09-06 16:50:27 +02:00
Camila Ayres
c3b270ba26
Merge pull request #1401 from DominiqueFuchs/logo-update
...
Logo update
2019-09-06 16:37:59 +02:00
Camila Ayres
9ab5241459
Merge branch 'master' into w10-start-logo
2019-09-06 16:03:54 +02:00
Camila Ayres
ec603b061d
Merge branch 'master' into logo-update
2019-09-06 15:42:02 +02:00
Michael Schuster
b792a627e2
Qt5.5 compatiblity patch for login flow V2 + UI improvment
...
Removes the right-click function for the "Re-open browser" buttons because
they are not intuitive for the user.
Adds a dedicated "Copy link" button.
Implements Qt 5.5 fixes based on: https://github.com/nextcloud/desktop/pull/1392
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-09-06 14:40:54 +02:00
Michael Schuster
0e8c6a176b
Merge branch 'master' of https://github.com/nextcloud/desktop
2019-09-06 14:39:10 +02:00
Camila Ayres
0353724472
Merge pull request #1374 from Ram-Z/per-directory-ignore
...
Read .sync_exclude.lst in each subdirectory
2019-09-06 14:20:34 +02:00
Martin Sucha
bbb295fea4
Use newer digest algorithms in TLS error dialog
...
MD5 has been broken for a long time now and SHA1 has been
deprecated as well. SHA1 is not used when issuing new
publicly trusted certificates since 1 January 2016[1] and
there are more and more effective attacks[2][3] against it,
so display SHA1 fingerprint only for old certificates
to encourage use of safer digests by users.
So, we display SHA-256 and SHA-512 fingerprints instead in
the common case.
[1] https://cabforum.org/wp-content/uploads/CA-Browser-Forum-BR-1.6.5.pdf
[2] https://shattered.io/static/shattered.pdf
[3] https://eprint.iacr.org/2019/459.pdf
Signed-off-by: Martin Sucha <git@mm.ms47.eu >
2019-09-06 14:07:07 +02:00
Camila Ayres
d36ddb752a
Merge branch 'master' into per-directory-ignore
2019-09-06 13:35:28 +02:00
Dominique Fuchs
680f70aa1a
Merge branch 'master' into w10-start-logo
2019-09-06 09:30:12 +02:00
Dominique Fuchs
4ea64bf9ee
Final commit to resolve #22 (at least in desktop repo, final bits have to be set in client-building).
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-06 09:24:06 +02:00
Dominique Fuchs
c1dd0079d9
Modified CMakeLists (src/gui/) to install VisualElements logo files in appropiate install output folder
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-06 08:35:46 +02:00
Dominique Fuchs
f33d0a322d
Renamed files for consistent sheme & use in CMakeLists (/src/gui)
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-06 08:23:48 +02:00
Dominique Fuchs
429c9afd60
Added files for start menu icon (70 & 150px) on Windows 10
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-06 07:44:49 +02:00
Nextcloud bot
a6653af440
[tx-robot] updated from transifex
2019-09-06 03:03:36 +00:00
Dominique Fuchs
abb2711d26
Merge branch 'master' into logo-update
2019-09-05 21:38:17 +02:00
Dominique Fuchs
0a5ba5a3c7
Merge pull request #1402 from DominiqueFuchs/gitignore
...
Updated .gitignore to integrate unwanted files when working with VSC …
2019-09-05 20:44:43 +02:00
Dominique Fuchs
0a643c06e7
Merge branch 'master' into gitignore
2019-09-05 20:31:23 +02:00
Dominique Fuchs
6f5dcfa78b
Complementary renaming in theme.qrc
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-05 19:59:49 +02:00
Dominique Fuchs
e2f7947966
Check for possible case failure when building on drone
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-05 19:52:03 +02:00
Dominique Fuchs
4b9e8274b5
Merge branch 'logo-update' of https://github.com/DominiqueFuchs/desktop into logo-update
2019-09-05 20:59:34 +02:00
Dominique Fuchs
7aefa5afaf
Updated CmakeLists for gui part to correct old variable (OUTFILE_BASE[NAME]) that changed by recent update of AddAppIcon modules. Fixes wrong naming of resource pack in build output.
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-05 20:58:05 +02:00
John Molakvoæ
1606cf2e09
Use newer digest algorithms in TLS error dialog ( #1404 )
...
Use newer digest algorithms in TLS error dialog
2019-09-05 07:12:36 +02:00
Dominique Fuchs
464cdabecf
Merge branch 'master' into gitignore
2019-09-05 07:00:13 +02:00
Dominique Fuchs
defa0b2781
Merge branch 'master' into logo-update
2019-09-05 06:59:34 +02:00
John Molakvoæ
acd2425250
Merge branch 'master' into ssl-error-digests
2019-09-05 06:44:19 +02:00
Nextcloud bot
aa37a67729
[tx-robot] updated from transifex
2019-09-05 03:09:38 +00:00
Michael Schuster
1b2e64788d
Merge branch 'master' into ssl-error-digests
2019-09-05 01:07:20 +02:00
Roeland Jago Douma
b8ef78205a
Merge pull request #1256 from meskobalazs/master
...
Marking unused strings as unstranslatable
2019-09-04 23:06:08 +02:00
Martin Sucha
3e6422a889
Use newer digest algorithms in TLS error dialog
...
MD5 has been broken for a long time now and SHA1 has been
deprecated as well. SHA1 is not used when issuing new
publicly trusted certificates since 1 January 2016[1] and
there are more and more effective attacks[2][3] against it,
so display SHA1 fingerprint only for old certificates
to encourage use of safer digests by users.
So, we display SHA-256 and SHA-512 fingerprints instead in
the common case.
[1] https://cabforum.org/wp-content/uploads/CA-Browser-Forum-BR-1.6.5.pdf
[2] https://shattered.io/static/shattered.pdf
[3] https://eprint.iacr.org/2019/459.pdf
Signed-off-by: Martin Sucha <git@mm.ms47.eu >
2019-09-04 22:06:12 +02:00
Michael Schuster
0bcc923a8a
Merge branch 'master' into gitignore
2019-09-04 21:12:48 +02:00
Roeland Jago Douma
0cb1f4d14b
Merge pull request #1394 from nextcloud/webflow-client-ssl-ca-chain
...
Windows: Workaround for CredWriteW used by QtKeychain
2019-09-04 20:04:45 +02:00
Dominique Fuchs
7ac6df24a3
Updated ECMAddAppIcon to newest ver from https://github.com/KDE/extra-cmake-modules/blob/master/modules/ECMAddAppIcon.cmake with modifications for nc workflow (incl. png2imagemagick)
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-04 16:51:16 +02:00
Michael Schuster
5ef9600007
Merge branch 'master' into webflow-client-ssl-ca-chain
2019-09-04 12:56:22 +02:00
Nextcloud bot
fcc84b6dc4
[tx-robot] updated from transifex
2019-09-04 03:07:24 +00:00
Dominique Fuchs
88dcbad790
Updated theme.qrc to include new icon logo files
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-03 19:38:01 +02:00
Dominique Fuchs
7e4323c7de
Revert-corrected naming of icon files due to limitations by ECMAddAppIcon
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-03 18:27:37 +02:00
Dominique Fuchs
af831a7653
updated resources for new logo icon files
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-03 18:17:46 +02:00
Dominique Fuchs
8bd85fa71d
Corrected sized icon versions to up2date windows guidelines (see also ECMAddAppIcon.cmake)
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-03 18:05:06 +02:00
Dominique Fuchs
9d225452bd
Updated svg version of nc icon
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-03 18:00:51 +02:00
Dominique Fuchs
b79a82cc3f
Updated AddAppIconMacro (esp. for new macOS retina guidelines) and corrected filenames to not change pattern in cmake scripts
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-03 17:54:22 +02:00
Dominique Fuchs
0380271499
Updated cmake module to current version (esp. worthy for newer windows versions reg. the sizes) in https://github.com/KDE/extra-cmake-modules/blob/master/modules/ECMAddAppIcon.cmake
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-03 17:25:05 +02:00
Dominique Fuchs
2e243e5a38
deleted old icon files (not sidebar logo files atm)
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-03 17:19:20 +02:00
Dominique Fuchs
e56b1a082b
Updated .gitignore to integrate unwanted files when working with VSC or VS2019
...
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-03 10:59:21 +02:00
Dominique Fuchs
ef9c092662
Added png export series of new logo based on svg material in promo branch.
...
Decided for new naming sheme too keep old variants in repo untill all changes (also in helper repos like client-building) are done.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-03 09:42:52 +02:00
Nextcloud bot
86f559add4
[tx-robot] updated from transifex
2019-09-03 03:04:22 +00:00
Dominique Fuchs
5bcff7dab6
Merge branch 'master' into master
2019-09-02 06:56:30 +02:00
Nextcloud bot
812e688572
[tx-robot] updated from transifex
2019-09-02 03:03:47 +00:00
Dominique Fuchs
8f3bf3313e
Integrated registry check on windows when hasDarkSystray is called.
...
Return value determines which theme is applied for monochrome variant.
Fixes #1276 but only when monochrome option is toggled or nc starts, not automatically when changing windows theme.
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com >
2019-09-01 22:13:14 +02:00
Nextcloud bot
87bf0d9a7e
[tx-robot] updated from transifex
2019-09-01 03:09:08 +00:00
Nextcloud bot
bb9140d075
[tx-robot] updated from transifex
2019-08-31 03:03:58 +00:00
Michael Schuster
267224b258
Merge branch 'master' into webflow-client-ssl-ca-chain
2019-08-30 05:38:07 +02:00
Michael Schuster
61884d1ada
fix indents, add comment
...
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-08-30 05:35:36 +02:00
Nextcloud bot
29ff9f403e
[tx-robot] updated from transifex
2019-08-30 03:06:24 +00:00
Michael Schuster
b52292db92
Windows: Workaround for CredWriteW used by QtKeychain
...
Saving all client CA's within one credential may result in:
Error: "Credential size exceeds maximum size of 2560"
Client CA certificates are now being stored in separate slots
within the keychain and are being processed by a queue mechanism.
IMPORTANT TODO:
forgetSensitiveData(): Invoked by "Log out" & "Remove account"
- Remove client CA certs and KEY!
(uncomment "//deleteKeychainEntries();" )
Disabled as long as selecting another cert is not supported by the UI.
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-08-30 04:56:01 +02:00
Nextcloud bot
57d0a17744
[tx-robot] updated from transifex
2019-08-29 03:03:24 +00:00
Roeland Jago Douma
85a2860e86
Merge pull request #1389 from nextcloud/webflow-client-ssl
...
Adds SSL client cert storage to webflow + Login Flow v2
2019-08-28 07:40:39 +02:00
Nextcloud bot
7fc95c4c52
[tx-robot] updated from transifex
2019-08-28 03:10:20 +00:00
Michael Schuster
2c4336ab2a
Merge branch 'master' into webflow-client-ssl
2019-08-28 00:30:36 +02:00
Roeland Jago Douma
d584bedcb6
Also store the CACertificates of the client side certificate
...
Else authentication will still fail in setups that have a chain of
certificates supplied.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-08-27 09:55:41 +02:00
Nextcloud bot
5c34f9e247
[tx-robot] updated from transifex
2019-08-27 03:04:46 +00:00
Michael Schuster
dbde585049
Adds SSL client cert storage to webflow + Login Flow v2
...
The previous commit 50cd6af394 - Build a webflowcredentials
changed:
src/gui/wizard/flow2authcredspage.cpp in line 135 to use WebFlowCredentials
instead of HttpCredentials.
But the WebFlowCredentials class didn't include code to store and load SSL client
certificates and keys from the keychain.
This commit migrates the useful stuff from the old HttpCredentials class
into WebFlowCredentials.
Successfully tested on Windows. Please test on other systems and verify it's safe! :)
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-08-27 03:32:21 +02:00
Michael Schuster
18404a128b
Merge pull request #1384 from nextcloud/login-flow-v2
...
Login flow v2
2019-08-26 21:48:40 +02:00
Roeland Jago Douma
302ca0e04e
Fix some compiler warnings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-08-26 20:41:14 +02:00
Roeland Jago Douma
50cd6af394
Build a webflowcredentials
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-08-26 20:04:23 +02:00
Michael Schuster
fd8345ccbe
Login Flow V2: adds re-auth upon logout, improvements
...
- Implements re-auth upon logout -> login
- Improves UI and security
TODO:
- SSL: Client certificate login is possible at the first time only but missing after relaunch
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-08-26 20:03:15 +02:00
Michael Schuster
7add98e9a3
UI: don't let Flow2 and OAuth hide the wizard
...
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-08-26 20:03:15 +02:00
Michael Schuster
aa93a04fd6
fix comment typo in httpcredentials.cpp
...
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-08-26 20:03:15 +02:00
Michael Schuster
628bab92c4
fix comment typo in webflowcredentials.cpp
...
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-08-26 20:03:15 +02:00
Michael Schuster
12f2ea6728
Login Flow V2: remove static test url
...
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-08-26 20:03:15 +02:00
Michael Schuster
8fa55b97b4
Login Flow V2: 1st implementation, cleanup
...
This is the first draft of the Login Flow V2 authorization method.
See: https://docs.nextcloud.com/server/latest/developer_manual/client_apis/LoginFlow/index.html#login-flow-v2
- Adds the Login Fĺow V2 auth method
- Adds ability to reinitiate a new request via UI
TODO:
- Implement re-auth upon logout -> login
- Improve UI
- SSL: Client certificate login is possible at the first time only but missing after relaunch
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-08-26 20:03:15 +02:00
Michael Schuster
2742411abd
Login Flow V2: 1st test-implementation
...
Signed-off-by: Michael Schuster <michael@schuster.ms >
2019-08-26 20:03:15 +02:00
Nextcloud bot
9941d49579
[tx-robot] updated from transifex
2019-08-26 03:00:53 +00:00
Nextcloud bot
93f6bb2740
[tx-robot] updated from transifex
2019-08-25 03:03:22 +00:00
Nextcloud bot
95c6dd32e9
[tx-robot] updated from transifex
2019-08-24 03:03:25 +00:00
Nextcloud bot
c5f8b00a6b
[tx-robot] updated from transifex
2019-08-21 03:04:55 +00:00
Nextcloud bot
7135d441e6
[tx-robot] updated from transifex
2019-08-20 03:04:04 +00:00
Roeland Jago Douma
e0a1d78441
Merge pull request #1225 from edent/patch-1
...
Typo
2019-08-19 15:39:10 +02:00
Nextcloud bot
eb31925a00
[tx-robot] updated from transifex
2019-08-18 03:08:13 +00:00
Nextcloud bot
6f4de8f503
[tx-robot] updated from transifex
2019-08-17 03:06:09 +00:00
Nextcloud bot
db83302546
[tx-robot] updated from transifex
2019-08-16 03:01:55 +00:00
Nextcloud bot
c74db8677b
[tx-robot] updated from transifex
2019-08-15 03:02:27 +00:00
Samir Benmendil
5e3c2d2a96
Fix fullPath matching
...
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
7a9b13a563
Manual exclude are anchored to _localPath by default
...
This makes a lot of sense, since there should be no file to be synced
outside of _localPath.
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
e27645cb00
Extract loadExcludeFile and use it when discovering new exclude files
...
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
34fcb13e78
Never ignore .sync-exclude, even if excludeHidden
...
That is unless any of the parent folders is hidden.
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
758483bc6e
Silence CMake warning
...
CMake Warning (dev) at NEXTCLOUD.cmake:31 (set):
implicitly converting 'string' to 'STRING' type
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
9f4873e864
Fix some typos
...
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
94448a8b33
Add menu action to main sync folder too
...
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
acf0b0f7c4
Add menu action to each subfolder
...
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
d4816442ef
Extract IgnoreListTableWidget to be reused
...
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
e44a2302de
Remove all rows in the table widget
...
`clearContents()` will leave the number of rows as is. This was causing
a segfault when trying to loop over the items of the widget.
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
4a2b91a043
IgnoreListEditor can work on any path
...
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Samir Benmendil
14279104ae
Read .sync_exclude.lst in each subdirectory
...
Signed-off-by: Samir Benmendil <me@rmz.io >
2019-08-15 03:00:26 +01:00
Nextcloud bot
7843660bbf
[tx-robot] updated from transifex
2019-08-14 03:05:59 +00:00
Camila Ayres
037b2338de
Merge pull request #1376 from nextcloud/updates-changelog
...
Update ChangeLog.
2019-08-12 15:20:23 +02:00
Camila San
cfa6f13620
Updates ChangeLog.
...
Signed-off-by: Camila San <hello@camila.codes >
2019-08-12 15:13:05 +02:00
Nextcloud bot
00d222891c
[tx-robot] updated from transifex
2019-08-12 03:03:59 +00:00
Nextcloud bot
1ed8c898e9
[tx-robot] updated from transifex
2019-08-11 03:06:12 +00:00
Nextcloud bot
c2f401a77a
[tx-robot] updated from transifex
2019-08-10 03:05:46 +00:00
Camila Ayres
169dea1627
Merge pull request #1372 from ivaradi/remove-libgnome-keyring
...
Remove dependency on libgnome-keyring0 on Eoan
2019-08-09 11:42:24 +02:00
István Váradi
1883c04a12
Remove dependency on libgnome-keyring0 on Eoan
...
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu >
2019-08-09 06:47:59 +02:00
Nextcloud bot
ec70ee96f3
[tx-robot] updated from transifex
2019-08-09 03:04:25 +00:00
Nextcloud bot
0337507446
[tx-robot] updated from transifex
2019-08-08 03:04:58 +00:00
Nextcloud bot
890c7d731d
[tx-robot] updated from transifex
2019-08-07 03:03:54 +00:00
Nextcloud bot
3a6f9e51f5
[tx-robot] updated from transifex
2019-08-06 03:03:52 +00:00
Nextcloud bot
eb41f01857
[tx-robot] updated from transifex
2019-08-05 03:01:25 +00:00
Nextcloud bot
681c03b097
[tx-robot] updated from transifex
2019-08-04 03:06:07 +00:00
Nextcloud bot
233333a616
[tx-robot] updated from transifex
2019-08-03 03:04:01 +00:00
Camila Ayres
f9947334f6
Merge pull request #1366 from nextcloud/fix/client_side_cert
...
Add proper CA to client side certificate connection
2019-08-02 18:38:27 +02:00
Camila Ayres
9b6b14b374
Merge branch 'master' into fix/client_side_cert
2019-08-02 14:40:20 +02:00
Roeland Jago Douma
4c8da1a3e7
Add proper CA
...
If the cert has a chain of certs we should send them all properly
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-08-02 14:19:37 +02:00
Nextcloud bot
9e7868b3de
[tx-robot] updated from transifex
2019-08-02 03:05:09 +00:00
Nextcloud bot
8fad2acc36
[tx-robot] updated from transifex
2019-08-01 03:08:11 +00:00
Nextcloud bot
4befda1eab
[tx-robot] updated from transifex
2019-07-31 03:08:42 +00:00
István Váradi
29218158c0
Merge pull request #1360 from ivaradi/ubuntu-eoan
...
Remove Ubuntu Cosmic and add Eoan package
2019-07-30 07:07:53 +02:00
István Váradi
40753860cf
Merge branch 'master' into ubuntu-eoan
2019-07-30 06:50:19 +02:00
István Váradi
5142cf026f
Merge pull request #1359 from ivaradi/qt55-update
...
Update Qt 5.5 compatibility patch for Xenial
2019-07-30 06:49:59 +02:00
István Váradi
d64b477280
Merge branch 'master' into ubuntu-eoan
2019-07-30 06:36:44 +02:00
István Váradi
d0cf21d355
Merge branch 'master' into qt55-update
2019-07-30 06:36:24 +02:00
Nextcloud bot
4257f70d2e
[tx-robot] updated from transifex
2019-07-30 03:05:57 +00:00
István Váradi
d000328700
Merge branch 'master' into ubuntu-eoan
2019-07-29 19:05:13 +02:00
István Váradi
b5e45711fc
Merge branch 'master' into qt55-update
2019-07-29 19:04:43 +02:00
Nextcloud bot
9f94f412ef
[tx-robot] updated from transifex
2019-07-29 03:03:27 +00:00
Nextcloud bot
c13d4ca40e
[tx-robot] updated from transifex
2019-07-28 03:05:54 +00:00
István Váradi
04d825f4b6
Remove Ubuntu Cosmic and add Eoan package
...
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu >
2019-07-27 11:21:39 +02:00
Nextcloud bot
b448e215ad
[tx-robot] updated from transifex
2019-07-27 03:03:03 +00:00
István Váradi
2d2c1ef29e
Update Qt 5.5 compatibility patch for Xenial
...
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu >
2019-07-26 21:08:23 +02:00
Nextcloud bot
d654a65ac7
[tx-robot] updated from transifex
2019-07-26 03:03:02 +00:00
István Váradi
f462bfc7c5
Merge pull request #1222 from ivaradi/new-drone-debian
...
Reinstate Debian build in the new Drone config
2019-07-25 18:58:29 +02:00
István Váradi
d6ab7920d9
Fix the Debian changelog generator
...
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu >
2019-07-25 16:48:24 +02:00
István Váradi
ec359d0e6b
Reinstate Debian build in the new Drone config
...
Signed-off-by: István Váradi <ivaradi@varadiistvan.hu >
2019-07-25 16:48:17 +02:00
Nextcloud bot
be3713a535
[tx-robot] updated from transifex
2019-07-25 03:03:32 +00:00
Camila Ayres
a21258487f
Merge pull request #1354 from nextcloud/minorchange/link-to-help-text
...
Minor text change in the link to help in the tab 'General'.
2019-07-24 19:07:10 +02:00
Camila San
3ea472d9f2
Minor text change in the link to help in the tab 'General'.
...
Also uses helpUrl() retrieve the correct APPLICATION_HELP_URL
instead of APPLICATION_DOMAIN.
Signed-off-by: Camila San <hello@camila.codes >
2019-07-24 16:39:21 +02:00
Nextcloud bot
a0587f3cde
[tx-robot] updated from transifex
2019-07-24 03:05:55 +00:00
Nextcloud bot
96c35a9410
[tx-robot] updated from transifex
2019-07-23 03:09:01 +00:00
Camila Ayres
41900140df
Merge pull request #1342 from gt-h6k/fixes-1187
...
Fixes issue #1187
2019-07-22 22:04:14 +02:00
Camila Ayres
a47dd69a71
Merge branch 'master' into fixes-1187
2019-07-22 20:45:50 +02:00
Camila Ayres
0539e34c69
Merge pull request #1275 from ivyclare/pr/607
...
Fixes #607
2019-07-22 20:45:28 +02:00
Camila Ayres
5d30f4b1eb
Merge branch 'master' into pr/607
2019-07-22 19:38:56 +02:00
Camila Ayres
4559965abf
Merge pull request #1278 from ivyclare/pr/878
...
Fixes issue #878
2019-07-22 19:38:36 +02:00
Camila Ayres
4801bd5818
Merge branch 'master' into pr/607
2019-07-22 16:46:45 +02:00
Camila Ayres
9411a34a2b
Merge branch 'master' into pr/878
2019-07-22 16:09:52 +02:00
Camila Ayres
94bff61c45
Merge branch 'master' into fixes-1187
2019-07-22 16:09:40 +02:00
Camila Ayres
cf3dd53e12
Merge pull request #1347 from caugner/965-file-folder-ignored-as-info
...
Displays FileIgnored activities with an info icon
2019-07-22 16:09:27 +02:00
Camila Ayres
0ae72cd68a
Merge branch 'master' into pr/878
2019-07-22 15:45:56 +02:00
Camila Ayres
88624f055d
Merge branch 'master' into 965-file-folder-ignored-as-info
2019-07-22 15:44:10 +02:00
Nextcloud bot
50be2e067c
[tx-robot] updated from transifex
2019-07-22 03:06:58 +00:00
Claas Augner
116c5b361f
Displays FileIgnored activities with an info icon
...
See: https://github.com/nextcloud/desktop/issues/965
Signed-off-by: Claas Augner <git@caugner.de >
2019-07-21 22:02:15 +02:00
Nextcloud bot
ae28be4a10
[tx-robot] updated from transifex
2019-07-21 03:07:35 +00:00
Nextcloud bot
fa2f52b551
[tx-robot] updated from transifex
2019-07-20 03:03:51 +00:00
Nextcloud bot
658f6817ce
[tx-robot] updated from transifex
2019-07-19 03:16:29 +00:00
Nextcloud bot
28c401236b
[tx-robot] updated from transifex
2019-07-17 03:03:58 +00:00
Hiroki Goto
57ca82e620
Merge branch 'master' into fixes-1187
2019-07-15 20:08:47 +09:00
Nextcloud bot
7d700a3c84
[tx-robot] updated from transifex
2019-07-15 03:00:34 +00:00
Nextcloud bot
2c2cc5c23e
[tx-robot] updated from transifex
2019-07-14 03:03:06 +00:00
gt-h6k
1763504b4e
Fixes issue #1187
...
Signed-off-by: Hiroki Goto <git@gt-h6k.net >
2019-07-13 16:39:30 +09:00
Nextcloud bot
94db2f82a2
[tx-robot] updated from transifex
2019-07-13 03:06:30 +00:00
Nextcloud bot
d967ebac9a
[tx-robot] updated from transifex
2019-07-12 02:59:46 +00:00
Nextcloud bot
6b5b3c96cf
[tx-robot] updated from transifex
2019-07-11 02:58:04 +00:00
Nextcloud bot
a8bf75d496
[tx-robot] updated from transifex
2019-07-10 02:57:49 +00:00
Nextcloud bot
bb34de2bd8
[tx-robot] updated from transifex
2019-07-09 02:54:41 +00:00
Nextcloud bot
b146654474
[tx-robot] updated from transifex
2019-07-07 02:55:41 +00:00
Nextcloud bot
c897564d28
[tx-robot] updated from transifex
2019-07-05 02:57:08 +00:00
Nextcloud bot
ae9bc786ad
[tx-robot] updated from transifex
2019-07-04 02:55:55 +00:00
Nextcloud bot
b2d85cc4bf
[tx-robot] updated from transifex
2019-07-03 02:55:33 +00:00
Nextcloud bot
ac505aac0e
[tx-robot] updated from transifex
2019-07-02 02:54:54 +00:00
Nextcloud bot
4eac71a032
[tx-robot] updated from transifex
2019-06-30 02:55:43 +00:00
Nextcloud bot
fa29fc4028
[tx-robot] updated from transifex
2019-06-28 02:56:13 +00:00
Nextcloud bot
f352af7ffb
[tx-robot] updated from transifex
2019-06-27 02:57:19 +00:00
Nextcloud bot
d7098343a2
[tx-robot] updated from transifex
2019-06-26 02:56:31 +00:00
Nextcloud bot
908f4d34e3
[tx-robot] updated from transifex
2019-06-25 02:57:16 +00:00
Nextcloud bot
78c7aed3b9
[tx-robot] updated from transifex
2019-06-24 02:56:03 +00:00
Nextcloud bot
a8986124b8
[tx-robot] updated from transifex
2019-06-23 02:56:59 +00:00
Nextcloud bot
57ec1cdda4
[tx-robot] updated from transifex
2019-06-22 02:55:39 +00:00
Camila Ayres
9dc47438c9
Merge pull request #1309 from nextcloud/feature/show-shared-file-owner
...
Displays the uid_owner of a shared file.
2019-06-21 19:53:46 +02:00
Camila San
d6a0a5272a
Displays the uid_owner of a shared file.
...
Also displays the sharees that reshared it via share link.
Signed-off-by: Camila San <hello@camila.codes >
2019-06-21 18:36:45 +02:00
Nextcloud bot
47ac10fb8e
[tx-robot] updated from transifex
2019-06-21 02:54:12 +00:00
Nextcloud bot
459a17bd7e
[tx-robot] updated from transifex
2019-06-20 02:55:55 +00:00
Nextcloud bot
de65b6fb7e
[tx-robot] updated from transifex
2019-06-18 02:55:35 +00:00
Nextcloud bot
6ddfc80672
[tx-robot] updated from transifex
2019-06-17 02:54:41 +00:00
Nextcloud bot
048cf3b23e
[tx-robot] updated from transifex
2019-06-16 02:56:30 +00:00
Nextcloud bot
3c958dea20
[tx-robot] updated from transifex
2019-06-13 02:48:18 +00:00
Camila Ayres
0b420c5fe6
Merge pull request #1301 from nextcloud/error-423-change-warning-color
...
Add error category for http file lock error status 423.
2019-06-12 11:33:25 +02:00
Camila San
bb7d330516
Add error category for http file lock error status 423.
...
It filters the error out of the list of blocking errors. It now shows up
in the Activities and Notificattions list as a warning.
Signed-off-by: Camila San <hello@camila.codes >
2019-06-11 23:32:10 +02:00
Nextcloud bot
795c29d5bd
[tx-robot] updated from transifex
2019-06-11 02:46:16 +00:00
Nextcloud bot
ad04116c00
[tx-robot] updated from transifex
2019-06-10 02:47:53 +00:00
Nextcloud bot
42b9dec1d0
[tx-robot] updated from transifex
2019-06-09 02:47:26 +00:00
Nextcloud bot
51e398d4f4
[tx-robot] updated from transifex
2019-06-08 02:46:59 +00:00
Ivoline Ngong
5c2e8c9574
Merge branch 'master' into pr/607
2019-06-07 19:36:44 +03:00
Nextcloud bot
feee0bf62b
[tx-robot] updated from transifex
2019-06-06 02:47:28 +00:00
Nextcloud bot
f6dee2b10f
[tx-robot] updated from transifex
2019-06-05 02:47:31 +00:00
Nextcloud bot
57fc438b91
[tx-robot] updated from transifex
2019-06-04 02:47:14 +00:00
Camila Ayres
aa5b62c931
Add comment to Github issue_template.md.
...
Minor change: removes some item e.g. PHP version that are not relevant to the client.
2019-06-03 17:42:29 +02:00
Ivan Čukić
f089fa34fc
Merge pull request #1241 from ivan-cukic/ivan/encryption-initial-setup
...
Added a nice UI for the E2E-enabled account first connect
2019-06-03 09:44:19 +02:00
Ivan Čukić
200032c9cb
Merge branch 'master' into ivan/encryption-initial-setup
2019-06-03 09:11:56 +02:00
Nextcloud bot
6a294bb4a0
[tx-robot] updated from transifex
2019-06-03 02:46:03 +00:00
Nextcloud bot
4aa2e2e8c3
[tx-robot] updated from transifex
2019-06-01 02:46:48 +00:00
Nextcloud bot
4cd7095a40
[tx-robot] updated from transifex
2019-05-30 02:46:02 +00:00
Ivoline Ngong
d3c5a71689
Merge branch 'master' into pr/878
2019-05-29 21:06:19 +03:00
ivyclare
f4340b98ce
Unshare action transferred to 3 dot menu
...
Signed-off-by: ivyclare <ivolinengong@gmail.com >
2019-05-29 20:54:53 +03:00
Camila Ayres
867e546fa9
Merge branch 'master' into master
2019-05-29 17:40:53 +02:00
Nextcloud bot
eb28fe9990
[tx-robot] updated from transifex
2019-05-29 02:56:09 +00:00
Nextcloud bot
fa5c1eff25
[tx-robot] updated from transifex
2019-05-28 03:00:44 +00:00
ivyclare
bcdc88ecf0
Change »Details…« to »View more activity…«
...
Signed-off-by: ivyclare <ivolinengong@gmail.com >
2019-05-28 01:14:31 +03:00
Camila Ayres
1dca017537
Merge pull request #1247 from nextcloud/backport/reshare
...
Adds parameter to retrieve shares with its reshares.
2019-05-27 20:16:34 +02:00
Camila San
9ff1a30dc4
Display error when current user is not allowed to reshare file/folder.
...
Signed-off-by: Camila San <hello@camila.codes >
2019-05-27 19:46:38 +02:00
Camila San
4f0ff154d3
Display sharees on the first show of the share dialog.
...
It was displaying them only when the current user would edit the share.
Signed-off-by: Camila San <hello@camila.codes >
2019-05-27 19:46:38 +02:00
Camila San
981a4ee240
Adds parameter to retrieve shares with its reshares.
...
If the initiator or the recipient is not the current user,
show the list of sharees without any options to edit it.
Minor change: updates api to v2.
Signed-off-by: Camila San <hello@camila.codes >
2019-05-27 19:46:38 +02:00
Nextcloud bot
378dd744fb
[tx-robot] updated from transifex
2019-05-27 02:54:16 +00:00
Nextcloud bot
d38e829330
[tx-robot] updated from transifex
2019-05-25 02:55:41 +00:00
Nextcloud bot
ad65b6fdf3
[tx-robot] updated from transifex
2019-05-24 02:56:34 +00:00
Roeland Jago Douma
ea6f3be374
Merge pull request #1273 from csware/issue-1266
...
WebView: Properly handle usernames with spaces and plus signs in it
2019-05-23 19:59:49 +02:00
Sven Strickroth
85d217ec95
WebView: Properly handle usernames with spaces and plus signs in it
...
The path returned from the server encodes a space in the username with `+` and if the username contains a `+` sign it is encoded as `%2B` (cf. https://www.php.net/manual/function.urlencode.php ).
Fix: Don't (double) decode the URL path and then replace `+` with space (introduced in issue #279 resp. commit 9ec61a84ce ). Instead first replace `+` with space, then decode percent encoding.
Tested with a username containing a space, a username containing a `+`sign and a username containing just A-Za-z0-9- (with Nextcloud 16).
(fixes issue #1266 )
Signed-off-by: Sven Strickroth <email@cs-ware.de >
2019-05-23 17:09:33 +02:00
Nextcloud bot
e8213242a9
[tx-robot] updated from transifex
2019-05-23 02:55:27 +00:00
Nextcloud bot
0c603944b8
[tx-robot] updated from transifex
2019-05-22 02:56:14 +00:00
Nextcloud bot
559187df6c
[tx-robot] updated from transifex
2019-05-20 02:53:13 +00:00
Nextcloud bot
eb00500b0b
[tx-robot] updated from transifex
2019-05-19 02:55:18 +00:00
Ivan Čukić
876f69dc7d
Merge branch 'master' into ivan/encryption-initial-setup
2019-05-18 23:07:34 +02:00
Ivan Čukić
33605d7f65
Removed ellipsis from the button text
2019-05-18 22:58:41 +02:00
Nextcloud bot
492fc846df
[tx-robot] updated from transifex
2019-05-18 02:53:47 +00:00
Nextcloud bot
febf206704
[tx-robot] updated from transifex
2019-05-17 02:59:46 +00:00
Nextcloud bot
e1eeaadaff
[tx-robot] updated from transifex
2019-05-16 02:53:07 +00:00
Ivan Čukić
4f17366262
Changed the message to 'Enable encryption...'
2019-05-14 21:54:43 +02:00
Ivan Čukić
a8ac89c20c
Merge branch 'master' into ivan/encryption-initial-setup
2019-05-14 21:53:57 +02:00
Balázs Meskó
a13bba7f42
Marking unused strings as unstranslatable
...
Signed-off-by: Balázs Meskó <mesko.balazs@fsf.hu >
2019-05-14 20:07:08 +02:00
Nextcloud bot
e0f421ac7a
[tx-robot] updated from transifex
2019-05-14 02:51:16 +00:00
Roeland Jago Douma
b6c0f9db5d
Merge pull request #1253 from muesli/webview-typo
...
Fixed typo in "certificate"
2019-05-13 07:58:52 +02:00
Roeland Jago Douma
50755d0295
Merge pull request #1251 from yarons/patch-1
...
Fixed typo
2019-05-13 07:58:29 +02:00
Christian Muehlhaeuser
9dc0027304
Fixed typo in "certificate"
...
Signed-off-by: Christian Muehlhaeuser <muesli@gmail.com >
2019-05-13 05:22:58 +02:00
Nextcloud bot
37ee52a930
[tx-robot] updated from transifex
2019-05-13 00:47:37 +00:00
Yaron Shahrabani
692d885b55
Fixed typo
...
Chipher -> Cipher
2019-05-12 19:11:33 +03:00
Ivan Čukić
6c0d796b4b
E2E UI setup poligh
...
- Text changed to "Enable..." instead of "Setup"
- The close icon follows NC style
- "end-to-end" instead of "end to end"
Signed-off-by: Ivan Čukić <ivan.cukic@kde.org >
2019-05-11 19:20:19 +02:00
Ivan Čukić
db7e5e01b3
Merge branch 'master' into ivan/encryption-initial-setup
2019-05-11 19:19:00 +02:00
Nextcloud bot
ae0b1ce3d6
[tx-robot] updated from transifex
2019-05-11 00:48:37 +00:00
Camila Ayres
419b8a3ff9
Merge pull request #1245 from joshua-sterner/master
...
This should fix issue #1000 .
2019-05-10 17:04:40 +02:00
Camila Ayres
bdfc5dcd14
Merge branch 'master' into master
2019-05-10 14:42:44 +02:00
Camila Ayres
c0704cd500
Merge pull request #1234 from curiousDTU/small-fix
...
updated default remote poll to 5 seconds #1115
2019-05-10 11:08:32 +02:00
Joshua Sterner
1b36dbc435
Merge branch 'master' into master
2019-05-09 23:15:54 -07:00
shobha
188374f60c
updated default remote poll to 5 seconds #1115
...
Signed-off-by: shobha <tyagishobha@gmail.com >
2019-05-10 09:15:09 +05:30
Nextcloud bot
fd9d7563c2
[tx-robot] updated from transifex
2019-05-10 00:49:02 +00:00
Joshua Sterner
bd9fcd88d8
testMove3LevelDirWithFile now uses mv function to move the directory
...
Signed-off-by: Joshua Sterner <joshua.s.sterner@gmail.com >
2019-05-09 04:12:33 -07:00
Joshua Sterner
b6ff17c50b
Fixed Issue #1000 - Subfolders of moved folders not synced
...
Signed-off-by: Joshua Sterner <joshua.s.sterner@gmail.com >
2019-05-09 04:12:33 -07:00
Nextcloud bot
2d3bac4e53
[tx-robot] updated from transifex
2019-05-09 00:48:24 +00:00
Ivan Čukić
7af786fde9
Added a nice UI for the E2E-enabled account first connect
...
Instead of immediately popping up the mnemonic dialogue,
only show a notification bar on the account setup page.
For the cases where the user does not want to use E2E,
this is significantly less intrusive than the old approach.
2019-05-09 00:37:24 +02:00
Camila Ayres
1f1a7a27f0
Merge pull request #1239 from nextcloud/fix/device-memory-leak
...
Fix memory leak with device pointer
2019-05-08 20:14:49 +02:00
Christoph Wurst
c2e3cbca31
Fix memory leak with device pointer
...
Downstream of https://github.com/owncloud/client/pull/6856
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at >
2019-05-08 19:41:48 +02:00
Nextcloud bot
92a5e64487
[tx-robot] updated from transifex
2019-05-08 00:52:12 +00:00
Nextcloud bot
9153f710df
[tx-robot] updated from transifex
2019-05-07 00:48:06 +00:00
Nextcloud bot
8151eb4837
[tx-robot] updated from transifex
2019-05-05 00:49:10 +00:00
Nextcloud bot
a5b65a73a8
[tx-robot] updated from transifex
2019-05-03 00:47:47 +00:00
Nextcloud bot
26b9bf0281
[tx-robot] updated from transifex
2019-05-02 00:48:16 +00:00
Nextcloud bot
19c968de76
[tx-robot] updated from transifex
2019-05-01 00:48:06 +00:00
Terence Eden
e64fa74899
Typo
...
There's no such thing as a "key*h*chain".
2019-04-28 10:03:38 +01:00
Nextcloud bot
9b3fa62b2d
[tx-robot] updated from transifex
2019-04-28 00:50:09 +00:00
Nextcloud bot
68983c54bb
[tx-robot] updated from transifex
2019-04-27 00:47:44 +00:00
Nextcloud bot
d9af9b895f
[tx-robot] updated from transifex
2019-04-26 00:47:12 +00:00
Nextcloud bot
50f332eac7
[tx-robot] updated from transifex
2019-04-25 00:47:56 +00:00
Nextcloud bot
ad095efe3a
[tx-robot] updated from transifex
2019-04-23 00:48:20 +00:00
Nextcloud bot
3c947819c1
[tx-robot] updated from transifex
2019-04-22 00:48:48 +00:00
Camila Ayres
f52f9f0abe
Merge pull request #1212 from nextcloud/cmake-simplify
...
Simplify cmake command to make copy-pastable.
2019-04-21 19:41:52 +02:00
Camila San
75ccffa5a2
Simplify compile instructions.
...
Signed-off-by: Camila San <hello@camila.codes >
2019-04-21 17:13:20 +02:00
Jan-Christoph Borchardt
f0035b95bb
Simplify cmake command to make copy-pastable
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net >
2019-04-21 14:31:10 +02:00
Nextcloud bot
955f54cdef
[tx-robot] updated from transifex
2019-04-21 00:50:00 +00:00
Nextcloud bot
c5b8cda323
[tx-robot] updated from transifex
2019-04-20 00:48:15 +00:00
Nextcloud bot
ae0dbcde5b
[tx-robot] updated from transifex
2019-04-19 00:49:24 +00:00
Nextcloud bot
f32d83e993
[tx-robot] updated from transifex
2019-04-18 00:49:41 +00:00
Nextcloud bot
d7b881feb6
[tx-robot] updated from transifex
2019-04-17 00:50:11 +00:00
Nextcloud bot
6bd98518e4
[tx-robot] updated from transifex
2019-04-15 00:49:36 +00:00
Nextcloud bot
54d80bbc9b
[tx-robot] updated from transifex
2019-04-14 00:51:05 +00:00
Nextcloud bot
5f9ec1762a
[tx-robot] updated from transifex
2019-04-13 00:51:53 +00:00
Camila San
1c8dfd701b
Increase version to 2.5.3.
2019-04-12 17:17:23 +02:00
Camila Ayres
f520d7364d
Merge pull request #1118 from tuchfarber/tuchfarber/fix_empty_file_error_wording
...
Fix empty file wording in error log (small)
2019-04-12 17:08:27 +02:00
Camila Ayres
4d61a7c263
Merge branch 'master' into tuchfarber/fix_empty_file_error_wording
2019-04-12 16:51:36 +02:00
Camila Ayres
ac6ef500cc
Merge pull request #1201 from nextcloud/bugfix/popup-empty-folder
...
Uses configuraion to determine if it should show empty folder popup.
2019-04-12 16:38:51 +02:00
Camila San
b5b2ef3120
Updates test to fit new configuration default value.
...
Signed-off-by: Camila San <hello@camila.codes >
2019-04-12 16:22:07 +02:00
Camila San
7f3c3f6eb6
Uses configuraion to determine if it should show empty folder popup.
...
Configuration default value is set to false because users are getting
the popup message too often.
Signed-off-by: Camila San <hello@camila.codes >
2019-04-12 16:22:07 +02:00
Camila Ayres
936bdd04a8
Merge pull request #1185 from tintou/master
...
libcloudproviders: Add missing check for Qt5DBus
2019-04-12 16:09:31 +02:00
Camila Ayres
33baf40061
Merge branch 'master' into master
2019-04-12 15:50:55 +02:00
Roeland Jago Douma
6a63d8f2b9
Merge pull request #1191 from nextcloud/bugfix/1172/share-link
...
Share link fixing
2019-04-12 14:31:11 +02:00
Corentin Noël
b11a4217c7
Merge branch 'master' into master
2019-04-12 14:25:56 +02:00
Camila San
35114cf45c
Disable options in share dialog if account state changes.
...
Signed-off-by: Camila San <hello@camila.codes >
2019-04-12 14:17:58 +02:00
Camila San
e07c472057
Refactores sharing link to support multiple share links.
...
Signed-off-by: Camila San <hello@camila.codes >
2019-04-12 14:17:58 +02:00
Camila San
0fed1cc54d
Fixes deleting of one single link share.
...
Signed-off-by: Camila San <hello@camila.codes >
2019-04-12 14:17:57 +02:00
Roeland Jago Douma
ac257cd65f
Merge pull request #1186 from tintou/tintou/i18n
...
Fix several memory leaks in cloudproviders and add translation support
2019-04-12 14:09:30 +02:00
Roeland Jago Douma
088b0817d8
Merge branch 'master' into tintou/i18n
2019-04-12 13:48:19 +02:00
Roeland Jago Douma
b0c75723e2
Merge pull request #1200 from nextcloud/new_drone
...
New drone config
2019-04-12 13:47:28 +02:00
Roeland Jago Douma
b368a93e2e
New drone config
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-04-12 11:14:05 +02:00
Roeland Jago Douma
c75cb390dd
Merge branch 'master' into tintou/i18n
2019-04-12 10:35:02 +02:00
Nextcloud bot
d39f826e0e
[tx-robot] updated from transifex
2019-04-12 00:49:48 +00:00
Camila Ayres
1ea8b18893
Merge branch 'master' into tintou/i18n
2019-04-11 13:54:18 +02:00
Nextcloud bot
8491ef428e
[tx-robot] updated from transifex
2019-04-10 00:48:53 +00:00
Julius Härtl
42ce5c0c0d
Merge branch 'master' into master
2019-04-09 10:01:35 +02:00
Nextcloud bot
acca019afe
[tx-robot] updated from transifex
2019-04-09 00:48:35 +00:00
Nextcloud bot
4591f9c09f
[tx-robot] updated from transifex
2019-04-08 00:49:58 +00:00
Corentin Noël
088a5a9771
Fix several memory leaks in cloudproviders and add translation support
2019-04-04 22:06:22 +02:00
Corentin Noël
19079c65c1
libcloudproviders: Add missing check for Qt5DBus
2019-04-04 17:50:30 +02:00
Nextcloud bot
3804410949
[tx-robot] updated from transifex
2019-04-04 00:49:12 +00:00
Nextcloud bot
b8e874a3a7
[tx-robot] updated from transifex
2019-04-02 00:51:06 +00:00
Nextcloud bot
3a03568ec8
[tx-robot] updated from transifex
2019-04-01 00:51:27 +00:00
Nextcloud bot
40da5630e1
[tx-robot] updated from transifex
2019-03-31 01:50:45 +00:00
Nextcloud bot
b36626d50a
[tx-robot] updated from transifex
2019-03-30 01:50:00 +00:00
Roeland Jago Douma
26f897d22c
Merge pull request #1157 from stragu/patch-1
...
Fix a minor typo
2019-03-29 13:33:55 +01:00
Nextcloud bot
1b4cb6483b
[tx-robot] updated from transifex
2019-03-29 01:50:20 +00:00
Nextcloud bot
9312c18c57
[tx-robot] updated from transifex
2019-03-27 11:31:33 +00:00
Nextcloud bot
96434aabe9
[tx-robot] updated from transifex
2019-03-27 01:42:51 +00:00
Nextcloud bot
95ec0777ca
[tx-robot] updated from transifex
2019-03-26 01:41:08 +00:00
Nextcloud bot
283423f1bd
[tx-robot] updated from transifex
2019-03-25 01:43:41 +00:00
Stéphane Guillou
3a893d6179
Fix a minor typo
2019-03-24 20:12:44 +10:00
Nextcloud bot
6a83b31c5a
[tx-robot] updated from transifex
2019-03-24 01:44:42 +00:00
Nextcloud bot
9a3667c1de
[tx-robot] updated from transifex
2019-03-23 01:43:05 +00:00
Nextcloud bot
90fa47bbe6
[tx-robot] updated from transifex
2019-03-22 01:44:35 +00:00
Camila Ayres
44c265e2a7
Merge pull request #1153 from nextcloud/enh/512/ci
...
Add Qt-5.12 to CI
2019-03-21 17:56:27 +01:00
Roeland Jago Douma
bb9017d3a6
Move over AppImage builder to 5.12
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-03-21 15:57:40 +01:00
Roeland Jago Douma
9d87f707a6
Add Qt-5.12 to CI
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-03-21 15:57:40 +01:00
Nextcloud bot
89cda9a1b4
[tx-robot] updated from transifex
2019-03-21 01:52:00 +00:00
Nextcloud bot
653e56268d
[tx-robot] updated from transifex
2019-03-20 01:49:54 +00:00
Nextcloud bot
56c905819e
[tx-robot] updated from transifex
2019-03-19 01:52:24 +00:00
Nextcloud bot
0d5120e7cc
[tx-robot] updated from transifex
2019-03-18 01:50:05 +00:00
Nextcloud bot
1c76dd5859
[tx-robot] updated from transifex
2019-03-17 01:50:55 +00:00
Nextcloud bot
37f709fe34
[tx-robot] updated from transifex
2019-03-16 01:50:19 +00:00
Nextcloud bot
a362f32402
[tx-robot] updated from transifex
2019-03-15 01:52:48 +00:00
Nextcloud bot
7ecab308f2
[tx-robot] updated from transifex
2019-03-14 01:45:23 +00:00
Nextcloud bot
d7314adcf1
[tx-robot] updated from transifex
2019-03-13 01:45:16 +00:00
Nextcloud bot
f64035339b
[tx-robot] updated from transifex
2019-03-12 01:44:20 +00:00
Nextcloud bot
0e70b8ab9f
[tx-robot] updated from transifex
2019-03-10 01:44:57 +00:00
Nextcloud bot
e805184726
[tx-robot] updated from transifex
2019-03-09 01:42:32 +00:00
Nextcloud bot
b0d1e34df3
[tx-robot] updated from transifex
2019-03-08 01:44:20 +00:00
Matt Tuchfarber
0862d6cfb0
Fix empty file wording in error log
...
Changing empty file error text so that it reads correctly.
2019-03-07 00:18:12 -05:00
Nextcloud bot
9032b1c491
[tx-robot] updated from transifex
2019-03-07 01:44:38 +00:00
Nextcloud bot
e9111d745c
[tx-robot] updated from transifex
2019-03-05 01:52:03 +00:00
Roeland Jago Douma
0e3a8856e5
Merge pull request #1092 from nextcloud/enh/debug_not_warnings
...
Be less verbose with logging
2019-03-04 10:19:16 +01:00
Nextcloud bot
3084b85229
[tx-robot] updated from transifex
2019-03-04 01:42:12 +00:00
Nextcloud bot
f7f0a3249f
[tx-robot] updated from transifex
2019-03-03 01:43:17 +00:00
Nextcloud bot
4419a51a5d
[tx-robot] updated from transifex
2019-03-02 01:43:14 +00:00
Camila Ayres
1d37e96999
Merge pull request #1119 from nextcloud/typo
...
Fix typo in translation string
2019-03-01 12:18:34 +01:00
Morris Jobke
158c6e8136
Fix typo in translation string
2019-03-01 11:40:20 +01:00
Nextcloud bot
423e4ef92e
[tx-robot] updated from transifex
2019-03-01 01:49:47 +00:00
Nextcloud bot
4645adda0a
[tx-robot] updated from transifex
2019-02-28 01:50:48 +00:00
Nextcloud bot
0252ad9a08
[tx-robot] updated from transifex
2019-02-25 01:48:24 +00:00
Nextcloud bot
089625c9fd
[tx-robot] updated from transifex
2019-02-24 01:51:53 +00:00
Nextcloud bot
e63fd9b894
[tx-robot] updated from transifex
2019-02-23 01:49:05 +00:00
Nextcloud bot
9be32355f9
[tx-robot] updated from transifex
2019-02-22 01:49:45 +00:00
Nextcloud bot
984c02546e
[tx-robot] updated from transifex
2019-02-21 01:48:49 +00:00
Nextcloud bot
c60b4afafb
[tx-robot] updated from transifex
2019-02-20 01:48:28 +00:00
Nextcloud bot
55ff37a454
[tx-robot] updated from transifex
2019-02-16 01:48:02 +00:00
Roeland Jago Douma
bb2f179342
Be less verbose with logging
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-02-15 20:23:24 +01:00
Roeland Jago Douma
28afe8c323
Merge pull request #1087 from SimJoSt/patch-1
...
correct app passwords link
2019-02-14 11:51:24 +01:00
Joda Stößer
9393626ec2
correct app passwords link
...
Since some versions ago, the path/url for the app password settings is `/settings/user/security#security` instead of `/settings/personal#apppasswords`
2019-02-14 05:26:21 +01:00
Nextcloud bot
c0d0d39d8d
[tx-robot] updated from transifex
2019-02-13 01:48:58 +00:00
Nextcloud bot
d06db158a0
[tx-robot] updated from transifex
2019-02-12 01:48:01 +00:00
Nextcloud bot
1698c39223
[tx-robot] updated from transifex
2019-02-11 01:49:14 +00:00
Nextcloud bot
42ad97de8c
[tx-robot] updated from transifex
2019-02-10 01:51:00 +00:00
Nextcloud bot
29230412ed
[tx-robot] updated from transifex
2019-02-09 01:49:42 +00:00
Nextcloud bot
e4bcc1a9ee
[tx-robot] updated from transifex
2019-02-08 01:49:54 +00:00
Nextcloud bot
ca624def40
[tx-robot] updated from transifex
2019-02-07 01:52:13 +00:00
Nextcloud bot
bb912ecc0a
[tx-robot] updated from transifex
2019-02-06 01:42:24 +00:00
Camila San
e2309362e1
Updates version to 2.5.2.
...
Signed-off-by: Camila San <hello@camila.codes >
2019-02-05 12:02:55 +01:00
Camila Ayres
a20ac05357
Merge pull request #1071 from nextcloud/enh/invalid_certificate_messagebox
...
Add invalid certiticate messagebox
2019-02-05 10:50:20 +01:00
Roeland Jago Douma
c9d4360fb6
Add invalid certiticate messagebox
...
This is a quick hack to make self signed certificates work.
I'm not to fond of it the real solution should be to request the url
with QNAM and then see if it fails.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-02-05 10:18:35 +01:00
Nextcloud bot
63fe2a7098
[tx-robot] updated from transifex
2019-02-05 01:42:29 +00:00
Camila Ayres
9931977266
Merge pull request #1062 from nextcloud/enh/notifications/do_not_show_dismissed
...
Do not display dismissed notifications
2019-02-04 20:43:42 +01:00
Camila Ayres
d4a77be3f8
Merge branch 'master' into enh/notifications/do_not_show_dismissed
2019-02-04 20:27:44 +01:00
Camila Ayres
79dd8397d7
Merge pull request #1069 from nextcloud/rakekniven-patch-1
...
Fixed l18n issue. Added space for separating string
2019-02-04 17:50:45 +01:00
rakekniven
d564279254
Fixed l18n issue. Added space for separating string
...
Related to #1068
Reported at forums with screenshots. See
https://help.nextcloud.com/t/client-2-5-1-linux-typo/46796
Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de >
2019-02-04 17:13:53 +01:00
Nextcloud bot
97c54249d5
[tx-robot] updated from transifex
2019-02-04 01:41:57 +00:00
Nextcloud bot
652304e82e
[tx-robot] updated from transifex
2019-02-02 01:42:34 +00:00
Roeland Jago Douma
86251ff2e3
Do not display dismissed notifications
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-02-01 14:39:59 +01:00
Nextcloud bot
ae7ad8fb4f
[tx-robot] updated from transifex
2019-02-01 01:42:38 +00:00
Roeland Jago Douma
822c386709
Merge pull request #1057 from nextcloud/fix/proxy-login-flow
...
Fix login flow with system proxy
2019-01-31 16:11:08 +01:00
Roeland Jago Douma
50ebc49d69
Work around proxy issue with webview by always setting a proxy
...
Just use the prefered http tcp socket proxy.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-01-31 14:14:31 +01:00
Roeland Jago Douma
eb3245b241
Fix login flow with system proxy
...
I must admit why this works is puzzling me. However if I just use a system
proxy without this it doesn't work. I suspect a Qt bug but will have to
dig deeper to find out if that is the case.
For now this little hack will have to do.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-01-31 13:45:40 +01:00
Julius Härtl
af443461e3
Merge pull request #1060 from nextcloud/enh/easier_theming
...
Start with easier theming
2019-01-31 12:04:25 +01:00
Roeland Jago Douma
e2293eddce
Allow to specifiy server url via CMAKE
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-01-31 11:28:46 +01:00
Roeland Jago Douma
b34708da29
Move help URL also to CMAKE
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-01-31 11:28:46 +01:00
Roeland Jago Douma
0c21852bc3
No need to overwrite customMedia in the theme
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-01-31 11:28:46 +01:00
Roeland Jago Douma
944f9e9668
Move wizard options to CMAKE as well
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-01-31 11:28:38 +01:00
Roeland Jago Douma
5c2996deb7
Use the provided updater URL
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-01-31 09:52:16 +01:00
Nextcloud bot
33d272e941
[tx-robot] updated from transifex
2019-01-31 01:43:23 +00:00
Roeland Jago Douma
bf81a473af
Merge pull request #1054 from nextcloud/enh/no_double_slash
...
Do not add double slash to login flow url
2019-01-30 16:39:52 +01:00
Roeland Jago Douma
a46548fc04
Merge pull request #1050 from IzabelaBakollari/master
...
Removed whitespace from string
2019-01-30 09:58:15 +01:00
Nextcloud bot
21b7257150
[tx-robot] updated from transifex
2019-01-30 01:44:34 +00:00
Roeland Jago Douma
7c1401da1c
Do not add double slash to login flow url
...
If the entered url ends with a slash we should not add another one.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-01-29 22:50:30 +01:00
Izabela Bakollari
c53e9cb417
Changes to be committed:
...
modified: CONTRIBUTING.md
Edited the link to report issue template.
2019-01-29 16:59:44 +01:00
Izabela Bakollari
e3731e40aa
Changes to be committed:
...
modified: src/gui/activitywidget.cpp
Removed whitespace from string
Issue #928
2019-01-29 13:10:11 +01:00
Nextcloud bot
218ffd0cd8
[tx-robot] updated from transifex
2019-01-29 01:42:50 +00:00
Nextcloud bot
9195452878
[tx-robot] updated from transifex
2019-01-28 01:43:34 +00:00
Nextcloud bot
67c25ca4b9
[tx-robot] updated from transifex
2019-01-27 01:46:09 +00:00
Nextcloud bot
75ddd315e3
[tx-robot] updated from transifex
2019-01-24 01:49:14 +00:00
Nextcloud bot
179ab90fce
[tx-robot] updated from transifex
2019-01-23 01:48:46 +00:00
Nextcloud bot
198b95676a
[tx-robot] updated from transifex
2019-01-22 01:49:05 +00:00
Nextcloud bot
63e5e4e92d
[tx-robot] updated from transifex
2019-01-21 01:48:04 +00:00
Nextcloud bot
107bf5db6d
[tx-robot] updated from transifex
2019-01-20 01:48:41 +00:00
Nextcloud bot
38449bf179
[tx-robot] updated from transifex
2019-01-19 01:49:57 +00:00
Nextcloud bot
8710d70a0a
[tx-robot] updated from transifex
2019-01-18 01:52:08 +00:00
Nextcloud bot
b0e8837b94
[tx-robot] updated from transifex
2019-01-17 01:49:26 +00:00
Nextcloud bot
aadd2ff7ac
[tx-robot] updated from transifex
2019-01-16 01:50:23 +00:00
Nextcloud bot
7dfe21fe35
[tx-robot] updated from transifex
2019-01-15 01:52:13 +00:00
Roeland Jago Douma
310266f9fa
Merge pull request #1006 from javierllorente/master
...
Wizard: show an error message if there is no enough free space in the local folder
2019-01-14 09:52:51 +01:00
Nextcloud bot
33e3b7098f
[tx-robot] updated from transifex
2019-01-14 01:49:44 +00:00
Javier Llorente
e5b5573711
Show an error message if there is no enough free space in the local
...
folder
2019-01-13 23:35:06 +01:00
Nextcloud bot
5e4abbc0c1
[tx-robot] updated from transifex
2019-01-13 01:49:32 +00:00
Nextcloud bot
9e6e6dd5db
[tx-robot] updated from transifex
2019-01-12 01:48:02 +00:00
Nextcloud bot
79e196a22f
[tx-robot] updated from transifex
2019-01-11 01:49:11 +00:00
Nextcloud bot
d73c4273ad
[tx-robot] updated from transifex
2019-01-10 01:47:53 +00:00
Nextcloud bot
86a1bc36cb
[tx-robot] updated from transifex
2019-01-09 01:50:35 +00:00
Nextcloud bot
aa600b4a24
[tx-robot] updated from transifex
2019-01-08 01:47:12 +00:00
Roeland Jago Douma
27298a2056
Merge pull request #959 from yan12125/correct-webview-deallocation
...
Make sure _profile and _page are deleted in the correct order
2019-01-07 15:01:23 +01:00
Roeland Jago Douma
5ebee92991
Merge pull request #1001 from nextcloud/fix/279/handle_username_space
...
Handle spaces in username properly in login flow
2019-01-07 14:21:52 +01:00
Roeland Jago Douma
9ec61a84ce
Handle spaces in username properly in login flow
...
Fixes #279
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2019-01-07 10:41:01 +01:00
Roeland Jago Douma
cacf3e9924
Merge pull request #923 from ivaradi/disco-support
...
Support Ubuntu Disco Dingo
2019-01-07 09:53:04 +01:00
Roeland Jago Douma
dc993d3ebe
Merge pull request #981 from yan12125/fix-kde-cmake-warnings
...
Fix KDEInstallDirs deprecation warnings
2019-01-07 09:49:07 +01:00
István Váradi
51829bfb47
Merge branch 'master' into disco-support
2019-01-07 09:40:39 +01:00
Roeland Jago Douma
6dfe160cef
Merge pull request #993 from HuemerGroup/stylesheet-fix
...
Removed Stylesheet
2019-01-07 09:33:53 +01:00
Nextcloud bot
a2f1ee05ba
[tx-robot] updated from transifex
2019-01-07 01:47:36 +00:00
István Váradi
76b9d5c0c3
Merge branch 'master' into disco-support
2019-01-06 16:53:46 +01:00
Nextcloud bot
51d349f527
[tx-robot] updated from transifex
2019-01-06 02:01:14 +00:00
Roeland Jago Douma
188125dd88
Merge branch 'master' into disco-support
2019-01-05 22:08:24 +01:00
Nextcloud bot
d8aed94ab1
[tx-robot] updated from transifex
2019-01-05 01:47:29 +00:00
Nextcloud bot
86d7d41e40
[tx-robot] updated from transifex
2019-01-04 02:31:36 +00:00
Oskar Kruschitz
74454d0452
Removed Stylesheet
...
Stylesheet String was not correctly defined (missing ";" after "%2") and caused an error in logging output.
After checking the fixed Style I removed it since it does not really look good.
2019-01-03 15:54:50 +01:00
Nextcloud bot
0dcf6c6024
[tx-robot] updated from transifex
2019-01-03 01:46:40 +00:00
Nextcloud bot
0a14f6eeb1
[tx-robot] updated from transifex
2019-01-02 01:46:49 +00:00
Nextcloud bot
b59b633a3d
[tx-robot] updated from transifex
2019-01-01 01:46:32 +00:00
Nextcloud bot
d6b34323c5
[tx-robot] updated from transifex
2018-12-31 01:48:26 +00:00
Nextcloud bot
716517db98
[tx-robot] updated from transifex
2018-12-30 01:50:18 +00:00
Nextcloud bot
76c515b09c
[tx-robot] updated from transifex
2018-12-29 01:46:03 +00:00
Nextcloud bot
ac367b21bc
[tx-robot] updated from transifex
2018-12-28 15:52:56 +00:00
Chih-Hsuan Yen
1361c3053a
Fix KDEInstallDirs deprecation warnings
...
Get rid of a bunch of such warnings from configuring the Dolphin plugin:
CMake Deprecation Warning at /usr/share/ECM/kde-modules/KDEInstallDirs.cmake:345 (message):
BIN_INSTALL_DIR is deprecated, use KDE_INSTALL_BINDIR instead.
Call Stack (most recent call first):
/usr/share/ECM/kde-modules/KDEInstallDirs.cmake:433 (_define_relative)
shell_integration/dolphin/CMakeLists.txt:23 (include)
Modified from https://github.com/owncloud/client/pull/6922
Original author: Dominik Schmidt <dev@dominik-schmidt.de >
2018-12-28 21:55:45 +08:00
Nextcloud bot
b46ee79081
[tx-robot] updated from transifex
2018-12-27 01:49:06 +00:00
Nextcloud bot
9cea77b0fb
[tx-robot] updated from transifex
2018-12-26 01:50:50 +00:00
Nextcloud bot
c04addc5c4
[tx-robot] updated from transifex
2018-12-24 01:55:12 +00:00
Nextcloud bot
c2f4326908
[tx-robot] updated from transifex
2018-12-23 01:50:47 +00:00
Nextcloud bot
f6d3229b38
[tx-robot] updated from transifex
2018-12-21 01:47:16 +00:00
Nextcloud bot
3451970751
[tx-robot] updated from transifex
2018-12-20 01:48:23 +00:00
Chih-Hsuan Yen
09b0055dc3
Make sure _profile and _page are deleted in the correct order
...
Inspired by https://github.com/electron/electron/pull/15028
Closes https://github.com/nextcloud/desktop/issues/941
Closes https://github.com/nextcloud/desktop/issues/950
2018-12-19 21:44:54 +08:00
Nextcloud bot
24907acc2a
[tx-robot] updated from transifex
2018-12-17 01:48:23 +00:00
Nextcloud bot
01bbfaacf3
[tx-robot] updated from transifex
2018-12-16 01:48:42 +00:00
Nextcloud bot
6d5da44947
[tx-robot] updated from transifex
2018-12-15 01:46:20 +00:00
Roeland Jago Douma
071709ab5e
Merge pull request #946 from hiiamok/qt5.12-wizard-webview
...
Added missing Include
2018-12-13 19:34:42 +01:00
Oskar Kruschitz
1295884420
Added missing Include
...
Fixing an error during Build with Qt5.12:
error: member access into incomplete type 'const QWebEngineCertificateError'
2018-12-13 16:13:01 +01:00
Nextcloud bot
6d661e0b3d
[tx-robot] updated from transifex
2018-12-13 01:48:20 +00:00
Nextcloud bot
e0430288ce
[tx-robot] updated from transifex
2018-12-12 01:54:46 +00:00
Nextcloud bot
a7b16e3c28
[tx-robot] updated from transifex
2018-12-11 01:47:42 +00:00
Nextcloud bot
abe22d8fe6
[tx-robot] updated from transifex
2018-12-10 05:20:00 +00:00
Nextcloud bot
1ad7116045
[tx-robot] updated from transifex
2018-12-09 01:48:57 +00:00
Nextcloud bot
72777be571
[tx-robot] updated from transifex
2018-12-07 01:47:38 +00:00
Camila Ayres
840904d527
Merge pull request #778 from jpnurmi/background
...
Add a command line option to launch the client in the background
2018-12-06 09:53:19 +01:00
Camila Ayres
f91678ef24
Merge branch 'master' into background
2018-12-06 09:35:15 +01:00
Nextcloud bot
6cf390f753
[tx-robot] updated from transifex
2018-12-06 01:54:12 +00:00
István Váradi
20b9404539
Support Ubuntu Disco Dingo
2018-12-05 19:46:45 +01:00
Nextcloud bot
0ff23eabca
[tx-robot] updated from transifex
2018-12-05 01:48:53 +00:00
Camila San
b37cbea5cc
Updates desktop client version to 2.5.1.
...
Signed-off-by: Camila San <hello@camila.codes >
2018-12-04 12:18:06 +01:00
Nextcloud bot
fc18fd9a06
[tx-robot] updated from transifex
2018-12-04 01:57:46 +00:00
Nextcloud bot
07116707e5
[tx-robot] updated from transifex
2018-12-03 01:45:39 +00:00
Nextcloud bot
0f935b06e9
[tx-robot] updated from transifex
2018-12-02 01:47:55 +00:00
Nextcloud bot
a0d6f5fb60
[tx-robot] updated from transifex
2018-12-01 01:45:33 +00:00
Nextcloud bot
4ddfc04534
[tx-robot] updated from transifex
2018-11-30 01:46:30 +00:00
Nextcloud bot
9fb5b4a92d
[tx-robot] updated from transifex
2018-11-29 01:48:27 +00:00
Camila Ayres
b97d8ba6db
Merge pull request #898 from nextcloud/nautilus-integration-name
...
Fix appname for Nautilus integration script.
2018-11-28 12:21:27 +01:00
Jan-Christoph Borchardt
7d8bba6786
Fix appname for Nautilus integration script
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net >
2018-11-28 11:54:08 +01:00
Nextcloud bot
f0c6825746
[tx-robot] updated from transifex
2018-11-28 01:48:00 +00:00
Roeland Jago Douma
1490b186f9
Merge pull request #860 from nextcloud/fix/566/do_not_read_system_exclude
...
Do not read system exclude list if user exclude is present
2018-11-27 11:54:40 +01:00
Roeland Jago Douma
8b64db6344
Merge branch 'master' into fix/566/do_not_read_system_exclude
2018-11-27 11:19:20 +01:00
Roeland Jago Douma
ab85dfcd67
Merge pull request #880 from nextcloud/fix/873
...
Write the actual folder to the log
2018-11-27 11:16:10 +01:00
Nextcloud bot
13fdb32d4f
[tx-robot] updated from transifex
2018-11-27 01:51:22 +00:00
Camila Ayres
72901a4ed8
Merge branch 'master' into background
2018-11-26 21:07:14 +01:00
Nextcloud bot
558d3ad492
[tx-robot] updated from transifex
2018-11-26 01:52:12 +00:00
Nextcloud bot
0a04419180
[tx-robot] updated from transifex
2018-11-25 05:19:20 +00:00
Nextcloud bot
fdbc523f85
[tx-robot] updated from transifex
2018-11-24 01:44:00 +00:00
Roeland Jago Douma
287d78ffd3
Write the actual folder to the log
...
Fixes #873
Not all folder names are proper latin1.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-23 10:33:25 +01:00
Nextcloud bot
8418507483
[tx-robot] updated from transifex
2018-11-23 02:52:33 +00:00
Roeland Jago Douma
d1b9d100b4
Merge pull request #874 from nextcloud/fix_activity_busy_loop
...
Fix the activity loop
2018-11-22 23:09:57 +01:00
Roeland Jago Douma
b93c762205
Fix the activity loop
...
We should stop fetching the moment the activity stream is empty when
fetched. It doesn't matter if the current list is empty.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-22 10:40:00 +01:00
Nextcloud bot
528e1bef37
[tx-robot] updated from transifex
2018-11-22 01:47:38 +00:00
Nextcloud bot
73aed1d630
[tx-robot] updated from transifex
2018-11-21 01:47:22 +00:00
Nextcloud bot
7b446eef93
[tx-robot] updated from transifex
2018-11-20 01:48:03 +00:00
Roeland Jago Douma
1afaa22ddb
Merge pull request #859 from nextcloud/fix/788/no_activity_flood
...
Do not fetch activities if they are not enabled
2018-11-19 23:15:08 +01:00
Roeland Jago Douma
bdd5d423ed
Merge branch 'master' into fix/788/no_activity_flood
2018-11-19 21:29:58 +01:00
Roeland Jago Douma
44b5e07a80
Merge pull request #847 from jpnurmi/share-dialog-take-2
...
Share dialog alignment
2018-11-19 20:18:30 +01:00
Roeland Jago Douma
d8c0fb856c
Merge branch 'master' into share-dialog-take-2
2018-11-19 19:33:05 +01:00
Roeland Jago Douma
6cc496633f
Do not read system exclude list if user exclude is present
...
For #566
Since we only showed the user exclude list (and some extra items) the
system exclude list was still used.
This copies over the system exclude list (if it isn't there).
If it fails we use the system one still.
However if you now remove items from your own list it will really be
gone.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-19 15:35:32 +01:00
Roeland Jago Douma
1d0bf08a1c
Do not fetch activities if they are not enabled
...
Fixes #788
Fixes #834
If the activity app is not enabled we should not try to fetch the
activities at all.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-19 14:13:51 +01:00
Nextcloud bot
a3d1bd3a42
[tx-robot] updated from transifex
2018-11-19 01:46:32 +00:00
Roeland Jago Douma
1c0fbba98e
Merge pull request #854 from nextcloud/enoch85-patch-1
...
Change link to docs for NC 15
2018-11-18 16:34:14 +01:00
Daniel Hansson
2d6c5f393f
Change link to docs for NC 15
...
This changes the link for the "Host your own" link in the wizard.
2018-11-18 11:02:34 +01:00
Nextcloud bot
eaf339b11d
[tx-robot] updated from transifex
2018-11-18 01:48:31 +00:00
Roeland Jago Douma
3a50b57b5a
Merge pull request #848 from nextcloud/rakekniven-patch-1
...
Fixed typo
2018-11-17 13:08:06 +01:00
rakekniven
6c0cd4bd3a
Fixed typo
...
Reported at Transifex.
Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de >
2018-11-17 11:36:16 +01:00
J-P Nurmi
d6170271e9
ShareDialog: increase the width
...
To match the old width it had before the alignment work.
2018-11-17 09:24:45 +01:00
J-P Nurmi
6f145e3a80
ShareUserGroupWidget: allow frame when scrollable
2018-11-17 09:22:52 +01:00
J-P Nurmi
3c193143f2
Cleanup sharedialog.ui
2018-11-17 09:22:52 +01:00
J-P Nurmi
b25e15347b
ShareUserGroupWidget: fix scroll area size management
2018-11-17 09:22:52 +01:00
J-P Nurmi
a8cce41f35
sharedialog.ui: fix scroll area size
2018-11-17 09:22:52 +01:00
J-P Nurmi
f0f691fffc
Cleanup shareuserline.ui
2018-11-17 09:22:52 +01:00
J-P Nurmi
847706432b
ShareLinkWidget: redo the layout
...
NOTE: The progress indicator is temporarily moved one line up to avoid
inserting it on its own line, which would cause the content pushed down
and the dialog size jump back and forth.
2018-11-17 09:22:52 +01:00
J-P Nurmi
bd93489b14
Cleanup shareusergroupwidget.ui
...
Remove hard-coded fixed sizes, size constraints, and other unnecessary
property assignments. This works with any dialog width, meaning that
the width can be defined in one place higher up in the widget hierachy.
2018-11-17 09:22:52 +01:00
J-P Nurmi
96d0059ca4
ShareDialog: use auto-raising tool buttons as confirm buttons
2018-11-17 09:22:52 +01:00
J-P Nurmi
df802472cb
ShareLinkWidget: sync the confirm button size
2018-11-17 09:22:52 +01:00
J-P Nurmi
94750a5ea1
ShareUserGroupWidget: sync the share confirm button size with others
...
This keeps also the total width of the share dialog constant.
2018-11-17 09:22:52 +01:00
J-P Nurmi
fae1c0dbdd
ShareUserLine: fix eliding
...
The widget doesn't have its final size at construction time, so the
width for eliding is not yet known. Let ElidedLabel do the job.
2018-11-17 09:22:52 +01:00
J-P Nurmi
b546e7c224
ElidedLabel: add default constructor
...
Makes it possible to promote QLabel to an ElidedLabel in Qt Designer.
2018-11-17 09:22:52 +01:00
J-P Nurmi
cd58850f5b
ShareUserGroupWidget: remove nested content margins
2018-11-17 09:22:52 +01:00
J-P Nurmi
7d3242077b
ShareDialog: align the left margin
...
All other margins are 10px.
2018-11-17 09:22:52 +01:00
Nextcloud bot
3f2ff2e6ba
[tx-robot] updated from transifex
2018-11-17 02:02:47 +00:00
Roeland Jago Douma
433a059223
Merge pull request #843 from Aentfs/master
...
Change man page names and contents for nextcloud
2018-11-16 22:35:22 +01:00
Stefan Suhren
d6feb984c3
Change man page names and contents for nextcloud
2018-11-16 16:57:15 +01:00
Nextcloud bot
41f2864ac9
[tx-robot] updated from transifex
2018-11-16 01:47:40 +00:00
Nextcloud bot
b1a2683e62
[tx-robot] updated from transifex
2018-11-15 01:50:21 +00:00
Roeland Jago Douma
4febf7c70b
Merge pull request #823 from Awesome-Technologies/providers
...
Fix cmake build using WITH_PROVIDERS=OFF
2018-11-14 14:43:42 +01:00
Roeland Jago Douma
b8f0721fcb
Merge pull request #824 from ivaradi/debian-repo-update
...
Debian/Ubuntu target repository update
2018-11-14 14:30:51 +01:00
Roeland Jago Douma
8f95f68f06
Merge branch 'master' into providers
2018-11-14 13:18:37 +01:00
Nextcloud bot
c9b7078fb7
[tx-robot] updated from transifex
2018-11-14 01:47:56 +00:00
István Váradi
f0b96445d2
Fixed the PPA names as well
2018-11-13 20:49:26 +01:00
István Váradi
bcb4b44c69
Also use the correct OBS repository
2018-11-13 16:47:06 +01:00
István Váradi
82f9ec78dc
Use the version kind to differentiate between target repos
2018-11-13 16:44:20 +01:00
István Váradi
5a26e7dabe
Use the tags to determine if a version is a release or a beta one
2018-11-13 16:42:42 +01:00
Manuel Stahl
6718f5ad58
Fix cmake build using WITH_PROVIDERS=OFF
...
Fixes #821 .
2018-11-13 14:54:30 +01:00
Roeland Jago Douma
88c738dd21
Merge pull request #818 from nextcloud/enhancement/809/config-error
...
More verbose error and proper app name on configuration read error
2018-11-13 11:30:18 +01:00
Julius Härtl
2d79ea5262
More verbose error and proper app name on configuration read error
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2018-11-13 11:01:20 +01:00
Roeland Jago Douma
cc7abc02f4
Merge pull request #813 from jpnurmi/action-colors
...
SettingsDialog: tweak color aware icons
2018-11-13 08:16:41 +01:00
Roeland Jago Douma
e2c813bfca
Merge branch 'master' into action-colors
2018-11-13 07:41:53 +01:00
Roeland Jago Douma
5695aba5d7
Merge pull request #811 from jpnurmi/modernize
...
libsync: let Clang-Tidy modernize nullptr & override usage
2018-11-13 07:41:10 +01:00
Nextcloud bot
0f9e32d49c
[tx-robot] updated from transifex
2018-11-13 01:52:41 +00:00
Roeland Jago Douma
0d9d942ab7
Merge branch 'master' into modernize
2018-11-12 20:21:13 +01:00
Roeland Jago Douma
9de32d2cb7
Merge pull request #812 from jpnurmi/settings-dialog-accounts
...
SettingsDialog: fix a little glitch in the account tool button size
2018-11-12 20:10:30 +01:00
J-P Nurmi
53c89e2196
SettingsDialog: tweak color aware icons
...
If selected text is light, provide a light icon too when selected.
2018-11-12 20:04:02 +01:00
J-P Nurmi
b0959a6292
SettingsDialog: fix a little glitch in the account tool button size
...
SettingsDialog::accountAdded() uses the height of the toolbar to
calculate the desired default size for toolbuttons. Make sure to have
the "General" and "Network" tool buttons in place before calling
accountAdded() to avoid cramped first button.
2018-11-12 18:53:47 +01:00
J-P Nurmi
1af9bf8abc
libsync: run clang-tidy modernize-use-nullptr
2018-11-12 18:46:39 +01:00
J-P Nurmi
0d1c15a768
libsync: run clang-tidy modernize-use-override
2018-11-12 18:43:58 +01:00
J-P Nurmi
48acaec66f
libsync: search'n'replace "Q_DECL_OVERRIDE" with "override"
2018-11-12 18:39:50 +01:00
Roeland Jago Douma
9f6bb617e9
Merge pull request #807 from nextcloud/modernize
...
GUI: let Clang-Tidy modernize nullptr & override usage
2018-11-12 15:26:18 +01:00
Roeland Jago Douma
c5a4694c74
Merge branch 'master' into modernize
2018-11-12 14:56:35 +01:00
Roeland Jago Douma
0f2294cef4
Merge pull request #806 from nextcloud/server-notification-handler
...
Fixup the port in server notification URLs
2018-11-12 14:48:30 +01:00
Roeland Jago Douma
778489d445
Merge pull request #808 from jpnurmi/slideshow
...
Improve the slide show
2018-11-12 14:47:56 +01:00
J-P Nurmi
ba53a01339
SlideShow: don't allow clicks while animating
...
Changing slides while animating was looking a bit awkward.
2018-11-11 12:30:33 +01:00
J-P Nurmi
8217c44ee5
SlideShow: slow down the slide interval
...
The original non-animated slide show was running at 2500ms interval.
The new animated slide show was using the same interval, but used
1000ms to animate the slides. This left significantly less time for
the user to read the slides.
2018-11-11 12:27:21 +01:00
J-P Nurmi
fff64e8aa5
GUI: search'n'replace remaining "Q_DECL_OVERRIDE" with "override"
2018-11-11 11:12:37 +01:00
J-P Nurmi
8e38e2ac86
GUI: run clang-tidy modernize-use-override
2018-11-11 11:08:03 +01:00
J-P Nurmi
fb5ff96ed6
GUI: run clang-tidy modernize-use-nullptr
2018-11-11 10:56:22 +01:00
Nextcloud bot
371001c9ff
[tx-robot] updated from transifex
2018-11-11 01:51:25 +00:00
J-P Nurmi
91602574a9
Fixup the port in server notification URLs
...
... in addition to fixing up the scheme and host.
For example, the survey app sends "/settings/admin/survey_client" as
a link. Clicking the "More information" button wouldn't lead to the
correct place if NC was running on a custom port.
2018-11-10 22:24:17 +01:00
Nextcloud bot
8367dbc67f
[tx-robot] updated from transifex
2018-11-10 01:49:34 +00:00
rakekniven
ee96d998e5
Merge pull request #803 from nextcloud/rakekniven-patch-1
...
l10n. Added space for correct grammar.
2018-11-09 17:06:25 +01:00
rakekniven
a73da99d78
Merge branch 'master' into rakekniven-patch-1
2018-11-09 16:37:43 +01:00
rakekniven
f25ef73772
l10n. Added space for correct grammar.
...
Signed-off-by: Mark Ziegler <mark.ziegler@rakekniven.de >
2018-11-09 16:37:29 +01:00
Roeland Jago Douma
cf0838643f
Merge pull request #800 from nextcloud/fix/open_activities_on_conflict
...
Actually open the activity view on a click for more info
2018-11-09 16:36:24 +01:00
Roeland Jago Douma
559fd910d8
Merge pull request #801 from nextcloud/fix/generated_avatar_not_black
...
Use a format that supports alpha channels for avatars
2018-11-09 15:15:46 +01:00
Roeland Jago Douma
3a0c7f64c0
Use a format that supports alpha channels for avatars
...
If we use the source format it can result in fully black images. As the
basic generated avatar doesn't have an alpha channel.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-09 13:01:28 +01:00
Roeland Jago Douma
7925c6c081
Actually open the activity view on a click for more info
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-09 12:12:25 +01:00
Roeland Jago Douma
9c0e5c2b19
Merge pull request #797 from alexcustos/issue_alternative_log_in
...
Added default scheme when server returns just a host
2018-11-09 08:52:39 +01:00
Nextcloud bot
c387592e47
[tx-robot] updated from transifex
2018-11-09 01:48:22 +00:00
Camila Ayres
b1d68f311d
Merge pull request #798 from alexcustos/issues_openssl_1_1
...
Removed explicit initialization; Fixed RAND_bytes not found
2018-11-08 10:26:47 +01:00
Aleksandr Borisenko
f5586baee7
Added default scheme when server returns just a host
2018-11-08 11:35:27 +03:00
Aleksandr Borisenko
bb2d31a2bd
Removed explicit initialization; Fixed RAND_bytes not found
2018-11-08 11:24:39 +03:00
Nextcloud bot
82cbee3f9d
[tx-robot] updated from transifex
2018-11-08 01:48:27 +00:00
Roeland Jago Douma
347f4c8675
Merge pull request #796 from nextcloud/settings-dialog-height
...
SettingsDialog: disable unnecessary wrapping for the about label
2018-11-07 21:09:27 +01:00
J-P Nurmi
3a6d0ee29c
SettingsDialog: disable unnecessary wrapping for the about label
...
For some reason, QLabel with rich text and word wrapping enabled
calculates quite a bit too large size hint. Luckily, it's rich text
that is already divided to paragraphs so that wrapping makes actually
very little visual difference. For example, on my screen, when the
settings dialog is resized horizontally to the minimum, the only word
that actually wrapped was "2017". After this patch, it naturally won't
wrap anymore, but the General Settings page also doesn't leave a large
gap at the bottom. As a result, the minimum height of the dialog went
down from 581 to 525. The exact values depend on the style and fonts.
Fixes #91 .
2018-11-07 20:01:28 +01:00
J-P Nurmi
ee8bcb2a5b
Add a command line option to launch the client in the background
...
Allow passing a --background argument to force the app in the background
even if systray is not available.
Fixes #737
2018-11-07 18:42:36 +01:00
Roeland Jago Douma
1b6e0c5292
Merge pull request #794 from jpnurmi/activity-text-colors
...
Fix ActivityWidget palette
2018-11-07 10:13:00 +01:00
Roeland Jago Douma
32cf2f2622
Merge branch 'master' into activity-text-colors
2018-11-07 09:29:15 +01:00
Nextcloud bot
6bd6bd3ed9
[tx-robot] updated from transifex
2018-11-07 01:48:19 +00:00
Roeland Jago Douma
13e1b6a34a
Merge pull request #790 from nextcloud/fix/789/osx_installer_background
...
Update isntaller background for OSX
2018-11-06 11:11:16 +01:00
Roeland Jago Douma
6ada87ed15
Update isntaller background for OSX
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-06 10:39:10 +01:00
Nextcloud bot
da367f17ab
[tx-robot] updated from transifex
2018-11-06 01:50:02 +00:00
J-P Nurmi
d01a99e9e5
ActivityWidget: remove a hard-coded white background
...
Let the system palette provide the appropriate color.
Fixes #742 .
2018-11-05 22:13:34 +01:00
J-P Nurmi
b8d97b590f
Fix palette usage in ActivityItemDelegate::paint()
...
Fixes #742 .
2018-11-05 20:18:54 +01:00
Roeland Jago Douma
5a1fed8e23
Merge pull request #785 from nextcloud/we_are_nextcloud
...
Use Nextcloud
2018-11-05 13:57:17 +01:00
Roeland Jago Douma
fe60a2a570
Use Nextcloud
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-05 13:27:30 +01:00
Roeland Jago Douma
aee0363876
Merge pull request #783 from nextcloud/doc/cmake-build
...
Fix cmake build of documentation
2018-11-05 11:26:36 +01:00
Julius Härtl
abac2c327e
Fix cmake build of documentation
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2018-11-05 10:56:21 +01:00
Nextcloud bot
6dae188ed9
[tx-robot] updated from transifex
2018-11-05 01:49:43 +00:00
Roeland Jago Douma
2b760cd63b
Merge pull request #781 from ivaradi/qt5.5-compat
...
Qt 5.5 compatibility patch for Xenial
2018-11-04 21:08:44 +01:00
Roeland Jago Douma
54b490c8d1
Merge branch 'master' into qt5.5-compat
2018-11-04 20:41:33 +01:00
Roeland Jago Douma
1e6b0b8924
Merge pull request #780 from jpnurmi/margins
...
Margins
2018-11-04 20:20:42 +01:00
Roeland Jago Douma
ef15534c64
Merge branch 'master' into margins
2018-11-04 19:40:40 +01:00
István Váradi
ea806a1287
Patch for Xenial to be able to compile with Qt 5.5
2018-11-04 17:28:13 +01:00
Roeland Jago Douma
b904d79d8f
Merge pull request #776 from nextcloud/feature/migrate_http_to_webflow
...
Migrate http auth to webflow
2018-11-04 14:03:13 +01:00
Roeland Jago Douma
0c535872cb
Merge branch 'master' into feature/migrate_http_to_webflow
2018-11-04 13:47:04 +01:00
Nextcloud bot
15553df34e
[tx-robot] updated from transifex
2018-11-04 01:54:37 +00:00
J-P Nurmi
028979d752
ActivityWidget: remove double margins
...
To align margins with the account settings tab, so the content doesn't
jump when switching tabs.
2018-11-03 23:03:54 +01:00
J-P Nurmi
1e1d116052
SettingsDialog: remove an unused button box
...
This makes the bottom margin aligned with horizontal margins, and
eliminates a warning on startup:
[unknown QObject::connect: Cannot connect (null)::clicked() to OCC::SettingsDialog::accept()
2018-11-03 22:49:48 +01:00
Roeland Jago Douma
045bba0161
Migrate http auth to webflow
...
This moves all the basic http auth over to the webflow mechanism.
This thus also makes sure that if the password changes a webflow page
pops up. And thus will directly move them over to apptokens then.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-03 12:37:53 +01:00
Nextcloud bot
b44408a91b
[tx-robot] updated from transifex
2018-11-03 01:49:48 +00:00
Roeland Jago Douma
af8a2819be
Merge pull request #768 from nextcloud/fix/766/copy_over_old_windows_config
...
Copy over config file to new location on windows
2018-11-02 21:01:22 +01:00
Roeland Jago Douma
17d05a2ad4
Merge pull request #750 from jpnurmi/slideshow
...
Setup wizard: implement an animated and interactive slide show
2018-11-02 12:21:07 +01:00
Roeland Jago Douma
0f767ed995
Increase durations a bit
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-02 11:10:57 +01:00
Roeland Jago Douma
e6f1d7632a
Merge branch 'master' into slideshow
2018-11-02 10:43:01 +01:00
Roeland Jago Douma
40c36a9ed3
Merge pull request #756 from jpnurmi/add-button
...
Make the "Add Folder Sync Connection" button act like a button
2018-11-02 10:39:00 +01:00
Roeland Jago Douma
67714d33db
Merge pull request #744 from jpnurmi/remove-qtsvg-include
...
Build fix: remove an unused QtSvg/QSvgRenderer include
2018-11-02 10:31:01 +01:00
Roeland Jago Douma
e01cb108e1
Merge pull request #754 from kevin147147/patch-1
...
theming for general settings ui
2018-11-02 10:08:18 +01:00
Roeland Jago Douma
3e634dad70
Merge pull request #764 from Awesome-Technologies/user_group_widget
...
Fix warning in ShareUserGroupWidget
2018-11-02 10:05:14 +01:00
Nextcloud bot
c2d947ee02
[tx-robot] updated from transifex
2018-11-02 01:51:45 +00:00
Roeland Jago Douma
28fe702e8e
Merge pull request #769 from nextcloud/l10n/update
...
Update to translate strings
2018-11-01 16:13:10 +01:00
Roeland Jago Douma
baf4d5f9fc
Update to translate strings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-01 15:22:41 +01:00
Roeland Jago Douma
188a1a6e24
Copy over config file to new location on windows
...
Fixes #766
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-11-01 15:02:31 +01:00
Roeland Jago Douma
899fca12ba
Merge pull request #721 from storca/patch-1
...
Inform user that configuration is not writable
2018-11-01 11:44:37 +01:00
Roeland Jago Douma
0f1395fdf0
Merge pull request #758 from nextcloud/self-signed-login-flow
...
Allow to use the login flow with a self signed certificate
2018-11-01 11:43:54 +01:00
Manuel Stahl
c9f720b68d
Fix warning in ShareUserGroupWidget
...
Change-Id: I63091c67cd56dce241f04ed6badc090bb25cad5f
2018-11-01 10:26:19 +01:00
Roeland Jago Douma
b30a8528bd
Merge pull request #645 from nextcloud/upstream/wizard
...
Wizard enhancement
2018-11-01 09:30:19 +01:00
Roeland Jago Douma
bb4c180c89
Merge branch 'master' into upstream/wizard
2018-11-01 08:32:12 +01:00
Roeland Jago Douma
a23dd9dfb3
Merge pull request #646 from nextcloud/upstream/pr/6656
...
FolderMan::checkPathValidityForNewFolder: make sure to work when fold…
2018-11-01 08:31:36 +01:00
Roeland Jago Douma
3b5d8f0277
Merge branch 'master' into upstream/pr/6656
2018-11-01 08:07:55 +01:00
Nextcloud bot
feb9a69703
[tx-robot] updated from transifex
2018-11-01 01:50:27 +00:00
Roeland Jago Douma
fd2293b067
Merge pull request #655 from nextcloud/upstream/pr/6671
...
Do not require server replies to contain an mtime
2018-10-31 22:19:26 +01:00
Roeland Jago Douma
5cfdc71ca5
Merge branch 'master' into upstream/pr/6671
2018-10-31 21:13:10 +01:00
Roeland Jago Douma
d3ee6ed9c5
Merge pull request #651 from nextcloud/upstream/pr/6616
...
Update: Report on readdir() errors #6610
2018-10-31 21:12:54 +01:00
J-P Nurmi
08879c0f14
Make the "Add Folder Sync Connection" button act like a button
2018-10-31 20:05:14 +01:00
Roeland Jago Douma
b7d0e5672a
Merge branch 'master' into upstream/pr/6616
2018-10-31 13:51:34 +01:00
Nextcloud bot
a39d4777fd
[tx-robot] updated from transifex
2018-10-31 01:49:53 +00:00
Roeland Jago Douma
cb4450864e
Merge pull request #656 from nextcloud/upstream/pr/6672
...
Settings: Attempt to fix rename issue on old macOS
2018-10-30 23:04:34 +01:00
Roeland Jago Douma
ef3aeb65cc
Merge pull request #658 from nextcloud/upstream/pr/6698
...
OAuth: Fix infinite loop when the refresh token is expired
2018-10-30 23:04:09 +01:00
Roeland Jago Douma
aca75ee982
Merge pull request #403 from nextcloud/upstream/pr/6372
...
Partial local discovery: Fix scheduling logic
2018-10-30 23:03:16 +01:00
Roeland Jago Douma
326c872ba7
Merge pull request #663 from nextcloud/upstream/pr/6707
...
Windows: Release handle/fd when file open fails #6699
2018-10-30 22:40:44 +01:00
Roeland Jago Douma
dd39887f2b
Merge pull request #641 from nextcloud/upstream/pr/6621
...
TestOAuth: Don't have global static QObject
2018-10-30 22:38:51 +01:00
Roeland Jago Douma
8df9746005
Merge branch 'master' into upstream/pr/6372
2018-10-30 22:37:30 +01:00
Roeland Jago Douma
668c53a0af
Allow to use the login flow with a self signed certificate
...
The QWebEngine uses a different certificate store/system. So we can't
just pass wour accepted certificates in there.
As a work around we now trust the url we set by definition. As this has
to already be approved before we access this.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2018-10-30 22:23:10 +01:00
kevin147147
30032f9c0c
i18n for general settings ui
2018-10-30 17:32:52 +01:00
Nextcloud bot
f2bc5c0482
[tx-robot] updated from transifex
2018-10-30 01:52:44 +00:00
J-P Nurmi
1d3d261e38
Setup wizard: implement an animated and interactive slide show
2018-10-29 19:10:27 +01:00
Nextcloud bot
c40793257d
[tx-robot] updated from transifex
2018-10-29 01:51:50 +00:00
Roeland Jago Douma
85b9f94a36
Merge pull request #748 from caugner/qtkeychain-0.9.1
...
qtkeychain: 0.8.0 -> 0.9.1
2018-10-28 19:45:17 +01:00
Roeland Jago Douma
8688fabee3
Merge branch 'master' into qtkeychain-0.9.1
2018-10-28 19:20:16 +01:00
Nextcloud bot
e88b81c6c9
[tx-robot] updated from transifex
2018-10-27 00:51:13 +00:00
Claas Augner
2344db8937
qtkeychain: 0.8.0 -> 0.9.1
2018-10-26 18:49:03 +02:00
Nextcloud bot
58302e9fc0
[tx-robot] updated from transifex
2018-10-26 00:50:27 +00:00
J-P Nurmi
f48aabf344
Build fix: remove an unused QtSvg/QSvgRenderer include
...
Slipped in in 156605c .
2018-10-25 21:32:43 +02: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
storca
ef8e029cbf
Merge branch 'master' into patch-1
2018-10-24 18:10:35 +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
23883b2b60
Merge branch 'master' into patch-1
2018-10-23 23:11:21 +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
storca
4bd3829f78
Merge branch 'master' into patch-1
2018-10-16 21:17:58 +02: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
Camila Ayres
4e3b408c50
Merge branch 'master' into patch-1
2018-10-14 16:14:43 +02:00
Nextcloud bot
bfc8154e68
[tx-robot] updated from transifex
2018-10-14 00:43:12 +00:00
storca
620908523e
Update accountmanager.cpp
...
Fixed syntax error
Possible fix for issue #720
2018-10-13 18:45:01 +02:00
storca
8a996ba9a9
Update accountmanager.cpp
...
Fixed issue #720 by adding the isWrittable method
2018-10-13 18:36:40 +02: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
4bd2545dad
Windows: Release handle/fd when file open fails #6699
2018-09-10 21:17:20 +02: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
Olivier Goffart
3b2c6d2202
OAuth: Fix infinite loop when the refresh token is expired
...
The server reply with a code 400 when the token is invalid,
the client was understanding this error as a network error, and was retying
again with the same token.
Instead, we must rely on what the json is saying, even if the reply is
not a 200 code.
Issue https://github.com/owncloud/enterprise/issues/2777
2018-09-10 20:22:40 +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
Markus Goetz
109947ba3f
Settings: Attempt to fix rename issue on old macOS
...
Found by @hurradieweltgehtunter
2018-09-10 17:34:48 +02:00
Christian Kamm
5b228d1afd
Do not require server replies to contain an mtime
...
The check was added for #6317 in commit
13eb64584f .
We did see missing mtimes in replies in tests with live servers though.
Possibly those were old incomplete responses cached in the stat cache?
2018-09-10 17:33:53 +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
Christian Kamm
3ec4fc6145
Update: Report on readdir() errors #6610
2018-09-10 14:33:36 +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
b3e4ec9454
FolderMan::checkPathValidityForNewFolder: make sure to work when folder points to deleted folders
...
Note that we also needed to adjust the server url to contains the user name
in the folder wizard. (As checkPathValidityForNewFolder expect the user name)
Issue #6654
2018-09-09 22:02:44 +02:00
Olivier Goffart
39c6196487
Wizard: show a message when the URL is invalid
...
Rather than let Qt show "Host not found"
Issue #6646
2018-09-09 21:47:03 +02:00
Olivier Goffart
986cf448a9
Wizard OAuth2 Page: add a context menu to copy the link
...
Relates to https://github.com/owncloud/enterprise/issues/2600
2018-09-09 21:46:42 +02: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
7019f03e46
TestOAuth: Don't have global static QObject
...
Fix a strange warning seen on the log from the CI on Windows in
https://github.com/owncloud/client/pull/6621
The test shows, at the beginning
QObject::connect: No such signal DesktopServiceHook::destroyed(QObject*)
And crashes at the and.
My guess is that when QDesktopServices::setUrlHandler is called, the
QMetaObject is not yet initialized
But this is probably not the reason of the crash
2018-09-09 18:16:59 +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
Christian Kamm
797b40237e
Partial local discovery: Fix scheduling logic
...
A recent patch that touched the condition for deciding whether a
periodic full local discovery is necessary accidentally inverted the
condition.
2018-06-06 22:49:50 +02: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
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
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
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
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
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
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
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
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
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
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
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
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
Christian Kamm
05c1bfb6cf
Merge remote-tracking branch 'origin/2.4'
2017-10-27 10:29:31 +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
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
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
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
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
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
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
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
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
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
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
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
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
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