chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-21 15:46:15 +02:00
Code Activity
6,076 Commits 4 Branches 173 Tags
v1.7.0-beta1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Klaas Freitag 6025b3a91b Bump version to beta1 2014-08-21 14:33:03 +02:00
Klaas Freitag c473428be6 Merge pull request #2084 from owncloud/contextless_exclude 
Contextless exclude, @ogoffart reviewed, I'll merge.
 2014-08-21 13:15:18 +02:00
Klaas Freitag e06e5fe55f Excludes: Fix unit tests for the new exclude load interface. 
Also removed some commented lines.
 2014-08-21 13:12:05 +02:00
Klaas Freitag dc8f437b31 Excludes: Add an context free implementation of exclude file loading. 
So that we are more thread safe.
 2014-08-21 12:43:04 +02:00
Klaas Freitag 54e2b9345b GUI: on Mac do not call slotUpdateAccountIcon 2014-08-21 11:00:57 +02:00
Klaas Freitag fef0d0b31c Overlays Nautilus: Handle UNREGISTER_PATH and do proper reconnect. 
This is needed to fix #2073
 2014-08-20 17:33:48 +02:00
Klaas Freitag 75101a0319 Application: Unload all folders when shutting down. 
That sends a proper UNREGISTER message via socket API.
 2014-08-20 17:33:48 +02:00
Klaas Freitag d1a660ce20 SocketAPI: Add parameter to enable wait for the socket write. 
This is needed to wait until the UNREGISTER message is sent to the
shell code when mirall shuts down.
 2014-08-20 17:33:48 +02:00
Klaas Freitag 4356005c5a FolderMan: Do not remove the folder icon too early from the map. 
Otherwise, method unloadFolder can not do important frees.

This is one part of the fix for #2073 because now the socketapi will
send the UNREGISTER_PATH message over the socket.
 2014-08-20 17:33:48 +02:00
Klaas Freitag 988fe70771 Merge pull request #2075 from owncloud/use_folder_paused 
Rework of the status icons in FolderMan and Folder objects.
 2014-08-20 10:50:28 +02:00
Klaas Freitag d02175210b Status Icon: Set a proper icon if no sync is configured. 
This fixes bug #1956
 2014-08-19 17:47:28 +02:00
Klaas Freitag 617887a0c6 Propagator: If the sync was interrupted by pausing, do not show error. 
Handle problems which happen because of pausing the sync as soft errors
rather than normal errors which are blacklisted and displayed in the
gui.

This fixes bug #1959
 2014-08-19 14:21:59 +02:00
Klaas Freitag e4fe4cb4d3 Status icons: Display the correct icons after startup connect. 2014-08-19 14:21:59 +02:00
Klaas Freitag dc0a054d94 Status icons: Set the offline icon at the very beginning. 
Otherwise, if the account is signed out and opens the credential popup,
there is a wrong icon displayed. If the account is coming from keychain
this icon is quickly overwritten.
 2014-08-19 14:21:51 +02:00
Klaas Freitag 924d9b985f Some minor cleanups. 2014-08-19 14:21:51 +02:00
Klaas Freitag bb3bd6930a StatusModel: Have another property accountConnected. 
With that , make the status model aware of the account connection state.
With that, we can grey out the correct state icon if the account is not
connected and display the normal icon if the account is connected.
 2014-08-19 14:21:51 +02:00
Klaas Freitag 1245ed6f06 Status Icons: Let FolderMan only write the folder config files. 
Remove the setSyncEnabled() call to individual folders which mistakenly
set the folders to pause. Let the folders keep their pause state on their
own.

If FolderMan is set to be enabled emit a general refresh signal rather
than one for each folder.
 2014-08-19 14:21:51 +02:00
Klaas Freitag 01b0ee49de Status Icons: Rename the syncEnable method to isPaused. 
Previously, in folder and folderman there have been the syncEnabled
properties, but they confused the semantics: While in FolderMan the
syncEnabled flag represents the network connection and stuff, in
Folder it represented if the user paused or resumed the folder.

This resulted in mixed use of both, which lead to wrong icon states.
This patch renames the folder methods and properties to isPaused to
make more clear about what it is.
 2014-08-19 14:21:42 +02:00
Klaas Freitag 4b716f3ea6 About page: Fix the translation of developer names. 2014-08-18 12:17:13 +02:00
Klaas Freitag ddbe181e48 Update phase progress: Check if callback is defined. 2014-08-18 11:51:45 +02:00
Klaas Freitag 27f9d4523b Settings: Display the commit SHA both in branded and unbranded. 
Also, do not put the developer names into the translation string.
 2014-08-18 11:27:56 +02:00
