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
30e0a13bc5
invalid password: Improve wording
2013-04-16 14:28:00 +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
Daniel Molkentin
d68c4b379f
Unbreak self-signed certificate handling
2013-04-02 15:22:27 +02: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
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
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
136b699106
Make sure to restart sync after folder add.
2013-02-20 16:06:46 +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
ec120cd64c
Make folderman load folders at start and update later.
2013-02-18 18:31:29 +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
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
804aef6548
Remove stray code
2013-02-14 17:36:11 +01:00
Klaas Freitag
424b3a9dfc
cleanup comments and dupes.
2013-02-11 14:18:16 +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
6f9bbc431d
Properly stop syncing when connection manager opens.
2013-02-10 11:02:39 +01:00
Klaas Freitag
39a89e8fc7
Allow setting of custom poll interval through status.php
2013-02-09 14:04:04 +01:00
Klaas Freitag
08babbf38d
Set credentials in ownCloudInfo after these have been fetched.
2013-02-06 10:09:02 +02: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
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
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
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
Sebastian Meßmer
4caca2ce1a
The configuration directory is a static attribute in mirallconfigfile class
2013-01-14 00:48:26 +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
Daniel Molkentin
e6b9c16d04
Update About dialog
2012-12-20 20:35:21 +01:00
Daniel Molkentin
26c01cefa7
New icons for ownCloud client
...
--monoicons shows platform-specific monochrome icons
for now until we have a proper settings dialog.
2012-12-20 16:41:54 +01:00
Daniel Molkentin
3cb2e74d12
Notify user about new files.
...
Let's see if its too annoying,
we can still add a timer later
2012-12-12 15:00:38 +01:00
Klaas Freitag
5da634ed70
Transparent fallback to the former password storage if keychain is not
...
there.
2012-12-11 15:08:20 +01:00
Daniel Molkentin
36c9a29a7b
Move Logger into its own file, move it to libsync.
...
This fixes a linker error.
2012-12-05 16:45:28 +01:00
Klaas Freitag
22128781be
Use new logging api of csync.
2012-12-04 17:24:46 +01:00
Klaas Freitag
34dcff4ce2
Add a ownCloudWizard finished slot.
2012-12-04 17:05:17 +01:00
Klaas Freitag
bcbdfdd7ab
Some cleanups to avoid build warnings under win32.
2012-12-04 17:05:17 +01:00
Klaas Freitag
593636f135
User feedback on wrong passwd from KeyStore.
2012-11-28 10:44:25 +01:00
Daniel Molkentin
5173de5798
Theme: allow enforced locale
2012-11-19 12:10:46 +01:00
Daniel Molkentin
c5739b4d53
Remove extraneous legalese.
2012-11-15 01:07:51 +01:00
Klaas Freitag
a8dbed989b
Use CredentialStore to manage user credentials.
...
This fixes the bug that if the password is not stored in the cfg
file the user could not cancel the auth dialog. Moreover it handles
various credential backends better and gives a better user experience.
2012-11-13 11:19:34 +01:00
Klaas Freitag
4d08605b5b
Also compute overall status for disabled folders.
2012-11-05 11:36:38 +01:00