Olivier Goffart
d7fa03cf2e
Systray menu: consider multiple account to choose the status
2015-05-13 13:10:14 +02:00
Olivier Goffart
af94e8943d
Systray menu: show one entry per account to open in a browser
2015-05-13 12:54:31 +02:00
Olivier Goffart
299fa2dee6
FolderMan: fix a #warning in the migration path
2015-05-12 16:49:37 +02:00
Olivier Goffart
de9770f52a
FolderMan: fix some signal-slot broken connection
...
In many cases the alias was changed to a Folder pointer
2015-05-12 15:50:38 +02:00
Olivier Goffart
389c4f8ef9
AccountManager: remove unused variable
2015-05-12 15:38:16 +02:00
Olivier Goffart
3a7bd3f95c
AccountManager: save the config after removing an account
2015-05-12 15:37:16 +02:00
Olivier Goffart
1136b969b2
Folder: fix compilation after merge
2015-05-12 15:27:20 +02:00
Olivier Goffart
716b0c68da
Merge remote-tracking branch 'origin/master' into new-ui
2015-05-12 15:20:40 +02:00
Olivier Goffart
1edd46b995
Multi-Account: add possibility to delete an account
2015-05-12 15:16:32 +02:00
Daniel Molkentin
b54f2b3b31
Merge remote-tracking branch 'origin/1.9'
...
Conflicts:
VERSION.cmake
src/libsync/propagatedownload.cpp
src/libsync/propagateupload.cpp
2015-05-12 10:03:38 +02:00
Klaas Freitag
41614ec851
Application: ifdef lock file issue as it only happens on Qt>5.1
...
However, the fix breaks Qt4 compile, so it needs to be ifdefed.
Not viel hilft viel.
2015-05-11 13:35:04 +02:00
Christian Kamm
9507bb4be6
ShareDialog: Password ui fixes. #3189
...
* Change the textedit-empty text to be just "Password"
* Hide the 'Copy link' button when the share isn't created yet
* Show the checked and disabled 'Password required' checkbox
when a password is required.
2015-05-08 14:53:38 +02:00
Christian Kamm
e1c370a9a2
Fix startup hang by removing QSettings lock file. #3175
...
In some situations the .lock file would stay around and
cause subsequent starts of the client to get stuck before
showing the ui.
2015-05-08 14:02:44 +02:00
Christian Kamm
b9eafaaf24
Wizard: Allow SSL cert dialog to show twice. #3168
...
Normally we never ask twice for the same url, but in the setup wizard
it makes sense to do so.
2015-05-08 12:32:14 +02:00
Christian Kamm
909368025f
ProtocolWidget: Fix rename message. #3210
...
For remote renames that are replicated locally the _file member is
overwritten by the target file name when the new entry is added to
the metadata table. Using _originalFile here guarantees that
the affected local file is mentioned.
2015-05-08 11:33:34 +02:00
Christian Kamm
441eca86c4
ShareDialog: Improve error reporting for share API fails.
...
This would have made debugging #3204 and #3136 easier.
2015-05-07 14:16:13 +02:00
Markus Goetz
f07d3d069e
Updater on OS X: Only allow if in /Applications #2931
2015-05-07 13:04:25 +02:00
Markus Goetz
e300e3c744
Wizard: Fix lock icon #1447
2015-05-07 13:04:25 +02:00
Christian Kamm
73e2254a80
AccountState: Treat *any* 503 as a temporary error. #3113
2015-05-07 09:21:52 +02:00
Jocelyn Turcotte
58867baf33
Merge pull request #3183 from christian-burger/fix-for-windows-explorer-extension-when-syncing-whole-drive
...
Windows Explorer: fix issues when syncing whole drive.
2015-05-06 14:54:19 +02:00
Daniel Molkentin
f315423811
Merge remote-tracking branch 'origin/1.8'
...
Conflicts:
VERSION.cmake
2015-05-06 10:04:22 +02:00
Christian Kamm
9e3c3353bd
IgnoreListEditor: Remove invalid connect. #3201
...
This has been around ever since the ignore editor was
added and the slot never existed.
2015-05-06 09:34:45 +02:00
Christian Burger
79f7ea0965
refactoring as requested in pull request
2015-05-05 16:34:01 +01:00
Daniel Molkentin
bfba6f752c
Remove dead code
2015-05-05 10:23:59 +02:00
Christian Burger
018cc54a94
Windows Explorer: fix issues when syncing whole drive.
...
When the local sync target is just a drive letter (e.g. "X:\"), neither
the display of the sync status via file icon overlay, nor the creation of a
share link works. In the latter case no pop-up comes up and no server
request is done.
QDir::cleanPath() usually removes trailing slashes, but not if the path to
be cleaned is just "X:\". In that case the trailing slash is kept. This
commit accounts for that exception.
2015-05-04 10:29:25 +01:00
Olivier Goffart
e02f1a222e
FolderMan: refactor some function to take a Folder* instead of an alias
...
I want to remove this dependency of alias in the code because we might get
rid of it entierly later
2015-04-28 17:49:05 +02:00
Olivier Goffart
e4694a6db8
Setup wizard: Do not remove all the folders of all theother acocunts when adding an account
...
Also we need the alias to be unique
2015-04-28 17:46:45 +02:00
Olivier Goffart
e5ad1b27b4
Settings dialog: show the first account page at start
2015-04-28 11:39:27 +02:00
Olivier Goffart
92e259c276
Add folder: Do not add at other accounts folder to know if you can add a folder
2015-04-28 11:29:35 +02:00
Olivier Goffart
f81918173b
Account settings: show the folder of the right account
2015-04-27 19:09:48 +02:00
Olivier Goffart
4006bcdaed
Wizard: Setup the folder in the right account
2015-04-27 17:43:07 +02:00
Olivier Goffart
3e4886725a
Folder: remove the member references to the FolderDefinition members
2015-04-27 17:33:59 +02:00
Olivier Goffart
f688bda759
Wizard: Save the settings after adding an account
...
So the account persist even if the client is not properly closed
2015-04-27 17:19:46 +02:00
Olivier Goffart
ac855858de
owncloud gui: move a comment where it belongs
...
The code was moved long time ago in commit ea1c95100
2015-04-27 17:14:25 +02:00
Olivier Goffart
23dc464ea2
Folderman: Fix crash when adding an account
...
Clang is picky if we forget to return a value
2015-04-27 14:34:39 +02:00
Olivier Goffart
04382c467b
Progress: Fix broken signal connection
2015-04-27 12:34:15 +02:00
Olivier Goffart
be1b39067d
Merge branch 'master' into new-ui
2015-04-27 12:32:12 +02:00
Olivier Goffart
ddfb7f3b7a
Merge remote-tracking branch 'origin/1.8'
2015-04-27 12:20:11 +02:00
Christian Kamm
78e82eb920
AccountWizard: Fix auth error handling. #3155
...
The problem was that on network error the networkError() and
finishedWithError() signals both fired. To fix it, I collapse all
error handing into a slot triggered by finishedWithError().
I tested the redirection case and the invalid credentials case.
2015-04-24 16:03:28 +02:00
Christian Kamm
27159104a9
Folders: Store inside account config.
2015-04-24 13:42:35 +02:00
Christian Kamm
a13a974e2d
Account: Generate shorter account ids.
2015-04-24 09:54:42 +02:00
Christian Kamm
f184d66ea2
Save and restore multiple accounts.
2015-04-23 16:08:20 +02:00
Christian Kamm
11927d625d
Fix crash on exit by not making Account parent of AccountState.
2015-04-23 16:08:20 +02:00
Christian Kamm
d64373c610
Never use 'new Account' directly, prefer Account::create()
2015-04-23 15:47:49 +02:00
Christian Kamm
28306e5dfb
Move AccountState::displayName to Account.
2015-04-23 15:47:49 +02:00
Christian Kamm
89bb58ac30
Ensure 'user' is available early enough for ui in httpcreds
2015-04-23 15:47:49 +02:00
Christian Kamm
3cc2e1a968
Fix bad connect/disconnects.
2015-04-23 14:24:54 +02:00
Christian Kamm
8390b0b930
Determine right account in ownCloudGui::slotShowShareDialog
2015-04-23 14:14:28 +02:00
Christian Kamm
dbddabfcd7
Remove SelectiveSyncText
...
It is unused and there were compiler warnings about it not
appearing it various switch() statements.
2015-04-23 14:13:33 +02:00
Christian Kamm
0d30e01e98
Add explanations to fixmes
2015-04-23 14:13:13 +02:00
