Commit Graph
17214 Commits
Author SHA1 Message Date
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
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