mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 21:46:03 +03:00
Code Issues Projects Releases Packages Wiki Activity
10102 commits 473 branches 255 tags 510 MiB
Commit graph

151 commits

Author SHA1 Message Date
Jocelyn Turcotte
2b274e9460 Fix the MSVC build 
- Replace functions that are provided by MinGW with a Win32-based
  implementation
- Explicitly export needed symbols from ocsync.dll
- Rename share.h to sharemanager.h since the name clashes with one
  of the Windows headers and get included from there
- Remove the timestamp from the fallback csync stderr logging, it's
  not used since we always provide a log callback
 2016-09-16 17:43:39 +02:00
Olivier Goffart
1d09f6b60f Allow to disable Shiboleth to build without QtWebkit (#5166) 2016-09-11 16:14:08 +02:00
Olivier Goffart
e960b265a8 Merge remote-tracking branch '2.1' into 2.2 2016-05-25 16:23:58 +02:00
Olivier Goffart
5676685f58 SyncEngine: Add a compile option so we rename to restoring a move we don't have the permission to do 
IL issue 550
 2016-05-12 13:15:30 +02:00
Markus Goetz
d1649ce4df OS X: Allow ampersand in APPLICATION_NAME #4657 2016-04-15 11:30:49 +02:00
Olivier Goffart
fdcdddca16 CMakeLists: move QtKeychain detection in client 2016-04-12 14:43:26 +02:00
Olivier Goffart
f8dc263338 CMakeLists: fix Qt4 build 
Only the src subdirectory needs Qt.
Otherwise it activates Qt4 also for the dolphin plugin which always need Qt5
 2016-04-11 15:49:18 +02:00
Markus Goetz
c8590c4468 Remove legacy propagator and neon 
The code was already uneeded/unbuilt on Windows and OS X.
 2015-10-20 17:57:43 +02:00
Phil Davis
7d191763b5 Minor build etc typos 
Just some random stuff I noticed while looking at how this beast is put
together.
 2015-09-10 13:20:11 +05:45
Jocelyn Turcotte
854bfb870d Revert "Silence verbose cmake policy warnings on Windows" 
This causes an error since those policies aren't known by
2.8.12, so better seeing those warnings on Windows for now.

This reverts commit 4441d3b342.
 2015-08-10 11:57:05 +02:00
Jocelyn Turcotte
4441d3b342 Silence verbose cmake policy warnings on Windows 2015-08-10 09:55:29 +02:00
Klaas Freitag
6992631c4c cmake: rather use SHAREDIR than DATADIR define. 
DATADIR is a reserved structure name in win32, using it like us here
leads to very nifty compile problems. SHAREDIR is clean.
 2015-07-30 16:38:30 +02:00
Jocelyn Turcotte
c85ace11dd Allow the OSX build to work without make install 
Also deploy sync-exclude.lst to the build directory in this case.
 2015-07-28 15:19:09 +02:00
Daniel Molkentin
0610d3ea8d Merge pull request #3347 from jturcotte/shell_integration_findersync 
shell_i: Add a FinderSync-based implementation #2340
 2015-07-02 14:20:24 +02:00
Daniel Molkentin
0735aa1fbd Structure developer documentation 
- rename target "doc-dev"
- group into modules
- move to doc/dev
 2015-06-29 18:43:21 +02:00
Daniel Molkentin
f4c816f378 Implement doxygen supoort to create developer documentation 
Fixes #3371
 2015-06-25 16:50:30 +02:00
Jocelyn Turcotte
9797782682 shell_i: Build the extension with the '-' identity by default 
This allows developers to build and run the extension by default.
Official packages bundles will be re-signed after the build, we

The SocketApi prefix can be set at configure time through cmake and
should match the key that will be used to sign the whole .app bundle
(including the embedded FindexSync .appex bundle).
 2015-06-22 13:55:19 +02:00
Olivier Goffart
3c8409ee69 CMakeList: change the message to indicate that newer versions of Qt are good too 
The current message sounds like you need 5.4, but 5.5 would work too
 2015-06-15 14:28:11 +02:00
Klaas Freitag
67d38bc87b Filesystem Utilities: Add Checksum calculation methods. 2015-05-19 17:09:39 +02:00
Jocelyn Turcotte
2ddaf5a06a Add a NO_MSG_HANDLER cmake option 
This allows QDebug to output to stdout or OutputDebugString
to ease development.
 2015-02-19 16:57:16 +01:00
Daniel Molkentin
00e42d1177 More HIDPI support 
Except for the non-native activity tab
icon in settings, this should fix #11
 2015-02-12 19:44:40 +01:00
Daniel Molkentin
07fe077f7f More Mirall -> Client renaming to make l10n work again 2015-02-07 23:28:20 +01:00
Olivier Goffart
eedb5d0dae Revert "cmake: Clearly Define qtmain.lib link policy on Windows" 
It make jenkins fail with the error:

CMake Error at CMakeLists.txt:3 (cmake_policy):
  Policy "CMP0020" is not known to this version of CMake.

This reverts commit 6d380c8548.
 2015-02-06 17:46:57 +01:00
Klaas Freitag
dbca7469f2 Enable the SHA sum in linux when build from source tar. 2015-02-06 12:18:09 +01:00
Daniel Molkentin
6d380c8548 cmake: Clearly Define qtmain.lib link policy on Windows 2015-02-05 15:37:22 +01:00
Daniel Molkentin
59bdda6226 Require OpenSSL > 1.0.0, remove obsolete dep from csync 2015-02-05 13:08:28 +01:00
Klaas Freitag
481d4f3478 CMake: Changed message about compiling against Qt4. 2015-01-30 13:21:38 +01:00
Markus Goetz
ea72d7bb11 CMake: Remove FIXME 2015-01-29 20:47:33 +01:00
Olivier Goffart
d70e146c1f Merge remote-tracking branch 'origin/ssl_client_cert' 
Conflicts:
	CMakeLists.txt
	csync/src/CMakeLists.txt
	csync/src/csync_owncloud.c
 2015-01-28 14:13:40 +01:00
Daniel Molkentin
989005d616 Clientcert support: Explictly link libsync against openssl 2015-01-28 13:31:17 +01:00
Olivier Goffart
fe51ada1e8 Don't require NEON with Qt 5.4 2015-01-23 17:11:34 +01:00
Markus Goetz
3885d5d706 Discovery: Report root etag from engine to folder 
For #2352
 2015-01-23 15:30:44 +01:00
Markus Goetz
c54621eb19 OS X: Share menu for Finder 2015-01-23 12:00:31 +01:00
Markus Goetz
d285db653e CMake: Check for Qt version 
This is still WiP, we need to compile without neon if possible
 2015-01-22 14:27:49 +01:00
Markus Goetz
f9b98d6d1d OS X: Fix exclude file install 2015-01-09 14:38:27 +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
Klaas Freitag
c5daf7d1b6 Mac installer: Make the installer background brandable for MacOSX. 2014-12-03 14:37:59 +01:00
Daniel Molkentin
3016844dd7 Merge branch 'master' into rename_client 
Conflicts:
	README.md
	src/gui/folderman.cpp
	src/gui/settingsdialog.cpp
	src/libsync/accessmanager.cpp
	src/libsync/propagateupload.h
 2014-12-02 13:37:22 +01:00
Olivier Goffart
78362af168 Compile with TOKEN_AUTH_ONLY 
(QtGui is not included in that case)
 2014-11-21 12:15:41 +01:00
Christian Kamm
4d7b8bdb25 Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	OWNCLOUD.cmake
	test/CMakeLists.txt
	test/testfolderwatcher.h
 2014-11-19 14:45:25 +01:00
Markus Goetz
e890c4ae1b OS X: Move previous fix to proper location 2014-11-17 18:30:32 +01:00
Daniel Molkentin
281c0e1553 Merge branch 'master' into rename_client 
Conflicts:
	CMakeLists.txt
	src/gui/main.cpp
	src/libsync/accessmanager.cpp
	src/libsync/accessmanager.h
	src/libsync/owncloudpropagator_p.h
 2014-11-12 00:07:59 +01:00
Daniel Molkentin
cdac8d56d5 Merge remote-tracking branch 'origin/master' into crashreporter 
Conflicts:
	src/libsync/utility.cpp
	src/libsync/utility.h
 2014-11-11 23:53:38 +01:00
Daniel Molkentin
9ebc41ed6f Remove "Mirall" from cmake project files 2014-11-09 22:30:05 +01:00
Daniel Molkentin
dc1e73dcb7 Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/libsync/syncjournaldb.cpp
	test/CMakeLists.txt
 2014-10-28 23:27:58 -04:00
Klaas Freitag
ab5dae741a Show GIT SHA sum in cmake output. 2014-10-27 11:54:22 +01:00
Markus Goetz
7e3d2029e0 OS X: Fix bundle creation after merge 2014-10-22 12:06:43 +02:00
Christian Kamm
7ae0338f5c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/socketapi.h
	src/libsync/syncengine.h
	test/CMakeLists.txt
 2014-10-22 10:41:55 +02:00
Markus Goetz
1d5b3aadea sqlite3: Bundle 3.8.6 for Mac and Windows 
it is linked into ocsync.
 2014-10-16 17:38:45 +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