1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-14 16:42:47 +01:00
Commit Graph

522 Commits

Author SHA1 Message Date
Jenkins for ownCloud
73e58fa090 [tx-robot] updated from transifex 2017-03-25 01:15:15 +01:00
Jenkins for ownCloud
005c027274 [tx-robot] updated from transifex 2017-03-07 01:15:15 +01:00
Roeland Jago Douma
99aaf22ae5 Update windows docker file to use 2.3 OBS repo
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-02-15 09:49:29 +01:00
Jenkins for ownCloud
72cd9abd4a [tx-robot] updated from transifex 2017-01-28 01:15:15 +01:00
Jocelyn Turcotte
d0d5b2b4ee Don't try to deploy the mng image format plugin on macOS
Qt now only build it if the system library is available since libmng
isn't active enough to make its security reliable enough. We don't
use that image format ourselves anyway.
2016-12-07 15:26:23 +01:00
Jocelyn Turcotte
36967122db Rebase Qt patches on 5.6 #3449
Also get rid of the list of different version. We always only support one Qt version
for macOS and Windows, and the list of patches will be based on that supported
version.
2016-12-07 15:26:23 +01:00
ckamm
ec7333a4bf Merge pull request #5272 from owncloud/licensefix-pending
License: Adjust license of GPLv2 source files to GPLv2+
2016-11-18 15:14:47 +01:00
Jenkins for ownCloud
019544fcfd [tx-robot] updated from transifex 2016-11-10 01:15:14 +01:00
Christian Kamm
db24f60ae3 License: Adjust license of GPLv2 source files to GPLv2+
See #5180
2016-10-25 11:06:54 +02:00
Jenkins for ownCloud
826459eae7 [tx-robot] updated from transifex 2016-10-17 01:15:13 +02:00
Jenkins for ownCloud
6382a142cd [tx-robot] updated from transifex 2016-10-01 01:15:17 +02:00
Jenkins for ownCloud
ea9d17b41d [tx-robot] updated from transifex 2016-09-22 01:15:16 +02:00
Markus Goetz
6ecda6e7f4 Merge branch '2.2' 2016-08-24 11:39:12 +02:00
Jenkins for ownCloud
7f59dec0bb [tx-robot] updated from transifex 2016-08-17 01:15:16 +02:00
Jenkins for ownCloud
1a454ec6b2 [tx-robot] updated from transifex 2016-08-15 01:15:15 +02:00
Jenkins for ownCloud
ce4daaaae2 [tx-robot] updated from transifex 2016-08-13 01:15:24 +02:00
Jenkins for ownCloud
775ad25be3 [tx-robot] updated from transifex 2016-08-12 01:16:28 +02:00
Jenkins for ownCloud
7e43fe599c [tx-robot] updated from transifex 2016-08-12 01:15:20 +02:00
Jenkins for ownCloud
3e64840e33 [tx-robot] updated from transifex 2016-08-11 01:16:34 +02:00
Jenkins for ownCloud
e6db2ee960 [tx-robot] updated from transifex 2016-08-11 01:15:18 +02:00
Jenkins for ownCloud
6fbeb60d86 [tx-robot] updated from transifex 2016-08-10 01:16:38 +02:00
Jenkins for ownCloud
60904496d2 [tx-robot] updated from transifex 2016-08-09 15:12:31 +02:00
Daniel Molkentin
7de70516f1 Fix module loading 2016-08-05 12:35:52 +02:00
Jenkins for ownCloud
d58c392d93 [tx-robot] updated from transifex 2016-08-01 01:16:19 +02:00
Jenkins for ownCloud
b21e3e0fdc [tx-robot] updated from transifex 2016-07-10 01:15:58 -04:00
Jenkins for ownCloud
4979181e85 [tx-robot] updated from transifex 2016-07-07 01:15:57 -04:00
Jenkins for ownCloud
73cc3a4fd4 [tx-robot] updated from transifex 2016-06-10 01:15:55 -04:00
Jenkins for ownCloud
86680a53e0 [tx-robot] updated from transifex 2016-06-03 01:15:59 -04:00
Jenkins for ownCloud
e031f7d090 [tx-robot] updated from transifex 2016-06-01 01:18:50 -04:00
Jenkins for ownCloud
d3a93cbaeb [tx-robot] updated from transifex 2016-05-27 01:15:50 -04:00
Jenkins for ownCloud
813bc15a78 [tx-robot] updated from transifex 2016-05-22 01:15:47 -04:00
Markus Goetz
7110091fdd Qt patches: Update with information about Qt 5.6 2016-05-03 15:16:07 +02:00
Jenkins for ownCloud
41eb5f0a3f [tx-robot] updated from transifex 2016-04-24 01:15:28 -04:00
Daniel Molkentin
665c3f40e1 Fix search & replace error in Dockerfile 2016-04-22 11:26:46 +02:00
Daniel Molkentin
dbcb94e7d4 Update doc and Dockerfile for 2.2 builds 2016-04-21 12:25:12 +02:00
Markus Goetz
6a9655aab6 OS X: Fix overlay installation on El Capitan #4650
The sleep is somehow needed, probably for pkg to rebuild its DB?
The case fix fixes a warning but did not fix the issue itself.
2016-04-15 16:58:58 +02:00
Markus Goetz
d1649ce4df OS X: Allow ampersand in APPLICATION_NAME #4657 2016-04-15 11:30:49 +02:00
Jenkins for ownCloud
329f512a40 [tx-robot] updated from transifex 2016-04-08 01:15:47 -04:00
Jenkins for ownCloud
f495daf1cf [tx-robot] updated from transifex 2016-04-05 01:15:46 -04:00
Jenkins for ownCloud
ecb34f60f2 [tx-robot] updated from transifex 2016-03-25 01:15:43 -04:00
Jenkins for ownCloud
366abb5350 [tx-robot] updated from transifex 2016-03-15 01:15:43 -04:00
Jenkins for ownCloud
e82a13803d [tx-robot] updated from transifex 2016-03-10 01:15:45 -05:00
Jenkins for ownCloud
3a608dda8f [tx-robot] updated from transifex 2016-03-09 01:15:44 -05:00
Jenkins for ownCloud
50c32f45ac [tx-robot] updated from transifex 2016-03-05 01:15:44 -05:00
Jenkins for ownCloud
744464aca6 [tx-robot] updated from transifex 2016-02-25 01:15:43 -05:00
Jenkins for ownCloud
64ca8a668a [tx-robot] updated from transifex 2016-02-20 01:15:28 -05:00
Jenkins for ownCloud
95a58e74ca [tx-robot] updated from transifex 2016-02-08 10:11:58 -05:00
Klaas Freitag
b70a95ba30 nsi translations: finally escape the NSIS lineends correctly.
This will now finally fix #3519
2016-02-08 16:11:18 +01:00
Klaas Freitag
e397056d2e Enable replacement of strange substrings also for nsh files. 2016-02-05 17:59:34 +01:00
Daniel Molkentin
b0acc475b0 Bring build documentation up to date, use docker for Win32 xbuild 2016-02-05 14:55:29 +01:00
Daniel Molkentin
834a971e2a Add Dockerfile that allows cross compiling the client 2016-02-05 12:17:31 +01:00
Jocelyn Turcotte
e4ae279f7b Fix the crash reporter not launching
The proper path needs to be returned from CopyFramework
in order for install_name_tool to be run on the destination.
2016-02-02 10:43:52 +01:00
Jocelyn Turcotte
46e384a2f2 OS X: The --strict option isn't supported on the build machine
XCode is too old.
2016-01-22 18:13:25 +01:00
Jocelyn Turcotte
5092243080 OS X: Fix macdeployqt not to embed symlinks when ran multiple times
ln has a special syntax to create the symlink inside the last path if it's
a directory (or a symlink to a directory).

