Klaas Freitag
cc16d19bc4
Removed unused defines.
2013-08-14 18:24:06 +02:00
Klaas Freitag
b96c2de2b7
Cleaned folder class, removed a couple of signals and helper classes.
2013-08-14 18:24:06 +02:00
Klaas Freitag
f882b80708
Fix wording to more consolidated style, Jan request.
2013-08-14 18:24:06 +02:00
Daniel Molkentin
4d7c014b23
Resize dialog
2013-08-14 17:47:10 +02:00
Daniel Molkentin
1f274699e5
Pressing F12 in Settings now open the log browser
2013-08-14 17:46:58 +02:00
Daniel Molkentin
697e355f07
Hide mono icon options if the resource has no mono icons
2013-08-14 16:35:42 +02:00
Olivier Goffart
f8e6326880
Default to not cancel
...
So that the owncloudcmd client is not blocked
2013-08-14 15:44:30 +02:00
Olivier Goffart
67c5f513aa
Fix compilation after merge
2013-08-14 15:36:34 +02:00
Olivier Goffart
0589bfc51b
Merge branch 'master' into propagator-ng
...
This just fix the conflict.
Do not compile or work yet
Conflicts:
src/CMakeLists.txt
src/mirall/csyncthread.cpp
src/mirall/csyncthread.h
src/mirall/owncloudfolder.cpp
src/mirall/syncfileitem.h
test/CMakeLists.txt
2013-08-14 15:19:21 +02:00
Olivier Goffart
04f32bd397
Revert "TMP threaded"
...
This reverts commit 5bb4c3be43
.
2013-08-14 14:59:32 +02:00
Olivier Goffart
e89bdfc422
Make the Pause button stop the sync
2013-08-14 14:57:56 +02:00
Olivier Goffart
c2cc9e62a7
Fix the brandwith limit
...
The unit in mirall are in kbytes/s, but csync expect byte/s
2013-08-14 14:57:56 +02:00
Daniel Molkentin
1f2ae0d061
Folder Wizard UI clean up
...
Input from Jan
2013-08-14 14:01:33 +02:00
Olivier Goffart
91a39588c6
re-enable the sync if the syncing was disabled because the connection is down at startup
2013-08-14 12:59:56 +02:00
Olivier Goffart
a642f86d5b
Detect connection failure from the polling
2013-08-14 12:34:03 +02:00
Olivier Goffart
00cf290574
reduce a bit the log output
2013-08-14 12:34:03 +02:00
Daniel Molkentin
b59952b539
Wrap custom message label
2013-08-14 11:58:03 +02:00
Daniel Molkentin
88b4ff9809
Wording changes proposed by Jan
2013-08-14 11:57:19 +02:00
Daniel Molkentin
ddd0965a82
Fix include after class rename
2013-08-14 11:11:47 +02:00
Klaas Freitag
0a9491ff46
Improved timestamp formatting in item sync progress dialog.
2013-08-14 08:04:46 +02:00
Klaas Freitag
32b44e3d87
Removed unused dialog class.
2013-08-14 08:04:46 +02:00
Klaas Freitag
268004b4ff
Get correct action kind from progress Dispatcher in case of Context
...
kind.
2013-08-14 08:04:46 +02:00
Daniel Molkentin
6c0f6ae62e
Make copy action copy all fields again
...
Fixes #863
2013-08-13 15:39:28 +02:00
Jenkins for ownCloud
094f2bb540
[tx-robot] updated from transifex
2013-08-13 08:12:11 -04:00
Daniel Molkentin
f4da7f1fb0
Merge pull request #857 from Arakmar/hiddenFix
...
Don't add empty entries in hidden files editor with an empty string or when cancel is clicked
2013-08-13 03:43:02 -07:00
Yoann Laissus
b058185d3b
Don't add empty entries in hidden files editor with an empty string
...
or when cancel is clicked
2013-08-12 13:10:16 +02:00
Jenkins for ownCloud
eecb981736
[tx-robot] updated from transifex
2013-08-11 07:07:58 -04:00
Daniel Molkentin
46b870e260
Revert "run tests verbosely"
...
This reverts commit ff2d59d32f
.
2013-08-09 14:45:49 +02:00
Olivier Goffart
1ffab7337d
add the temporary downloaded files to the exclude list
2013-08-09 14:10:21 +02:00
Olivier Goffart
82fb8c49cf
Do not clear the pending event in the polling anymore
...
This is useless, and can even cause problems now since polling only do
a sync when the server has actually changed
2013-08-09 14:10:21 +02:00
Daniel Molkentin
ff2d59d32f
run tests verbosely
2013-08-09 13:27:05 +02:00
Daniel Molkentin
0ced165b3e
Add tests for Utility namespace
2013-08-09 13:09:41 +02:00
Daniel Molkentin
d3378c131a
Fix formatting for 1 byte size in octetsToString()
2013-08-09 13:02:24 +02:00
Jenkins for ownCloud
0300a85295
[tx-robot] updated from transifex
2013-08-09 07:01:08 -04:00
Daniel Molkentin
60a116f3e0
Add tests for Utility namespace
2013-08-09 12:56:43 +02:00
Daniel Molkentin
ff4d2d488f
Add cancel button to wizard on Mac
...
Fixes #848
2013-08-09 01:08:46 +02:00
Daniel Molkentin
b0852b4cf5
No ... for entires that do not spawn a dialog
2013-08-08 20:27:16 +02:00
Daniel Molkentin
c047b4d4de
Seems autowrapping doesn't work everywhere. Enforce it
2013-08-08 17:52:09 +02:00
Daniel Molkentin
f054ca3f72
Disable Werror by default, set CSYNC_STRICT=ON to disable
2013-08-08 16:19:44 +02:00
Olivier Goffart
6655da9d24
Fix warning
2013-08-08 16:03:57 +02:00
Klaas Freitag
74b7d441c8
Bump version to 0.81.0
2013-08-08 16:00:20 +02:00
Daniel Molkentin
cc6abfc366
ChangeLog: 1.4.0beta1
2013-08-08 15:51:48 +02:00
Daniel Molkentin
4e3d4c3153
Credits: Add Jan
2013-08-08 15:51:36 +02:00
Klaas Freitag
1df602be26
Updated changelog for 0.81.0
2013-08-08 15:51:30 +02:00
Daniel Molkentin
c323041040
NSIS: install libjpeg for qjpeg4.dll
2013-08-08 15:39:34 +02:00
Daniel Molkentin
95d600c5f1
Fix proxy documentation, explain bandwidth limiter
2013-08-08 14:54:52 +02:00
Olivier Goffart
52a47fbc67
Force a sync run after 5 minutes
2013-08-08 14:32:14 +02:00
Klaas Freitag
4e7c069c1f
Some adds to the architecture documentation.
2013-08-08 14:19:13 +02:00
Klaas Freitag
f89ffa513a
Bump version to 1.4.0beta1
2013-08-08 13:08:23 +02:00
Daniel Molkentin
0086916b4d
Retain all old settings when running the setup wizard
...
Fixes #825
Fixes #759
2013-08-08 13:04:05 +02:00