Klaas Freitag dccb9def3a Merge pull request #2067 from owncloud/grammar 
subject verb agreement - very good, thanks.
 2014-08-16 12:13:01 +02:00
Klaas Freitag 8d819956d3 Tests: Fixed the CSync statedb test defined in the mirall module. 2014-08-15 18:33:04 +02:00
Klaas Freitag 4aec783362 Nautilus Overlays: Fix: do not change an dictionary which is iterated. 
Also, item.invalidate_extension_info() is sufficient, no need to call
update_file_info afterwards.
 2014-08-15 17:16:47 +02:00
Klaas Freitag b494181764 Nautilus Overlays: Use port 34001 by default. 2014-08-15 17:16:47 +02:00
Klaas Freitag 78e50747e4 Updated the about text for the generic ownCloud Theme. 2014-08-14 17:12:23 +02:00
Klaas Freitag b09498d852 csync journal: Improve get_below_path query. 
Add another index on the pathlen column. Use that column to deselect
all rows that are shorter than the path to search files below. That
shrinks the amount of rows to examine using LIKE tremendously by
a cheaply to query for criteria.
 2014-08-14 13:52:44 +02:00
Klaas Freitag 7fcf723039 SyncJournal: Add an index on inode to the journal database. 2014-08-14 13:22:43 +02:00
Klaas Freitag d27ab8c6ca Revert "FolderMan: Proper singleton implementation." 
This reverts commit 0350508b65.
 2014-08-14 12:46:01 +02:00
Klaas Freitag 0350508b65 FolderMan: Proper singleton implementation. 
The connect in SocketAPI had to be moved because it also uses
FolderMan::instance(). And since SocketAPI is instanciated in
FolderMans constructor, this was a deadlock.

Now the connect is tried on every new socket connection in SocketAPI
but I assume that multiple attempts to connect are not an issue.
 2014-08-14 11:32:03 +02:00
Klaas Freitag 32739cc305 SyncEngine: End the journal transaction after update. 2014-08-14 11:32:02 +02:00
Klaas Freitag f515fe77c4 SyncJournal: Fix logging text. 2014-08-14 11:32:02 +02:00
Klaas Freitag f6d20cbe55 nautilus overlay: Fix reconnect, create a new socket everytime. 2014-08-14 11:07:31 +02:00
Klaas Freitag 8bc0d9acd3 Updater: Added a bit of useful logging. 2014-08-14 11:07:31 +02:00
Klaas Freitag 73325bcd41 csync statedb: Fixed handling of sqlite reply value. 2014-08-14 11:07:31 +02:00
Klaas Freitag 1b5bbfdad3 csync statedb: Set sqlite3_busy_timeout to 5 seconds. 2014-08-14 11:07:31 +02:00
Klaas Freitag fcd211b190 overlayNautilus: Better reconnect behaviour if mirall was not running. 2014-08-14 11:07:31 +02:00
Klaas Freitag 600a6d9346 Bumped version to alpha1 2014-08-08 10:57:09 +02:00
Klaas Freitag c3f8e099f4 tests: Never stumble over an already existing test share dir. 2014-08-07 15:45:17 +02:00
Klaas Freitag 6cb8134690 SocketAPI: Use Win32 function SHChangeNotify to notify Explorer. 2014-08-07 14:59:06 +02:00
Klaas Freitag d8a8b53fc9 SocketAPI: Also update view when paused. 2014-08-07 14:07:08 +02:00
Klaas Freitag e71ce01f90 tests: Some more tests with local files and shares. 2014-08-07 12:48:14 +02:00
Klaas Freitag fe2e4d87c5 tests: Fix t5: work with ownCloud 7 sharing. 2014-08-06 17:19:02 +02:00
Klaas Freitag e9c4635f6b tests: Add another two seconds break, hope to make it work in virt. env. 
Tests fail randomly on the CI computer which is virtualized. Maybe this
fix helps.
 2014-08-06 11:34:35 +02:00
