Klaas Freitag
e896d16f32
ActivityWidget: Make sure Notification are visible if Activity disabled
...
This is the fix for #4651
2016-04-11 15:39:25 +02:00
Klaas Freitag
2ec642aadb
ActivityWidget: Properly set widget for the Scrollview.
...
Also fixed some SizePolicy settings.
2016-04-11 15:38:25 +02:00
ckamm
4ce97633cd
Merge pull request #4630 from ckamm/folderwatchwin
...
Graceful termination of folderwatcher_win #4620
2016-04-09 06:55:30 +02:00
Klaas Freitag
8f7b833c12
Not Synced Tab: Use tr rather than string concat
2016-04-07 09:18:51 +02:00
Klaas Freitag
48bfcde97d
Merge pull request #4640 from owncloud/numberInProtocolTab
...
ProtocolWidget: Show number of non synced files in tab label.
2016-04-07 09:15:06 +02:00
Klaas Freitag
42439490cc
Merge pull request #4645 from owncloud/fix_4633
...
SelectiveSync: Verify if the list could be read from journal.
If not handle the error rather than assuming the selective sync list is empty.
2016-04-07 09:14:33 +02:00
Klaas Freitag
058cd33324
Not Synced: Display only the number of not synced items in parathesis.
...
This was Jans wish.
2016-04-06 17:53:42 +02:00
Klaas Freitag
7b1f02fcda
SelectiveSync: Verify if the list could be read from journal.
...
If there is a read error from the database while trying to get
the list from database, make sure to not behave badly because
the list is empty.
2016-04-06 15:01:28 +02:00
Klaas Freitag
52a5234122
Merge pull request #4641 from owncloud/bubbleUpConflicts
...
Bubble up conflicts: Show a tray notification on conflicts and show the conflicts in the not-synced list.
2016-04-06 13:45:47 +02:00
Klaas Freitag
4e17dabcb6
Folder: Fixed a couple of plural translation issues.
2016-04-06 12:22:29 +02:00
Klaas Freitag
9bdc84c6f4
NotificationJobs: Set ocs header to maintain the session.
...
This is needed by the server.
2016-04-05 16:52:51 +02:00
Klaas Freitag
efb0faa14e
Folder: After sync, fire up tray notification if conflicts happened.
...
If there were conflicts, users want to have a tray notification that warn
about.
This will help for #3222
2016-04-05 16:37:54 +02:00
Klaas Freitag
5b40921587
ProtocolWidget: Show number of non synced files in tab label.
2016-04-05 13:57:38 +02:00
Klaas Freitag
73e2a503d7
NotificationWidget: Some ui refinements.
2016-04-04 12:46:00 +02:00
Klaas Freitag
bc6eebddf4
NotificationWidget: Handle empty message and subject properly.
2016-04-04 12:45:39 +02:00
Klaas Freitag
6b0d535120
Merge branch 'notifications'
2016-04-04 10:40:33 +02:00
Christian Kamm
fa1bb309ca
Graceful termination of folderwatcher_win #4620
2016-03-31 15:44:42 +02:00
Christian Kamm
e05819370b
Fix invalid read on account removal
2016-03-31 09:00:32 +02:00
Daniel Molkentin
9ea191f63d
Scale correctly with HiDPI displays on Linux with Qt 5.6
2016-03-30 18:25:30 +02:00
Olivier Goffart
cdbc25ede8
Merge pull request #4615 from owncloud/socketApiRefactor
...
Socket API refactor
2016-03-30 13:24:10 +02:00
Jocelyn Turcotte
a0260c29c0
Fix the build on Windows
2016-03-30 12:19:09 +02:00
ckamm
98995f45e6
Merge pull request #4618 from ckamm/progressui
...
Progress layout adjustments
2016-03-30 09:22:27 +02:00
Christian Kamm
5636dc1386
Tooltip updater: Fix compile with Qt4
2016-03-30 09:21:28 +02:00
Klaas Freitag
885f8b382f
ActivityWidget: Handle plural properly in translations.
...
Even for the case where the number is fixed.
Also fix the translators comments.
2016-03-29 18:01:54 +02:00
Klaas Freitag
8166c52f4a
NotificationHandling: Use QByteArray for the verb.
2016-03-29 18:01:49 +02:00
Jocelyn Turcotte
fbf23b6abb
Cleanup after the SyncFileStatusTracker change
...
- Add missing explicit keywords
- Add doc
- Comment out verbose and partly redundant qDebug statements
2016-03-29 17:39:30 +02:00
Klaas Freitag
cd3f612857
ActivityWidget: Rename blacklistActivities to blacklistNotifications.
2016-03-29 16:50:58 +02:00
Klaas Freitag
2e30a0e5bc
Remove superflous iterator increment
2016-03-29 16:50:15 +02:00
Klaas Freitag
cacb751ab8
Cleaups based on review feedback.
2016-03-29 14:38:11 +02:00
Klaas Freitag
4d59f5ec66
ActivityData: Declare operators outside the class
2016-03-29 14:09:19 +02:00
Klaas Freitag
69e8e15884
Remove explicit time spec specification as it is not needed.
2016-03-29 13:59:08 +02:00
Daniel Molkentin
1730569f77
No Q_NULLPTR in Qt 4.8
2016-03-29 13:28:11 +02:00
Christian Kamm
c5fbde412c
Folder info layout adjustments #3403
...
* Remove duplicate remote path
* Use thin progress bar
* Move bandwidth and file info to tooltip
* Shorten overall progress message
This also fixes #4562 by making the layout not dependent on the
width of the displayed text.
2016-03-29 12:45:01 +02:00
Christian Kamm
10a7128d1a
Update QTreeView tooltips as they change #3403
2016-03-29 12:26:09 +02:00
Christian Kamm
41f43feecf
Add utility function for shorter time duration strings #3403
2016-03-29 12:26:09 +02:00
Christian Kamm
ffbd5df25f
Account UI: Fix log out button text #4578
2016-03-29 12:14:53 +02:00
Jocelyn Turcotte
69aa39f1f6
Don's use SyncFileStatus for Folder::createGuiLog
...
SyncFileStatus' purpose is to track overlay icon status.
Instead of putting comments and default: clauses in switch
on both sides about unused enums, use different enums.
This also remove STATUS_NEW which is the equivalent of
STATUS_SYNC in all shell extension implementations, and
remove STATUS_UPDATED and STATUS_STAT_ERROR which have
the same semantic as STATUS_UPTODATE and STATUS__ERROR.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
ea5e6d367b
Connect the SocketApi directly to the SyncFileStatusTracker
...
Don't go through the Folder->ProgressDispatcher->SocketApi route and
keep the path logic in SyncFileStatusTracker.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
da7b9916e5
Move the SocketApi business logic to a libsync SyncFileStatusTracker class
...
This will allow testing this code and avoid going through too many
layers to get notified and a file status changed.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
dac4bd8370
Remove null-checks for FolderMan::_socketApi
...
It's now created in the constructor and won't be null.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
6e16e34799
Remove SocketApi::dbFileRecord_capi in favor of JournalDB::getFileRecord
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
6d3fe9d865
Remove the tainted folder logic
...
This currently is no-op code since the socket API isn't notified
that the tainted folder list changed, and the result is the same
since a sync will be triggered within the next 5 seconds and the
modified folder will be shown as SYNC at that point anyway.
Removing the dependency to the file watcher allows moving the
status estimation logic to libsync.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
c090a511fd
Remove OwnCloud6 specific sharing code
...
If users encounter this situation, the share icon will simply not show.
This simplifies the transition to move this code in libsync.
2016-03-28 14:29:47 +02:00
Jocelyn Turcotte
2d2c7bc9b8
Move the SyncEngine construction to the Folder constructor
...
The SyncEngine is now created only once, at construction of the
Folder, instead of being reconstructed on each sync.
2016-03-28 13:26:38 +02:00
Jocelyn Turcotte
df386b64ba
Make the AccountState a construction argument of the Folder
...
This will help moving the SyncEngine construction in the constructor
and allow moving functionalities from Folder to SyncEngine or its
delegated objects.
2016-03-28 13:07:28 +02:00
Daniel Molkentin
7730e826b0
Merge pull request #4580 from owncloud/implement_ep_1136
...
Implement EP 1136
2016-03-24 14:58:09 +01:00
Daniel Molkentin
2d24585a8f
Implement enforcing a static URL postfix.
...
Second part of EP 1136
2016-03-24 14:18:52 +01:00
Klaas Freitag
1fe5d6bb0c
Notifications: Handle Notifications without an action.
...
The policy that was said is that if a notification has no action, the
client can and should display a close-button. This patch does it.
In additon to that, the client needs a blacklist of closed notifcations
otherwise they would re-appear next time the server notifications are
fetched again.
Also, changed the cleanup of not-longer-used widgets to be more robust.
2016-03-23 17:02:13 +01:00
Klaas Freitag
0c944a06f9
NotificationWidgetUI: Fix sizing and sizePolicy
2016-03-23 16:49:25 +01:00
Klaas Freitag
1bb3a4a45d
NotificationWidget: Remove accountName() and add activity() method.
2016-03-23 16:48:38 +01:00
Klaas Freitag
161d21904a
ActivityData: Add source file for implementation details
...
Add the ident() method and operators.
2016-03-23 16:47:13 +01:00
Klaas Freitag
f70c6282ca
Notifications: Remove unused variable.
2016-03-22 11:38:10 +01:00
Klaas Freitag
ad60e8ac89
Notifications: Fix handling of notifications to remove from the list.
...
If a notification is not longer in the list of notifications coming from
the server, it needs to be removed from the widget list.
2016-03-22 10:35:24 +01:00
Klaas Freitag
d03fcc95e4
Notifications: Maintain a timeSinceLastCheck for every Account.
...
In multi-account environment every account needs the own counter.
2016-03-22 09:58:30 +01:00
Daniel Molkentin
fb75adcd57
Wizard: Implement alternative forms of inquiring about the userID
...
Settable in the theme.
2016-03-21 23:50:48 +01:00
Klaas Freitag
d407aacc4a
Notifications: remove notification widgets if the notification is gone.
...
If a notification is not longer in the list that comes from the
server, the notification is removed.
That is mainly for the notifications that are created by the
announcement application
2016-03-21 16:32:37 +01:00
Klaas Freitag
b9663456d8
Notifications: Refresh the notifications based on a config value.
...
Pulls a timer that polls for new notifications regularly. Add
Config file method for the interval value.
2016-03-18 16:28:20 +01:00
Christian Kamm
03db1894d8
Fix wizardSelectiveSyncDefaultNothing #4581
2016-03-18 13:52:45 +01:00
Christian Kamm
ff4cdc3161
Quota: Change quota path if single folder #4460
...
Since the quota is a per-folder value, this will make the displayed data
more useful when a single sync folder is configured.
Of course each subfolder could have a different quota again.
2016-03-18 13:34:49 +01:00
Klaas Freitag
7f22a07312
Notifications: Check if the account is connected before querying.
...
Also avoid memory leaks if it is not connected.
2016-03-18 12:29:09 +01:00
Klaas Freitag
328d254f7f
Notifications: Remove "done" notification widgets after fife seconds.
2016-03-18 11:25:14 +01:00
Klaas Freitag
0a590b7cbe
Notifications: Give feedback if notifcation request succeeded.
...
Also display a time stamp.
2016-03-18 10:02:11 +01:00
Klaas Freitag
05de710b67
Notifications: Display timestamp of the notification in the widget
2016-03-18 08:21:54 +01:00
Christian Kamm
2bba68e059
Handle server timezone data correctly #4521
...
The date we receive from the server is an ISO8601 datetime that
includes the offset from UTC. Qt does correctly parse this
information and creates the appropriate QDateTime object.
Calling setTimeSpec(UTC) will force the timezone offset to 0 and
thereby change the referenced point in time to an incorrect one.
2016-03-17 13:04:18 +01:00
Olivier Goffart
254361cb87
Shared dialog: move the error label up ( #4348 )
2016-03-16 18:06:46 +01:00
Klaas Freitag
f7f412007e
Activity: Some documentation and better varialbe names
2016-03-16 16:31:52 +01:00
Klaas Freitag
45c32ec0b1
NotificationWidget: Remove not needed method.
2016-03-16 16:21:20 +01:00
Christian Kamm
7bd4f95b8c
SqlQuery: Write NULL when intended #4548
...
In SQLite bindings are not cleared by sqlite3_reset() calls, so
skipping a sqlite3_bind call to create a NULL value doesn't work,
instead the previous value will be written.
To fix this, I clear all bindings in SqlQuery::reset and make sure
to explicitly bind NULL when desired in SqlQuery::bind.
To make sure there's no confusion about SqlQuery::reset and
sqlite3_reset, I rename our method to reset_and_clear_bindings().
2016-03-15 14:38:31 +01:00
Klaas Freitag
a4dcc2784a
Notification: Fix plural handling for tray message
2016-03-14 16:21:04 +01:00
Klaas Freitag
9a2f1456c5
ocs jobs: Add a define for OCS job success.
2016-03-14 15:41:20 +01:00
Klaas Freitag
9d219a18f3
ActivityListModel: Code cleanups
...
based on review feedback.
2016-03-14 15:40:39 +01:00
Klaas Freitag
97f1694f7e
ActivityData: Simplified implementation.
...
Use QVariantHash and removed ActivityList object in favour
of a typedef
2016-03-14 15:39:07 +01:00
Klaas Freitag
73cd5a9c27
Notifications: Cleaner notification string build
2016-03-14 14:41:21 +01:00
Markus Goetz
6c07f08175
Proxies: Enable ownBrander to force system proxy usage #4458
2016-03-11 16:21:40 +01:00
Markus Goetz
62d4ed8087
Protocol: Show by default instead of server activity #4395
2016-03-11 16:08:56 +01:00
Klaas Freitag
adf9570a92
Notification: Enhance the tray message
...
Add the hostname from where the notification comes, as well as
the name of the application to the header.
2016-03-11 12:48:31 +01:00
Klaas Freitag
2c2a18af43
Activitiy: Refactor - move classes to their own source files.
...
Created a activitydata.h header (only) for the basic data, plus
a separate file for the model. Cleans up the widget source.
2016-03-11 11:41:19 +01:00
Klaas Freitag
2d1ab27cb5
Notifications: Refactor - create a notification handler class
...
That cleans the ActivityWidget class
2016-03-11 10:48:34 +01:00
Klaas Freitag
903e79a7c4
Notifications: Do a GUI tray notification if new notifciations arrive.
...
Show a GUI notification once an hour if no new notifications arrive
to not annoy users.
2016-03-11 10:15:28 +01:00
Klaas Freitag
8a0ce463da
Notifications: Properly delete the notification check job.
2016-03-10 17:46:00 +01:00
Klaas Freitag
7d13a1d8e1
Notifications: Check capabilities if the notifications are enabled
...
If not, do not query for them.
2016-03-10 17:46:00 +01:00
Klaas Freitag
4a4dac22e2
Notifications: Add a Progress indicator and handle job results.
...
Parse the replyCode from the button action calls and disable
buttons accordingly.
2016-03-10 17:46:00 +01:00
Klaas Freitag
32e16b323c
Display server notifications on the client ( #3733 )
...
As interaction is required, the notifications are displayed in a
separate widget above the server activity list.
Note that design and also where we display the notifications can
still be discussed and changed.
2016-03-10 17:46:00 +01:00
Klaas Freitag
688c5502a8
New GUI class NotificationWidget.
...
It displays a server notification that can come with a dynamic
set of buttons next to a message and a subject (=header)
2016-03-10 17:22:36 +01:00
Klaas Freitag
eb00b34191
Minor wording fixes
2016-03-10 17:22:36 +01:00
Markus Goetz
5cb45bf738
Merge pull request #4549 from owncloud/fix_4545
...
Add account name to warning message boxes in Folder
2016-03-09 19:12:34 +01:00
Markus Goetz
ad1c343cd7
Merge pull request #4552 from owncloud/hide_activity_tab
...
Activities: Hide if non of the accounts has the app enabled.
2016-03-09 15:34:12 +01:00
Christian Kamm
17003cec19
Settings: Hide update info if skipUpdateCheck #4397
...
(cherry picked from commit 93de378fb21e934d324d621f66eec98e53f1637a)
2016-03-09 15:32:32 +01:00
Markus Goetz
2843214d09
Merge pull request #4531 from ckamm/old-server
...
Add warnings for old server versions #4523
2016-03-09 15:16:48 +01:00
Daniel Molkentin
b456ded5e7
Show full path in warning message boxes before folder removal
...
Fixes #4545
2016-03-09 14:07:34 +01:00
Roeland Jago Douma
41d38b37cf
Add spinner to show we are creating the share
...
Fixes #3737
2016-03-08 20:54:14 +01:00
Olivier Goffart
54612455e6
Merge pull request #4513 from owncloud/csyncContextToSyncEngine
...
Move the csync_context creation in SyncEngine
2016-03-08 18:12:31 +01:00
Klaas Freitag
9c5b9f932b
Activities: Hide if non of the accounts has the app enabled.
...
If the ownCloud server does not have the activity app enabled,
it returns 999 as status code. If all the configured accounts
do that, this code hides the entire tab with the server
activities.
This is supposed to fix #4533
2016-03-08 18:01:42 +01:00
Jocelyn Turcotte
e91a5c85ff
Move the Logger reference back into src/gui
2016-03-03 20:26:48 +01:00
Christian Kamm
f66c28900a
Add warnings for old server versions #4523
...
* A tray message on every start up
* Red message in account settings
* Folders are paused when the server version switches to
an unsupported one
2016-03-02 12:54:22 +01:00
Christian Kamm
40c109597e
Improve folder pausing API
...
Previously one could accidentally call Folder::setSyncPaused() and miss
some expected side effects. Before, the correct call was to FolderMan::
slotSetFolderPaused(). Now the setter on Folder has the expected effect.
2016-03-02 11:06:03 +01:00
ckamm
6e9019120f
Merge pull request #4527 from ckamm/account-pause
...
Account pausing #3829
2016-03-02 10:35:40 +01:00
Roeland Jago Douma
e4ec09dd87
Do not send reshare permissions when creating a federated share
...
See https://github.com/owncloud/core/issues/22122#issuecomment-185637344
2016-03-01 16:58:47 +01:00
Roeland Jago Douma
ba42d40df9
Disable sharing dialog if account state is not connected
...
Fixes #4185
2016-03-01 16:55:56 +01:00
Christian Kamm
d521232587
AccountState: Allow storing state in settings
...
This will be useful if we ever want to store account-level gui state.
I built this originally because I thought a paused account would be
this kind of state.
2016-03-01 16:08:23 +01:00
Christian Kamm
10e8f03ea4
Add 'pause all' tray menu entry #3829
2016-03-01 16:07:11 +01:00
Roeland Douma
8877f04835
Merge pull request #4497 from owncloud/fix_4469
...
Lock the sharee input when sharing
2016-03-01 15:40:29 +01:00
Roeland Douma
f24fa46789
Merge pull request #4496 from owncloud/fix_4325
...
Add theming options control sharing operations
2016-03-01 15:33:04 +01:00
Jocelyn Turcotte
49f00499f7
Fix a crash when syncing
2016-02-26 18:05:04 +01:00
Jocelyn Turcotte
b8227afcaa
Move the csync_context creation in SyncEngine
...
The creation doesn't need to be separated from the SyncEngine anymore.
This allows the SyncEngine to be created in fewer steps if we want to
use it in tests.
This moves most of the direct csync code from Folder into the SyncEngine.
The exclude file logic for the context has been wrapped using the
existing ExcludedFiles class as well.
2016-02-25 20:53:13 +01:00
Jocelyn Turcotte
b8dee63d7a
Remove superfluous error checking from csync_create and csync_init
...
Given that we control all call sites, the only way that this can fail is during
OOM. Also remove the code in csync itself to make sure that it's obvious that
any new error case wouldn't be handled by call sites.
2016-02-25 20:53:13 +01:00
Olivier Goffart
1fafb1325b
Revert "AccountManager: take theURL from the Theme rather than from the config if the theme specify it"
...
The URL may change from shiboleth to normal authentication method.
Also some people were changing the config file manually to test stuff
Issue https://github.com/owncloud/enterprise/issues/1113
This reverts commit 7e5d89293d
.
2016-02-25 11:33:26 +01:00
Olivier Goffart
7e5d89293d
AccountManager: take theURL from the Theme rather than from the config if the theme specify it
...
That way an upgrade of the client can actually change the URL
Issue https://github.com/owncloud/enterprise/issues/1113
2016-02-23 18:10:11 +01:00
Markus Goetz
47ce4bd9e5
SelectiveSync: Improve menu #4378
2016-02-23 11:28:03 +01:00
Olivier Goffart
8fe4f1f0d7
Selective sync: Don't show negative size
...
Relates to issue #4491
2016-02-22 17:26:09 +01:00
Olivier Goffart
b3d57f3c7c
Cleanup syncengine after the new option not to ask confirmation when everything is removed
...
Cleanup after pull reuqest #4389
Do not make the SyncEngine depends on the ConfigFile
2016-02-22 16:14:22 +01:00
Roeland Jago Douma
cf0762a067
Lock the sharee input when sharing
...
This prevents accidentally sharing with the same sharee multiple times.
Because creating shares is not instance.
Fixes #4469
2016-02-22 15:14:05 +01:00
Roeland Jago Douma
99b3b752e3
Add theming options control sharing operations
...
Fixes #4325
2016-02-22 13:53:45 +01:00
Hefee
28b694b170
Merge branch '2.1'
2016-02-20 10:34:34 +01:00
Hefee
74f74e0363
fix typo occured->occurred
2016-02-20 10:33:13 +01:00
Daniel Molkentin
841973d399
Use correct values for items in version.rc
2016-02-17 14:16:29 +01:00
Daniel Molkentin
2918e45343
Add comment, transliterate copyright symbol
2016-02-16 17:56:51 +01:00
Daniel Molkentin
e3b56fb559
Add file description, copyright to win32 VERSIONINFO struct
2016-02-16 16:19:12 +01:00
Klaas Freitag
3cc9019b37
ActivityWidget: Set timespec to UTC for JSON values.
...
This will fix the problem in #4439 that the time display
jumps if the timezone is changed on windows.
2016-02-15 17:59:24 +01:00
Daniel Molkentin
37924b9c7f
Win32: More complete resource specification
...
Add application and vendor name
Addresses #4473
2016-02-15 15:51:48 +01:00
Olivier Goffart
dd89ab59e4
Use oc:size instead of quota-used-bytes to get the sizes of folder ( #4459 )
2016-02-11 15:09:47 +01:00
Olivier Goffart
c93ecfbfb5
Merge branch restore_backup
2016-02-10 17:47:06 +01:00
Olivier Goffart
e9307bb797
Use a constant for ConnectionValidator::DefaultCallingIntervalMsec
...
So there is no runtime initialization
2016-02-10 12:36:09 +01:00
Olivier Goffart
93308faeb9
Merge remote-tracking branch 'origin/2.1'
...
Conflicts:
doc/building.rst
2016-02-08 14:28:25 +01:00
Jocelyn Turcotte
f140d3447c
OS X: Fix the file system watcher ignoring unicode paths #4424
...
Add a missing string normalization when fetching the path
from the file system event.
2016-02-08 13:30:08 +01:00
Daniel Molkentin
dd76d72d61
Merge remote-tracking branch 'origin/2.1'
2016-01-26 14:09:38 +01:00
Christian Kamm
7eba784b0c
Share dialog: More error handling with password policy #4209
2016-01-22 14:49:30 +01:00
Jocelyn Turcotte
8486a2fd2b
Bring back the automatic authentication popups
...
Users have complained that they don't see the notification when it is
shown and are not aware that their files aren't syncing.
Remove the non-interactive credentials fetch logic and add make sure
that the shibboleth popup will flash in the taskbar instead.
This will still not allow the popup to show in front in all cases,
but this is a compromise that we have to chose.
This reverts commit dcb687929f
.
Issue https://github.com/owncloud/enterprise/issues/990
2016-01-22 14:25:36 +01:00
Christian Kamm
3b60f6e238
Sharing: Fix resharing items with limited permissions #4357 #4358
2016-01-21 14:21:25 +01:00
Christian Kamm
1534dad5b2
Sharing: Allow only one share dialog per path #3184
2016-01-20 13:17:54 +01:00
Christian Kamm
f705c56cb3
AccountSettings: Auto-expand only single folders #4283
2016-01-20 12:41:52 +01:00
Christian Kamm
4d52838e2b
Share dialog: Error reporting with password policy #4209
2016-01-20 09:49:10 +01:00
Christian Kamm
7f44e83cc7
Share dialog: Remove unintended spinner when password required
2016-01-20 09:49:10 +01:00
Olivier Goffart
7a676a748a
AccountSettings: fix Add Folder button size #4373
2016-01-19 17:39:43 +01:00
Jocelyn Turcotte
19a3a10524
Windows: Fix the progress text being cut but a few pixels
...
QFontMetrics::boundingRect doesn't return the right size for this
font size for some reason, while it works well if we remove the
smaller point size adjustment for the progress font.
To avoid having to debug the font system in Qt just increase the
existing +2px adjustment to +5px so that it renders fine.
2016-01-14 13:01:18 +01:00
Olivier Goffart
a18b13d56e
FolderDelegate: fix positions and margin
...
- Fix the margin of the progressbar to let some room for the '...' button
- Fix the size of the "Add Folder" button
2016-01-13 11:57:15 +01:00
Jocelyn Turcotte
31da3e98c9
Fix the folder option button click
...
The height adjustment done to place the button in the middle of the
non-error area was only done for rendering. Make sure that we do the
same adjustment when mapping click events as well.
Also replace some wrong occurences of aliasMargin*2 for margin.
2016-01-13 11:44:36 +01:00
Olivier Goffart
9800101748
Sharing: feedback when there is no result while searching for an user #4348
2016-01-12 14:36:13 +01:00
Olivier Goffart
1ed02f6494
Sharing: Display the error from the server when trying to share with users or group
2016-01-12 14:36:13 +01:00
Markus Goetz
9c9b9f3931
Activities: Fix color when row is selected
2016-01-11 16:52:37 +01:00
Jocelyn Turcotte
54c2c9ac4e
Windows: Fix HiDPI #3414
...
Use QT_DEVICE_PIXEL_RATIO=auto on Qt<=5.5 to enable automatic
scale factor settings on Windows. Also move the existing
Qt::AA_EnableHighDpiScaling logic to use the equivalent
QT_AUTO_SCREEN_SCALE_FACTOR=1 environment variable just to
keep the 5.5 and >=5.6 code at the same place.
2016-01-11 15:41:08 +01:00
Christian Kamm
abf5a5ad1e
Propagation: Fix dir <-> file changes propagating to server #4302
...
* Ensure every time a file becomes a directory or the other way around
the item is flagged as INSTRUCTION_TYPE_CHANGE.
* Delete the badly-typed entity if necessary in the propagation jobs.
2016-01-08 05:38:08 +01:00
Jocelyn Turcotte
ce6f90397a
Fix the rendering of the red error box text
...
QPainter::drawText uses the top of the font for the y position of its
rect argument, but uses the baseline when using a point argument.
Also use the margin variable that matches the font used instead of
the aliasMargin and make sure that the margin is only added between
the box and the text once.
2016-01-07 18:02:35 +01:00
Olivier Goffart
bb6a50be02
SettingsDialog: show "Account" for the tab name for branded client
...
https://github.com/owncloud/enterprise/issues/863
2016-01-07 17:59:21 +01:00
Jocelyn Turcotte
e7e918dafe
Only clean the Not Synced list for the current account #3171
2016-01-07 16:14:18 +01:00
Christian Kamm
71ad94ddb2
Fix crash when deleting account while sync is running #4337
2016-01-07 13:54:26 +01:00
Olivier Goffart
06ffc44073
Fix RTL languages in sync dialog #4336
2016-01-07 13:37:46 +01:00
Jocelyn Turcotte
e9ba7c612e
Keep only active entries in the Not Synced list #3171
...
Now that we have a separate list for files that could not be synced,
we can make sure that it only shows entries for files that are still
not in sync with the server. This allows the user to treat this list
as action items in order to get everything synced, including the
blacklist.
Simply remove the keep-errors logic that was used when the lists were
merged to achieve this result.
2016-01-07 11:37:50 +01:00
Daniel Molkentin
9c7066ac47
Translation cleanups
...
- Disambiguation
- Remove potentially illigitmate concatenations
2016-01-06 16:50:59 +01:00
Daniel Molkentin
cede7ec971
Work around layouting issue for RTL languages
...
This has been fixed in the meanwhile, but we are still shipping
with Qt 5.4. Also, some Linux Distros will still have older Qt
versions.
Addresses issue #4301
2016-01-06 12:52:58 +01:00
Jocelyn Turcotte
a63ebe0904
Bring back the red box for errors #3796
...
This use the previous code by resetting the progress to hide
the progress back and then return errors in the FolderErrorMsg
data role of the folder model.
This also remove the unused FolderRemotePath role, remove FolderStatus
in favor of invalidating all roles in dataChanged and make sure
that the SyncRunning role is transfered properly from the SyncResult
to show the warning icon during sync.
2016-01-06 12:37:35 +01:00
Jocelyn Turcotte
62df938465
Rename SyncFileStatus::STATUS_SYNC to STATUS_UPTODATE
...
Also use STATUS_UPDATED instead to match SyncFileItem::Success in the SocketAPI.
2016-01-05 15:41:15 +01:00
Markus Goetz
634dad033f
Debug: Attempt to make log more useful
2016-01-05 15:12:00 +01:00
Markus Goetz
60a6b2b0c3
OS X: Also show desktop notifications when app is active
2016-01-05 13:33:05 +01:00
Christian Kamm
2662203fb7
Windows: Fix deleting and replacing of read-only files #4308
2016-01-05 13:15:59 +01:00
Olivier Goffart
1bb76f5343
Attempt to recover from backup restoration on the server
...
If all the files bring us to past timestamp, it is possibly a backup
restoration in the server. In which case we want don't want to just
overwrite newer files with the older ones.
Issue #2325
2016-01-05 12:14:18 +01:00
Jocelyn Turcotte
2e7a3f9e37
Fix a missing sync-exclude.lst file not failing the sync
...
After c3cf6aef7d
the invokeMethod calls
should be adjusted to pass the new method arguments.
The result was currently a passing sync with this error message on
the console:
QMetaObject::invokeMethod: No such method OCC::Folder::slotSyncFinished()
2016-01-04 17:01:21 +01:00
Markus Goetz
c8b3df6668
OS X: Fix alignment of "Copy" button in protocol #4207
2016-01-04 16:16:15 +01:00
Olivier Goffart
639301e9e9
Merge remote-tracking branch 'origin/2.1'
...
Conflicts:
VERSION.cmake
2016-01-04 12:38:59 +01:00
Olivier Goffart
970cdcfdbb
SocketAPI: SHARE: Fix the paths when creating the share dialog
...
The socket api uses native folder separator. We need to use QDir::cleanPath
for anything else so we only work with '/' everywhere else in the code
This fixes the sharing dialog on window.
Issue #4311
2016-01-04 12:06:09 +01:00
Daniel Molkentin
16030a61eb
Enable HiDpi scaling with Qt 5.6
2016-01-04 11:50:00 +01:00
Daniel Molkentin
5487fc1f9c
Ensure Qt translator does always get loaded.
2016-01-04 11:50:00 +01:00
Klaas Freitag
a759ba1d9e
Do not use nullptr, old compilers die on it.
2015-12-22 15:07:51 +01:00
Klaas Freitag
c607707580
Backport of #4245
2015-12-22 10:26:13 +01:00
Klaas Freitag
8f26bb698d
Merge pull request #4245 from masoudcs/masoudcs-patch-1
...
Fixing bug in opening Activity log from tray icon menu 'Recent Changes/Details...'
2015-12-22 10:15:14 +01:00
Olivier Goffart
a0b913f65d
gui: Word Wrap in QInputDialog ( #4197 )
2015-12-22 10:08:17 +01:00
Olivier Goffart
48a0ffdc9e
Systray: Use the original name for the rename notification #4295
...
Otherwise it shows twice as "newname was renamed to newname".
Because _file is set to the new name in PropagateLocalRename::start
2015-12-21 11:06:39 +01:00
Christian Kamm
0555c88425
User Sharing: Match user names and case insensitive #4269
2015-12-10 14:56:15 +01:00
Christian Kamm
e2d1a5a41d
Share UI: Allow typing in a sharee
...
Previously you *had* to select one of the completion options, even
if the text in the lineedit was identical to one of the options.
2015-12-10 13:49:47 +01:00
Christian Kamm
df1b309b36
FolderWatcher: Remove IN_DONT_FOLLOW #3475
...
This fixes the case of the root folder being symlinked.
2015-12-10 13:05:43 +01:00
Christian Kamm
e3b53b7e74
Log: Remove scary messages :)
2015-12-10 11:50:19 +01:00
Christian Kamm
d8d9fcf2f4
Silence warning about zorder in .ui file.
2015-12-10 11:10:49 +01:00
Christian Kamm
ae806e8214
Merge remote-tracking branch 'origin/2.1'
2015-12-10 11:07:20 +01:00
Christian Kamm
8b5474ff67
SocketAPI: Don't use ERROR for SoftErrors #3944
2015-12-10 11:02:38 +01:00
Christian Kamm
f65a29df5d
SocketAPI: Ensure messages are consistent #3944
...
Before we blindly broadcasted the result of a sync action. That was
often different from what a subsequent FILE_STATUS query would report.
2015-12-10 10:43:17 +01:00
Christian Kamm
fd18c565b0
SocketAPI: Fix file error cache #3944
2015-12-10 10:43:17 +01:00
Christian Kamm
fbb85fab81
Activity tab doesn't vanish with too many accounts #4188
...
The bug was introduced by a bad merge.
2015-12-10 09:43:16 +01:00
Christian Kamm
3572e7ffa4
Activity: Improve formatting of copied data #3498
2015-12-09 15:49:30 +01:00
Christian Kamm
fe75c6ad28
Wizard: Find user:pw even if redirected #4265
2015-12-09 14:48:51 +01:00
Christian Kamm
3de8f27a02
Force account wizard when last account is deleted #4266
2015-12-09 11:41:43 +01:00
Christian Kamm
4dfce57a58
Creds: Forget password on explicit sign-out #4241
2015-12-09 11:31:37 +01:00
Christian Kamm
179b25d289
AccountWizard: Don't crash when sync is running #4221
...
Running FolderMan::setupFolders() is redundant and just a leftover
from before multiaccount.
2015-12-09 09:08:21 +01:00
Christian Kamm
a2eee7e349
Share UI: Hide 'allow editing' for files #4211
2015-12-08 15:37:17 +01:00
Christian Kamm
cec4b803cf
Share UI: Hide 'can share' if capability missing #4231
2015-12-08 12:58:56 +01:00
Christian Kamm
1a519ac1fb
Share UI: Respect enfore-expire #4235
2015-12-08 12:16:05 +01:00
Christian Kamm
d92c8bec86
UI: Sign in/out -> Log in/out #4249
2015-12-08 12:05:14 +01:00
Olivier Goffart
68057c1c5a
Sharee.cpp: Get rid of lambdas because we still need to support GCC 4.4
2015-12-03 14:47:59 +01:00
Masoud Kazemi
903dd8acef
Fixing bug in opening Activity log from tray icon menu 'Recent Changes/Details...'
2015-12-03 15:25:59 +03:30
Markus Goetz
c4006795cc
OS X: Attempt to fix account add oddities #4237
2015-12-02 17:59:41 +01:00
Markus Goetz
d15cf0c2ff
Sharing: Remove mentioning of remote users from dialog #4234
2015-12-02 16:44:29 +01:00
Klaas Freitag
770ad54229
AccountSettings: Update the visibility of the add account button.
...
That fixes #4238
2015-12-02 16:33:37 +01:00
Markus Goetz
a75209d104
Account: Invalidate credentials when clicking "Sign out" #4241
2015-12-02 16:31:58 +01:00
Daniel Molkentin
ab5e543099
Use user-readable short folder path in the context menu
2015-12-02 15:46:42 +01:00
Klaas Freitag
451ebd447b
Merge pull request #4169 from owncloud/2.1_file_exists_before_share
...
[Sharing] Make sure the file is actually synced to the server
2015-12-02 13:40:42 +01:00
Olivier Goffart
e27374324d
AccountSettings: Remove the F5 reset folder shortcut
...
This secret key was used to wipe the database. In the past this was
usefull because of many bugs, but now this is not usefull anymore.
And cause trouble because it also erase the selective sync list.
Issue #4182
2015-12-02 12:27:53 +01:00
Klaas Freitag
4a2b5f7cc8
Merge pull request #4228 from owncloud/enforce_password-block
...
[Sharing] Do not allow users to uset the password if it is enforced
2015-12-02 10:07:04 +01:00
Klaas Freitag
52dc55d044
ShareLinkWidget: Stop editing progress animation if passwd is required.
2015-12-02 10:06:34 +01:00
Klaas Freitag
e6ab047751
ShareLinkWidget: Set state of passwd checkbox always.
2015-12-02 10:05:56 +01:00
Markus Goetz
c24a8ba208
Account removal: More crash fixes for Windows
...
Seems things happen a bit different here, maybe because of paint events.
For #4229 #4202
2015-12-01 19:21:52 +01:00
Markus Goetz
db7d70a929
Account removal: Do it inside global application object
...
For #4229 #4202
2015-12-01 16:32:04 +01:00
Roeland Jago Douma
01faf102ba
[Sharing] Do not allow users to uset the password if it is enforced
2015-12-01 12:43:14 +01:00
Olivier Goffart
76d1296053
Disable some code that needs lambda with old GCC
...
It's just a feature that was not there in 2.0
It means that removed folder stay on the undecided list if it is removed
from the server until the user press apply in the selective sync widget.
Not a very bad bug anyway.
2015-12-01 10:30:11 +01:00
Roeland Jago Douma
b033a8e731
[Sharing] Files should not have create permissions
2015-11-30 15:47:10 +01:00
Arthur Schiwon
d62c51890e
show displaynames of users in share dialog instead of userid
2015-11-27 15:19:39 +01:00
Klaas Freitag
b896d8aa15
ActivityWidget: Fix type ( #4204 )
2015-11-26 21:41:31 +01:00
Christian Kamm
9e66a6bec6
Settings dialog: Fix crash when deleting account #4202
2015-11-26 13:27:20 +01:00
Roeland Douma
f1435c86ed
Merge pull request #4199 from owncloud/permission_dropdown
...
[Sharing] Permissions now in dropdown menu
2015-11-25 14:04:39 +01:00
Roeland Jago Douma
ece164f679
[Share] Use more icon
2015-11-25 14:02:45 +01:00
Roeland Jago Douma
f1faf8745a
[Sharing] Permissions now in dropdown menu
...
As discusses with jan.
* Detailed permissions displayed in qtoolboxmenu
* Made share rows slightly smaller
Bug fix:
* Do not show delete permissions for file shares
2015-11-25 11:26:21 +01:00
Christian Kamm
5216648d0b
Share dialog: Work around painting bug #4189
2015-11-25 10:09:41 +01:00
Roeland Jago Douma
fcdab1e804
[Sharing] Also add sync status to SHARE_STATUS command
2015-11-25 09:40:21 +01:00
Roeland Jago Douma
9f15ba3972
[Sharing] Make sure the file is actually synced to the server
...
Before we attemt any sharing make sure the file is synced to the server.
2015-11-25 09:22:20 +01:00
Markus Goetz
76ce9ff8c4
Activity List: Improve double click handling on filenames #4168
2015-11-24 14:25:16 +01:00
Christian Kamm
23ed68c8dd
Re-apply ee69ab2021
2015-11-24 13:45:02 +01:00
Christian Kamm
2982c79444
Settings: Fix "Choose what to sync" #4187
...
There was a duplicate connect() due to a merge problem (?) in
7e4c0bd515
2015-11-24 13:41:00 +01:00
Christian Kamm
7e56408331
SelectiveSync: Show Apply/Cancel less
...
Before the selective sync status text and apply/cancel buttons
were shown as soon as any folder was expanded. This changes it
to only show when the model is dirty (or a big folder confirmation
is needed).
This is nice because we auto-open the folder list sometimes
and having the apply/cancel buttons visible makes users think a
decision is needed.
2015-11-24 13:01:10 +01:00
Christian Kamm
bcfdcec3ee
Share dialog: Adjust layout #4119
2015-11-24 12:30:53 +01:00
Christian Kamm
f96d94f143
ShareDialog: Only link share if capabilities allow #4179
2015-11-24 11:58:10 +01:00
Christian Kamm
f9dc569b0a
Share dialog: Don't close on enter
...
Setting default=false was not enough.
2015-11-24 09:58:18 +01:00
Christian Kamm
f7932bb0c7
ShareDialog: Completion uses MatchContains #4123
...
For Qt 5.2.0+ only.
2015-11-24 09:10:26 +01:00
Markus Goetz
b52a3a415c
Connectivity: Improve reconnecting after network change/disconnect #4167
2015-11-23 21:48:26 +01:00
Markus Goetz
709da37be2
Activities: Only emit debug when actually refreshing
2015-11-23 21:48:25 +01:00
Christian Kamm
bd72642a58
ShareLink: Always initialize expire date #4075
2015-11-23 09:42:16 +01:00
Olivier Goffart
0020211857
owncloudcmd: Don't do a check that file are older than 2s ( #4160 )
...
This is required for the smashbox test to pass
2015-11-20 15:16:09 +01:00
Klaas Freitag
94e7c762bf
ActivityWidget: display if the server does not support acitivities.
...
If the server does not have the activities app enabled, it says so now.
Fix for #4163
2015-11-19 16:01:51 +01:00
Klaas Freitag
421c6a92f3
NetworkJobs: JSON network job now reports OCS reply code.
...
The signal jsonReceived() now not only delivers the raw json string, but
also the status code that came as OCS reply.
Also, fixed a typo in the signals name (recieved => received).
2015-11-19 16:01:51 +01:00
Olivier Goffart
d6aa667971
ShareDialog: remove the "Premissions" label and adjust the size of the scrollarea ( #3737 )
2015-11-19 12:32:50 +01:00
Olivier Goffart
575fc9acbd
ShareDialog: show an error if the sharing API is disabled ( #4126 )
2015-11-19 12:00:53 +01:00
Olivier Goffart
d581550130
Fix compilation warning
2015-11-19 10:50:52 +01:00
Olivier Goffart
952a134745
Sharing: document that the two Type enum are linked
2015-11-19 10:50:21 +01:00
Olivier Goffart
887aa952fe
ShareDialog: Keep default server permissions by default ( #4152 )
2015-11-19 10:49:39 +01:00
Phil Davis
55a96af7cc
tagLastSuccessfullETagRequest comment wording
...
Improve this to say what I think it means.
2015-11-19 11:02:15 +05:45
Olivier Goffart
41a6f6df84
FolderStatusModel: add hints for translators ( #4158 )
2015-11-18 16:35:11 +01:00
Olivier Goffart
4984da7e0d
Activity Widget: Fix runtime warning
...
Fix the warning:
QLayout: Attempting to add QLayout "" to OCC::ActivitySettings "", which already has a layout
It was caused because one layout was created with the wrong parent
2015-11-18 15:32:39 +01:00
Markus Goetz
f2d8143511
Activity View: Update only if visible and when becoming visible #4083
2015-11-18 15:25:29 +01:00
Markus Goetz
3c1a605f62
Connectivity: Also accept SyncEngine etag as received ETag
...
Avoids requests on startup.
For #3964
2015-11-18 14:51:28 +01:00
Markus Goetz
65ec8a9e94
Connectivity: Decrease debug logging
...
For #3964
2015-11-18 12:13:21 +01:00
Klaas Freitag
60598c0d34
Use the configuration value of remotePollInterval rather than hardcoded.
2015-11-18 11:40:29 +01:00
Klaas Freitag
3d7fc711ca
AccountState: Avoid ConnectionCheck if ETag job was just done.
...
This patch lets a successful etag job check mark a timestamp.
If next time a connection check is requested, it is checked if
the last ETag happened within the last 30 seconds and if so the
connection check can be checked.
This way we avoid half of the PROPFINDs if all goes well.
2015-11-18 11:40:29 +01:00
Klaas Freitag
46dbca1bf5
ShareDialog: Remove Qt4 incompatible property of QScrollView.
2015-11-18 10:30:02 +01:00
Klaas Freitag
f5da95a5b7
ActivityWidget: Make compile with Qt4
2015-11-18 10:30:01 +01:00
Daniel Molkentin
b37361e21c
Remove spacer that would constrain a vertical resize
...
Fixes #4157
2015-11-18 10:06:38 +01:00
Klaas Freitag
5ec4fd94e0
ActivityWidget: No progress indic. for non connected accounts.
2015-11-17 15:05:54 +01:00
Klaas Freitag
c9ef4d5fa0
ActivityWidget: Detect new items in the list to refetch the activities.
...
On refresh, remove the activity list object from the models list.
2015-11-17 14:46:25 +01:00
Klaas Freitag
1cdf0e8597
ActivityWidget: Always combine the final activity list.
...
In cases where the activity app is not activated on the server, the
returned list of activities is empty, so it is better this way.
2015-11-17 14:46:25 +01:00
Olivier Goffart
e0f54428d0
ShareDialog: softer line separator ( #3737 )
2015-11-17 12:02:20 +01:00
Markus Goetz
52a11b0835
Activities: Fix on Mac #4083
2015-11-17 11:53:49 +01:00
Markus Goetz
ef17dc6482
Connectivity: Improve log output
2015-11-17 11:02:53 +01:00
Olivier Goffart
f618ed3dfb
gui: Fix some icons in highdpi
...
QIcon does not need to use Theme::hidpiFileName because QIcon takes care
of the @2x images
2015-11-17 10:48:45 +01:00
Olivier Goffart
ef915fb2e5
SharedDialog: Fix the delete icon on windows and mac ( #3737 )
2015-11-17 10:40:45 +01:00