Also pass --strict to codesign --verify to catch this kind of error.
2016-01-22 18:04:46 +01:00
Jocelyn Turcotte
110f3710be OS X: Make sure Qt frameworks have the right structure
This fixes the codesign verification by making sure that the Qt
framework bundles follow the required structure described at:
https://developer.apple.com/library/ios/documentation/CoreFoundation/Conceptual/CFBundles/BundleTypes/BundleTypes.html
2016-01-22 16:58:41 +01:00
Jocelyn Turcotte
6096a836a4 Do a codesign --verify before running spctl
codesign is less strict than spctl and gives more output.
codesign -d alone doesn't verify but only prints.
2016-01-22 16:54:04 +01:00
Jocelyn Turcotte
c3724068e5 Fix gen_sym_files.py trying to process non-macho files
Since it processes all files under PlugIns uncondisionally, it would
now try to process the Info.plist file in the FinderSyncExt bundle.
2016-01-22 16:48:53 +01:00
Klaas Freitag
c23ae5aa14 Win Admin: Added script to create stable toolchain prj. in OBS 2016-01-21 11:40:53 +01:00
Jenkins for ownCloud
76bf93e3de [tx-robot] updated from transifex 2016-01-20 01:15:17 -05:00
Daniel Molkentin
21e3df4f34 Add mac system tray fix as deployed on the build machine
Fixes #3918
2016-01-18 16:18:53 +01:00
Jenkins for ownCloud
8c531873a8 [tx-robot] updated from transifex 2016-01-12 01:15:38 -05:00
Klaas Freitag
ea03f9da13 NSIS: Escape line endings for NSIS correctly.
This is supposed to fix #3519
2016-01-11 15:36:24 +01:00
Jenkins for ownCloud
ed6f76ca28 [tx-robot] updated from transifex 2016-01-10 01:15:43 -05:00
Markus Goetz
0f658e5ca9 OS X: Don't install legacy Finder plugin on >= 10.10 #3587 (v2) 2016-01-08 17:54:10 +01:00
Markus Goetz
93e8bbab10 OS X: Don't install legacy Finder plugin on >= 10.10 #3587 2016-01-05 17:43:48 +01:00
Daniel Molkentin
0ef9bd9e23 Remove bearer plugins
Causes regressions due to constant Wifi scanning
2016-01-04 11:54:11 +01:00
Jenkins for ownCloud
442cc63d22 [tx-robot] updated from transifex 2015-12-02 01:15:38 -05:00
Daniel Molkentin
2d604cee25 Qt: Add Windows-specific patches OBS, also a QNAM fix 2015-11-25 22:36:37 +01:00
Daniel Molkentin
1cc9070a50 Qt patches: Tweak more for Qt 5.4.0 2015-11-25 12:42:58 +01:00
Daniel Molkentin
127c107094 Ensure patches apply cleanly, drop patch 14 2015-11-25 11:49:34 +01:00
Daniel Molkentin
60a51f8085 Add more Qt patches 2015-11-25 10:40:41 +01:00
Jenkins for ownCloud
b468767184 [tx-robot] updated from transifex 2015-11-25 01:15:38 -05:00
Jenkins for ownCloud
02daca9cb9 [tx-robot] updated from transifex 2015-11-24 01:15:44 -05:00
Jenkins for ownCloud
5a7eebe16e [tx-robot] updated from transifex 2015-11-19 01:15:40 -05:00
Daniel Molkentin
b3c2c594bd Add the set of currently used patches 2015-11-16 18:35:50 +01:00
Markus Goetz
1a1541ecd6 macdeployqt: Forgot comma 2015-11-06 15:18:14 +01:00
Markus Goetz
6901fc9e38 macdeployqt: Also copy bearer plugins
See #3449
2015-11-05 18:15:45 +01:00
Markus Goetz
0070835330 macdeployqt: Hack to make Qt 5.5 work 2015-11-05 17:19:49 +01: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
Jenkins for ownCloud
64718fe567 [tx-robot] updated from transifex 2015-10-19 01:15:39 -04:00
Jenkins for ownCloud
79f14e0933 [tx-robot] updated from transifex 2015-10-18 01:15:40 -04:00
Jenkins for ownCloud
afeb9e07e2 [tx-robot] updated from transifex 2015-10-09 01:15:36 -04:00
Jenkins for ownCloud
a0eb4b9c85 [tx-robot] updated from transifex 2015-10-07 01:15:35 -04:00
Jenkins for ownCloud
bb289f63f1 [tx-robot] updated from transifex 2015-10-06 01:15:38 -04:00
Jenkins for ownCloud
7b61bcfe10 [tx-robot] updated from transifex 2015-10-03 01:15:41 -04:00
Jenkins for ownCloud
fe88b48fb1 [tx-robot] updated from transifex 2015-09-26 01:15:34 -04:00
Klaas Freitag
57f10c0c8e Use application SHORT name for the name of the MacOSX pkg file.
THis is because of https://github.com/owncloud/ownbrander/issues/445
2015-09-24 16:02:08 +02:00
Jenkins for ownCloud
836d7e1e5d [tx-robot] updated from transifex 2015-09-23 01:15:36 -04:00
Jenkins for ownCloud
5f06e3f738 [tx-robot] updated from transifex 2015-09-17 01:15:41 -04:00
Jenkins for ownCloud
57e9f96836 [tx-robot] updated from transifex 2015-09-14 01:15:35 -04:00
Jenkins for ownCloud
e695144cd8 [tx-robot] updated from transifex 2015-09-13 01:15:38 -04:00
Jenkins for ownCloud
a08cb3846c [tx-robot] updated from transifex 2015-09-12 01:15:36 -04:00
Jenkins for ownCloud
7bafc92df3 [tx-robot] updated from transifex 2015-09-11 09:32:57 -04:00
Daniel Molkentin
223a162a8b NSIS: all strings must use $\r$\n rather than \r\n
Part of fix for #3519
2015-09-11 15:31:56 +02:00
Jenkins for ownCloud
c2fd708ce9 [tx-robot] updated from transifex 2015-09-11 01:15:36 -04:00
Jenkins for ownCloud
cc4bc2e47a [tx-robot] updated from transifex 2015-09-01 13:02:24 -04:00
Jenkins for ownCloud
7ba97d88d5 [tx-robot] updated from transifex 2015-08-28 01:15:38 -04:00
Jenkins for ownCloud
f368c0e379 [tx-robot] updated from transifex 2015-08-18 01:15:36 -04:00
Jenkins for ownCloud
bd16ad4783 [tx-robot] updated from transifex 2015-08-17 01:15:27 -04:00
Jenkins for ownCloud
5429ab4a85 [tx-robot] updated from transifex 2015-08-13 01:15:36 -04:00
Jenkins for ownCloud
f36b95d6b0 [tx-robot] updated from transifex 2015-08-10 01:15:25 -04:00
Jenkins for ownCloud
06515d4e96 [tx-robot] updated from transifex 2015-08-08 01:15:24 -04:00
Jenkins for ownCloud
cad2d639af [tx-robot] updated from transifex 2015-08-06 11:37:16 -04:00
Daniel Molkentin
5657d4ec1b NSIS: Remove (almost untranslated) Slovak tr for now 2015-08-06 17:36:53 +02:00
Daniel Molkentin
4b9352f291 Fix codepages for Czech and Slovak 2015-08-06 17:36:53 +02:00
Daniel Molkentin
50195ce4be Revert "Update NSIS translations"
This reverts commit 47a8fbb07e.
2015-08-06 17:19:37 +02:00
Daniel Molkentin
47a8fbb07e Update NSIS translations 2015-08-06 17:08:53 +02:00
Markus Goetz
cad33de824 OS X: Try harder to enable 10.10 plugin #3463 2015-08-05 15:10:00 +02:00
Daniel Molkentin
b8d21bdd51 Merge remote-tracking branch 'origin/master' into new_nsis_modules 2015-07-31 18:20:27 +02:00
Markus Goetz
1e72ea45dd OS X: Fix enabling overlays for branded clients #3463 2015-07-31 15:13:14 +02:00
Daniel Molkentin
6d3f607396 NSIS: Add conversions for polish and slavic languages 2015-07-29 14:50:24 +02:00
Jocelyn Turcotte
ed51358478 shell_i: Activate the finder integration on install #3463
This makes sure that users won't have to go into settings
to activate the extension. This might upset users by forcing
them to re-disable it on each oC upgrade, but if this becomes
an issue we should then make this configurable in the client's
settings itself.
2015-07-28 17:58:17 +02:00
Daniel Molkentin
b9edc64982 NSIS: Fix NSIS error handling 2015-07-17 14:43:18 +02:00
Daniel Molkentin
d53eaf8fd6 Win32: Remove confusing option to remove AppData
- This only works for the current user (while being a HKLM installer)
- The naming is confusing.

