chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-16 13:42:46 +01:00
Code
16,343 Commits 4 Branches 173 Tags 91 MiB
v3.2.3
Commit Graph

502 Commits

Author SHA1 Message Date
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
Daniel Molkentin
c8714be1d2 mac os sign script: quote all params 2014-02-28 10:23:02 +01:00
Jenkins for ownCloud
3cb6fc82dd [tx-robot] updated from transifex 2014-02-25 02:07:10 -05:00
Olivier Goffart
2de288c5f3 Merge remote-tracking branch 'origin/1.5' 
Conflicts:
	VERSION.cmake
 2014-02-19 10:21:23 +01:00
Jenkins for ownCloud
ee7c8d3c94 [tx-robot] updated from transifex 2014-02-18 06:14:46 -05:00
Jenkins for ownCloud
e34122ad54 [tx-robot] updated from transifex 2014-02-15 07:19:10 -05:00
Markus Goetz
372f8b3426 OS X: Document how to disable the auto updater 2014-02-13 14:11:04 +01:00
Jenkins for ownCloud
842c6c0e9e [tx-robot] updated from transifex 2014-02-13 03:19:10 -05:00
Jenkins for ownCloud
9815ccb760 [tx-robot] updated from transifex 2014-02-12 02:14:56 -05:00
Jenkins for ownCloud
3ffd7034c9 [tx-robot] updated from transifex 2014-02-11 02:07:14 -05:00
Jenkins for ownCloud
88e9014dad [tx-robot] updated from transifex 2014-02-09 04:30:28 -05:00
Jenkins for ownCloud
8152b7ebcf [tx-robot] updated from transifex 2014-02-08 02:21:31 -05:00
Thomas Müller
fdf73fe539 - Replace undeclared variables: 
- PageReinstall_OLD_MUI_HEADER_TEXT_SUBTITLE
  - PageReinstall_OLD_Field_2
  - PageReinstall_OLD_Field_3
  - REVISION
- README.md updated - calling bin/l10n.sh was missing

This commit includes updated translations from transifex.
 2014-02-05 12:01:36 +01:00
Jenkins for ownCloud
3480cb4432 [tx-robot] updated from transifex 2014-02-05 02:07:17 -05:00
Markus Goetz
034c3ae017 Sparkle: Sample RSS 
The real thing will be stored on owncloud.com somewhere.
 2014-02-04 17:37:01 +01:00
Markus Goetz
e001e70816 Sparkle: Get it working 2014-02-04 17:37:01 +01:00
Jenkins for ownCloud
cf7b77e2bf [tx-robot] updated from transifex 2014-02-03 02:20:25 -05:00
Jenkins for ownCloud
35f5c1f3a7 [tx-robot] updated from transifex 2014-02-02 02:07:45 -05:00
Jenkins for ownCloud
e38e1be3a7 [tx-robot] updated from transifex 2014-01-30 02:07:17 -05:00
Jenkins for ownCloud
53554075fa [tx-robot] updated from transifex 2014-01-29 02:07:21 -05:00
Jenkins for ownCloud
618833140c [tx-robot] updated from transifex 2014-01-28 02:28:26 -05:00
Daniel Molkentin
a700605c41 NSIS: Make string changes from 77610eb184 persistent 2014-01-27 13:04:27 +01:00
Daniel Molkentin
e2a77f8e73 NSIS: persist e774bbacde 2014-01-27 13:04:27 +01:00
Thomas Müller
e2c64e4513 Update README.md 2014-01-27 10:59:39 +01:00
Thomas Müller
8f26706466 Readme added on how to work with translations in windows installer. 2014-01-27 10:57:33 +01:00
Jenkins for ownCloud
c327ffe8d8 [tx-robot] updated from transifex 2014-01-27 03:16:58 -05:00
Jenkins for ownCloud
a664dc5f1d [tx-robot] updated from transifex 2014-01-23 02:07:01 -05:00
Daniel Molkentin
484ad28cd6 Merge pull request #1357 from owncloud/nsis_fixes 
NSIS preparations for upgrade mode
 2014-01-22 07:20:53 -08:00
Jenkins for ownCloud
3f1199fcf3 [tx-robot] updated from transifex 2014-01-18 02:07:00 -05:00
Daniel Molkentin
77610eb184 NSIS: Only remove sections that we actually installed 
We can query the NSIS Memento extension for that.
 2014-01-17 23:51:52 +01:00
