Daniel Molkentin
89438f7ace
Make SyncDisabler local to slotAddFolder
...
This also allows us to update the folder state as
soon as the wizard is being closed.
2013-06-12 09:27:20 +02:00
Daniel Molkentin
d323ec5dd9
FileItemDialog: more clarity in the label
...
- finished %n sec ago -> last finished %n sec ago
- switch to minutes after 60 seconds
2013-06-11 22:34:37 +02:00
Daniel Molkentin
bb5cf37330
Fix issues found after review
...
- use safer formatting
- remove unnecessary condition
2013-06-11 22:33:11 +02:00
Daniel Molkentin
4b0bdd648c
Do not repeat old strings
...
Fixes #678 , fixes #494
2013-06-11 22:14:32 +02:00
Olivier Goffart
5588fbe695
Fix clicking on the systray when the setup is not finished
...
We should raise the wizard
2013-06-11 21:32:44 +02:00
Olivier Goffart
12ea381205
Do not re-use the configuration wizard.
...
Create it on demand.
This allow yo alays keep a cleen state.
Mirall issue #668
2013-06-11 21:15:37 +02:00
Daniel Molkentin
99fbf25fb2
Keep the member variable, avoids double instanciation
2013-06-11 18:41:35 +02:00
Daniel Molkentin
b37645e14d
Revert "Put FolderWizard on the stack"
...
This reverts commit 1ec5a1aaa2
.
2013-06-11 18:33:39 +02:00
Daniel Molkentin
1ec5a1aaa2
Put FolderWizard on the stack
2013-06-11 18:19:09 +02:00
Daniel Molkentin
3eb7acde25
Folder wizard: use native separators in path lineedit
2013-06-11 18:18:38 +02:00
Daniel Molkentin
e53e39cfad
Remove obsolete members from enum
2013-06-11 18:17:34 +02:00
Daniel Molkentin
1a17f40233
Remove debug
2013-06-11 18:17:22 +02:00
Daniel Molkentin
10094a997a
Proxy Dialog: default to port 8080
2013-06-11 17:46:00 +02:00
Daniel Molkentin
2af38b093f
Fix status delegate
...
- remove magic values
- remove backend icon, put status icon in the front
- elide text when > list view width
- use list view font
2013-06-11 14:46:12 +02:00
Daniel Molkentin
b03c168175
Status dialog> Do not adjust pen when using Vista Style
...
Light blue and white are not contrasting enough
2013-06-10 21:29:45 +02:00
Daniel Molkentin
1c6bc84d2d
Wizard: Always initialize all labels
2013-06-10 21:29:45 +02:00
Olivier Goffart
541239c17b
Make the message box more explicit when all files have been removed
...
Also clean the db if the user wish to keep the files
2013-06-10 15:58:02 +02:00
Daniel Molkentin
74b4ade15a
Add missing return statement
2013-06-10 15:37:52 +02:00
Daniel Molkentin
54e4217216
Add Missing LGPL_EXCEPTION.txt
...
Fixes #671
2013-06-10 07:38:35 +02:00
Olivier Goffart
d2579a7754
Warn if we detect that all fles are about to be removed.
2013-06-08 15:41:53 +02:00
Daniel Molkentin
76580840dd
Fix misleading confirmation message
...
Fixes #459
2013-06-07 22:01:26 +02:00
Olivier Goffart
779e59156c
Added --logexpire to remove the log after some hours
2013-06-07 18:58:16 +02:00
Daniel Molkentin
b0f0d0b1cd
qDebug() ises local8bit, not utf-8.
...
Fixes #651
2013-06-07 17:28:04 +02:00
Daniel Molkentin
858dcb53bd
Status dialog delegate: Use font from option
2013-06-06 22:12:18 +02:00
Daniel Molkentin
9d7db88fcb
status dialog: Use contrast color for highlights
...
Fixes #440 .
2013-06-06 22:11:36 +02:00
Daniel Molkentin
2099b7c6a0
ensureJournalGone: fix logic
2013-06-06 21:43:05 +02:00
Daniel Molkentin
4442564ad2
Clean up slotAddFolder
...
Ensure folder sync scheduling is off in the meanwhile.
2013-06-06 21:27:15 +02:00
Daniel Molkentin
12148b5c9b
remove journal when adding a new sync on an existing folder
2013-06-06 17:59:50 +02:00
Daniel Molkentin
d7d77a49fc
Show help on Windows
...
We have no console, so show a message box.
2013-06-06 16:00:51 +02:00
Daniel Molkentin
0c959e8661
Windows: Log change of power state
2013-06-05 16:14:20 +02:00
Daniel Molkentin
0090862313
wizard: show native separators on folder chooser button
2013-06-04 00:46:34 +02:00
Daniel Molkentin
a4a68c6622
Wizard: Better wording when renaming failes
2013-06-03 23:34:28 +02:00
Klaas Freitag
49b4c341ae
Really unload folders before reconfiguring.
2013-06-03 17:27:06 +02:00
Olivier Goffart
7c1f91abdd
Add the --logdir commandline option
...
To log to a different file for every sync.
This also changed a QueuedConnection to AutoConnection, that way we
directly save the log from the main thread in the file without waiting
for the event loop (so if it crashes before, the log has been writen)
2013-06-03 16:25:41 +02:00
Klaas Freitag
1f2ba7e254
Handle rename fails for backup reasons correctly.
2013-06-03 15:47:39 +02:00
Klaas Freitag
8014bcb7c4
Check for emptiness before backuping the entire dir.
2013-06-03 15:47:07 +02:00
Klaas Freitag
b1c8bf5954
Fix backup name generation.
2013-06-03 15:46:41 +02:00
Klaas Freitag
0eb6740bac
Added default argument to terminateSyncProcess
2013-06-03 15:46:11 +02:00
Klaas Freitag
96531b548a
Minor Cleanups.
2013-06-03 15:45:28 +02:00
Klaas Freitag
f3371360ed
Check the CredentialStore state before fetching creds again.
2013-06-03 15:44:58 +02:00
Daniel Molkentin
b028ca0738
Merge pull request #650 from manolopm/master
...
Fixes for windows client when setup server url customization
2013-05-31 07:25:09 -07:00
Daniel Molkentin
a9aab30d55
Display proxy errors
2013-05-31 16:16:56 +02:00
Daniel Molkentin
efbad3a3c8
Propagate proxy changes to csync at run time
2013-05-31 16:16:41 +02:00
Manuel Padron Martinez
b6ed959f98
Removes server url label if a custom url is defined
...
Signed-off-by: Manuel Padron Martinez <manolopm@gmail.com>
2013-05-31 04:46:26 +01:00
Manuel Padron Martinez
477953f965
Put wizard url customization before connect signals
...
Signed-off-by: Manuel Padron Martinez <manolopm@gmail.com>
2013-05-31 04:45:48 +01:00
Daniel Molkentin
aaf59cece5
Wizard: Normalize directory separators
2013-05-29 17:24:59 +02:00
Daniel Molkentin
e88b7e8ec2
Centralize User Agent string and use in UpdateDetector
2013-05-29 16:13:38 +02:00
Daniel Molkentin
078b09b5f4
Remove obsolete include
2013-05-29 16:12:42 +02:00
Daniel Molkentin
0d06fe764a
Status dialog: Use correct font metrics
...
This avoids cutting charcters such as 'y'.
2013-05-29 14:46:02 +02:00
Daniel Molkentin
94f8c39a9e
Proxy settings: Also keep proxy user/pwd
...
make sure not to use it when the user
has asked us not to.
Simplify setupProxy()
2013-05-29 12:56:23 +02:00
Daniel Molkentin
7d1bd9da86
Properly deal with SOCKS proxies
...
Fixes #10
2013-05-29 02:14:40 +02:00
Daniel Molkentin
ed8cdf6910
Remember proxy settings even after switching type
...
Fixes #649
2013-05-29 01:41:04 +02:00
Daniel Molkentin
7ee83847c8
Do not try to reset the wizard when visible
2013-05-29 01:30:00 +02:00
Daniel Molkentin
52eca1362f
Delete QWizard on destruction
2013-05-29 01:29:56 +02:00
Daniel Molkentin
eec1af09c4
Wizard: Fix rich text label layouting
2013-05-29 01:17:12 +02:00
Daniel Molkentin
c651c8cbf9
Wizard: Improve wording.
2013-05-29 01:16:52 +02:00
Daniel Molkentin
da6a398624
Wizard: Warn on re-setup with multiple folders
2013-05-28 20:25:31 +02:00
Daniel Molkentin
1418512a9f
More cheating on proxies: Add OS to User-Agent
2013-05-28 19:35:30 +02:00
Daniel Molkentin
dd2859880b
Set User-Agent to contain Mozilla/5.0 string
...
A blatant lie for a blatant abuse of Firewall filters.
2013-05-28 15:44:41 +02:00
Daniel Molkentin
f38d8ba2e4
Improve wizard in edit mode
2013-05-28 14:51:49 +02:00
Daniel Molkentin
fdd52a2520
Kill non-boxed mode for now
2013-05-28 14:51:48 +02:00
Daniel Molkentin
e2c0792043
take local folder path from property
...
This gets set by slotSelectFolder() and from the wizards caller.
2013-05-28 14:51:41 +02:00
Daniel Molkentin
e8889530b0
Fix owncloud theme icon
2013-05-28 14:42:41 +02:00
Klaas Freitag
23f67d950a
Handle password change correct, add "sync from scratch".
...
The setup wizard now destinguishes if there was already a configuration
or not. If yes, it's going to password-change mode. Also added a checkbox
that allows to start a sync from a cleared local directory.
2013-05-26 14:04:11 +02:00
Klaas Freitag
0bd1f507ab
Added a checkbox "start sync from scratch".
2013-05-26 13:57:28 +02:00
Klaas Freitag
2bcfc143f6
Let the folderman create a new sync directory.
...
If a sync directory exists its moved to a backup path and created new.
That allows to start a sync "from scratch".
2013-05-26 13:56:51 +02:00
Klaas Freitag
9dc21bf8a3
Let the keychain return new creds during async save.
...
The credentials are asynchronously saved. The credentialstore now returns
the creds even if the saving has not yet finished but is running, for that
the new state AsyncWriting was added. That makes the start of the sync
after the password was changed more reliable.
2013-05-26 13:55:23 +02:00
Klaas Freitag
70f627ba06
Fix the folder setup wizard.
2013-05-24 09:54:48 +02:00
Daniel Molkentin
0683c26d41
Make setting custom folders work again
...
Also, ensure that opening the local directory from the wizard
will work on Windows.
2013-05-23 01:51:05 +02:00
Daniel Molkentin
dbc085d4d4
Fix systray class when built without FDO support
2013-05-22 17:39:49 +02:00
Daniel Molkentin
804eaa700e
Remove bogus debug output
2013-05-22 15:58:54 +02:00
Daniel Molkentin
62ad2f19e3
Setup Wizard: Make server/folder buttons work
2013-05-21 14:25:31 +02:00
Daniel Molkentin
14f55420f9
Remove obsolete connect statement
2013-05-21 14:20:56 +02:00
Daniel Molkentin
d4ea0ba6ba
Merge branch 'master' of git://github.com/gnumdk/mirall
...
Conflicts:
CMakeLists.txt
As per PR 457
2013-05-20 16:54:49 +02:00
Daniel Molkentin
3a50eece9e
More theming refactoring
2013-05-17 20:56:17 +02:00
Daniel Molkentin
44f0fb0242
Fix broken include
2013-05-17 20:12:31 +02:00
Daniel Molkentin
c210e2b72f
Remove obsolete miralltheme
2013-05-17 20:11:16 +02:00
Daniel Molkentin
0f03b47a46
Make new connection wizard themable
2013-05-17 18:05:22 +02:00
Daniel Molkentin
c923e0803e
Add SyncResult::SyncPrepare case to FileItemDialog
2013-05-17 12:33:02 +02:00
Klaas Freitag
f334b6349b
Add a call to quit to make the thread ending the loop
2013-05-16 17:35:40 +02:00
Klaas Freitag
2ff9fcfa1d
Fix crash if _thread is not initialized before.
2013-05-16 13:26:05 +02:00
Daniel Molkentin
302fdeb1f9
Use UTF-8 for basic auth
...
Slightly off-specs, and fails for non UTF-8 setups,
but the ownCloud server itself expects UTF-8 encoding.
2013-05-09 22:01:39 +02:00
Daniel Molkentin
eea8542fc0
Quit app/abort sync gracefully.
2013-05-09 21:55:28 +02:00
Daniel Molkentin
a36d79e993
Fix make install
2013-05-04 17:01:14 +02:00
Daniel Molkentin
be5c1b2072
Fix build
2013-05-04 16:38:39 +02:00
Daniel Molkentin
f0bd1ea48e
Add connectionvalidator class
2013-05-04 16:01:45 +02:00
Daniel Molkentin
90d0460a42
Remove dummy artwork, dead switches
2013-05-04 15:55:04 +02:00
Daniel Molkentin
c15ce2b20b
Remove last traces of localRun
2013-05-04 15:16:53 +02:00
Daniel Molkentin
b51f210bfa
Drop (broken) mirall binary
...
This remove all non-ownCloud backends, as well
as all obsolete wizard pages. CSync is now
a mandatory dependency.
2013-05-04 14:03:51 +02:00
Daniel Molkentin
105c76c055
Fix sizing problems in the new wizard dialog.
2013-04-30 21:51:48 +02:00
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
Klaas Freitag
f62626e3eb
Delete existing folders properly before adding new ones.
2013-02-10 11:02:38 +01:00
Klaas Freitag
39a89e8fc7
Allow setting of custom poll interval through status.php
2013-02-09 14:04:04 +01:00
Klaas Freitag
38a8096732
Fixed sorting of header entries, ie. public / protected / private.
2013-02-09 14:03:05 +01:00
Klaas Freitag
d358c839ce
Fixed typos.
2013-02-09 12:46:08 +01:00
Sandro Knauß
cfa777260c
removing version for mirallsync (it is'nt build anymore :)
2013-02-08 18:37:29 +01:00
Sandro Knauß
66fc273db6
merging with default
2013-02-08 18:36:26 +01:00
Klaas Freitag
dbb0cbaff8
Removed build of obsolete mirallsync lib which is equal to owncloudsync.
2013-02-08 19:18:36 +01:00
hefee
9c9e377cf4
adding soname version to libowncloudsync and libmirallsync
2013-02-08 18:21:59 +01:00
Klaas Freitag
07258deaaf
Fix build for mirall target.
2013-02-06 15:05:34 +01:00
Klaas Freitag
7b53e0f953
Fix return from non void function.
2013-02-06 14:58:31 +01:00
Klaas Freitag
2ac764bd1a
Fix compile without OWNCLOUD_CLIENT define, thx Jenkins
2013-02-06 11:58:14 +02:00
Klaas Freitag
82d2851a6b
Set username in connection dialog if there.
2013-02-06 11:42:36 +02:00
Klaas Freitag
7a3be71452
The user name is not really to be protected.
2013-02-06 11:41:47 +02:00
Klaas Freitag
977a513ee5
Always set the connect result to en/disable the Finish button.
2013-02-06 11:21:50 +02:00
Klaas Freitag
22cbebb7a7
Fix build on debian with ancient Qt, thanks Mr. Jenkins for notifying.
2013-02-06 10:41:25 +02:00
Klaas Freitag
72b2e6778a
Use new ownCloudInfo / CredentialStore interface.
2013-02-06 10:09:02 +02:00
Klaas Freitag
08babbf38d
Set credentials in ownCloudInfo after these have been fetched.
2013-02-06 10:09:02 +02:00
Klaas Freitag
2ae5ae6962
Change interface to not support customHandles.
2013-02-06 10:09:02 +02:00
Klaas Freitag
fa6331a40a
Removed use of CredentialStore from class and added setter for
...
credentials.
This makes handling of temporar credentials for the setup dialog easier
and streamlines the code.
2013-02-06 10:09:02 +02:00
Klaas Freitag
cece465947
Link libdl explicitely.
2013-02-06 10:09:02 +02:00
Daniel Molkentin
0bcb65db29
Do not allow to press Finished if connection to the server fails
...
This does not yet consider cases where the connection
succeeds but webdav fails.
2013-02-05 15:40:59 +01:00
Daniel Molkentin
fd30d8b0d1
Typo
2013-02-03 13:39:34 +01:00
Daniel Molkentin
5944acf8a6
Hack: Do not leak FDs when neon is built with gnutls (Linux)
...
Previously, this would cause Mirall to crash sooner or later.
Fixes #154
2013-02-03 13:37:03 +01:00
Michael Kent
854852959c
Changes to handling of command line options. Fix a segmentation fault with owncloud --help. Add -h as help short. If a commandline argument isn't recognized, print that it isn't recognized, print help, and abort.
2013-01-28 22:19:14 -06:00
Daniel Molkentin
d681066dc2
Results bubble: _localPrefix might not end in a separator
2013-01-26 20:47:20 +01:00
Daniel Molkentin
11e06c33db
Fix compilation on win/mac
2013-01-25 15:46:23 +01:00
Daniel Molkentin
c0f2f5bcaa
Load Qt translations from app dir/bundle, too
2013-01-25 15:41:18 +01:00
Klaas Freitag
4fac62560e
Removed remove of list of configured sync folder on reconfiguration.
...
The removal of the configured folders was needed as long as the
csync journal was based in on the folder name of the sync folder.
Now that every folder has its own sync journal its not longer needed.
2013-01-25 11:33:00 +01:00
Daniel Molkentin
aca965f111
Fix favlink generation on windows
2013-01-23 17:22:38 +03:00
Daniel Molkentin
5dbd987df3
Mirall != owncloud client. Move about dialog to theme.
2013-01-23 13:45:50 +01:00
Daniel Molkentin
e37fc8c6e5
tr: Don't hardcode app name in string
2013-01-23 13:45:50 +01:00
Klaas Freitag
7614776e10
Fixed isComplete() for credential setup dialog.
2013-01-23 10:57:45 +01:00
Daniel Molkentin
e0332deffc
SSL: Use better test.
...
The other one was not working anyway.
2013-01-22 15:29:14 +01:00
Daniel Molkentin
afe6caf406
Remove stray object
2013-01-22 15:29:14 +01:00
Klaas Freitag
862a9d938c
Handle missed case in switch statement.
2013-01-22 15:08:04 +01:00
Klaas Freitag
80108727c4
Linux: Work around keychain shortcoming if chain does not contain
...
a password entry.
2013-01-22 12:08:56 +01:00
Klaas Freitag
84e3d6278d
Check for empty user in keychain key.
2013-01-21 18:36:03 +01:00
Klaas Freitag
a1bf324f47
normilize url before writing, error checks.
2013-01-21 16:33:52 +01:00
Klaas Freitag
1b8f7059e3
Fix pre initialization of _state in fetchCredentials().
2013-01-21 15:23:44 +01:00
Daniel Molkentin
7794480da0
csync: Put up the QNAM key chain for comparison
...
Comparing with the CA certs will not help with
intermediates, and other cases.
2013-01-21 13:33:33 +01:00
Daniel Molkentin
0171b8b998
Make hash formatting static
...
no need for class instanciation.
2013-01-21 13:33:33 +01:00
Klaas Freitag
915764cc52
If credentials are ok, do not fetch them again from store.
2013-01-21 13:32:52 +01:00
Klaas Freitag
76653fcedb
Minor: removed bogus stuff.
2013-01-21 11:43:39 +01:00
Daniel Molkentin
9af862b455
Fix make install, clean up
2013-01-18 22:15:08 +01:00
Daniel Molkentin
0f36dc03c4
FileItemDialog: Add copy to clipboard functionality
2013-01-17 10:35:08 +01:00
Daniel Molkentin
5e3f2cf25a
Remove legacy configuration options.
...
They were not used anyway.
2013-01-16 18:03:40 +01:00
Daniel Molkentin
f678629734
Fix proxy auth
...
- The port was not set correctly
- The password was read base64 encoded, but not read stored as such
2013-01-16 17:50:26 +01:00
Daniel Molkentin
87df74e4d0
Fix: pause icon not visible
2013-01-16 14:41:12 +01:00
Daniel Molkentin
45c82a2746
Go offline when server is in maintenance.
2013-01-16 14:41:12 +01:00
Klaas Freitag
bc3938daa7
A new sync file protocol dialog.
2013-01-15 20:42:09 +01:00
Klaas Freitag
07034daffe
Take valid caList from QSslSocket::defaultCA.
2013-01-14 12:13:51 +01:00
Klaas Freitag
dca8ecb929
Remove bogus spaces.
2013-01-14 12:13:50 +01:00
Klaas Freitag
dd2eecec42
Remove bogus reset after creds were written.
2013-01-14 12:13:50 +01:00
Klaas Freitag
11dbacab60
Exclude desktop file handling for windows platform.
2013-01-14 12:13:50 +01:00
Sebastian Meßmer
4caca2ce1a
The configuration directory is a static attribute in mirallconfigfile class
2013-01-14 00:48:26 +01:00
Daniel Molkentin
280dd205d9
setup wizard: Improve wording and context
2013-01-11 17:10:31 +01:00
Daniel Molkentin
5c495265f4
Consolidate theming support.
...
This implements out-of-repository-theming, and removes the old
custom.ini theming that never worked on all platforms and had
no straight deployment story.
The new approach requires the CMAKE variable OEM_THEME_DIR to
point to a directory that must at least contain an OEM.cmake file
(check OWNCLOUD.cmake for possible options) as well as a themes.qrc
and a themes/ directory that directly correspond to the ones in
the source tree.
2013-01-10 17:16:59 +01:00
Daniel Molkentin
9cdf2d8150
Remove potentially dangerous processEvent calls
2013-01-10 17:16:58 +01:00
Sebastian Meßmer
e0645b4b63
Allow setting the configuration directory on command line
2013-01-02 19:08:14 +01:00
Daniel Molkentin
4ce55a44ba
Klaas > Danimo, I am rather unpolite...
...
Also, fix whitespace errors
2012-12-21 01:16:54 +01:00