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
Daniel Molkentin
864b7cd41e
Merge pull request #998 from owncloud/fixing-mb-1.4
...
Fixing mb 1.4
2013-09-13 11:11:43 -07:00
Thomas Müller
78c8f13645
fixing testOctetsToString
2013-09-13 17:30:53 +02:00
Thomas Müller
c87c456ae0
moving back to 1024 as divider for kB, MB, GB & TB
2013-09-13 15:00:49 +02:00
hefee
94d9b8fb39
Don't ship doc/scripts/README.rst via sphinx
2013-09-13 02:26:21 +02:00
Daniel Molkentin
7045a6c239
Merge pull request #996 from owncloud/dont-ship-doc_scripts
...
Don't ship doc/scripts/README.rst via sphinx
2013-09-12 17:25:39 -07:00
hefee
2b1602872c
Don't ship doc/scripts/README.rst via sphinx
2013-09-13 01:26:02 +02:00
Klaas Freitag
e09cb0c068
Move the check on the progressdb to the correct place, no crash anymore.
2013-09-12 15:37:10 +02:00
Klaas Freitag
62f4d118ea
Use new interface to csync_excluded.
2013-09-12 15:30:47 +02:00
Klaas Freitag
302f81b1d2
Adjusted tests for csync_excluded.
2013-09-12 15:30:13 +02:00
Klaas Freitag
1c87314b88
Fix a typo.
2013-09-12 15:30:04 +02:00
Klaas Freitag
ba1184f5ab
Make csync_excluded function work gitignore like.
2013-09-12 15:29:52 +02:00
Daniel Molkentin
30d8290d1c
Replace every occurrence of csync with ocsync in the documentation.
...
Patch by Sandro Knauß <buggs@sandroknauss.de>
Fixes Mirall issue #991
Conflicts:
doc/ocsync.1.txt
2013-09-12 15:29:37 +02:00
Daniel Molkentin
d4da443b12
Fixing spelling error 'transferred'
...
Lintian complains about the wrong spelling for transferred
Patch by Sandro Knauß <bugs@sandroknauss.de>
Fixes Mirall issue #990
2013-09-12 15:28:41 +02:00
Klaas Freitag
1f8aee8a4f
Adjusted tests for csync_excluded.
2013-09-12 14:47:17 +02:00
Klaas Freitag
526d23583a
Use new interface to csync_excluded.
2013-09-12 14:47:17 +02:00
Klaas Freitag
20821e6ffd
Fix a typo.
2013-09-12 14:47:17 +02:00
Klaas Freitag
d31f11fe88
Make csync_excluded function work gitignore like.
2013-09-12 14:47:17 +02:00
Daniel Molkentin
dbad6d641e
Replace every occurrence of csync with ocsync in the documentation.
...
Patch by Sandro Knauß <buggs@sandroknauss.de>
Fixes Mirall issue #991
2013-09-12 13:32:17 +02:00
Daniel Molkentin
c33e21a8c6
Fixing spelling error 'transferred'
...
Lintian complains about the wrong spelling for transferred
Patch by Sandro Knauß <bugs@sandroknauss.de>
Fixes Mirall issue #990
2013-09-12 13:32:14 +02:00
Daniel Molkentin
b488ad12c2
Do not build org and com theming when building from tar ball
...
Fixes #989
2013-09-12 12:56:24 +02:00
Daniel Molkentin
2dad027001
Do not build org and com theming when building from tar ball
...
Fixes #989
2013-09-12 12:55:12 +02:00
Daniel Molkentin
f97bb240d7
Setting thread priority is only possible after calling start()
2013-09-11 15:52:07 +02:00
Daniel Molkentin
574e029254
Setting thread priority is only possible after calling start()
2013-09-11 15:51:06 +02:00
Jenkins for ownCloud
91759c4a27
[tx-robot] updated from transifex
2013-09-11 06:40:51 -04:00
Klaas Freitag
ce5934461e
Do not en- or disable the watcher in setSyncEnabled.
...
The watcher is handled through the start and stop sync hooks in the
folder class. Even if the the folder is disabled and the watcher
fires, the folder does not schedule because it checks first if the
folder is enabled.
2013-09-11 12:33:07 +02:00
Klaas Freitag
80332fb6ab
Do not en- or disable the watcher in setSyncEnabled.
...
The watcher is handled through the start and stop sync hooks in the
folder class. Even if the the folder is disabled and the watcher
fires, the folder does not schedule because it checks first if the
folder is enabled.
2013-09-11 12:30:29 +02:00
