mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-17 11:21:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
6598 commits 483 branches 258 tags 454 MiB
Commit graph

6598 commits

This branch
This branch
All branches
Author SHA1 Message Date
Klaas Freitag
6c2ce06fea tx.pl: Set the SSL relaxing env variable. 2014-10-03 10:33:30 +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
Jenkins for ownCloud
1b02a1a6f3 [tx-robot] updated from transifex 2014-10-02 01:25:30 -04:00
Daniel Molkentin
1d8900dc19 OS X: write a qt.conf file 2014-10-01 23:57:14 +02:00
Daniel Molkentin
171fd22d91 Fix rpath for libraries 2014-10-01 21:41:56 +02:00
Daniel Molkentin
78d50f4033 CPack is still needed for Windows 
This partially reverts commit dafd9c308f.
This partially reverts commit 7f836cc01b.
 2014-10-01 21:16:18 +02:00
Klaas Freitag
fee18dd457 Push version to beta2 2014-10-01 21:04:13 +02:00
Klaas Freitag
81d3ce8257 cmake: Commented setting of the INSTALL_PREFIX var on Mac 2014-10-01 20:55:39 +02:00
Daniel Molkentin
5213970c3d OSX: fix signing script 2014-10-01 17:57:51 +02:00
Daniel Molkentin
bcc06af904 fix last commit 2014-10-01 17:46:29 +02:00
Daniel Molkentin
a98242a2b8 fix install target for macdeployqt 2014-10-01 17:32:17 +02:00
Daniel Molkentin
5f715ca063 OSX: fix Frameworks path in signing script 2014-10-01 16:04:24 +02:00
Daniel Molkentin
0ceeff62d6 Fix app signing on OS X 2014-10-01 15:34:42 +02:00
Daniel Molkentin
f53a7c0e4a Improve macdeploy script 2014-10-01 15:34:42 +02:00
Daniel Molkentin
41b07d045a OS X: Use a python script to fix for bundle fixup... 
...rather than relying on cmake magic
 2014-10-01 15:34:42 +02:00
Olivier Goffart
0d303f1d1f SelectiveSync: sort the item instead of using the order from the server 
Task #2259
 2014-10-01 13:47:24 +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
Jenkins for ownCloud
3e982ad34c [tx-robot] updated from transifex 2014-10-01 06:54:46 -04:00
Daniel Molkentin
dafd9c308f More removal of obsolete CMake code 2014-10-01 12:51:38 +02:00
Daniel Molkentin
7f836cc01b Kill obsolete Mac deployment code 2014-10-01 12:35:21 +02:00
Olivier Goffart
147fa60f81 Merge branch 'socketapi_localsocket' into 1.7 2014-10-01 12:34:22 +02:00
Olivier Goffart
a1b9405e2e Windows has not been ported back to QLocalSocket 2014-10-01 12:33:54 +02:00
Olivier Goffart
db02d44c6a No need to update mtime and etag after a move 
The server keeps the mtime and etag anyway.
And changing the mtime also changes the etag and so make other clients re-download
the file instead of detecting the move
 2014-10-01 11:22:00 +02:00
Klaas Freitag
dff1f77dfa SocketAPI: remove nonsense FIXME's. 2014-09-30 17:12:07 +02:00
Daniel Molkentin
1a2fff8ed8 OS X: Use a python script to fix for bundle fixup... 
...rather than relying on cmake magic
 2014-09-30 17:09:16 +02:00
Markus Goetz
52c12b33c3 OS X: CMD+H should hide the dialog 2014-09-30 15:21:55 +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
479b340d75 Folderman: Check if socketApi member is non zero, no crashes. 2014-09-30 12:33:51 +02:00
Klaas Freitag
06c48f58cc SyncEngine: Use proper start indicator, max unit64. 
This avoids a warning.
 2014-09-30 12:29:24 +02:00
Klaas Freitag
0ee81a2865 SocketAPI: Set permission of the socket Directory. 
Set that to be accessible by the owner only.
 2014-09-30 11:23:49 +02:00
Klaas Freitag
e78c251832 SocketAPI: Split up for specific linux and mac implementation. 2014-09-30 11:23:49 +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
Jenkins for ownCloud
f25a590af5 [tx-robot] updated from transifex 2014-09-30 01:25:39 -04: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
Olivier Goffart
a587148c73 SocketApi: Save the socket in $XDG_RUNTIME/<appname>/socket 2014-09-29 13:54:13 +02:00
Olivier Goffart
9acd3a58ee SocketApi: Use QLocalSocket after all for windows and linux 
Relates issue #2189
 2014-09-29 12:19:33 +02:00
Jenkins for ownCloud
449f5adaba [tx-robot] updated from transifex 2014-09-28 01:25:20 -04:00
Jenkins for ownCloud
2380b7af3d [tx-robot] updated from transifex 2014-09-27 01:25:22 -04:00
Olivier Goffart
10989d13e4 Folder: Remove slotTerminateAndPauseSync 
This make no sens to just set the pause config flag here. It make selective sync to mark
the folder as posed on restart
 2014-09-26 12:43:54 +02:00
Olivier Goffart
fe1653ede6 csync_update: don't recurse into ignored directory. 
This save some time when selective sync deselected a large tree
 2014-09-26 12:35:56 +02:00
Olivier Goffart
b4071cec01 DiscoveryPhase: fix the name of a function 
It was renamed from white list to black list long ago
 2014-09-26 12:35:56 +02:00
Klaas Freitag
b1c842373d Add OWNCLOUDSYNC_EXPORT to make building on windows. 2014-09-26 10:07:50 +02:00
Olivier Goffart
a3d70b3cf6 Attempt to fix a crash 
The reply might be null at the point we are timing out.
Issue #2246
 2014-09-26 10:04:36 +02:00
Jenkins for ownCloud
70912c44de [tx-robot] updated from transifex 2014-09-26 01:25:28 -04:00
Klaas Freitag
98d9f7924d SocketAPI: Before reporting something new check for parent permissions. 
In case it is not allowed to create files or dirs because of missing
permissions in shares, the socket API has to report an error state
rather than the NEW state.

As discussed in mirall issue #1931
 2014-09-25 21:52:20 +02:00
Klaas Freitag
172295289e Permissions: If a top level shared dir is removed, do not restore files in it 
A top level shared dir can always be removed on the client, even if it is
read only shared. In that case, the removal means "unsharing". Fixed the
permission check accordingly.

See bug #1918 for more information.
 2014-09-25 15:39:14 +02:00
Klaas Freitag
8ba08d7e87 Activity View: honor error string even if no warning 
that allows to specify a more specific user message to be displayed.
 2014-09-25 15:03:54 +02:00