nextcloud
/
desktop
Π·Π΅Ρ€ΠΊΠ°Π»ΠΎ ΠΈΠ· https://github.com/nextcloud/desktop.git
1
0
Π€ΠΎΡ€ΠΊΠ½ΡƒΡ‚ΡŒ 0
Код Π—Π°Π΄Π°Ρ‡ΠΈ ΠŸΠ°ΠΊΠ΅Ρ‚Ρ‹ ΠŸΡ€ΠΎΠ΅ΠΊΡ‚Ρ‹ Π Π΅Π»ΠΈΠ·Ρ‹ Π’ΠΈΠΊΠΈ ΠΠΊΡ‚ΠΈΠ²Π½ΠΎΡΡ‚ΡŒ
22Β 272 ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ² 478 Π’Π΅Ρ‚ΠΊΠΈ 255 Π’Π΅Π³ΠΈ 494 MiB
Π“Ρ€Π°Ρ„ ΠΊΠΎΠΌΠΌΠΈΡ‚ΠΎΠ²

972 ΠšΠΎΠΌΠΌΠΈΡ‚ΠΎΠ²

Автор SHA1 Π‘ΠΎΠΎΠ±Ρ‰Π΅Π½ΠΈΠ΅ Π”Π°Ρ‚Π°
Klaas Freitag ed4d31ebc5 Nautilus overlay: Use branded program name for menu item. 2015-01-23 11:50:42 +01:00
Daniel Molkentin 316c476bbd Revert "Revert "Windows Shell Integration: Show status icon for root folder"" 
This reverts commit 176413d312.
 2015-01-22 19:13:12 +01:00
Daniel Molkentin 081cc0b9e8 WiP: Add Win32 Context menu integration 2015-01-22 18:45:20 +01:00
Olivier Goffart 560759ede8 Windows shell integration: Reduce the timeout time of WaitNamedPipe 
This is maybe what causes the troubles of task #2576
 2015-01-22 16:30:02 +01:00
Klaas Freitag 82e5e36c57 Nautilus: Display context menu for files that are not yet synced. 2015-01-21 17:41:57 +01:00
Klaas Freitag b754ffb047 Nautilus: Add a context menu that opens the sharing dialog. 2015-01-12 14:49:22 +01:00
Klaas Freitag 89eb4727b4 Nautilus overlays: Add a script to patch the branding name into pyhton script. 2015-01-12 14:49:22 +01:00
Daniel Molkentin 5619947685 Relocate Windows shell extensions 
The directory was redundant
 2015-01-12 14:40:42 +01:00
Olivier Goffart 2d8053a9df Dolphin plugin for KF5 2015-01-05 17:23:36 +01:00
Olivier Goffart 414ac5433d Merge branch '1.7' 
Conflicts:
	binary
	doc/accountsetup.rst
	doc/architecture.rst
	doc/navigating.rst
	doc/owncloudcmd.rst
	doc/troubleshooting.rst
 2015-01-05 14:40:53 +01:00
Markus Goetz f195648b90 OS X: Fix overlay icons 
a3e7f513e6 broke them.
 2014-12-15 11:34:44 +01:00
Christian Kamm 53d5de685c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/gui/folder.cpp
	src/gui/folder.h
	src/libsync/networkjobs.cpp
	src/libsync/owncloudpropagator.h
	src/libsync/propagatedownload.cpp
 2014-12-10 13:01:36 +01:00
Daniel Molkentin d5f2c36abd Mirall -> (Desktop) Client 2014-12-08 17:54:32 +01:00
Olivier Goffart 0fd0b08c09 Windows shell integration: Always release the lock before calling win32 API 
May help for 2515
 2014-12-03 09:11:38 +01:00
Olivier Goffart 512492bf30 Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/libsync/propagatedownload.cpp
 2014-12-01 14:37:47 +01:00
Olivier Goffart b154e1baa1 Nautilus shell integration: Use fallback when XDG_RUNTIME_DIR is not defined 
Same fallback as in Qt5

Task #2477
 2014-12-01 12:06:09 +01:00
