Klaas Freitag
5cf13dfa32
Make logging work again.
2013-09-24 15:56:03 +02:00
Klaas Freitag
27b9a5aed9
Merge branch '1.4', brings in the changes we did for 1.4.1
2013-09-24 14:18:25 +02:00
Klaas Freitag
c45d55b94b
Create a rc2.
2013-09-24 12:45:45 +02:00
Klaas Freitag
7048bd8cc9
Handle app icon names properly.
2013-09-24 12:19:29 +02:00
Klaas Freitag
cae6ca987f
Revert "Fix application shortname for proper icon"
...
We must not change the app short name for ownCloud. Too dangerous as it
is used all over.
This reverts commit 65171cfb3a
2013-09-24 11:48:19 +02:00
Klaas Freitag
65171cfb3a
Fix application shortname for proper icon
2013-09-23 18:23:21 +02:00
Klaas Freitag
740f0091f2
Updated version to 0.90.1
2013-09-23 16:37:31 +02:00
Klaas Freitag
ed636ffc9c
Added Changelog entries.
2013-09-23 16:37:18 +02:00
Klaas Freitag
7ec636aeb6
Added changelog entries.
2013-09-23 16:36:49 +02:00
Klaas Freitag
c96980a57d
Set version to 1.4.1rc1
2013-09-23 16:36:36 +02:00
Klaas Freitag
0959ceeff2
Disable delete of folder object temparily.
2013-09-23 15:10:42 +02:00
Klaas Freitag
1988c9d8c4
Do complete sync if network was disconnected.
...
This fixes owncloud/mirall#1007
2013-09-23 15:10:42 +02:00
Klaas Freitag
1eaa1e47fe
Be more careful with items in model when deleting rows.
2013-09-23 15:10:42 +02:00
Klaas Freitag
31923b314e
Removed left over stuff from refactoring.
2013-09-23 15:10:42 +02:00
Klaas Freitag
ee840b62e5
Fix syncEnable in folder and folderman.
2013-09-23 15:10:42 +02:00
Jenkins for ownCloud
4de99d2540
[tx-robot] updated from transifex
2013-09-22 11:52:39 -04:00
Daniel Molkentin
363efaa408
Theming build fix: Icons need shortname
2013-09-20 23:09:41 +02:00
Jenkins for ownCloud
5b60522e5e
[tx-robot] updated from transifex
2013-09-20 09:44:46 -04:00
Daniel Molkentin
b0beeea95f
More fixes related to object destruction on exit
...
- _logBrowser is not delete on close, call deleteLater
- move writing geometry out of dtor.
- _folderWizard was unused, remove it and all related noops
Hopefully solves #945
2013-09-20 14:18:28 +02:00
Daniel Molkentin
d0a4650d69
Settings: calculate sidebar width dynamically
...
Fixes #1020
2013-09-20 10:40:22 +02:00
Daniel Molkentin
ec5a84cf01
Pop up config wizard if no server url is configured.
...
Fixes #1018 .
2013-09-19 17:24:22 +02:00
Daniel Molkentin
a057eb8590
Fix focus issue during setup wizard
2013-09-19 14:52:41 +02:00
Klaas Freitag
0e17b00675
Added a new error code HBF_TRANSFER_NOT_ACKED.
...
If the server does not acknowledge the transfer with sending back an
ETag after the last missing chunk was uploaded, this is an error
which is now reported by this new error type.
2013-09-19 12:52:54 +02:00
Klaas Freitag
740a275836
Cleaned and added some debugging output.
2013-09-19 12:52:11 +02:00
Klaas Freitag
125a63bf8d
More descriptive error message.
2013-09-19 12:50:44 +02:00
Klaas Freitag
b4f14e086d
Added a new error code HBF_TRANSFER_NOT_ACKED.
...
If the server does not acknowledge the transfer with sending back an
ETag after the last missing chunk was uploaded, this is an error
which is now reported by this new error type.
2013-09-19 12:40:17 +02:00
Klaas Freitag
6d8cef3bb6
Cleaned and added some debugging output.
2013-09-19 12:38:20 +02:00
Daniel Molkentin
6a8753b119
Start only one wizard, delete it when done
2013-09-19 12:11:46 +02:00
Jenkins for ownCloud
b334c82fdd
[tx-robot] updated from transifex
2013-09-18 10:45:45 -04:00
Daniel Molkentin
23fab90a31
_tray is a QPointer, not a QScopedPointer
2013-09-18 16:41:37 +02:00
Daniel Molkentin
d657a679ba
Fix for previous commit
2013-09-18 16:28:01 +02:00
Klaas Freitag
219ce5fc4c
Make compile on win32 without fnmatch
2013-09-18 16:17:58 +02:00
Klaas Freitag
2ec1bcfc29
Make compile on win32 without fnmatch.
2013-09-18 16:15:08 +02:00
Daniel Molkentin
8fdf9cac6b
Try to be more graceful during shutdown
...
- Do not delete _tray, use deleteLater() via QScropedPointer
- force closing any dialoges that might want to write their
geometry in aboutToQuit(), before the actual destruction
of the sync thread, etc starts.
This tries to fix #945
2013-09-18 15:42:35 +02:00
Daniel Molkentin
525d12f5a2
Make "Sync started" message optional
...
Fixes #934
2013-09-18 14:14:42 +02:00
Daniel Molkentin
15d247a708
Ui::SslErrorDialog belongs within the Mirall namespace
2013-09-18 14:06:23 +02:00
Klaas Freitag
373746c296
Fix crash in case of NE_TIMEOUT happened.
...
Fixes https://github.com/owncloud/mirall/issues/1010
In case of NE_TIMEOUT the request is repeated for three times. In this
case, the hooks weren't correctly unhooked which caused a crash.
2013-09-18 12:58:17 +02:00
Klaas Freitag
525278450a
Fix crash in case of NE_TIMEOUT happened.
...
Fixes https://github.com/owncloud/mirall/issues/1010
In case of NE_TIMEOUT the request is repeated for three times. In this
case, the hooks weren't correctly unhooked which caused a crash.
2013-09-18 12:57:15 +02:00
Daniel Molkentin
91e527dc2a
Fix csync_version.h creation for cmake 2.6
2013-09-17 22:38:19 +02:00
Daniel Molkentin
82d31095f2
Fix csync_version.h creation for cmake 2.6
2013-09-17 22:37:59 +02:00
Jenkins for ownCloud
9ed4aa4111
[tx-robot] updated from transifex
2013-09-16 10:34:17 -04:00
Klaas Freitag
de074804eb
Detect empty etags coming from server side.
2013-09-16 16:15:15 +02:00
Klaas Freitag
c54a3ab7cc
Added missing parenthesis.
2013-09-16 14:16:14 +02:00
Daniel Molkentin
a1d0b85277
Add copyright header to syncfileitem.h
...
Fixes #993
2013-09-15 22:49:24 +02:00
Daniel Molkentin
5e5a77b040
Fix parameter order
2013-09-15 22:48:12 +02:00
Daniel Molkentin
e420ae6942
Folder Wizard: Fix various issues
...
- Use data role for pathes
- call root dir "ownCloud"
- don't connect() multiple times
- ensure chars like # or ? in path are interpreted as part of the url path segment
Should fix #992
2013-09-15 22:47:35 +02:00
Daniel Molkentin
0be7c0273e
Replace forgotton 22px app icon version which was still s/w
2013-09-15 00:48:06 +02:00
Jenkins for ownCloud
41b1b53c76
[tx-robot] updated from transifex
2013-09-13 20:47:28 -04:00
Thomas Müller
60ef5535c6
fixing testOctetsToString
...
(cherry picked from commit 78c8f13645
2013-09-13 20:14:53 +02:00
Thomas Müller
e38d0807c9
moving back to 1024 as divider for kB, MB, GB & TB
...
(cherry picked from commit c87c456ae0
2013-09-13 20:14:47 +02:00