Fixes #3461
2015-07-16 16:22:00 +02:00
Markus Goetz
a8fb94f51b OS X Installer: Select app in Finder after install
This is to improve UX in #2410
2015-07-13 10:52:48 +02:00
Jocelyn Turcotte
18efc5eb65 shell_i: Add a way to fail the build if the signing key doesn't match
This tries to catch error at build time instead of having
to check the OS X console for errors afterward.
2015-06-22 13:55:19 +02:00
Jenkins for ownCloud
e7f01b9a95 [tx-robot] updated from transifex 2015-06-07 01:15:27 -04:00
Daniel Molkentin
eb6d29a223 Revert "NSIS: Fix NSIS error handling"
This reverts commit 3df26ef189.
2015-06-05 09:15:14 +02:00
Daniel Molkentin
3df26ef189 NSIS: Fix NSIS error handling 2015-06-05 08:45:23 +02:00
Jenkins for ownCloud
90f4a20a50 [tx-robot] updated from transifex 2015-05-26 01:15:28 -04:00
Daniel Molkentin
070d9d3147 NSIS Installer: Fix Basque, Galician, Slovak, Turkish
Not sure when this broke, but those languages could never have worked...
2015-05-25 21:48:21 +02:00
Daniel Molkentin
9b73308edd NSIS: Add Norwegian (Bokmål) translation 2015-05-25 21:41:23 +02:00
Daniel Molkentin
b46a8239e2 NSIS installer tx: Sort/de-whitespace translation file config 2015-05-25 19:45:02 +02:00
Jenkins for ownCloud
0b0ecfcbe4 [tx-robot] updated from transifex 2015-04-22 01:15:19 -04:00
Daniel Molkentin
99c8118229 create_mac_pkg.sh.cmake: increase space-in-filename resiliance 2015-04-21 15:42:51 +02:00
Daniel Molkentin
7390ddbd98 Mac OS: The Resource/ folder in Qt frameworks might not exist
Make sure to create it
2015-04-17 13:31:05 +02:00
Daniel Molkentin
c3dca7a288 OS X: Actually Make the signing script fail on failure
Addresses #3114
2015-04-16 16:35:09 +02:00
Daniel Molkentin
96ff0076c7 Fix mac deployment again 2015-04-16 16:35:09 +02:00
Jenkins for ownCloud
32af63764c [tx-robot] updated from transifex 2015-03-29 01:15:23 -04:00
Daniel Molkentin
450a815d61 Add user id param 2015-03-24 22:24:09 +01:00
Daniel Molkentin
b5ea56df73 Add docker buildscript for win32 2015-03-23 22:24:43 +01:00
Jenkins for ownCloud
04db332051 [tx-robot] updated from transifex 2015-03-18 01:15:17 -04:00
Markus Goetz
6c4b7f1479 OS X: Always return 0 from pre_install.sh 2015-03-13 16:35:44 +01:00
Daniel Molkentin
4601ac8b0e Remove unused (and partly binary!) NSIS artifacts 2015-03-12 09:29:48 +01:00
Jocelyn Turcotte
4c13992f5d Add a gen_sym_files script for OSX
This attempts to replicate what i686-w64-mingw32-gen_sym_files
is doing for us with MinGW by parsing the output of otool -L
to get the library name actually used by the executable.
2015-03-06 19:28:53 +01:00
Jenkins for ownCloud
15a60bb359 [tx-robot] updated from transifex 2015-03-03 01:15:17 -05:00
Jenkins for ownCloud
298ca552c8 [tx-robot] updated from transifex 2015-02-24 01:15:20 -05:00
Jenkins for ownCloud
6c09764b35 [tx-robot] updated from transifex 2015-02-22 01:15:16 -05:00
Jenkins for ownCloud
b1e9a74cc2 [tx-robot] updated from transifex 2015-02-21 01:15:14 -05:00
Jenkins for ownCloud
377887871c [tx-robot] updated from transifex 2015-02-11 01:15:14 -05:00
Jenkins for ownCloud
faec7362fe [tx-robot] updated from transifex 2015-02-08 01:15:15 -05:00
Daniel Molkentin
07fe077f7f More Mirall -> Client renaming to make l10n work again 2015-02-07 23:28:20 +01:00
Jenkins for ownCloud
c48ab4830d [tx-robot] updated from transifex 2015-02-07 01:15:14 -05:00
Daniel Molkentin
01bca39138 s/mirall/client in transifex & translations
Last part of #2470
2015-02-06 15:16:55 +01:00
Jenkins for ownCloud
b5212c4467 [tx-robot] updated from transifex 2015-02-06 02:06:13 -05:00
Jenkins for ownCloud
4f03234487 [tx-robot] updated from transifex 2015-02-05 02:06:15 -05:00
Jenkins for ownCloud
5fdf9bb7d2 [tx-robot] updated from transifex 2015-02-04 02:06:17 -05:00
Jenkins for ownCloud
6c3e19e531 [tx-robot] updated from transifex 2015-02-02 02:06:11 -05:00
Jenkins for ownCloud
ed49a708d0 [tx-robot] updated from transifex 2015-02-01 02:06:12 -05:00
Jenkins for ownCloud
e04300a01c [tx-robot] updated from transifex 2015-01-31 02:06:13 -05:00
Jenkins for ownCloud
5cf8726e60 [tx-robot] updated from transifex 2015-01-30 02:06:17 -05:00
Daniel Molkentin
b1d2e1fa10 More translation adjustments 2015-01-29 14:44:48 +01:00
Daniel Molkentin
44e1d33faa Further string fixes 2015-01-29 13:35:48 +01:00
Daniel Molkentin
183b3c61e4 Update NSIS installer to install ContextMenu Extension 2015-01-29 13:19:54 +01:00
Vyronas Tsingaras
4603798996 Update Toolchain-mingw32-openSUSE.cmake
Fix cross-compiling for windows. change qt4 to qt5 since windows and OSX require Qt5 now.
2015-01-26 15:53:44 +02:00
Jenkins for ownCloud
75540e8a4c [tx-robot] updated from transifex 2015-01-25 02:06:12 -05:00
Daniel Molkentin
39097980b0 Deployment: Accessiblewidgets no longer exists in Qt 5.4
Part of #2699
2015-01-22 15:27:19 +01:00
Jenkins for ownCloud
d2fc3e8023 [tx-robot] updated from transifex 2015-01-13 02:06:12 -05:00
Jenkins for ownCloud
5539f1d498 [tx-robot] updated from transifex 2015-01-06 02:06:11 -05: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
Jenkins for ownCloud
1dd4fecffb [tx-robot] updated from transifex 2015-01-04 02:06:13 -05:00
Jenkins for ownCloud
cc3f7995fb [tx-robot] updated from transifex 2014-12-17 02:06:12 -05:00
Markus Goetz
dc5d0e367c OS X: Improve installer
This should mostly fix #2105 and #2044
2014-12-16 19:08:12 +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
Jenkins for ownCloud
054e557531 [tx-robot] updated from transifex 2014-12-04 02:06:11 -05:00
Klaas Freitag
c5daf7d1b6 Mac installer: Make the installer background brandable for MacOSX. 2014-12-03 14:37:59 +01:00
Daniel Molkentin
e1fa6f1a0d fix_frameworks is no longer required
This is taken care of by macdeployqt.py, which is
run during "make install"
2014-12-03 13:41:12 +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
Jenkins for ownCloud
8866494c94 [tx-robot] updated from transifex 2014-11-29 02:06:10 -05:00
Markus Goetz
fab82107bb OS X: Don't use hardcoded name in packages file 2014-11-21 16:34:30 +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
7ada625161 OS X: Fix packages file 2014-11-17 17:48:29 +01:00
Jenkins for ownCloud
e6eb91c5f9 [tx-robot] updated from transifex 2014-11-11 02:06:12 -05: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
Craig Morrissey
2120ff8037 fix resources path and permissions 2014-10-23 16:42:32 -04: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
Daniel Molkentin
83880aed52 Add proper background for OS X installer
Fixes #2335
2014-10-22 18:02:19 -04: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
Jenkins for ownCloud
b2460fbee2 [tx-robot] updated from transifex 2014-10-22 02:06:40 -04:00
Daniel Molkentin
6048a7143a Revert "Remove references to qsqlite3"
QtWebkit needs it

