Commit graph

5611 commits

Author SHA1 Message Date
Olivier Goffart
50b9a7b191 remove unused include from header file 2014-01-27 11:58:50 +01:00
Daniel Molkentin
9b09a2ee32 Merge pull request #1375 from owncloud/l10n-installer-readme
L10n installer readme
2014-01-27 02:03:47 -08: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
Mr. Jenkins
a90512c825 [tx-robot] updated from transifex 2014-01-27 02:20:52 -05:00
Olivier Goffart
94190b73ff fix test compilation 2014-01-26 19:05:43 +01:00
Olivier Goffart
2eb9962f4c Adapt the test to the changes in the exclude list
The exclude list was removed from csync in commit
f32d901653
Adapt the test.
2014-01-26 18:58:56 +01:00
Olivier Goffart
5119d5d366 Remove csync_config
commit c585c73044 removed the use of it.
So remove this code completely as it is no longer used
2014-01-26 18:39:47 +01:00
Mr. Jenkins
da93038a78 [tx-robot] updated from transifex 2014-01-26 02:14:59 -05:00
Mr. Jenkins
ea5a0ab1bc [tx-robot] updated from transifex 2014-01-25 01:27:09 -05:00
Olivier Goffart
08c03d19b9 Only one quote should be enough
Should fix #1295
2014-01-24 20:28:17 +01:00
Daniel Molkentin
7762e80c60 Bump to 1.5.1 2014-01-24 14:24:54 +01:00
Klaas Freitag
f2fc866cc4 Set the library and bin install path to cmake standard path. 2014-01-24 13:43:05 +01:00
Klaas Freitag
f32d901653 Remove ocsyncs config which is unused in the owncloud client. 2014-01-24 13:43:05 +01:00
Klaas Freitag
c585c73044 Do not load the config file and csync exclude list. 2014-01-24 13:43:05 +01:00
Klaas Freitag
0b680ef90e Removed the csync documentation as it is not longer used here. 2014-01-24 13:43:05 +01:00
Daniel Molkentin
03b449e081 CPack: revert part of previous commit 2014-01-24 12:27:08 +01:00
Daniel Molkentin
8fd881a176 Remove obsolete CPack Options 2014-01-24 12:03:31 +01:00
Daniel Molkentin
42f5aa072d Link against Sparkle if available 2014-01-24 11:58:11 +01:00
Daniel Molkentin
86eb68df7f csync_rename.cc: Remove superflous semicolon 2014-01-24 10:50:33 +01:00
Mr. Jenkins
b8d13e985f [tx-robot] updated from transifex 2014-01-24 01:27:07 -05:00
Daniel Molkentin
815efb69d7 NSIS: implement /launch for updater 2014-01-23 17:17:13 +01:00
Daniel Molkentin
1d32fb74f9 NSIS: Don't try to log 2014-01-23 16:15:46 +01:00
Klaas Freitag
9c300b83bd Add FindINotify cmake module. 2014-01-23 16:15:29 +01:00
Klaas Freitag
688d394576 Check for INotify if compiling for Linuxe and friends 2014-01-23 16:05:35 +01:00
Klaas Freitag
04d8c82dbd Make NEON_WITH_LFS conditional to avoid build warnings. 2014-01-23 16:05:35 +01:00
Daniel Molkentin
f98db9ac9d NSIS: find DLL from csync copy within cmake 2014-01-23 15:55:55 +01:00
Klaas Freitag
d868df3b9b Fix windows compilation after having merged in csync. 2014-01-23 15:19:27 +01:00
Klaas Freitag
3d6718315c Fix Include dirs and add tests. 2014-01-23 13:23:27 +01:00
Klaas Freitag
5841cf4020 Add and remove watches for folders independent from sync dir.
Before it was just in case of download.
2014-01-23 13:23:27 +01:00
Klaas Freitag
e9e132c06c Make use of the new linux folder watcher. 2014-01-23 13:23:27 +01:00
Klaas Freitag
e3723fcfc2 Add a new folder watcher implementation for Linux. 2014-01-23 13:23:27 +01:00
Jenkins for ownCloud
a664dc5f1d [tx-robot] updated from transifex 2014-01-23 02:07:01 -05:00
Mr. Jenkins
cdc24eb437 [tx-robot] updated from transifex 2014-01-23 01:26:22 -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
Daniel Molkentin
8485a7fd30 Fix typo 2014-01-22 16:09:22 +01:00
Mr. Jenkins
93a28e7a95 [tx-robot] updated from transifex 2014-01-22 01:26:24 -05:00
Daniel Molkentin
83e628b9f7 Revert "fix test"
This reverts commit f35e2efd4e.
2014-01-22 00:00:34 +01:00
Daniel Molkentin
129aef5beb Revert "Formatting hashes with : seems to be out of fashion"
This reverts commit c52e3a0732.
2014-01-22 00:00:34 +01:00
Daniel Molkentin
f35e2efd4e fix test 2014-01-21 16:34:52 +01:00
Daniel Molkentin
54c0c4057b Improve SSL detail display 2014-01-21 15:54:06 +01:00
Daniel Molkentin
c52e3a0732 Formatting hashes with : seems to be out of fashion 2014-01-21 15:25:51 +01:00
Klaas Freitag
699f6a62f8 Do not set sync-state to Prepare in setSyncEnabled().
This method is also called if the sync was disabled due to
network problems and such, ie. from the ETag change check.
In that case, we do not want to go to the Prepare state as
we not neccessarily want to have the folder synced now.

This fixes the problem that the folders were resynced way
to often which we had in master for a couple of days now.
2014-01-21 15:25:05 +01:00
Olivier Goffart
61f3b839ab Fix compilation in Qt5
Some Qt SSL function used to return QString now return a QStringList.

By having  QStringList(...).join(':')   the code will compile both
if the ... is a QString or a QStringList. So the code will still
compile in Qt4.
2014-01-21 15:09:12 +01:00
Olivier Goffart
29590fa00b Revert "Commented opening of files from the activity view as it does not work."
This reverts commit c50b0a995b.

This was only broken on windows and probabyl fixed by commit 23f52bcd
2014-01-21 13:01:05 +01:00
Olivier Goffart
0c33fc6e8a Do not block while launching the explorer on linux
Fixes #1338
2014-01-21 13:01:05 +01:00
Daniel Molkentin
c4c36d641b Remove garbage include 2014-01-21 12:34:51 +01:00
Klaas Freitag
a1d6cf7d4d Fix typo in documentation 2014-01-21 12:20:23 +01:00
Klaas Freitag
4d8e65cfd0 Hide useless logging that indicates an error. 2014-01-21 12:10:49 +01:00