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
Daniel Molkentin
2cbcd52f35
Do not allow the selection of a target in single folder mode
2012-10-22 11:32:53 +02:00
Daniel Molkentin
b0801d469c
If present, select first item in status dialog
...
The old behavior is confusing and there is no real
reason to not have an object that is default-selected.
2012-10-20 14:58:49 +02:00
Daniel Molkentin
8fbc0e7c46
Show wizard with intro when starting without account
...
The message box was complicated and not even correct
on some OSes. The intro page is omitted if the wizard
gets called via the "Configure" menu item.
2012-10-20 13:58:37 +02:00
Daniel Molkentin
d8728a56bc
Pre-setup, disable irrelevant items in context menu
2012-10-20 13:58:37 +02:00
Daniel Molkentin
379da4ed0d
Proper workaround for bug in Ubuntu's Qt SNI bridge.
2012-10-17 23:16:59 +02:00
Klaas Freitag
cff0fcee16
Escape the folder alias as used in QSetting and as file name.
2012-10-17 16:33:19 +02:00
Daniel Molkentin
257896969a
Clean up argument handling
...
- Allow to retrospectively open log window
- Don't waste init time if only help is requested.
2012-10-16 19:06:23 +02:00
Klaas Freitag
fe665f234d
Use better default value instead of constant number.
2012-10-16 10:11:24 +02:00
Daniel Molkentin
bb76365a3a
Make sure SSL errors are always handled
2012-10-16 10:09:38 +02:00
Daniel Molkentin
b7433ccad6
Revert "Hide remove button in singleFolder mode"
...
This reverts commit 8939e08ce1
.
2012-10-12 14:44:21 +02:00
Daniel Molkentin
72f3b5457e
Use HTTPS for update check
2012-10-09 17:46:41 +02:00
Daniel Molkentin
e45dfdb3b2
Dirty qnam/proxy export is no longer required
2012-10-09 17:19:09 +02:00
Daniel Molkentin
19a4f8fc64
_accessManager is already initialized in the ctor
2012-10-09 17:15:46 +02:00
Daniel Molkentin
a8d6c083e3
Make code more readable.
2012-10-09 10:10:41 +02:00
Daniel Molkentin
861a66f8cb
Make PAC work on Windows
2012-10-09 03:08:39 +02:00
Daniel Molkentin
3db60b4fe7
Massive simplification of proxy support.
...
Purposefully separated from last commit, but
associated with it: No more need for special
cases after libocsync got fixed do adhere properly.
2012-10-09 02:35:08 +02:00
Daniel Molkentin
c93721258e
Working PAC support
...
This goes along with e0f02c in csync/dav.
2012-10-09 02:35:08 +02:00
Klaas Freitag
48d5261ba7
Use Max instead of Min of course
2012-10-08 20:43:16 +02:00
Klaas Freitag
23c598a907
Only replace the scheme at the beginning of string
2012-10-08 16:21:18 +02:00
Daniel Molkentin
d7b94c7f96
Use HttpProxy instead of Socks5Proxy.
2012-10-08 11:08:01 +02:00
Daniel Molkentin
34b8c39878
Quick hack: do not crash on windows when pausing sync
2012-10-05 22:53:42 +02:00
Daniel Molkentin
0ee938ac9b
Prepend slash to remote folder
2012-10-05 22:42:35 +02:00
Klaas Freitag
06b2e1f645
Simplify url string from textfield to avoid unwanted spaces.
2012-10-05 22:33:16 +02:00
Daniel Molkentin
06a1cfe642
Anther fix for sync pausing
2012-10-05 12:59:58 +02:00
Daniel Molkentin
3a983b428f
Fix bug when trying to pause a running sync
2012-10-04 14:08:23 +02:00
Daniel Molkentin
c42f77cf23
Consistency fix: name ui and src alike
2012-10-03 00:45:54 +02:00
Daniel Molkentin
d169bc24bf
ownCloudInfo must not include sslErrorDialog
2012-10-03 00:43:43 +02:00
Klaas Freitag
4d11e41e97
Merge branch 'master' of github.com:owncloud/mirall
2012-10-02 17:42:56 +02:00
Klaas Freitag
0007579ab8
Initialize pointer before use.
2012-10-02 17:42:37 +02:00
Daniel Molkentin
1752c23002
Use themed app name in password dialog.
2012-10-02 16:54:46 +02:00
Klaas Freitag
fabb353158
Use Qt proxy setting in csync in case its "default proxy"
2012-10-02 13:24:10 +02:00
Klaas Freitag
11706c4e3e
Fix header.
2012-10-02 13:17:37 +02:00
Klaas Freitag
de60d53a78
Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog
...
Conflicts:
src/mirall/application.cpp
src/mirall/application.h
src/mirall/owncloudinfo.cpp
2012-10-02 12:34:06 +02:00
Klaas Freitag
1c326029a3
More theming fixes.
2012-09-28 15:19:42 +02:00
Klaas Freitag
4ac85b0702
Removed more hardcoded program names and replaced by theme appName.
2012-09-28 14:22:43 +02:00
Klaas Freitag
8939e08ce1
Hide remove button in singleFolder mode
2012-09-28 13:47:43 +02:00
Klaas Freitag
7156e47355
Introduce defaultServerFolder and defaultClientFolder.
2012-09-28 13:42:22 +02:00
Klaas Freitag
94ceb95045
Remove unneeded settings-code for win32.
2012-09-28 11:36:39 +02:00
Klaas Freitag
b41d8c3c12
Removed app name from strings even more and replaced by theme string.
2012-09-27 17:22:08 +02:00
Klaas Freitag
9d3d789890
Rename ownCloudClient.ini to custom.ini and put it to /etc/ownCloud.
2012-09-27 15:28:49 +02:00
Klaas Freitag
d09693f191
Read sync-exclude.lst from /etc/ownCloud, renamed from exclude.lst.
2012-09-27 13:16:14 +02:00
Klaas Freitag
e4024015a4
Merge branch 'master' of github.com:owncloud/mirall
2012-09-27 12:30:27 +02:00
Klaas Freitag
180b99c02e
Change the csync config dir to the users app path, not longer .csync.
2012-09-27 12:27:40 +02:00
Daniel Molkentin
32579dd25a
Brown paper bag fix.
2012-09-27 12:22:27 +02:00
Daniel Molkentin
740370b106
Do not translate application name, it's a brand
...
Another reason: File system and registry names depend on it
2012-09-27 11:52:58 +02:00
Daniel Molkentin
3d6a2a4966
Partial revert of 261731
...
An experimental change sneaked in.
2012-09-26 18:24:07 +02:00
Daniel Molkentin
6e1deab0ae
Supplemental: less hardcoded uses of "ownCloud"
2012-09-26 17:01:33 +02:00
Daniel Molkentin
5df5d55fa4
Make code more readable
2012-09-26 17:01:25 +02:00
Daniel Molkentin
991a04abc5
remove arguments from ownCloudInfo ctor
...
its only caller is the singletons instance() method
2012-09-26 16:59:53 +02:00
Daniel Molkentin
261731c841
Consistency fixes for single folder mode
2012-09-26 16:59:47 +02:00
Daniel Molkentin
1b0744dac6
icon improvements
...
- more sizes
- rename state icons due to a cmake limitation
(it globs owncloud-icon-* for mac and windows icons,
which causes the state icons to appear as app icons)
- adjust resourcefile and theme accordingly
2012-09-25 17:14:21 +02:00
Daniel Molkentin
bcf9bb8238
Reuse Theme singleton
2012-09-24 19:42:48 +02:00
Daniel Molkentin
bc08f81683
More use of appName() in tr()'s.
2012-09-24 19:21:55 +02:00
Daniel Molkentin
e3a9081181
Fix default implementation of Folder::nativeSecondPath().
2012-09-24 19:20:16 +02:00
Daniel Molkentin
2de9cc9590
Use the themes appName() instead of "ownCloud".
...
This turns the Theme class into a singleton.
2012-09-24 17:57:20 +02:00