hh.lohmann [Wed, 9 Sep 2015 10:33:25 +0000 (12:33 +0200)]
/doc/autoupdate.rst: "Migrate to the following directory" => "Edit this Registry key"
Registry keys are no directories; you would not "migrate" to keys if you are just about to switch to them; resembling formulas as "Edit these / this Registry key/s" ease fast reading, for that also ":" instead of "::" at the end (formatting what follows)
hh.lohmann [Wed, 9 Sep 2015 10:10:10 +0000 (12:10 +0200)]
/doc/autoupdate.rst: "32-/64-bit" => "32-/64-bit-Windows"
Should be stated clearly that there are no alternative 32- / 64-bit-ownCloud-Clients, but just a 32-bit-ownCloud-Client that is treated differently in 32- / 64-bit-Windows
Markus Goetz [Tue, 8 Sep 2015 14:06:42 +0000 (16:06 +0200)]
Merge pull request #3777 from owncloud/individual-it-utf8-patch
fix unicode issue #3753
Individual IT Services [Tue, 8 Sep 2015 08:14:43 +0000 (13:59 +0545)]
fix unicode issue #3753
fixes the unicode issue #3753
I don't know much CPP and Qt but after some google research I found this http://wiki.qt.io/Strings_and_encodings_in_Qt
it does mention trUtf8() that has done the trick for me on Linux with Gnome 3.16.
Haven't tested it on other systems
Olivier Goffart [Mon, 7 Sep 2015 08:32:16 +0000 (10:32 +0200)]
Merge remote-tracking branch 'origin/2.0'
Daniel Molkentin [Mon, 7 Sep 2015 06:51:22 +0000 (08:51 +0200)]
Consistency: Use folder instead of directory in user visible strings
Jenkins for ownCloud [Mon, 7 Sep 2015 06:18:55 +0000 (02:18 -0400)]
[tx-robot] updated from transifex
Christian Kamm [Mon, 7 Sep 2015 05:44:07 +0000 (07:44 +0200)]
Tray: Enable workaround for Qt5 only #3765
Jenkins for ownCloud [Sun, 6 Sep 2015 06:19:00 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Sat, 5 Sep 2015 16:14:30 +0000 (18:14 +0200)]
Merge remote-tracking branch 'origin/2.0'
Jocelyn Turcotte [Sat, 5 Sep 2015 13:51:11 +0000 (15:51 +0200)]
Remove *Credentials::_fetchJobInProgress
Now that fetchFromKeychain is solely called from AccountState::slotInvalidCredentials
and that this one already protects the fetch call using _waitingForNewCredentials,
we can remove that extra check.
Jocelyn Turcotte [Sat, 5 Sep 2015 13:39:22 +0000 (15:39 +0200)]
Separate the credential dialog from their fetch #3350
This moves the responsibility of asking the user or not for
credentials from the Credentials classes back to the AccountState.
fetch() now only extract credentials from the keychain, reports
the result to the AccountState which then decides if askFromUser()
should be called or not. The result is once more reported to the
AccounState.
This also replaces the HttpCredentials::queryPassword virtual
which now lets HttpCredentialsGui and HttpCredentialsText do it
the way that they prefer.
Jocelyn Turcotte [Sat, 5 Sep 2015 13:37:20 +0000 (15:37 +0200)]
Simplify the authentication code paths #3350
The AccountState is now the only class responsible for triggering credentials
fetching from the keychain or from the user.
With the ShibbolethRefresher out of the question it's possible
to remove the invalidateAndFetch virtual and manually call invalidateToken.
This also allows us to move that code from Account to AccountState.
In the end this also allows us to move the fetch() call from the
ConnectionValidator and use the same code path as for invalid credentials.
Jocelyn Turcotte [Fri, 4 Sep 2015 20:28:21 +0000 (22:28 +0200)]
Get rid of ShibbolethRefresher
This is only for neon and not necessary if we want to show a notification
instead of a login window when the network reports invalid credentials.
Jenkins for ownCloud [Sat, 5 Sep 2015 06:19:05 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Christian Kamm [Fri, 4 Sep 2015 12:00:02 +0000 (14:00 +0200)]
csync io: Fix UNC path conversion on Win #3748
Paths that were already in UNC form don't need to be prefixed.
Christian Kamm [Fri, 4 Sep 2015 09:58:50 +0000 (11:58 +0200)]
Tray: Don't use the tray workaround with the KDE theme #3706
That just triggers another bug...
Christian Kamm [Fri, 4 Sep 2015 13:15:26 +0000 (15:15 +0200)]
ShareDialog: Fix folder display #3659
Sometimes having a double starting / broke the display logic.
Christian Kamm [Fri, 4 Sep 2015 08:33:48 +0000 (10:33 +0200)]
FolderStatus: Show 'waiting for other folder' #3619
We monitor the scheduling queue and show messages like
"Waiting for 5 other folders...".
Christian Kamm [Thu, 3 Sep 2015 04:23:19 +0000 (06:23 +0200)]
AccountSettings: Restore from legacy only once #3565
And also introduce a Accounts/version int at the same time. That
may make future account settings migrations easier to manage.
Jenkins for ownCloud [Fri, 4 Sep 2015 06:19:10 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Thu, 3 Sep 2015 14:14:14 +0000 (16:14 +0200)]
SSL Certificate Error Dialog: show account name #3729
Change the wording of the certificate error dialog to include the
account URL and be a bit more accurate.
(Do not mention "SSL" in user facing messages)
Olivier Goffart [Thu, 3 Sep 2015 09:18:02 +0000 (11:18 +0200)]
Doc for owncloudcmd: we only use the config of the gui client for the crendential #3293
Jenkins for ownCloud [Thu, 3 Sep 2015 06:19:02 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Christian Kamm [Thu, 3 Sep 2015 04:14:49 +0000 (06:14 +0200)]
Settings: Allow adding at least one account #3721
We always show the 'Add Account' button when no account exists,
even When the 'singleAccount' option is enabled.
Olivier Goffart [Wed, 2 Sep 2015 14:05:58 +0000 (16:05 +0200)]
FolderDefinition: Escape the alias of a folder before writing to the config
Issue #3707
Christian Kamm [Wed, 2 Sep 2015 09:10:01 +0000 (11:10 +0200)]
Tray: Clicks work even with Qt 5.5.0 workaround #3722
Olivier Goffart [Wed, 2 Sep 2015 13:19:34 +0000 (15:19 +0200)]
PropagateLocalRemove: remove entries from the DB even if there was an error.
Previously, in case of an error while deleting a directory, we would not
remove the entries from the local db, despite most of the files would
be deleted.
Which means that if the files re-appear on the server with the same etag,
we would think the file were deleted from the client and propagate the change.
In 1.8.0 we had this bug that we would not see some directory in the server in
some cases. This would lead us to delete the file on the client. Normaly the
files are deleted from the local database and next sync would re-download the files.
But in the cases where there was an error deleting one of the file (for example
if it was locked) we would then propagate the delete to the server.
Fix this by always deleting from the database the files that we deleted.
Issue #3206
Jenkins for ownCloud [Wed, 2 Sep 2015 11:09:38 +0000 (07:09 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 1 Sep 2015 18:04:35 +0000 (14:04 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 1 Sep 2015 17:02:24 +0000 (13:02 -0400)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Tue, 1 Sep 2015 13:37:58 +0000 (15:37 +0200)]
Show a notification instead of a login window on startup #3350
The original problem is that showing a popup not originated
from the main settings window while it's focused won't be
shown in front to the user.
This try not to highjack the user's attention of the user
by showing a notification when checking the connection for
valid credentials, and require the user to sign in through
the UI. There are still issues with showing that popup from
the tray icon, but the user will most likely be looking for
the popup in that case. The new sign in button directly in
the settings account works properly.
Jocelyn Turcotte [Sun, 30 Aug 2015 10:08:40 +0000 (12:08 +0200)]
Remove the _readPwdFromDeprecatedPlace codepath
This was introduced in 1.6.2 to read the password from earlier versions.
People upgrading from 1.5 to 2.1 will sadly need to re-enter their password.
Jocelyn Turcotte [Sat, 29 Aug 2015 11:32:36 +0000 (13:32 +0200)]
Add a sign in button in the settings window
It's not obvious for users that they should sign in through
the tray icon, especially if they were automatically signed out.
Olivier Goffart [Tue, 1 Sep 2015 15:57:56 +0000 (17:57 +0200)]
Merge branch '2.0'
Olivier Goffart [Tue, 1 Sep 2015 15:02:23 +0000 (17:02 +0200)]
Remove the accountmigrator.cpp It is not used
This was used to convert the config from the community client to
the branded client. But we don't need this feature anymore
https://github.com/owncloud/client/issues/3515#issuecomment-
133394443
Jocelyn Turcotte [Sat, 29 Aug 2015 11:04:10 +0000 (13:04 +0200)]
Don't show a sync success status toolip when signed out
Olivier Goffart [Tue, 1 Sep 2015 09:39:55 +0000 (11:39 +0200)]
AccountSettings: Fix coverity warning
FolderMan::folder might return null
Olivier Goffart [Tue, 1 Sep 2015 09:37:47 +0000 (11:37 +0200)]
AccountSettings: remove unused member
Fix a coverity warning
Olivier Goffart [Tue, 1 Sep 2015 09:32:59 +0000 (11:32 +0200)]
Settings dialog: remove the close button #3713
Olivier Goffart [Tue, 1 Sep 2015 09:29:37 +0000 (11:29 +0200)]
Tray notification: Don't show a message about modified folder #3613
Jocelyn Turcotte [Mon, 31 Aug 2015 15:23:15 +0000 (17:23 +0200)]
Fix the Windows build
Use an iterator variable declared outside of the loop condition
expression.
MinGW doesn't support C99 very easily and it's easier to keep
our C code C89 compliant.
Daniel Molkentin [Mon, 31 Aug 2015 14:50:07 +0000 (16:50 +0200)]
Bump 2.0 brancht to 2.0.2 after creation of 2.0.1 branch
Olivier Goffart [Mon, 31 Aug 2015 12:34:04 +0000 (14:34 +0200)]
Merge branch '2.0'
Jocelyn Turcotte [Sun, 30 Aug 2015 13:57:33 +0000 (15:57 +0200)]
Move the progress bar to the right of the quota label
Also change the label to show the free space and show
the used and total space only on a tooltip of the bar.
Related to #3644
Markus Goetz [Mon, 31 Aug 2015 09:31:20 +0000 (11:31 +0200)]
Desktop file: Add X-GNOME-Autostart-Delay #3686 #1739
Carla Schroder [Mon, 31 Aug 2015 09:12:47 +0000 (11:12 +0200)]
more typos
Carla Schroder [Mon, 31 Aug 2015 09:03:14 +0000 (11:03 +0200)]
typo correction
Carla Schroder [Mon, 31 Aug 2015 08:48:43 +0000 (10:48 +0200)]
typo corrections, cross-refs
Olivier Goffart [Mon, 31 Aug 2015 08:12:45 +0000 (10:12 +0200)]
FolderStatusModel: add a function to get a QModelIndex from the path
Will be usefull to solve #3704
Jenkins for ownCloud [Mon, 31 Aug 2015 06:19:06 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Sun, 30 Aug 2015 15:55:32 +0000 (17:55 +0200)]
Merge pull request #3709 from owncloud/fix/mac
Fix/mac
Felix Böhm [Sun, 30 Aug 2015 15:51:43 +0000 (17:51 +0200)]
Fix qtmacgoodies submodule
* was broken by
514372db6b0fffae226d7dd43e738ced1b7fa35b
Felix Böhm [Sun, 30 Aug 2015 15:41:51 +0000 (17:41 +0200)]
update documentation link to build for version 2.0
Olivier Goffart [Sun, 30 Aug 2015 13:20:35 +0000 (15:20 +0200)]
Account Settings: rework the toolbar
Modifications ask by Jan:
- Elide the label in the actions
- Minimum sizes for the actions
- No separatcions between the accounts
Issue #3516
Jenkins for ownCloud [Sun, 30 Aug 2015 06:19:04 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Sat, 29 Aug 2015 16:49:10 +0000 (18:49 +0200)]
AccountWizard: fix when the theme specify a override URL #3699
Carla Schroder [Sat, 29 Aug 2015 15:08:03 +0000 (17:08 +0200)]
Merge pull request #3702 from owncloud/updates2-0
updates for 2.0 release
carla schroder [Sat, 29 Aug 2015 14:26:48 +0000 (16:26 +0200)]
updates for 2.0 release
Jenkins for ownCloud [Sat, 29 Aug 2015 06:19:05 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jocelyn Turcotte [Fri, 28 Aug 2015 13:51:11 +0000 (15:51 +0200)]
Tweak the settings UI
- Move the cancel and apply buttons side by side
- Hide the notification label when empty
- Clamp elements at the top together a bit
Jocelyn Turcotte [Fri, 28 Aug 2015 10:14:56 +0000 (12:14 +0200)]
Don't disable the selective sync cancel button
This makes its interaction more consistent versus other
kinds of dialogs or versus when the selective sync config
has been changed or not.
Jenkins for ownCloud [Fri, 28 Aug 2015 06:19:15 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 28 Aug 2015 05:15:38 +0000 (01:15 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Thu, 27 Aug 2015 08:28:03 +0000 (10:28 +0200)]
Merge pull request #3665 from owncloud/2-0updates
1st batch of updates for 2.0
Carla Schroder [Thu, 27 Aug 2015 08:25:19 +0000 (10:25 +0200)]
Update navigating.rst
Carla Schroder [Thu, 27 Aug 2015 08:20:15 +0000 (10:20 +0200)]
Update navigating.rst
Carla Schroder [Thu, 27 Aug 2015 08:07:54 +0000 (10:07 +0200)]
Update installing.rst
Jenkins for ownCloud [Thu, 27 Aug 2015 06:19:42 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 26 Aug 2015 06:19:06 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Klaas Freitag [Tue, 25 Aug 2015 08:24:52 +0000 (10:24 +0200)]
Push version on to 2.0.1 git
Christian Kamm [Tue, 25 Aug 2015 07:46:03 +0000 (09:46 +0200)]
Tray: Hide while modifying menus #3656 #3672
This may help workaround the dbus tray issue in Qt 5.5.0.
Jenkins for ownCloud [Tue, 25 Aug 2015 06:19:17 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Christian Kamm [Fri, 21 Aug 2015 09:46:38 +0000 (11:46 +0200)]
AddFolder: Improve remote path selection error handling #3573
Christian Kamm [Mon, 24 Aug 2015 09:09:34 +0000 (11:09 +0200)]
csync_excluded: Another speedup #3638
Build a list of path components outside of the exclude pattern loop.
Christian Kamm [Mon, 24 Aug 2015 07:47:33 +0000 (09:47 +0200)]
csync_update: Use excluded_traversal() to improve performance #3638
Christian Kamm [Mon, 24 Aug 2015 07:44:54 +0000 (09:44 +0200)]
csync_excluded: Add fast _traversal() function #3638
This function only checks the full path and the basename and is thus
around 7x faster. It is very useful in a csync_update context where
we know that the leading dirs have already been checked for exclusion.
Christian Kamm [Fri, 21 Aug 2015 12:20:27 +0000 (14:20 +0200)]
csync_exclude: Speed up siginificantly #3638
The performance test indicates a speedup of around 3x for paths
with around 12 components.
Christian Kamm [Wed, 19 Aug 2015 13:16:09 +0000 (15:16 +0200)]
AccountSettings: Adjust quota info design #3644 #3651
Christian Kamm [Fri, 21 Aug 2015 09:01:01 +0000 (11:01 +0200)]
Adjust buttons on remove folder/account questions #3654
Klaas Freitag [Mon, 24 Aug 2015 12:23:32 +0000 (14:23 +0200)]
Bump version to 2.0.0 final, some Changlog addings
Christian Kamm [Mon, 24 Aug 2015 11:56:10 +0000 (13:56 +0200)]
Utility: Fix constants for 32-bit arch #3670
Christian Kamm [Mon, 24 Aug 2015 10:52:41 +0000 (12:52 +0200)]
Theme: Fix wizardSelectiveSyncDefaultNothing #3671
Jenkins for ownCloud [Mon, 24 Aug 2015 06:19:03 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 23 Aug 2015 06:19:02 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 22 Aug 2015 06:19:05 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Carla Schroder [Fri, 21 Aug 2015 20:19:15 +0000 (13:19 -0700)]
1st batch of updates for 2.0
Klaas Freitag [Fri, 21 Aug 2015 13:59:27 +0000 (15:59 +0200)]
Bump version to rc2
Christian Kamm [Fri, 21 Aug 2015 07:41:24 +0000 (09:41 +0200)]
Systray: Workaround for issue with Qt 5.5.0 #3656
Jenkins for ownCloud [Fri, 21 Aug 2015 06:19:05 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Christian Kamm [Thu, 20 Aug 2015 11:25:19 +0000 (13:25 +0200)]
AccountSettings: Fix margins on 'Add folder' button #3650
Christian Kamm [Thu, 20 Aug 2015 09:57:44 +0000 (11:57 +0200)]
SettingsDialog: Fix typo in showFirstPage()
Jenkins for ownCloud [Thu, 20 Aug 2015 06:19:09 +0000 (02:19 -0400)]
[tx-robot] updated from transifex
Olivier Goffart [Wed, 19 Aug 2015 15:59:39 +0000 (17:59 +0200)]
Account Settings: Hide the add folder button when Theme::singleSyncFolder is set
Christian Kamm [Wed, 19 Aug 2015 14:15:30 +0000 (16:15 +0200)]
FolderStatusDelegate: Add margin to button #3650
Christian Kamm [Wed, 19 Aug 2015 13:55:29 +0000 (15:55 +0200)]
Another account deletion wording update #3649
Christian Kamm [Wed, 19 Aug 2015 13:51:48 +0000 (15:51 +0200)]
SettingsDialog: Activate the first page on startup
Christian Kamm [Wed, 19 Aug 2015 13:05:30 +0000 (15:05 +0200)]
FolderStatusModel: Undo accidental debug change
Christian Kamm [Wed, 19 Aug 2015 13:04:39 +0000 (15:04 +0200)]
FolderStatusModel: Fix typo in error message #3524
Christian Kamm [Wed, 19 Aug 2015 13:02:08 +0000 (15:02 +0200)]
FolderStatusModel: No italic text #3524