mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-19 20:32:03 +03:00
Code Issues Projects Releases Packages Wiki Activity
12074 commits 488 branches 258 tags 463 MiB
Commit graph

12074 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
64cbc88474
Merge pull request #251 from nextcloud/clientSideEncryptionV4 
Client side encryption v4.
 2018-04-26 19:56:55 +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