Jenkins for ownCloud
45ed37025a [tx-robot] updated from transifex 2014-01-17 02:07:01 -05:00
Jenkins for ownCloud
843ea13553 [tx-robot] updated from transifex 2014-01-16 02:08:15 -05:00
Daniel Molkentin
a9d2079bc4 Use only global variables in translation 2014-01-15 11:50:54 +01:00
Jenkins for ownCloud
954ebcca2e [tx-robot] updated from transifex 2014-01-15 05:25:51 -05:00
Jenkins for ownCloud
dcc5a8b02b [tx-robot] updated from transifex 2014-01-13 02:06:59 -05:00
Jenkins for ownCloud
db87f9926a [tx-robot] updated from transifex 2014-01-11 02:06:59 -05:00
Jenkins for ownCloud
3923911368 [tx-robot] updated from transifex 2014-01-10 02:07:01 -05:00
Jenkins for ownCloud
78b1d3c347 [tx-robot] updated from transifex 2014-01-09 02:06:59 -05:00
Jenkins for ownCloud
4e2b2274a4 [tx-robot] updated from transifex 2014-01-08 02:07:00 -05:00
Jenkins for ownCloud
24644164ca [tx-robot] updated from transifex 2014-01-07 02:07:16 -05:00
Jenkins for ownCloud
3a1a3f7282 [tx-robot] updated from transifex 2014-01-06 02:07:16 -05:00
Jenkins for ownCloud
c3ecc5b224 [tx-robot] updated from transifex 2013-12-30 02:06:58 -05:00
Jenkins for ownCloud
9f1d89e330 [tx-robot] updated from transifex 2013-12-29 02:06:59 -05:00
Jenkins for ownCloud
27ce6cc6fe [tx-robot] updated from transifex 2013-12-28 02:07:01 -05:00
Jenkins for ownCloud
9745248c81 [tx-robot] updated from transifex 2013-12-26 02:06:59 -05:00
Jenkins for ownCloud
02461f7ff7 [tx-robot] updated from transifex 2013-12-25 02:06:58 -05:00
Jenkins for ownCloud
26c8dbf14c [tx-robot] updated from transifex 2013-12-24 02:06:58 -05:00
Jenkins for ownCloud
22bcda65ce [tx-robot] updated from transifex 2013-12-21 02:07:31 -05:00
Jenkins for ownCloud
1df295cb32 [tx-robot] updated from transifex 2013-12-19 02:07:19 -05:00
Jenkins for ownCloud
45710b7e6f [tx-robot] updated from transifex 2013-12-17 07:39:56 -05:00
Jenkins for ownCloud
c311083d7b [tx-robot] updated from transifex 2013-12-13 15:39:01 -05:00
Daniel Molkentin
e774bbacde NSIS: Can only use global variables in translation strings 
fixes #1273
 2013-12-12 10:44:05 +01:00
Jenkins for ownCloud
81773e53b1 [tx-robot] updated from transifex 2013-12-11 13:40:28 -05:00
Thomas Müller
f05e998430 Translation SectionGroup Shortcuts 2013-12-10 18:08:07 +01:00
Daniel Molkentin
ebfe2c793e Remove leftover file 2013-12-10 12:20:43 +01:00
Jenkins for ownCloud
082a60e067 [tx-robot] updated from transifex 2013-12-10 04:00:10 -05:00
Thomas Müller
d82a9423d6 adding Turkish translation to installer 2013-12-10 09:59:23 +01:00
Thomas Müller
b41feebcdd Multi-lingual installer 2013-12-10 00:43:58 +01:00
Sven Strickroth
b026bb308d Do not create folder for single link 
Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2013-11-14 00:45:18 +01:00
Sven Strickroth
6bd4d367d4 Do not create uninstall shortcut in start menu 
According to Microsoft Design guidelines (http://msdn.microsoft.com/en-us/library/windows/desktop/aa511447.aspx) no icons for uninstallers should be created.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2013-11-14 00:43:11 +01:00
Daniel Molkentin
d1451a3c90 Mac: Use hdiutil attach instead of open during signing 2013-08-28 12:53:34 +02:00
Daniel Molkentin
1e1751e451 sign_dmg.sh: increase wait time for dmg mount 2013-01-28 21:04:43 +01:00
Daniel Molkentin
5c495265f4 Consolidate theming support. 
This implements out-of-repository-theming, and removes the old
custom.ini theming that never worked on all platforms and had
no straight deployment story.

The new approach requires the CMAKE variable OEM_THEME_DIR to
point to a directory that must at least contain an OEM.cmake file
(check OWNCLOUD.cmake for possible options) as well as a themes.qrc
and a themes/ directory that directly correspond to the ones in
the source tree.
 2013-01-10 17:16:59 +01:00
Klaas Freitag
703002bafa Set path to neon-config file in cmake toolchain file. 2013-01-09 15:08:25 +01:00
Daniel Molkentin
d52d32f1b3 add helper script to sign app bundle 2012-10-10 16:57:07 +02:00
Daniel Molkentin
d9d0432187 nicer Setup images 2012-09-27 10:36:43 +02:00
Daniel Molkentin
95f28eca5b Rename win installer BMPs as a consequence of renaming the package 2012-09-24 00:42:30 +02:00
Daniel Molkentin
a94e6dbe8c NSIS: Remove stray file 2012-09-20 17:32:13 +02:00
Daniel Molkentin
663a1886e9 CMake: Centralize all application-specific parameters. 2012-09-20 17:31:18 +02:00
Klaas Freitag
b34da1cd40 Updated windows pics for installer 2012-05-11 11:25:06 +02:00
Dominik Schmidt
c03c112193 Add a CMake toolchain file for cross-compiling in openSUSE. 2012-04-26 14:45:40 +02:00
Dominik Schmidt
ccac3dcf95 Make it buildable as bundle on OSX 2012-04-16 13:03:20 +02:00
Klaas Freitag
95f6f90cb5 Add win32 packaging with nsi 2012-04-02 13:44:24 +02:00