Olivier Goffart 12203461f0 Import the dolphin plugin 2014-11-24 15:06:08 +01:00
Olivier Goffart a337564864 shell_integration/windows/OCShellExtensions/OCUtilTest: remove 
We do not need it anymore
 2014-11-24 14:53:37 +01:00
Daniel Molkentin 058d868edd Merge remote-tracking branch 'origin/1.7' 2014-11-12 00:09:00 +01:00
hefee f9dfdd58df Fixing indent and make nautilus script python3 compatible. 2014-11-09 16:59:01 +01:00
Olivier Goffart 7ae6712d56 Add a few Q_DECL_OVERRIDE 2014-11-08 11:21:48 +01:00
Daniel Molkentin 17a4299f74 Fix nautilus python integration 2014-11-06 19:26:43 +01:00
Daniel Molkentin 176413d312 Revert "Windows Shell Integration: Show status icon for root folder" 
This reverts commit 5805ffebec.

There is no good way to fix this on the Mirall side without risk.
Delay until after 1.7.0
 2014-11-06 15:18:54 +01:00
Klaas Freitag a78bb252de Nautilus shell: Remove some useless logging. 2014-11-06 09:23:30 +01:00
Daniel Molkentin 5805ffebec Windows Shell Integration: Show status icon for root folder 2014-11-04 09:30:29 +01:00
Daniel Molkentin 19daff36b0 Windows Overlay: Fix icon refresh 
The condition for the refresh was inverse of what it should have been.
 2014-11-03 20:46:35 +01:00
Daniel Molkentin c34c8ff358 Windows Overlay: Use FLUSHNOW everywhere to speed up updates 2014-11-03 20:45:38 +01:00
Olivier Goffart 1eccfb798f Add missing license headers 
Part of #2068
 2014-10-29 13:30:46 +01:00
Olivier Goffart a470138450 Windows Shell Integration: refresh the cache on UPDATE_VIEW 
Attempt to fix #2383
 2014-10-29 11:00:51 +01:00
Daniel Molkentin 149b16aefd Win32 Shell Integration: Use RegDeleteKey instead of RegDeleteKeyEx 
RegDeleteKeyEx does not exist on Windows XP 32 bit

Fixes: #2165
 2014-10-23 21:00:31 +02:00
Markus Goetz 0d9ae241c9 OwnCloudFinder: Rename to SyncStateFinder 
Project file names stay the same, only the output file(s) changed
 2014-10-23 12:19:19 +02:00
Olivier Goffart 98c5871d38 Windows shell integration: Add SHCNF_FLUSHNOWAIT to SHChangeNotify 
(TortoiseSVN have this flag)

Also do not call SHChangeNotify if there was no change
 2014-10-21 14:51:18 +02:00
Daniel Molkentin 52a5729298 Merge pull request #2319 from owncloud/sqlite_capi 
Introduce a common sqlite layer across csync and mirall.

This avoids conflicts that both each load different and/or updated sqlite versions.
 2014-10-17 12:11:27 +02:00
Daniel Molkentin b9849580f8 ReNautilus Shell Intgration: Remove debug output 2014-10-17 12:09:30 +02:00
Olivier Goffart 7804bf0a9a Windows Shell Integration: Use the right parametter to SHChangeNotify 2014-10-15 16:47:08 +02:00
Olivier Goffart bb37e93f52 Windows shell integration: Do proper wait 2014-10-15 16:09:35 +02:00
Olivier Goffart aa0f2c64ff Windows Shell Integration: fixeWindows Shell Integration: fixe 2014-10-15 15:57:15 +02:00
Olivier Goffart e66ca267f4 Windows Shell Integration: try to wait for connection 2014-10-15 15:13:04 +02:00
Olivier Goffart 4b001a77b3 Windows Shell Integration: Use the QLocalSocket on windo and do the request assynchroniously 
Squashed commit of the following:

commit 4d9b072f560fa171a1390b7c74425614aa20e955
Author: Olivier Goffart <ogoffart@woboq.com>
Date:   Tue Oct 14 16:04:02 2014 +0200

    Remove useless variable

