chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-04 17:31:01 +02:00
Code Activity
2,380 Commits 4 Branches 173 Tags
v1.5.0-beta3
Commit Graph
2380 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier Goffart b56fcd8ebd Implement a sync now button 
The button is in the account config, next to the "pause/resume" button

Fixes #409
 2013-10-30 16:27:00 +01:00
Olivier Goffart e38d6d974b Replace _Button* with _button 
Identifiers starting with underscore and uppercase are reserved in C++.
 2013-10-30 15:52:30 +01:00
Olivier Goffart 9500c5ffab Do not change the instruction anymore when we finish an item 
The status is in the status.  Keep the original instruction so the
UI knows what to display for eath item
 2013-10-30 10:46:05 +01:00
Olivier Goffart b079cedbf5 Use the status instead of the instruction for finished items 2013-10-30 10:44:41 +01:00
Olivier Goffart 6e088e28f5 Adjust the mtime in case of fake conflicts 
"Fake conflicts" happen when the etag changes on the server, and the
mtime changes on the client,  but the actual file is still exactly
the same.  We correctly detect them as false conflict and we do not
generate the conflict file for them.
But we should also update the local mtime to the server mtime so future
sync don't get confused.
 2013-10-29 12:23:51 +01:00
Olivier Goffart 01e2743bae Always download the conflicted files. 
Conflicts have a direction==NONE. And they need to be downloaded, not uploaded
 2013-10-29 12:13:30 +01:00
Olivier Goffart 75ffa787a6 emit the EndDownload progress at the right place. 
It was put in rename instead of download
 2013-10-29 12:13:30 +01:00
Olivier Goffart 4ad9f34807 Save the UPDATED files in the database 
Those are files that were detected as "resolved conflict".
They should have been a conflict because they both were new, or both
had their local mtime or remote etag modified, but the size and mtime
is the same on the server.  This typically happen when the database is removed.
Nothing will be done for those file, but we still need to update the database.
 2013-10-29 12:13:30 +01:00
Daniel Molkentin a91799a11c Make the setup wizard compile again 
- introduces more jobs
- needs more cleaning up
 2013-10-28 20:01:59 +01:00
Daniel Molkentin 44fd03c058 Merge pull request #1125 from iAndre89/patch-1 
Update mingw32-cross-nsis-plugin-processes and mingw32-cross-nsis-plugin...
 2013-10-28 09:20:09 -07:00
Andrea Sosso 083e75998f Update mingw32-cross-nsis-plugin-processes and mingw32-cross-nsis-plugin-uac 2013-10-28 17:17:10 +01:00
Olivier Goffart adc47948a5 Add a comment explaining OwncloudPropagator::start 2013-10-28 17:00:27 +01:00
Olivier Goffart 6e886e28e9 Merge branch 'propagator-job' 
Conflicts:
	src/mirall/owncloudpropagator.cpp
 2013-10-28 16:26:25 +01:00
Klaas Freitag e63fc184a5 Options parsing added. 2013-10-28 16:07:13 +01:00
Olivier Goffart 84a40dcb59 Refactor the new propagator in jobs 
This makes the code (IMHO) more easy to understand, and will allow
even more easy parallelism
 2013-10-28 15:58:35 +01:00
Olivier Goffart 8e90782107 Make owncloudcmd display the debug output 2013-10-28 15:45:37 +01:00
Klaas Freitag 68ba99b7f0 Fixed fileID parsing and improved logging. 2013-10-28 15:28:34 +01:00
Klaas Freitag 2fefc428a8 Write file Id to journal table. 
Since this requires a change of existing sync journals, database migration
code was added.
 2013-10-25 13:31:00 +02:00
Klaas Freitag 17220f2604 Query file Id from server if unknown. 2013-10-25 13:31:00 +02:00
Klaas Freitag 7a68961b25 Add handling for the file_id data to the sync items. 2013-10-25 13:31:00 +02:00
Daniel Molkentin aa2baa45fb Cleanups, ownership for ssl error handler 2013-10-24 12:55:26 +02:00
Daniel Molkentin eda5feb82c Bring back proper ssl handling 2013-10-24 00:29:08 +02:00
Daniel Molkentin d2b445c80c Basic port, misses wizard 2013-10-23 14:48:53 +02:00
hefee b4621e22e6 Merge pull request #1114 from owncloud/freebsd-inotify 
Need inotify on FreeBSD for libsync
 2013-10-23 02:36:12 -07:00
