Commit Graph
6388 Commits
Author SHA1 Message Date
Klaas Freitag b74cfcfec5 Add missing ifdef QTKEYCHAIN. 2012-12-04 18:11:24 +01:00
Daniel Molkentin bc67756ff6 Fix typo 2012-12-04 17:48:14 +01:00
Daniel Molkentin eccd12923b factor inotify out of folderwatcher 2012-12-04 17:48:14 +01:00
Klaas Freitag 5d958a4c07 Make use of QKeyChain if its there. 2012-12-04 17:27:59 +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
Dominik Schmidt 097be61c9f Fix QT_STRICT_ITERATOR errors 2012-11-28 23:31:03 +01:00
Daniel Molkentin b349caeab1 Build with ancient GCC (4.2 on Mac OS) 2012-11-28 12:03:36 +01:00
Klaas Freitag 593636f135 User feedback on wrong passwd from KeyStore. 2012-11-28 10:44:25 +01:00
Klaas Freitag 70ea325c75 Do not commit devel hardcoded to KeyChain 2012-11-28 10:44:25 +01:00
Klaas Freitag 1a9a9cb402 More QtKeyChain integration. 2012-11-28 10:44:25 +01:00
Dominik Schmidt 2b2eb853fc Add qtkeychain to cmake - WIP read password from keychain.
Conflicts:

	CMakeLists.txt
2012-11-27 19:28:03 +01:00
Klaas Freitag f20bbe05bd Allow alias setting in Settings group name. 2012-11-22 12:32:07 +01:00
Klaas Freitag c560fc5959 Escape [ and ] in Folder alias and file name. 2012-11-22 12:32:06 +01:00
Klaas Freitag ee9e814f41 Getter and Setter for the config file name. 2012-11-22 12:32:06 +01:00
Klaas Freitag 01ccf679bd Fix Qt 46 build 2012-11-20 10:56:20 +01:00
dragotin b55d6742fe Merge pull request #94 from owncloud/qt46fixurl
Fix url encoding in Qt46, Bug #93
2012-11-20 01:39:04 -08:00
Daniel Molkentin be367eb94b Do not prepopulate the user field, it's usually wrong
Especially without LDAP, or in cases where the login
is an email address. If we ever want this again,
we need to make this cleverer.
2012-11-19 12:10:46 +01:00
Daniel Molkentin aa577ce038 Remove placeholder texts for username and password
User names might be misleading, since they might be
email addresses, SMB logins including domain, etc.
2012-11-19 12:10:46 +01:00
Daniel Molkentin 53b0b96627 setup wizard: Remove subtitles 2012-11-19 12:10:46 +01:00
Daniel Molkentin 5173de5798 Theme: allow enforced locale 2012-11-19 12:10:46 +01:00
Klaas Freitag afa48b0cc2 Fix url encoding in Qt46, Bug #93 2012-11-17 16:46:31 +01:00
Daniel Molkentin 8fc1b38359 dialog title == menu item title 2012-11-16 13:36:16 +01:00
Klaas Freitag 9e66de07f9 Better error message for propagate fail. 2012-11-16 12:32:07 +01:00
Daniel Molkentin e4ae794bac Remove and do not try to commit temp editor files 2012-11-15 12:50:52 +01:00
Klaas Freitag 01e8c9dbbe Fix credentialstore on startup, promote credentials back on setup.
This fixes https://github.com/owncloud/mirall/issues/81
2012-11-15 11:43:43 +01:00
Daniel Molkentin c5739b4d53 Remove extraneous legalese. 2012-11-15 01:07:51 +01:00
Klaas Freitag 39dc4cb46c Use CredentialStore also for Qt4.6 based builds. 2012-11-13 15:01:05 +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
Daniel Molkentin 59969c3574 Qt is not C. 2012-11-05 11:44:22 +01:00
Klaas Freitag 5519bc7cbb Try to create local dir if not existing. 2012-11-05 11:36:39 +01:00
Klaas Freitag c31f0885a4 Remove bogus space 2012-11-05 11:36:38 +01:00
Klaas Freitag 2501cc57d5 Display error status in statusdialog. 2012-11-05 11:36:38 +01:00
Klaas Freitag fbb46b64f9 Check if local folder is proper and set error stat accordingly. 2012-11-05 11:36:38 +01:00
Klaas Freitag 4d08605b5b Also compute overall status for disabled folders. 2012-11-05 11:36:38 +01:00
Klaas Freitag 764c352c8f Calculate overallSyncStartup on startup. 2012-11-05 11:36:38 +01:00
Daniel Molkentin 7cc3e7e392 Debug: fix typo 2012-11-02 16:32:26 +01:00
Daniel Molkentin 46a82b69c5 Show user name for connection in statusdialog
Move server version purely to tooltip.

Fixes issue #8.
2012-11-02 14:09:23 +01:00
Klaas Freitag 0224c3fbd6 Compare absolute path in fileStatus. 2012-10-29 14:35:02 +01:00
Klaas Freitag 78c1bc6b22 Cleanup of sync result treewalk, build up journal in owncloudfolder. 2012-10-29 12:24:20 +01:00
Klaas Freitag 993d33f779 Fix fileStatus API.
Conflicts:

	src/mirall/owncloudfolder.cpp
2012-10-29 12:23:01 +01:00
Klaas Freitag 0aa403eca3 Clean merge problems. 2012-10-29 12:20:57 +01:00
Klaas Freitag 8d1c7ddb9f Make sure that path() has a trailing slash. 2012-10-29 12:20:57 +01:00
Daniel Molkentin 6d4f712f83 Make SSL error dialog more intuitive 2012-10-27 17:05:01 +02:00
Daniel Molkentin d2ebcd065e Fix tab order in setup page 2012-10-27 17:04:49 +02:00
Daniel Molkentin 28e15f5420 Escape HTML tags in self-signed certs 2012-10-27 17:04:49 +02:00
Daniel Molkentin a315a3b5c7 There always must be both kinds of hashes, simplify code 2012-10-27 17:04:49 +02:00
Bartek Przybylski 55c9c3bf12 remove compilation warning 2012-10-25 23:20:00 +02:00
Daniel Molkentin efa8d7670c Show hashes of unknown certs 2012-10-24 01:44:13 +02:00