Klaas Freitag 2ccfdcb084 NautilusOverlays: return False if sock connection breaks 2014-08-06 09:52:52 +02:00
Klaas Freitag f4e2041b0b CMake: Fix installation of the icons, path corrected. 2014-08-05 11:46:21 +02:00
Klaas Freitag 4e13c882f8 CMake: Install the nautilus plugin. 2014-08-04 18:58:35 +02:00
Klaas Freitag 0fe51d826f Overlays: renamed icons to sensible names. Also removed .DS_Store 2014-08-04 17:22:34 +02:00
Klaas Freitag b2976baf9b NautilusOverlays: Use the correct icon names, removed unused function. 2014-08-04 17:21:49 +02:00
Klaas Freitag a0a5a49d7b CMake: Install icons under linux. 2014-08-04 17:20:57 +02:00
Klaas Freitag f983264b5d SocketAPI: Do not allow a trailing slash for directories. 
The entries in our sync journal have no trailing slashes for directories.
 2014-08-04 12:47:22 +02:00
Klaas Freitag 40cebeedfc SocketAPI: Call csync_exclude with the relative path. 
This avoids messing with the windows pathes and csync_exclude is
designed that way.
 2014-08-04 12:47:22 +02:00
Klaas Freitag 1f9280c68e GUI: Remove useless comment. 2014-08-04 12:47:22 +02:00
Klaas Freitag 14ed261606 MacOverlays: Rather use FileManager API to check if is directory. 2014-08-04 12:03:01 +02:00
Klaas Freitag 4fb671e7f4 SocketAPI: Send Broadcasts only for Linux, not used on Mac and Win. 2014-08-04 11:09:17 +02:00
Klaas Freitag aad5c96759 Mac Overlays: No crash on context menu actions. 
Disable overlay menus for now.
 2014-08-04 11:09:16 +02:00
Klaas Freitag 9b37357513 cmake: Add the icons path to cmake, install the Mac icons properly. 2014-08-01 15:30:13 +02:00
Klaas Freitag 23269c9a08 Mac Overlays: load icons from the proper place in the system. 2014-08-01 15:26:18 +02:00
Klaas Freitag 327f70240c GUI: Load the finder overlay icon script on MacOSX. 2014-08-01 14:28:34 +02:00
Klaas Freitag 0a7642dbe0 Mac Package: New shellscript and packages steering file. 2014-08-01 12:19:08 +02:00
Klaas Freitag 742b036a07 CMake: Follow policy for 2.8.0 (avoid cmake warnings) 2014-08-01 12:18:52 +02:00
Klaas Freitag 6e00989a9e Add directory MacOSX to cmake processing. 2014-08-01 12:18:52 +02:00
Klaas Freitag 68f0227ca1 OverlaysMac: Make use of REGISTER_PATH to learn the synced dirs. 2014-08-01 12:18:52 +02:00
Klaas Freitag fe9a2e7ba4 SocketAPI: Normalize file names when read from the filesystem. 
Otherwise there will be bad encoded file names because of a Qt
upstream error that skips the normalization.
 2014-08-01 12:18:52 +02:00
Klaas Freitag a248fc36fe Remove user XCode file. 2014-08-01 12:18:52 +02:00
Klaas Freitag e28a7a7ae3 MacOverlays: Start a 5 seconds timer to try connect if unconn. 
If mirall is not here, a timer is started to try again later.
 2014-08-01 12:18:52 +02:00
Klaas Freitag b92789825d MacOverlays: Redraw window if registered pathes are empty. 
That is the condition after a reconnect to the mirall server.
 2014-08-01 12:18:52 +02:00
Klaas Freitag c3b6aecb79 MacOverlay: Some logging cleanings. 2014-08-01 12:18:52 +02:00
Klaas Freitag 4688126f84 MacOverlays: Export the redraw method of content man. 2014-08-01 12:18:52 +02:00
Klaas Freitag 5a5c03a826 MacOverlays: Registered pathes support. 
Remember the pathes that come with the first UPDATE_VIEW msg. That
reduces the number of socket communications.
 2014-08-01 12:18:52 +02:00
