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 c50b0a995b23f52bcd
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
Daniel Molkentin
8303c8f909
Mac OS Bundle file: bump copyright year
2014-01-21 11:23:46 +01:00
Daniel Molkentin
2370060ac5
Implement Certificate Information Widget
...
Currently used in status window. Before, there was no way to know
about the current certificate situation.
Fixes #44
2014-01-21 09:21:33 +01:00
Mr. Jenkins
77e09e786e
[tx-robot] updated from transifex
2014-01-21 01:26:23 -05:00
Daniel Molkentin
d4bb0e44cd
Wizard: Gracefully fall back to HTTP if HTTPS connection fails
...
If the connection fails, the user is now being asked if he does
agree to a new attempt via an unencrypted connection. If he complies,
the connection will be reattempted using plain HTTP.
Fixes #1356
2014-01-20 19:46:09 +01:00
Daniel Molkentin
9b9b62d4e3
Wizard: Prepend 'https://' if no scheme is set
...
First part of fix for #1356
2014-01-20 17:53:46 +01:00
Daniel Molkentin
2780dae569
Setup Wizard: Fix http(s) label size
2014-01-20 17:41:57 +01:00
Daniel Molkentin
562513d5a5
Propagator: Don't pass arbitrary strings as formating string
...
Not a security issue since this code was never in any release.
2014-01-20 17:22:29 +01:00
Daniel Molkentin
a2e9353296
Fix copy & paste problem in Ignore List Editor
...
Fixes #1355
2014-01-20 17:08:30 +01:00
Olivier Goffart
7f76fcff5e
Do not account the size of deleted or renamed file in the progress
...
Fixes #1360
2014-01-20 17:00:28 +01:00
Olivier Goffart
0afbb264e0
cleanup mutex usage in CSyncThread
...
The only method which is used from another thread is abort().
So the only thing that needs protection is that function, and the
function which may race with. Which are csync_request_abort which
should not race with csync_resume
2014-01-20 17:00:28 +01:00
Klaas Freitag
05b81bc7d8
rename csync/doc to csync/csync_doc to satisfy cmake.
...
CMake throws a warning if there are two subdirs with the same name.
2014-01-20 16:19:30 +01:00
Klaas Freitag
7bb7b1d73b
Remove wipeAllJournals after rebase mistake.
2014-01-20 16:19:30 +01:00
Klaas Freitag
0eebc0e5be
Add folder to schedule queue in setupFolders method.
...
This fixes bug #1352
2014-01-20 16:19:30 +01:00
Klaas Freitag
a6b0ccfa12
Remove explicit logging.
2014-01-20 16:19:30 +01:00
Klaas Freitag
ce077f97c6
Checks if the folder from map is still defined.
...
I saw a crash were a folder which was deleted was dereferenced later
in the Quota check slot. There the folder pointer returned from folder
map was zero.
2014-01-20 16:19:29 +01:00
Klaas Freitag
c705a6360d
Rather removeFolder than addFolder to watcher (typo fix).
2014-01-20 16:19:29 +01:00
Olivier Goffart
19a19978b7
fix csync BINARYDIR and SOURCEDIR
2014-01-20 16:16:29 +01:00
Olivier Goffart
e7e319e3f5
Fix compilation of the owncloudpropagator test
...
This test does nothing, remove problematic line"
2014-01-20 15:44:43 +01:00
