chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-19 20:08:02 +02:00
Code Activity
17,214 Commits 4 Branches 173 Tags
v3.4.0-do-not-use
Commit Graph
17214 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 GoffartandOlivier Goffart 883080b557 Windows shell extension: port to the new protocol 2018-01-23 14:02:56 +01:00
Christian KammandOlivier Goffart 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 KammandOlivier Goffart 3c2622d2de Shell integration: Update nautilus for GET_MENU_ITEMS 2018-01-23 14:02:56 +01:00
Olivier GoffartandOlivier Goffart 982c591ec9 SocketApi: add a way to disable menu entries 2018-01-23 14:02:56 +01:00
Olivier GoffartandOlivier 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 KammandOlivier Goffart 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 GoffartandOlivier 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 GoffartandOlivier 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 SchmidtandGitHub 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 SchmidtandGitHub 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