Klaas Freitag f3477877d0 Added XCode file. 2014-08-01 12:18:52 +02:00
Klaas Freitag 7bef588851 SocketAPI: Try reconnect if socket was not connected. 2014-08-01 10:59:50 +02:00
Klaas Freitag 72a25cf6ee MacOverlays: Minor cleanups. 2014-08-01 10:59:50 +02:00
Klaas Freitag 74e13f4c70 Use better variable naming. 2014-08-01 10:59:50 +02:00
Klaas Freitag 3c09ef6cbf SocketAPI: rename slot to send UPDATE_VIEW. 2014-08-01 10:59:49 +02:00
Klaas Freitag 68bfcf5d24 SocketAPI: Create the socket API instance in folderman. 2014-08-01 10:59:49 +02:00
Klaas Freitag b2a10de71a Copyright plus minor beautification. 2014-08-01 10:59:49 +02:00
Klaas Freitag 267b9e5c2f FinderOverlays: Display the error if socket can not connect. 2014-08-01 10:59:49 +02:00
Klaas Freitag 55d94bf15a Overlays: Handle Sharing state and display the correct icons. 2014-08-01 10:59:49 +02:00
Klaas Freitag 629e2a9e1c Overlays: Add the missing icon containers for MacOSX. 2014-08-01 10:59:49 +02:00
Klaas Freitag 86acdf69d9 MocOverlays: Handle the UPDATE_VIEW socket notification correctly. 
With UPDATE_VIEW the plugin gets notified to update the overlays.
It invalidates the entries in the file icon cache for the path
that comes with the UPDATE_VIEW and than refreshes the view.
 2014-08-01 10:59:49 +02:00
Klaas Freitag a6987ad703 Mac overlays: Fix allocations, use icns, correct query type. 2014-08-01 10:59:49 +02:00
Klaas Freitag 5642e40bc8 Mac Overlays: Add icon containers 1.st part 2014-08-01 10:59:48 +02:00
Klaas Freitag 98e21ae0ad SocketAPI: Connect REGISTER_FOLDER to Foldermans events. 2014-07-25 12:20:38 +02:00
Klaas Freitag 00274722ce nautilus plugin: Adopted to latest socket api changes. 2014-07-25 12:11:21 +02:00
Klaas Freitag 8b93678e3d SocketAPI: Added REGISTER_PATH and UNREGISTER_PATH 
to inform the plugins about the top sync directories.

Also cleaned the code a bit.
 2014-07-25 12:11:21 +02:00
Klaas Freitag c97f46d403 Bump version to 1.6.2 rc2 plus Changelog 2014-07-24 09:58:23 +02:00
Klaas Freitag 1fb52f0d8b HTTPCreds: Do delete the WritePasswordJob to not leak memory. 2014-07-23 17:59:02 +02:00
Klaas Freitag d4de024f15 Propagator: Fix local file name clash detection. 
Need to normalize the output of QFileInfo::canonicalFilePath() before
comparing to a server side path.
See https://bugreports.qt-project.org/browse/QTBUG-39622

This fixes #1998 and #1999
 2014-07-23 17:56:46 +02:00
Klaas Freitag 8d85516e72 tx.pl: Add a chunking update test, test for precondition failed. 2014-07-22 18:07:34 +02:00
Klaas Freitag 0f4cf74ae0 SyncEngine: allow to do a post upgrade script in debug mode. 2014-07-22 18:07:02 +02:00
Klaas Freitag 4dfe0fad7d tests: Big file chunking, change an existing big file to trigger update 
This failed on oC7
 2014-07-22 10:45:03 +02:00
Klaas Freitag 77e3480b2f csync oC Util: set field flag correctly to avoid etag memleak. 
The fields varialbe should contain or'ed flags of the fields set
in the csync_vio_file_stat_t struct. The problem was that the field
for CSYNC_VIO_FILE_STAT_FIELDS_PERM was assigned rather than or'ed
which makes the release function for the struct not freeing the
etag memory => memleak.
 2014-07-21 13:19:36 +02:00
Klaas Freitag 74b3e2ce3f tests: Another try to get around the jenkins test problem. 2014-07-18 12:20:14 +02:00
Klaas Freitag f8bea55b10 SocketAPI: Handle top sync folder correctly. 2014-07-17 19:34:50 +02:00
Klaas Freitag 743c1c2eda SocketAPI: Send an UPDATE_VIEW to the shell plugin on connect. 
For each configured sync folder send an UPDATE_VIEW directly after
the socket connect to make the shell integration updating the view.
 2014-07-17 11:26:03 +02:00
Klaas Freitag 0e9a08cbbf SocketAPI: rename slot to send UPDATE_VIEW. 2014-07-17 11:25:08 +02:00
Klaas Freitag d2445ec72d PropagatorQNAM: Never send if-match header for new files. 2014-07-17 11:23:11 +02:00
Klaas Freitag fef713aaed SocketAPI: Create the socket API instance in folderman. 2014-07-17 11:22:18 +02:00
Klaas Freitag c4d73688a6 Folderman: Fix path detection in folderForPath(). 2014-07-17 11:21:02 +02:00