This reverts commit b1c10c8454.
2014-10-20 10:27:34 +02:00
Jenkins for ownCloud
bce6916c13 [tx-robot] updated from transifex 2014-10-17 02:07:06 -04:00
Markus Goetz
b1c10c8454 Remove references to qsqlite3 2014-10-16 17:51:17 +02:00
Jenkins for ownCloud
557c63b372 [tx-robot] updated from transifex 2014-10-15 02:06:11 -04:00
Markus Goetz
f0fef4f232 OS X: Fix .app creation for non-system Qt 2014-10-09 16:50:03 +02:00
Markus Goetz
32aaecd832 macdeployqt: Fix missing symbol 2014-10-09 12:07:00 +02: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
5213970c3d OSX: fix signing script 2014-10-01 17:57:51 +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
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
Jenkins for ownCloud
dce30a27b9 [tx-robot] updated from transifex 2014-09-28 02:06:12 -04:00
Jenkins for ownCloud
37a7ad4795 [tx-robot] updated from transifex 2014-09-23 02:08:06 -04:00
Klaas Freitag
8f8265b219 Mac Installer: Add file name quoting. 2014-09-22 16:45:33 +02:00
Klaas Freitag
00ae3c3120 Mac Installer: Rename the final package to branded. 2014-09-22 16:38:51 +02:00
Klaas Freitag
1e49f152be Mac create pkg: Adjust background image path 2014-09-22 16:25:23 +02:00
Klaas Freitag
f72ca4d83e Mac installer: Use template value for bundle name 2014-09-22 16:18:30 +02:00
Jenkins for ownCloud
fa606b38b7 [tx-robot] updated from transifex 2014-09-21 02:06:11 -04:00
Olivier Goffart
50e718b1e7 Merge branch '1.7'
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/folder.cpp
	src/gui/socketapi.cpp
	translations/mirall_ca.ts
	translations/mirall_cs.ts
	translations/mirall_de.ts
	translations/mirall_el.ts
	translations/mirall_en.ts
	translations/mirall_es.ts
	translations/mirall_es_AR.ts
	translations/mirall_et.ts
	translations/mirall_eu.ts
	translations/mirall_fa.ts
	translations/mirall_fi.ts
	translations/mirall_fr.ts
	translations/mirall_gl.ts
	translations/mirall_hu.ts
	translations/mirall_it.ts
	translations/mirall_ja.ts
	translations/mirall_nl.ts
	translations/mirall_pl.ts
	translations/mirall_pt.ts
	translations/mirall_pt_BR.ts
	translations/mirall_ru.ts
	translations/mirall_sk.ts
	translations/mirall_sl.ts
	translations/mirall_sv.ts
	translations/mirall_th.ts
	translations/mirall_tr.ts
	translations/mirall_uk.ts
	translations/mirall_zh_CN.ts
	translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