commit 8e85de0307ec5f31bf3f92a7de793fed7d41c2ea
Author: Daniel Molkentin <danimo@owncloud.com>
Date:   Tue Oct 14 16:01:52 2014 +0200

    Make Windows Explorer Extension build

commit 8e2942cd9fd32e3af72d60cba0d06bd9d6222a45
Author: Daniel Molkentin <danimo@owncloud.com>
Date:   Tue Oct 14 11:39:37 2014 +0200

    Fix compilation

commit 0fc0c0e0e0c7e58ad97f62700256c7d1f8c0670b
Author: Olivier Goffart <ogoffart@woboq.com>
Date:   Tue Oct 14 11:48:32 2014 +0200

    Windows Shell Integration: Try to let the thread notify about changes when there are changes

commit 4a1712b7c03269ca3007f167b8f313ea47655967
Author: Olivier Goffart <ogoffart@woboq.com>
Date:   Tue Oct 14 11:35:20 2014 +0200

    Windows Shell Integration: Share the RemotePathChecker amongst all the OCOverlay instances

commit 2d87408e9af5a4d7ab71c460ce606ba1f367c09f
Author: Olivier Goffart <ogoffart@woboq.com>
Date:   Mon Oct 13 18:55:15 2014 +0200

    Windows Shell Integration: Attempts to wait on multiple objects (WIP)

commit e448e427b6d1561ad7a40d08fc6632f4d2b4ef44
Author: Daniel Molkentin <danimo@owncloud.com>
Date:   Mon Oct 13 17:58:02 2014 +0200

    Introduce a worker thread

commit 2344407ec0bc1ce173ebbacadcf3992d62d94078
Author: Olivier Goffart <ogoffart@woboq.com>
Date:   Mon Oct 13 17:03:47 2014 +0200

    Windows Shell Integration:  try to keep the socket open using a thread (WIP)

commit ea6d5273ed60d8bc3f1c5d5c6936364d783a1c0f
Author: Daniel Molkentin <danimo@owncloud.com>
Date:   Mon Oct 13 15:27:46 2014 +0200

    Make Explorer plugin work again with named pipes

    This is a temporary hack, which needs more refactoring.

commit 44a3437a44082379efa0078c9afd7b8bbde930de
Author: Daniel Molkentin <danimo@owncloud.com>
Date:   Sat Oct 11 07:31:24 2014 +0200

    Fix code

commit 123390a0f3516c0078309d7048c6d2acb9293676
Author: Olivier Goffart <ogoffart@woboq.com>
Date:   Fri Oct 10 16:29:35 2014 +0200

    Windows shell integration: Use named pipe  (WIP)

commit 9eea7e2321abeac6b8db0bd85bfce612dbf6bb20
Author: Olivier Goffart <ogoffart@woboq.com>
Date:   Wed Oct 1 12:04:13 2014 +0200

    Windows Shell Integration: Simplify StringUtil

    This fixes a memory leak in CommunicationSocket::ReadLine
 2014-10-14 16:05:48 +02:00
