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
Olivier Goffart
be874e36da
remove unused variable and functions
2014-01-20 15:10:53 +01:00
Olivier Goffart
3a9c485515
Fix crashwhile removing a folder
...
in a QMap, Accessing an entry that does not exists create the null entry
We should not use operator[] if we are not sure the folder indeed exists
2014-01-20 14:59:35 +01:00
Olivier Goffart
4df1d7d893
Remove unused variables
2014-01-20 14:59:23 +01:00
Olivier Goffart
bbf3a64c02
Fix crash.
...
toUtf8() returns a temporary QByteArray wuich is only valid until the
end of the statement (the next ';'). QByteArray::data() returns a
pointer to the QByteArray's data which is only valid if the QByteArray
is valid.
Keeping the char* is therefore wrong.
2014-01-20 14:24:20 +01:00
Olivier Goffart
b93efbaefe
EIO is not necessarily a proxy error.
...
Should change error message such as
"CSync failed to connect through a proxy. 500 Internal Server Error"
To:
"CSync processing step update failed. 500 Internal Server Error"
2014-01-20 13:58:54 +01:00
Olivier Goffart
316aade340
Merge branch 'csync_merge'
...
Conflicts:
src/CMakeLists.txt
2014-01-20 13:27:33 +01:00
Mr. Jenkins
309908687f
[tx-robot] updated from transifex
2014-01-19 01:26:16 -05:00
Jenkins for ownCloud
3f1199fcf3
[tx-robot] updated from transifex
2014-01-18 02:07:00 -05:00
Mr. Jenkins
6f488e1988
[tx-robot] updated from transifex
2014-01-18 01:26:14 -05:00
Daniel Molkentin
28c4cd9caa
NSIS: Cleanup: Use MEMENTO defines where possible
2014-01-18 00:06:58 +01:00
Daniel Molkentin
2a0f28208c
NSIS: Don't install link to Desktop of a link by the same name already exists
...
Unfortunately, we cannot determine the target path for the .lnk file
without pulling in closed source plugins (or write our own), a length
I am not willing to go in the light of MSI.
Fixes #356
2014-01-18 00:01:44 +01: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
Daniel Molkentin
4c7ddb769a
NSIS: INSTALL_PATH has never been used
...
Remove it to avoid confusion
2014-01-17 12:11:19 +01:00
Daniel Molkentin
91345d9e25
NSIS: Fix transations in uninstaller
...
Before, we could not show custom strings at all
2014-01-17 12:11:19 +01:00
Jenkins for ownCloud
45ed37025a
[tx-robot] updated from transifex
2014-01-17 02:07:01 -05:00
Mr. Jenkins
cfa2c3acdf
[tx-robot] updated from transifex
2014-01-17 01:26:23 -05:00
Klaas Freitag
45c75f722c
Show an indicator if the url is encrypted or not in connection wizard.
...
Fixes bug #1350
2014-01-16 17:40:46 +01:00
Olivier Goffart
6257ed6605
Make sure that the jobs have the Q_OBJECT macro.
...
so tr() works there
2014-01-16 14:06:17 +01:00
Klaas Freitag
0455d96462
Fix untranslated error messages.
2014-01-16 13:04:57 +01:00
Klaas Freitag
d2e8043a4a
Use ClientProxy that reads the client config in commandline client.
...
Fixes mirall#1347
2014-01-16 12:52:11 +01:00
Klaas Freitag
98689d48f1
Check if configuration actually exists.
...
If not, set System Proxy as default.
2014-01-16 12:52:11 +01:00
Klaas Freitag
ec9efd7894
Make use of the new Proxy handling class.
2014-01-16 12:52:11 +01:00
Klaas Freitag
671100ce5c
Add a class ClientProxy that handles proxy setting for Qt and csync.
2014-01-16 12:52:11 +01:00
Jenkins for ownCloud
843ea13553
[tx-robot] updated from transifex
2014-01-16 02:08:15 -05:00
Mr. Jenkins
8c37e7742a
[tx-robot] updated from transifex
2014-01-16 01:27:36 -05:00
Daniel Molkentin
96633307c0
Move owncloudcmd into Bundle on OS X
...
Fixes #1300
2014-01-15 18:14:37 +01:00
Daniel Molkentin
2009fbc886
Deploy all of Sparkle manually
2014-01-15 17:52:19 +01:00
Daniel Molkentin
4caa038de6
More sparkle fixes
2014-01-15 16:01:35 +01:00
Daniel Molkentin
f5dc2b3127
Compile on OS X
2014-01-15 12:45:43 +01:00
Olivier Goffart
c7227297af
Make it compile with the merge of csync mirall
2014-01-15 12:20:03 +01: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
Daniel Molkentin
dc9f145a24
New Updater for Windows, passive notification on Linux, Sparkle on Mac
2014-01-15 11:09:31 +01:00
Mr. Jenkins
93239cbdca
[tx-robot] updated from transifex
2014-01-15 01:58:37 -05:00
Klaas Freitag
55da857e59
A bit of refactoring, add useful names and set the alias properly.
...
The alias field is now set from the last component of the picked
local dir. Also some tooltips were added.
2014-01-14 17:40:42 +01:00
Klaas Freitag
aba1252e60
Remove inotify from cmake files.
2014-01-14 15:06:06 +01:00
Mr. Jenkins
890c0eb885
[tx-robot] updated from transifex
2014-01-14 01:56:32 -05:00
Klaas Freitag
561f32cede
License header cleanups.
2014-01-13 16:16:19 +01:00
Klaas Freitag
e0d8d93b50
Removed obsolete inotify class of folderwatcher.
2014-01-13 16:07:52 +01:00
Klaas Freitag
3d8505d7f4
Adopt mac folderwatcher to the new folderwatcher.
2014-01-13 16:00:41 +01:00
Klaas Freitag
18171862ac
Unify folderwatcher private constructor.
2014-01-13 15:29:05 +01:00
Klaas Freitag
0e5858b1aa
Add a pathIsIgnored method to the folderwatcher.
2014-01-13 15:29:05 +01:00
Klaas Freitag
5482ad1fd3
Remove event buffering from watcher, other refactoring.
2014-01-13 15:28:56 +01:00
Olivier Goffart
924e0e3242
Merge csync inside the mirall repository
2014-01-13 14:43:14 +01:00
Olivier Goffart
bf7ca60bec
Move csync in order to merge it with mirall
2014-01-13 14:39:50 +01:00
Klaas Freitag
f9080c59ab
Remove FolderWatcher from Folder and move to FolderMan.
2014-01-13 11:30:27 +01:00
Klaas Freitag
a12288ff21
Use folderwatcher based on Qt for Linux.
2014-01-13 11:30:27 +01:00
Jenkins for ownCloud
dcc5a8b02b
[tx-robot] updated from transifex
2014-01-13 02:06:59 -05:00