Jenkins for ownCloud
9daacd7aee [tx-robot] updated from transifex 2014-09-18 02:06:15 -04:00
Markus Goetz
49c40a4b11 OS X: Have the PKG installer also be signed 2014-09-02 17:57:22 +02:00
Markus Goetz
d1eff0ae24 OS X: Add sign_app.sh 2014-09-02 16:14:00 +02:00
Markus Goetz
7da8a5e374 OS X: Create tbz in create_mac_pkg.sh
Sparkle needs this
2014-09-02 12:15:11 +02:00
Jenkins for ownCloud
fef37b0222 [tx-robot] updated from transifex 2014-08-31 02:06:16 -04:00
Jenkins for ownCloud
ff970ee3f5 [tx-robot] updated from transifex 2014-08-30 02:06:15 -04:00
Daniel Molkentin
59a9cc7c12 OS X build: use correct macro for version number 2014-08-28 00:08:24 +02:00
Markus Goetz
f8b1b243c1 OS X: Fix installer target name if we have a build number 2014-08-27 14:44:21 +02:00
Markus Goetz
61138b58bf OS X: Quote the installer filename
Viel hilft viel
2014-08-27 12:49:22 +02:00
Markus Goetz
5490063b7e OS X: Fix installer creation
The script should know independently of the machine
2014-08-27 12:02:57 +02:00
Klaas Freitag
eb898646bc Create Mac Pack: Copy the creator script to the build directory. 2014-08-26 18:13:43 +02:00
Jenkins for ownCloud
15c11ea172 [tx-robot] updated from transifex 2014-08-24 02:06:11 -04:00
Jenkins for ownCloud
9743fee8f9 [tx-robot] updated from transifex 2014-08-21 02:06:14 -04:00
Jenkins for ownCloud
2436ef9574 [tx-robot] updated from transifex 2014-08-19 02:06:17 -04:00
Markus Goetz
b62b87eed3 OS X: Rename LiferayNativity code for shell icons 2014-08-18 12:57:29 +02:00
Jenkins for ownCloud
5c5d57a996 [tx-robot] updated from transifex 2014-08-16 02:06:14 -04:00
Jenkins for ownCloud
192c23bfce [tx-robot] updated from transifex 2014-08-13 02:06:14 -04:00
Jenkins for ownCloud
e2d5ae1035 [tx-robot] updated from transifex 2014-08-11 02:06:11 -04:00
Daniel Molkentin
80f9ed70d3 NSIS: Script to download the VS runtimes 2014-08-07 16:24:09 +02:00
Jenkins for ownCloud
bd9d5432f5 [tx-robot] updated from transifex 2014-08-07 02:06:14 -04:00
Jenkins for ownCloud
7337010fd8 [tx-robot] updated from transifex 2014-08-06 05:10:32 -04:00
Daniel Molkentin
f06019ab81 NSIS: First steps at installing the shell extension 2014-08-06 10:44:17 +02:00
Markus Goetz
fe3f751a8a OS X: Slightly improve pkgproj
It is still too much bound to Klaas' machine.
2014-08-05 17:16:17 +02:00
Klaas Freitag
0a7642dbe0 Mac Package: New shellscript and packages steering file. 2014-08-01 12:19:08 +02:00
Jenkins for ownCloud
5a4c023fc9 [tx-robot] updated from transifex 2014-07-28 02:06:11 -04:00
Jenkins for ownCloud
eb0f074097 [tx-robot] updated from transifex 2014-07-13 02:06:11 -04:00
Jenkins for ownCloud
e7d597045b [tx-robot] updated from transifex 2014-06-27 02:06:13 -04:00
Jenkins for ownCloud
b3b3ca0e16 [tx-robot] updated from transifex 2014-06-26 02:06:14 -04:00
Jenkins for ownCloud
a92f1cb055 [tx-robot] updated from transifex 2014-06-25 06:34:41 -04:00
Jenkins for ownCloud
22c01748ce [tx-robot] updated from transifex 2014-06-16 02:06:11 -04:00
Jenkins for ownCloud
8745a684ae [tx-robot] updated from transifex 2014-06-12 02:06:12 -04:00
Jenkins for ownCloud
3f543b881d [tx-robot] updated from transifex 2014-06-11 02:06:11 -04:00
Jenkins for ownCloud
e497b6d458 [tx-robot] updated from transifex 2014-06-07 02:06:12 -04:00
Jenkins for ownCloud
0ae82e2041 [tx-robot] updated from transifex 2014-06-01 02:06:11 -04:00
Jenkins for ownCloud
072af16f3b [tx-robot] updated from transifex 2014-05-25 02:06:12 -04:00
Jenkins for ownCloud
b8b064836c [tx-robot] updated from transifex 2014-04-28 02:07:38 -04:00
Jenkins for ownCloud
ab711ddc36 [tx-robot] updated from transifex 2014-04-27 02:06:35 -04:00
Jenkins for ownCloud
7544f4d367 [tx-robot] updated from transifex 2014-04-25 02:06:36 -04:00
Jenkins for ownCloud
f302da81b1 [tx-robot] updated from transifex 2014-04-09 02:07:10 -04:00
Jenkins for ownCloud
6d325e6557 [tx-robot] updated from transifex 2014-04-07 02:07:45 -04:00
Jenkins for ownCloud
6c2d286f10 [tx-robot] updated from transifex 2014-04-03 02:07:48 -04:00
Daniel Molkentin
70eb688e86 fix frameworks during signing 2014-03-28 14:46:08 +01:00
Jenkins for ownCloud
359dd2b986 [tx-robot] updated from transifex 2014-03-28 02:07:21 -04:00
Jenkins for ownCloud
0f385db314 [tx-robot] updated from transifex 2014-03-16 03:17:49 -04:00
Thomas Müller
f6ff20ca17 Switching to transifex.com 2014-03-11 11:46:50 +01:00
Jenkins for ownCloud
4018338725 [tx-robot] updated from transifex 2014-03-10 02:06:43 -04:00
Jenkins for ownCloud
d617c40ee7 [tx-robot] updated from transifex 2014-03-07 02:07:26 -05:00
Olivier Goffart
e5a8cd4521 Merge branch '1.5'
Conflicts:
	VERSION.cmake
2014-03-06 14:10:08 +01:00
Daniel Molkentin
f8d996258e OS X: Make script more even robust 2014-02-28 11:16:25 +01:00