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
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 DoumaandGitHub 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>
e2e-tech-preview-1 		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 DoumaandGitHub 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 DoumaandGitHub 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ärtlandGitHub 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