Klaas Freitag 8371e34d87 Nautilus overlay: minor cleanups 2014-10-13 14:59:23 +02:00
Markus Goetz f8f5a7ceaa OS X Overlay Icons: Fix static analyzer warnings 2014-10-10 11:44:40 +02:00
Markus Goetz b01839e9a4 OS X: Remove dead JSON code 2014-10-10 11:44:40 +02:00
Markus Goetz 6fbd28d228 Merge branch 'overlayicon_cache' into 1.7 2014-10-08 11:02:58 +02:00
Markus Goetz ef019cdbfa OS X Overlay Icons: Fix Finder plugin crash 
By enabling ARC for GCDAsyncSocket (as we should have done before
https://github.com/robbiehanson/CocoaAsyncSocket/wiki/ARC) there
is no chance anymore for a situation where the to-be-written NSData*
is deleted before the socket has had a chance to write it.
Interestingly, this only happened after switching to local sockets,
probably because of how immediatly the NSData* would be sent.

This commit also keeps the debug symbols for the Finder plugin.
 2014-10-03 07:23:43 +02:00
Markus Goetz b6d97cfffb OS X Overlay Icons: Introduce a short term cache for rendered icons 
This is for #2093
 2014-10-01 13:21:29 +02:00
Olivier Goffart 147fa60f81 Merge branch 'socketapi_localsocket' into 1.7 2014-10-01 12:34:22 +02:00
Klaas Freitag 29987ca2aa Overlays Linux: Add the state to the cache to save calls to add_emblem 
The SocketAPI sends status updates for files without being asked for.
And in order to not draw the emblem again if it had not changed, the
state is compared before calling add_emblem
 2014-09-30 13:57:06 +02:00
Markus Goetz 02f971b534 OS X Overlay Icons: Fix request for sync dir itself 2014-09-30 12:53:35 +02:00
Klaas Freitag efbc495f79 overlays Nautilus: Adopt to the use a local unix socket not TCP. 
Also, use the appname to find the correct branded icons.
 2014-09-30 11:17:05 +02:00
Markus Goetz f8b73eb9d9 SocketApi: Port OS X to use local sockets 2014-09-30 07:36:20 +02:00
Markus Goetz 0539098371 OS X: Update GCDAsyncSocket 
The two files are from the fork from
https://github.com/jdiehl/CocoaAsyncSocket/tree/socketUN
It supports unix domain sockets.

SHA1 was 7e97fc876522c7bf2a2a434cf40579ae9daf9da5
 2014-09-30 07:09:39 +02:00
Klaas Freitag 788c27bf2f cmake: Fix installation of overlay icons on linux 2014-09-29 16:08:49 +02:00
Klaas Freitag 8915f94931 Mac Overlays: handle filenames with slashes properly. 
There are filenames with slashes on MacOSX, they can be created
in Finder. Internally they are converted to colons.
 2014-09-25 12:24:32 +02:00
Klaas Freitag 688b8dcc38 MacOverlays: Pass isDir flag to isRegisteredPath method 
With that, a path can be added to directories to also detect the
sync top directory.

This fixes bug #2053
 2014-09-23 10:25:11 +02:00
Klaas Freitag 280edee1db cmake: fix typo 2014-09-23 10:25:11 +02:00
Klaas Freitag 09be4d22ee Nautilus: Renamed nautilus plugin script to make it branding friendly 2014-09-22 12:24:06 +02:00
Markus Goetz 2fddf05515 OS X: Overlay Icons: Load from bundle-specific path 
The client (in this case mirall) tells the Finder plugin where to get the icons.
This enables installation in different locations and in branded clients.
 2014-09-12 15:09:47 +02:00
Markus Goetz 91d1864840 OS X: Overlay Icons: Less verbose debug output 2014-09-12 15:09:46 +02:00
Markus Goetz 0edd4d3c02 OS X: Overlay icons: Don't show if folder is not marked as being an oC folder 2014-09-12 11:46:53 +02:00
Markus Goetz 4ce03e8b61 OS X: Fix Overlay icon retrieval 
Re-retrieve all icons for a path in case we receive UPDATE_VIEW.
(But in contrast to previous code, don't delete the icons which then
would have caused screen flickering)
 2014-09-07 11:38:23 +02:00
hefee ddfc7c75df Fix minor Python styling issues 
* Do not use sapces inside parenthesis
* make indend PEP8
* empty lines should not contain whitespaces
 2014-08-31 00:35:56 +02:00
David PrΓ©vot 7618f29657 Fix minor Python syntax errors 
The installation fails because of these:

	TabError: inconsistent use of tabs and spaces in indentation
	SyntaxError: Missing parentheses in call to 'print'
 2014-08-31 00:28:25 +02:00
Klaas Freitag 4d33773cef Nautilus Overlays: Rename icons according to branding. 
Added a script that renames the icons and patches the python file for
nautilus.
 2014-08-29 20:02:52 +02:00
Markus Goetz b6f42a91f4 OS X: Fix Finder bundle NVTY->OWNC 2014-08-28 15:45:07 +02:00
Markus Goetz d69049ce10 OS X: Fix Finder plugin 2014-08-28 10:21:56 +02:00
Markus Goetz 2f34b046d0 Overlay Icons: Improve OS X version, improve general feedback 
Now the update phase of the syncing algorithm pushes stuff the notification socket too.
 2014-08-27 19:15:43 +02:00
Markus Goetz 79b547b83b Icon Overlay OS X: Complain if icon couldnt be loaded 2014-08-26 17:21:15 +02:00
Daniel Molkentin 315c2eb4ca Windows Shell Integration: Ensure precedence 2014-08-21 11:06:10 +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
Markus Goetz d9de6e68ad OS X: Optimize Finder icon drawing code 
Don't have an intermeditate TIFF.
 2014-08-20 14:02:58 +02:00
Daniel Molkentin d171431ac7 Windows Shell Integration: Add version information 2014-08-19 15:52:58 +02:00
Daniel Molkentin 76e0d61b19 Windows Shell Integration: Register icons with well known name 2014-08-19 15:52:47 +02:00
Daniel Molkentin cc6d83a953 Windows Shell Integration: Adjust port 2014-08-19 15:51:40 +02:00
Daniel Molkentin 6fbbe2d0e4 Create ShellIconOverlayIdentifiers key 
It may not exist. Registration fails in that case.
 2014-08-18 17:06:26 +02:00
Markus Goetz b62b87eed3 OS X: Rename LiferayNativity code for shell icons 2014-08-18 12:57:29 +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 f6d20cbe55 nautilus overlay: Fix reconnect, create a new socket everytime. 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
Daniel Molkentin 5306cdc7a1 Shell Integration: Fix Integration bug when explorer starts before OCC 
Also slightly improves performance
 2014-08-08 02:40:46 +02:00
Daniel Molkentin 344b98bf13 Shell Integration / MSVC: Fix target platform 2014-08-08 02:40:46 +02:00
Klaas Freitag 2ccfdcb084 NautilusOverlays: return False if sock connection breaks 2014-08-06 09:52:52 +02:00
Daniel Molkentin 4ad9ff4301 Merge remote-tracking branch 'origin/win_overlay_icons' 
Conflicts:
	.gitignore
 2014-08-05 19:27:51 +02:00
Daniel Molkentin c7ff1e9b3f Windows Shell extension: Add watched directories 2014-08-05 19:23:40 +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
Daniel Molkentin 9a1781f613 Support for multiple icons 2014-08-04 15:40:08 +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 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 0a7642dbe0 Mac Package: New shellscript and packages steering file. 2014-08-01 12:19:08 +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 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 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 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
Mackie Messer 50d178feaa MacOSX shell integration code plus icons. 2014-08-01 10:59:48 +02:00
Daniel Molkentin 8d71328192 Windows Overlay Icons 2014-07-30 17:20:55 +02:00
Klaas Freitag 00274722ce nautilus plugin: Adopted to latest socket api changes. 2014-07-25 12:11:21 +02:00
Klaas Freitag 0e9a08cbbf SocketAPI: rename slot to send UPDATE_VIEW. 2014-07-17 11:25:08 +02:00
Klaas Freitag fef713aaed SocketAPI: Create the socket API instance in folderman. 2014-07-17 11:22:18 +02:00
Daniel Molkentin 2cdfc16829 SocketAPI: rename test client binary to socketapiclient 2014-07-02 12:03:52 +02:00
Daniel Molkentin e63d45cca9 SocketAPI: put binary into bin/ dir 2014-07-02 11:15:39 +02:00
Daniel Molkentin 553f186b7c SocketAPI: Build test client with Qt5 2014-07-02 11:11:11 +02:00
Daniel Molkentin 623dfc0286 Socket API: Add test client 2014-07-02 10:10:32 +02:00
Klaas Freitag 14a5ff6747 overlayIcons: First version of the nautilus overlay python module 2014-06-06 17:49:19 +02:00