Daniel Molkentin
6b15b7a58f
Update detector: make it possible to skip updates.
...
Fixes issue #588 .
2013-04-30 17:46:07 +02:00
Daniel Molkentin
fee0aae975
new wizard: Better separate folder names in strings.
2013-04-30 17:46:07 +02:00
Klaas Freitag
1e677a5f0f
Fixed default target dir to / and fixed logging text.
2013-04-30 13:53:13 +02:00
Klaas Freitag
3f3f6c0f39
Move setPlaceholderText to correct class.
2013-04-29 14:09:05 +02:00
Klaas Freitag
5dd53b48ef
Add missing lineedit method for ancient Qt versions
2013-04-29 11:08:37 +02:00
Klaas Freitag
a215e11b20
Merge development branch with new setup dialog.
2013-04-29 10:20:01 +02:00
Klaas Freitag
c848ff4bdb
New setup dialog, simplified version.
2013-04-27 22:24:32 +02:00
Klaas Freitag
5aa8f5bc01
Added own CookieJar to not return a Session Cookie, rem Auth Callback
...
The auth callback is not needed as we send an Basic Auth header.
2013-04-27 22:22:20 +02:00
Klaas Freitag
6c5d5a543c
Simplified config file write method, removed don't store pwd.
2013-04-27 22:21:28 +02:00
Daniel Molkentin
238111be09
Find csync_version.h, local config.h
2013-04-26 10:48:02 +02:00
Klaas Freitag
6f0820a3ed
Add QProgressIndicator to source list
2013-04-26 10:47:17 +02:00
Daniel Molkentin
2789522948
Folder/ownCloudFolder: Clean up secondPath stuff
2013-04-25 16:06:31 +02:00
Daniel Molkentin
55a56cc275
Find csync_version.h, local config.h
2013-04-25 13:19:38 +02:00
Daniel Molkentin
311bd39100
Add simplified FancyLineEdit from Qt Creator to 3rdparty
2013-04-24 13:36:25 +02:00
Klaas Freitag
fab77a15f0
Fix build after merge
2013-04-24 13:33:26 +02:00
Klaas Freitag
09e7f5c618
Add qprogressindicator widget
2013-04-24 11:45:53 +02:00
Klaas Freitag
c5a674b1df
More work on new Connection dialog. First working version.
2013-04-24 11:40:29 +02:00
Klaas Freitag
7cc73ed46c
Merge feature branch that introduces non terminating csync.
2013-04-23 16:52:02 +02:00
Klaas Freitag
8928c87fc3
Removed silly configDir hack from thread.
2013-04-22 15:06:28 +02:00
Mario Enrico Ragucci
de99c0c7e7
Silently ignore "installed = true" string in JSON string returned by status.php
2013-04-21 00:46:37 +02:00
Klaas Freitag
9f0348979b
Simplify csyncthread with keeping csync ctx intact
2013-04-20 13:15:27 +03:00
Daniel Molkentin
ea85d68a26
Revert non-working hack
2013-04-19 16:20:30 +02:00
Daniel Molkentin
fb0a883f7b
Init member to 0, remove nonsensical if (foo) delete foo
2013-04-19 16:20:30 +02:00
Daniel Molkentin
1f361b7260
Make certificateChain() thread safe
...
Fixes #487 , #491 , #454
2013-04-18 14:02:20 +02:00
Klaas Freitag
cd7d2a0778
Set path for configure_file of desktop file.
2013-04-17 16:21:05 +02:00
Klaas Freitag
a4be3f304d
Set log verbosity before calling csync_init.
2013-04-17 15:29:44 +02:00
Daniel Molkentin
844d8eba47
Fix tr plural usage
2013-04-17 01:21:15 +02:00
Daniel Molkentin
5e65945a53
filitemdialog: more wording changes
2013-04-16 17:28:03 +02:00
Daniel Molkentin
428040762f
fileitemdialog: GUI feedback for the copy action
2013-04-16 16:49:53 +02:00
Daniel Molkentin
30e0a13bc5
invalid password: Improve wording
2013-04-16 14:28:00 +02:00
Daniel Molkentin
275c2b1a6b
Fix misleading balloon titles
...
Fixes #546
2013-04-16 11:24:07 +02:00
Daniel Molkentin
acdb624713
safer approach for detecting duplicate sync runs
2013-04-15 15:55:54 +02:00
Daniel Molkentin
3cae8e7124
Remove debugging code
2013-04-15 14:32:23 +02:00
Daniel Molkentin
fcde01fd4c
Clarify string in folder wizard
2013-04-11 10:57:19 +04:00
Klaas Freitag
aa6160ab62
Fixed some valgrind warnings.
2013-04-08 14:50:47 +02:00
Daniel Molkentin
f74aa1e9a6
terminate if more than one thread is being started.
2013-04-04 17:25:53 +02:00
Klaas Freitag
86525570aa
Fix default config storage path.
2013-04-04 15:19:45 +02:00
Klaas Freitag
be5a50a000
Merge branch 'confdir' of https://github.com/smessmer/mirall into smessmer-confdir
2013-04-03 14:42:13 +02:00
dragotin
7309a894bc
Merge pull request #477 from rominf/master
...
Fix for bug with folders adding
2013-04-03 04:39:17 -07:00
Daniel Molkentin
d68c4b379f
Unbreak self-signed certificate handling
2013-04-02 15:22:27 +02:00
Klaas Freitag
bec2f7c9b9
Removed verbose logging on Win32.
2013-03-28 11:14:16 +01:00
Daniel Molkentin
0ad2bd4b91
Add favlink generation support for Nautilus
2013-03-25 18:00:58 +01:00
Markus Goetz
d7a93c74aa
OS X: Fix creation of Finder Favorite
2013-03-25 14:57:34 +01:00
rominf
a8f0e79046
Skipping folders with no absolute path.
2013-03-23 10:48:37 +04:00
Daniel Molkentin
1831a975eb
SSLErrorDialog: We cannot use the existing key chain
...
... use the one returned by the new server instead.
2013-03-22 14:59:22 +01:00
Cedric Bellegarde
8165b83a27
Check for service availability
2013-03-22 11:58:55 +01:00
Cedric Bellegarde
fa62c270e6
Merge git://github.com/owncloud/mirall
2013-03-22 11:40:58 +01:00
Cedric Bellegarde
c03199e78a
Re add space
2013-03-22 11:35:25 +01:00
Cedric Bellegarde
f346503534
Better fdo detection
2013-03-22 11:34:21 +01:00
Daniel Molkentin
337c6d3e4e
Try to avoid crash on Mac OS during setup
...
... by moving setupFavLink to a place only called
if the folder to be referenced exists for sure.
2013-03-21 12:50:47 +01:00
Daniel Molkentin
c633302f31
Use the certificateChain() in the SSL error dialog
...
This includes the self-signed certificate anyway, and the previous
behavior led to funny side-effects.
2013-03-20 15:53:55 +01:00
Cedric Bellegarde
1315ca2a57
Move files to correct location
2013-03-20 10:19:55 +01:00
Cedric Bellegarde
2f0474a467
Add support for freedesktop notifications
2013-03-20 10:03:49 +01:00
Daniel Molkentin
284285d441
Do not follow symlinks when recursing
...
We do not support symlinks anyway
2013-03-18 14:12:25 +01:00
Klaas Freitag
9d2c3ebad3
Move config.h out of header files.
2013-02-25 09:54:19 +01:00
Daniel Molkentin
ad063b0634
Make chinese translations work on OS X
...
... by mapping chinese script codes to country
codes as used by Qt and Transifex.
2013-02-24 15:44:38 +01:00
Daniel Molkentin
8765538458
Be more permission when loading languages
...
Accept languages when they only exist for mirall,
but not for Qt and QtKeychain (Fixes #359 ). This
is more permissive than before, but while fixing
#359 , it became evident that supporting "partial"
translations might actually be beneficial.
2013-02-24 15:44:38 +01:00
Daniel Molkentin
e85291c4ba
en language is implied
2013-02-21 15:17:13 +01:00
Klaas Freitag
4ba85311da
Handle all cases in switches.
2013-02-21 13:36:51 +01:00
Daniel Molkentin
3cf7003101
Load UI languages instead of locales where possible
...
Load Qt translations consistently along the way.
This only has been verified on mac and needs adoption
for win32.
2013-02-21 13:19:54 +01:00
Klaas Freitag
ae558a5889
Add a appNameGUI method to the theming.
2013-02-21 12:21:42 +01:00
Klaas Freitag
55a4fd752d
Fix commit fd83bf - add treewalk success check.
2013-02-20 17:26:07 +01:00
Klaas Freitag
136b699106
Make sure to restart sync after folder add.
2013-02-20 16:06:46 +01:00
Klaas Freitag
fd83bf2089
Remove unused variable doTreeWalk.
2013-02-20 10:06:45 +01:00
Klaas Freitag
817039ddf3
Simplify and fix startup: Steer starting of sync from folderman.
2013-02-19 17:24:10 +01:00
Klaas Freitag
6d6deaf6c4
Setup folders added after setup wizard ended.
2013-02-19 12:04:36 +01:00
Klaas Freitag
9c63b89bac
Removed useless warning.
2013-02-19 09:34:33 +01:00
Klaas Freitag
ec120cd64c
Make folderman load folders at start and update later.
2013-02-18 18:31:29 +02:00
Klaas Freitag
a9173b1aa1
Add setters for update check and max log lines
2013-02-18 17:17:03 +02:00
Klaas Freitag
89f7f75af2
If a new server is configured, take the proxy config to the new config
...
file.
2013-02-18 17:16:10 +02:00
Daniel Molkentin
8809ac0c4a
remove unused connect
2013-02-18 14:56:50 +01:00
Daniel Molkentin
7a03164a9a
Handle server offline state on application start gracefully
2013-02-18 14:56:50 +01:00
Daniel Molkentin
38954c2193
Remove obsolete signal.
2013-02-15 19:29:38 +01:00
Daniel Molkentin
5954fb280c
Centralize error handling for csync steps
...
...as a preparation for offline handling.
As a side-effect, removed the last instance
of goto in mirall.
2013-02-15 19:29:27 +01:00
Daniel Molkentin
8e63652fb3
Send OEM string to update detector.
2013-02-15 18:39:25 +01:00
Daniel Molkentin
1c70fb3ba4
Set csync config dir in mirall properly
...
Otherwise canceling the sync cannot remove the lock file
2013-02-14 17:36:11 +01:00
Daniel Molkentin
e5af8e87b3
Fix crash when pausing mirall.
2013-02-14 17:36:11 +01:00
Daniel Molkentin
bfbec24f43
Add more debug in case inotify fails
...
We should probably make this at least a visible error, because it's a
limitation set by the kernel/the distro and we would require root
permissions to adjust the value.
Right now all that happens is that syncing is not immediate, but only
run every 30 secs (due to server polling).
2013-02-14 17:36:11 +01:00
Daniel Molkentin
8dd97a358a
Introduce SyncPrepare state
...
SyncPrepare is when the folder class prepares the actual syncing,
i.e. does treewalks and runs the reconceiler in case of mirall. The actual
SyncRunning state will only be entered if there is actually anything to
sync.
Fixes #289
2013-02-14 17:36:11 +01:00
Daniel Molkentin
7290afc6fe
Minimize Sync notification notification
...
Notifies only in the end of a complete sync run now
Migitates/fixes #314
2013-02-14 17:36:11 +01:00
Daniel Molkentin
2ba20369ea
Remove unused gitfolder class for now
2013-02-14 17:36:11 +01:00
Daniel Molkentin
804aef6548
Remove stray code
2013-02-14 17:36:11 +01:00
Daniel Molkentin
85f49b6af4
Fix guard position
2013-02-14 17:36:11 +01:00
Daniel Molkentin
68afc6011d
proxy dialog: no extra heading
2013-02-14 17:36:11 +01:00
Daniel Molkentin
524ffcd0e1
owncloud setup: Fix label style
2013-02-14 17:36:11 +01:00
Klaas Freitag
6d984b505d
Handle not stored password correctly.
2013-02-11 14:21:53 +01:00
Klaas Freitag
8d9336f9f4
Removed obsolete scheduler start.
2013-02-11 14:21:21 +01:00
Klaas Freitag
2b5e694181
Set default argument to method.
2013-02-11 14:20:32 +01:00
Klaas Freitag
aa983e4966
Make user password dialog real async working.
2013-02-11 14:18:45 +01:00
Klaas Freitag
424b3a9dfc
cleanup comments and dupes.
2013-02-11 14:18:16 +01:00
Klaas Freitag
4501ec10dc
Make sure that journals are wiped if server changes + some utility
...
functions.
2013-02-10 20:04:03 +01:00
Klaas Freitag
699ae176df
Revert "Allow setting of custom poll interval through status.php"
...
This reverts commit 39a89e8fc7
.
Conflicts:
src/mirall/folderman.cpp
src/mirall/folderman.h
2013-02-10 14:57:57 +01:00
Klaas Freitag
cac5f81388
Clear pending network requests in setup wizard on back.
2013-02-10 14:03:09 +01:00
Klaas Freitag
28af8068e9
Always return QNetworkReply* on mkdir and also on checkInstall.
2013-02-10 14:01:38 +01:00
Sebastian Kügler
a1d64af7b1
API additions for the Plasma client
...
This patch contains a few (source-compatible) API additions needed for
the Plasma client.
* return QNetworkReply* to caller for tracking status and error of
requests such as mkdir, getWebDAVPath and getRequest
* Add a setter for the QNetworkAccessManager. This allows us to route at
least some of the network requests through KIO in the Plasma client
* Add a setter for the remotePollInterval. This should be enough API to
* make it possible to adapt the polling interval to the client's machine
state, e.g. sync less often on battery, or somesuch
2013-02-10 13:10:53 +01:00
dragotin
edbb79b79c
Merge pull request #5 from sebasje/mkdirreply
...
Return QNetworkReply from remote mkdir
2013-02-10 02:34:36 -08:00
dragotin
a000a7b52e
Merge pull request #4 from sebasje/requestreply
...
Return QNetworkReply from getRequests
2013-02-10 02:34:14 -08:00
Klaas Freitag
0a427541d6
Added config file setter for poll interval. Thx for pull request.
2013-02-10 11:27:21 +01:00
Klaas Freitag
1c297c56a2
Stop authentication tries already after the first attempt without
...
success.
2013-02-10 11:02:39 +01:00
Klaas Freitag
6f9bbc431d
Properly stop syncing when connection manager opens.
2013-02-10 11:02:39 +01:00