hefee 38679f79b5 Need inotify on FreeBSD for libsync 2013-10-23 01:24:27 +02:00
hefee a927caf2b0 Fixing Utility::platform for all platforms 2013-10-23 00:59:29 +02:00
Daniel Molkentin 29c846a764 WIP: Dissolve owncloudinfo class 2013-10-21 21:42:52 +02:00
Jenkins for ownCloud 804c9fbd6f [tx-robot] updated from transifex 2013-10-21 12:01:30 -04:00
Jenkins for ownCloud 2edebdef08 [tx-robot] updated from transifex 2013-10-20 06:49:52 -04:00
Daniel Molkentin a91ba0fd48 WIP: Move network tasks from ownCloudInfo into Job classes. 2013-10-18 12:24:29 +02:00
Daniel Molkentin a25d55a265 Add QtJson to 3rdparty, use it in ownCloudInfo 2013-10-18 02:00:19 +02:00
Jenkins for ownCloud c99f75b247 [tx-robot] updated from transifex 2013-10-17 12:48:20 -04:00
Olivier Goffart 0efbfb10aa Fix MOVE of directory. 
Remove the right entry from the database (i.e: the original file name)
Fetch the etags of the sub entries
 2013-10-17 13:06:39 +02:00
Olivier Goffart cb8006b89f Fix comments of the propagation step. 
Also, don't mark item as removed if the instruction is not REMOVE
 2013-10-17 12:09:44 +02:00
Klaas Freitag 660469cbf5 Do not propagate a move of the Shared folder. 2013-10-17 10:48:31 +02:00
Daniel Molkentin a06e551469 Merge pull request #1103 from Absolight/freebsd-port 
Patches for FreeBSD
 2013-10-16 08:52:46 -07:00
Olivier Goffart 746b86a1dd Save the progress db once a chunk has been upload 
Allow to resume when we cancel the sync
 2013-10-16 16:47:24 +02:00
Mathieu Arnold 1c594b6a8d FreeBSD doesn't have statvfs64, like MacOS X. 2013-10-16 15:57:59 +02:00
Mathieu Arnold 2b652422b9 Don't call make directly, it can have another name. 2013-10-16 15:57:05 +02:00
Olivier Goffart 313832de8d Put the progress database within the journal 2013-10-16 12:01:14 +02:00
Jenkins for ownCloud 250f281189 [tx-robot] updated from transifex 2013-10-15 23:26:29 -04:00
Olivier Goffart 2c63f7a24d Merge branch '1.4' 
Conflicts:
	VERSION.cmake
	src/mirall/application.cpp
	src/mirall/application.h
	src/mirall/csyncthread.cpp
	src/mirall/folder.cpp
	src/mirall/folder.h
	src/mirall/folderman.cpp
 2013-10-15 17:00:53 +02:00
Olivier Goffart 10fba886dc Do not elide the progress text 
It's size is computed so the text fit, there is no need to alide it.

Fixes #1094
 2013-10-15 14:58:34 +02:00
Daniel Molkentin 046d955f5c 1.4.2beta1 2013-10-14 20:21:07 +02:00
Klaas Freitag d0d362664b Handle proxy on folder level, not folderman level. 2013-10-14 16:11:52 +02:00
Klaas Freitag f841450dae Do append non empty lines not starting with a hash to ignores. 2013-10-14 16:11:52 +02:00
Klaas Freitag a3927c5c2c Avoid quick flickering up of the ok-icon for the sync prepare state. 
For the SyncPrepare phase now the icon that was displayed before is
kept. If the folder was disabled before, the sync icon is displayed.
 2013-10-14 12:59:08 +02:00
Klaas Freitag 89cfa387cd Remove bogus html formatting tag. 2013-10-14 11:46:02 +02:00
Olivier Goffart 1fccb23442 Don't show desktop notification when the user don't want to 
Fix #1093
 2013-10-14 11:33:47 +02:00
Klaas Freitag bfd50ffcd0 Do not show progress if nothing is transmitted, show number of deletes. 2013-10-14 11:16:17 +02:00