Jocelyn Turcotte
7561f5c717
Add comment and cleanup the csync exclude list code
...
Removed the csync_add_exclude_list function that isn't use anywhere
anymore.
2016-03-03 20:26:48 +01:00
Christian Kamm
c554f5383c
Downloads: Preserve group ownership #4330
2016-03-03 12:02:06 +01:00
Christian Kamm
4f48c888ef
Don't use QVector::removeOne, added in Qt 5.4
...
A QList makes sense there and makes the rest of the code
work with earlier Qt versions.
2016-03-03 10:03:41 +01:00
Markus Goetz
266508b691
Merge pull request #4529 from owncloud/dynamic_parallelism_scaling
...
Propagator: Pump in more requests if we think current ones are quick
2016-03-02 15:23:58 +01:00
Markus Goetz
d78c3679e7
Propagator: Pump in more requests if we think current ones are quick
...
Helps with small file sync #331
When I benchmarked this, it went up to 6 parallelism and
was about 1/3 faster than the previous fixed 3 parallelism.
Doing more than 6 is dangerous because QNAM limits to 6 TCP
connections and also the server might become a bottleneck.
Should also help for #4081
2016-03-02 15:22:21 +01:00
Christian Kamm
d6d3502960
Checksums: Compute content checksum on download #4375
2016-03-02 14:28:41 +01:00
Christian Kamm
7ed7512f27
Checksums: Content checksums for all uploads #4375
2016-03-02 14:28:20 +01:00
ckamm
ffa78b99d9
Merge pull request #4512 from owncloud/add-checksum-to-database
...
Checksums: keep the transfer checksum in the database as the content …
2016-03-02 14:04:37 +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
Christian Kamm
a9b00a7489
Don't make files read-only when server is too old #4450
2016-03-01 10:11:20 +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
e6f81d3965
Checksums: keep the transfer checksum in the database as the content checksum
...
Currently, we only use this for .eml files. But we can just store this checksum
in the database if it was computed anyway.
Issue #4487
2016-02-25 17:17:14 +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
60c101d90b
PropagatorDownload: fix possible crash
...
Backtrace seen from the crash reporter where reply() is null.
2016-02-24 19:52:14 +01:00
Olivier Goffart
b685f6b6b6
Chunking: change the default chunk size to 10MB
...
As discussed with Klaas, this seems to be a better compromise.
10MB * 3 prarralel jobs = 30MB in memory, and to retry in case of
disconnection. Which is still reasonable. And might make the upload
almost twice as fast on fast network where the amount of chunk is the
bottleneck (because of more server processing)
Relates to issue #4354
2016-02-24 16:25:45 +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
fe7630954e
Propagator: Remove 100msec delay between jobs
2016-02-23 14:27:35 +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
Markus Goetz
a76ba06817
Merge pull request #4389 from Bottswana/deleteprompt
...
Add option to disable the delete all files prompt
2016-02-22 15:44:50 +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
Markus Goetz
5d7aa792e7
SyncEngine: Improve error message for ignored files/folders #4143
2016-02-22 11:13:29 +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
7f18d087e6
Utility: Make the timeAgoInWords method a bit more verbose
2016-02-15 17:59:24 +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
cd83772112
SyncJounral: add an index on the error blacklist table
...
https://github.com/owncloud/enterprise/issues/1035
2016-02-11 14:38:38 +01:00
Olivier Goffart
c93ecfbfb5
Merge branch restore_backup
2016-02-10 17:47:06 +01:00
Olivier Goffart
893e22691d
ConnectionValidator: Make sure we intercept propfind error
...
If the PROPFIND return an invalid code (like 200) then we would
not recieve the error signal and we would never sync again.
Found while investigating https://github.com/owncloud/enterprise/issues/1068
2016-02-10 15:38:21 +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
Olivier Goffart
6b643c7501
Discovery: don't ignore recall file #4420
...
The ".sys.admin#recall#" is the recall file and should not be ignored
even if hidden.
The remote discovery do not need to detect hidden files because it
is already detected by csync in all cases. So this avoid code duplication
2016-02-08 12:07:34 +01:00
James Botting
f442195b8a
Remove option from GUI, leaving config option only.
2016-02-05 15:48:17 +00:00
Olivier Goffart
54a278edb9
fix compilation with TOKEN_AUTH_ONLY
2016-02-05 15:30:29 +01:00
Daniel Molkentin
dd76d72d61
Merge remote-tracking branch 'origin/2.1'
2016-01-26 14:09:38 +01:00
James Botting
d8af949a6a
Alter sync engine to check new setting before displaying prompt
2016-01-24 18:45:29 +00:00
James Botting
74a8c4aae8
Add additional configuration option to toggle display of delete prompt
2016-01-24 18:45:12 +00: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
Olivier Goffart
47710d167a
SyncEngine: fix inode after move if the file has moved on the file system
...
This is the fix for issue #4370
Step to reproduce the bug:
1) have lots of files in directory "dir1"
2) do mkdir dir2 && mv dir1/* dir2
3) DURING the sync (which takes time because of the many moves) do mkdir dir3 && mv dir2/* dir3/
4) observe that files are PUT in the next sync
The problem is that SyncJournalFileRecord::SyncJournalFileRecord will fail to
get the inode after the forst move because the files are already moved on the
filesystem. Normaly it should use the inode from the discovery phase in that
case but that is not working because it comes from the remote node in case of
moves, so the code in SyncEngine::treewalkFile would not set the inode.
Test in https://github.com/owncloud/smashbox/pull/143
2016-01-20 13:49:12 +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
Christian Kamm
17895f3a30
Win: Fix filesystem detection for exFAT workaround #2701
2016-01-19 10:00:12 +01:00
Olivier Goffart
d12c0939b9
Upload: Chunk size can be changed in the config file
...
Added a new "chunkSize" entry in the General group of the owncloud.cfg
which can be set to the size, in bytes, of the chunks.
This allow user with hude bandwidth to select more optimal chunk size
Issue #4354
2016-01-15 13:16:52 +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
bbedeed1c5
SyncEngine: For server older than 8.1, ignore invalid char in new directories
...
Server older than 8.1 cannot cope with invalid char in the filename
so we must not send them from the client. We were already checking
for new files, but not for renames or new directories.
https://github.com/owncloud/enterprise/issues/1009
2016-01-13 17:53:12 +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
272755e1ec
ConfigFile: Create the directory when using --confdir and it does not exist
...
Previously we would fail to start if the directory was not existing.
This was working for relative directory, but it should also work for
absolute ones
https://github.com/owncloud/enterprise/issues/970
2016-01-13 10:31:02 +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
Christian Kamm
d4b6b5cb1d
Propagator: Remove warning when moving out of deleted folder
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
Olivier Goffart
81b7798ac2
HttpCredentials::slotAuthentication: fix comment
...
The recent revert did no fix the comment
2016-01-07 14:58:02 +01:00
Olivier Goffart
868d4c781a
HTTP creds: Fix GUI blocking for 5 seconds when entering wrong password
...
The Qt HTTP thread calls authenticationRequired (indirectly) using a
BlockingQueuedConnection. So when we call invalidateToken from slot
connected to this signal and end up calling QNAM::clearAccessCache which
waits on the thread for 5 seconds
Backtraces:
Qt HTTP thread:
#0 0x00007ffff20c707f in pthread_cond_wait@@GLIBC_2.3.2 ()
#1 0x00007ffff43f0c0b in QWaitConditionPrivate::wait
#2 QWaitCondition::wait
#3 0x00007ffff43ea06b in QSemaphore::acquire
#4 0x00007ffff45dcf6f in QMetaObject::activate
[...]
#9 0x00007ffff45dd607 in QMetaObject::activate
#10 0x00007ffff4edbaf7 in QHttpNetworkReply::authenticationRequired
#11 0x00007ffff4e0b2b4 in QHttpNetworkConnectionPrivate::handleAuthenticateChallenge
#12 0x00007ffff4e10753 in QHttpNetworkConnectionChannel::handleStatus
#13 0x00007ffff4e11cc9 in QHttpNetworkConnectionChannel::allDone
#14 0x00007ffff4e14605 in QHttpProtocolHandler::_q_receiveReply
Main Thread:
#0 0x00007ffff20c7428 in pthread_cond_timedwait@@GLIBC_2.3.2 ()
#1 0x00007ffff43f0b56 in QWaitConditionPrivate::wait_relative (time=5000, this=0x136c580)
#2 QWaitConditionPrivate::wait (time=5000, this=0x136c580)
#3 QWaitCondition::wait (this=this@entry=0x136c788, mutex=mutex@entry=0x136c760, time=time@entry=5000)
#4 0x00007ffff43efa6e in QThread::wait (this=<optimized out>, time=time@entry=5000)
#5 0x00007ffff4e1edd3 in QNetworkAccessManagerPrivate::clearCache
#6 0x00007ffff7b6fb03 in OCC::HttpCredentials::invalidateToken()
#7 0x000000000057adb4 in OCC::AccountState::slotInvalidCredentials()
#8 0x000000000057ac76 in OCC::AccountState::slotConnectionValidatorResult(OCC::ConnectionValidator::Status, QStringList const&) ()
#9 0x00000000005ab45c in OCC::AccountState::qt_static_metacall(QObject*, QMetaObject::Call, int, void**)
#10 0x00007ffff45dcd30 in QMetaObject::activate
#11 0x00007ffff7b78671 in OCC::ConnectionValidator::connectionResult(OCC::ConnectionValidator::Status, QStringList) ()
#12 0x00007ffff7ae2514 in OCC::ConnectionValidator::reportResult(OCC::ConnectionValidator::Status) ()
#13 0x00007ffff7ae39b7 in OCC::ConnectionValidator::slotAuthFailed(QNetworkReply*) ()
#14 0x00007ffff7b784a9 in OCC::ConnectionValidator::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#15 0x00007ffff45dcd30 in QMetaObject::activate
#16 0x00007ffff7b766dc in OCC::AbstractNetworkJob::networkError(QNetworkReply*)
#17 0x00007ffff7af9f6e in OCC::AbstractNetworkJob::slotFinished()
#18 0x00007ffff7b7654d in OCC::AbstractNetworkJob::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#20 0x00007ffff45dd607 in QMetaObject::activate
#21 0x00007ffff4edd143 in QNetworkReply::finished
#22 0x00007ffff4e3fec7 in QNetworkReplyHttpImplPrivate::finished
#23 0x00007ffff4e41818 in QNetworkReplyHttpImpl::close
#24 0x00007ffff7b7047b in OCC::HttpCredentials::slotAuthentication(QNetworkReply*, QAuthenticator*) ()
#25 0x00007ffff7b79092 in OCC::HttpCredentials::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#27 0x00007ffff45dd607 in QMetaObject::activate
#28 0x00007ffff4e1d6fb in QNetworkAccessManager::authenticationRequired
#29 0x00007ffff4e1ea07 in QNetworkAccessManagerPrivate::authenticationRequired
#30 0x00007ffff4e3c784 in QNetworkReplyHttpImplPrivate::httpAuthenticationRequired
Another case of Main Thread:
#5 0x00007ffff4e1edd3 in QNetworkAccessManagerPrivate::clearCache
#6 0x00007ffff7b6fb03 in OCC::HttpCredentials::invalidateToken()
#7 0x000000000057b1e4 in OCC::AccountState::slotInvalidCredentials() ()
#8 0x00000000005abb8a in OCC::AccountState::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#9 0x00007ffff45dcd30 in QMetaObject::activate
#10 0x00007ffff7b76ed5 in OCC::Account::invalidCredentials() ()
#11 0x00007ffff7ad55f5 in OCC::Account::handleInvalidCredentials()
#12 0x00007ffff7afa69a in OCC::AbstractNetworkJob::slotFinished()
#13 0x00007ffff7b7654d in OCC::AbstractNetworkJob::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#15 0x00007ffff45dd607 in QMetaObject::activate
#16 0x00007ffff4edd143 in QNetworkReply::finished
#17 0x00007ffff4e3fec7 in QNetworkReplyHttpImplPrivate::finished
#18 0x00007ffff4e41818 in QNetworkReplyHttpImpl::close
#19 0x00007ffff7b7047b in OCC::HttpCredentials::slotAuthentication(QNetworkReply*, QAuthenticator*) ()
#20 0x00007ffff7b79092 in OCC::HttpCredentials::qt_static_metacall(QObject*, QMetaObject::Call, int, void**) ()
#22 0x00007ffff45dd607 in QMetaObject::activate
#23 0x00007ffff4e1d6fb in QNetworkAccessManager::authenticationRequired
2016-01-07 14:46:49 +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
2f355c473a
Don't show parent folders in the error list #3796
...
The error status of children should only be used for the etag logic.
The SocketApi uses a path matching system to do this and the UI should
report errors only for individual involved files/directories.
2016-01-06 12:37:35 +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
Markus Goetz
ef9483c82d
Revert "HTTP Creds: Do not send the password at every request"
...
We need this for #4326
This reverts commit ae17f58b80
.
2016-01-06 11:50:52 +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
Jocelyn Turcotte
6e3809528e
Fix OK statuses not being broadcasted during a sync #3944
...
Since the presence of any path in SyncEngine::_syncedItems
would translate in a SYNC status, platforms that don't refresh
all their status cache after an UPDATE_VIEW message like OS X
or Windows would keep displaying that status even after all
files are successfully synchronized.
- Read SyncFileItem::_status to determine the status to display mid-sync
- Match moved paths also to _renameTarget since this might be the
path to match
- Make sure that PropagateDirectory jobs also set SyncFileItem::_status
properly
2016-01-05 15:08:26 +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
Christian Kamm
d4edab02b0
Propagator: Deal with directories becoming files #4302
...
Note, in particular the revised order of directory deletion jobs.
2016-01-05 10:26:41 +01:00
Christian Kamm
5cc4c03b6a
Propagator: Deal with files becoming directories #4302
...
This needed adjustments in reconcile, to mark the item as SYNC
as well as additions to the LocalMkdir job.
2016-01-05 10:26:41 +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
cf5b1e401c
csync_vio_local_stat: Win: fetch mtime and size if not previously fetched
...
Since owncloud 2.1, csync_vio_local_stat was optimized because readdir
would already fetch most of the info. This works for the discovery,
but not later. And we used this function later for symliks and co.
So this fixes the .lnk on windows
Issue #4300
2015-12-21 14:25:30 +01:00
Olivier Goffart
11174ddf4c
PropagateLocalRemove: Make it possible to remove read only files ( #4277 )
2015-12-21 13:25:10 +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
Christian Kamm
eb28d171f3
Doc: Add checksum overview
2015-12-08 10:59:42 +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
Klaas Freitag
cf06083d1b
Utilities: Include math.h because of floor()
2015-12-02 17:56:37 +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
c79879aa07
[Sharing] Default capabilitie for link sharing
...
Required to fix sharing for pre 8.1 servers
2015-11-30 16:55:06 +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
Klaas Freitag
1ad8e539aa
SyncJournalFileRecord: Fix comparison operator
...
Compare only full seconds, as milliseconds can disappear during storage
of the database.
This is needed to fix the syncjournaldb test reliably. And maybe
elsewhere.
Also see
http://www.qtcentre.org/threads/13618-Problem-with-comparing-two-QDateTime-objects
2015-11-25 21:11:58 +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
Christian Kamm
698f47d5ad
Blacklist: Treat all 403s the same #4071
...
We can't detect firewall errors due to error message localization.
2015-11-25 12:49:57 +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
df63579071
Blacklist: Firewall errors are silenced for up to 1h only #4071
2015-11-25 10:39:43 +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
adea301e5b
Blacklist: Clear on successful chunk upload #3934
2015-11-24 10:09:55 +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
33dcb0c8d9
PropagateLocalRemove: Add debug
...
Was not in log so far
2015-11-23 21:48:25 +01:00
Markus Goetz
709da37be2
Activities: Only emit debug when actually refreshing
2015-11-23 21:48:25 +01:00
Christian Kamm
2458f07ca1
Checksums: Reuse the discovery checksum where possible
2015-11-23 14:13:10 +01:00
Christian Kamm
6cf5fc7f7d
Permissions: Keep more user permissions
...
t4.pl discovered that it'd needlessly override permissions sometimes
2015-11-23 13:24:05 +01:00
Christian Kamm
10db6cee6c
Rename files
2015-11-23 12:09:25 +01:00
Christian Kamm
a25f094c4c
Checksums: Don't reupload if size and checksum are unchanged #3235
...
* Compute the content checksum (in addition to the optional
transmission checksum) during upload (.eml files only)
* Add hook to compute and compare the checksum in csync_update
* Add content checksum to database, remove transmission checksum
2015-11-23 11:59:56 +01:00
Christian Kamm
bdf830f691
Add an experimental ProppatchJob #3235
2015-11-23 11:59:56 +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
Klaas Freitag
8abaf92083
Merge git://github.com/NvanAdrichem/client into 2.1, pull #4060
2015-11-18 17:00:19 +01:00
Klaas Freitag
b0c29d5c66
Merge pull request #4159 from owncloud/fix_3490
...
csync updater: Handle file firewall reply codes correctly: Ignore the files.
Fixes #3490
2015-11-18 16:55:53 +01:00
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
Klaas Freitag
62d26814b2
SyncEngine: Handle 403 Forbidden properly.
...
A 403 is a reply code sent from the file firewall to indicate that
this directory is forbidden to use for the user.
The patch handles it by setting the state to IGNORED.
This addresses #3490
2015-11-18 15:31:55 +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
Markus Goetz
9978dc3f6c
QNAM: Use invalid configuration instead of default configuration
...
For #3969 and others.
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
Olivier Goffart
6e42405113
ShareDialog: remove the search button ( #3737 )
2015-11-17 10:24:35 +01:00
Olivier Goffart
11ef07c74a
ActivityWidget: fix compiler warnings
2015-11-17 09:54:38 +01:00
Klaas Freitag
8852911f67
Merge branch 'master' of github.com:owncloud/mirall
2015-11-16 18:16:58 +01:00
Klaas Freitag
e38bc6eab8
AcitivityWidget: Moved timespan-in-words method to utility.
...
Also added a second parameter, fixed plural translation and added
a less-than-a-minute-ago term.
2015-11-16 18:08:25 +01:00
Olivier Goffart
459e200ac0
ShareDialog: add a QScrollArea (issue #4125 )
2015-11-16 18:01:11 +01:00
Klaas Freitag
c781155b60
General Settings page: Remove the add account button.
...
It is now in the toolbox on the account page.
2015-11-16 17:07:05 +01:00
Klaas Freitag
87aa1de67a
Merge branch 'newactivity'
2015-11-16 17:02:05 +01:00
Klaas Freitag
ccb871c30b
ActivityWidget: Show the subject in the Tooltip.
...
the original text might be elided.
2015-11-16 16:44:52 +01:00
Klaas Freitag
74ed0b4f09
Merge pull request #4139 from owncloud/account_toolbox
...
AccountSettings: Add a toolbox button for the account specific actions.
2015-11-16 15:53:30 +01:00
Klaas Freitag
becbb7b284
AccountSettings: Address jans suggestions in #4139
...
- Changed sequence of menu items
- lowercased entries
- removed the "Account" from entries, its in the toolbox button already
- added a little space between toolbox button label and the rectangle.
2015-11-16 15:50:32 +01:00
Klaas Freitag
ff76a842d0
Added some documentation.
2015-11-16 15:38:08 +01:00
Klaas Freitag
a56926b8d9
ActivityWidget: open local file in file manager if exists.
2015-11-16 15:31:24 +01:00
Olivier Goffart
0d21503ee5
ShareDialog: fix auto completion to actualy auto complete
2015-11-16 15:23:02 +01:00
Klaas Freitag
631cb095dd
ActivityWidget: Show the local path in a tooltip.
...
Note that the activity has also entries of files that are not synced so
that not every activity entry has to have a local pendant.
Also, one activity entry can reference multiple files, so only the first
one is shown.
2015-11-16 15:07:02 +01:00
Klaas Freitag
caba719950
Folderman: Added method to find local files for a rel. server path.
2015-11-16 15:04:59 +01:00
Klaas Freitag
7e4c0bd515
AccountSettings: Add a toolbox button for the account specific actions.
...
Also move the 'Add Account' button from the General Tab, where it
is not properly found, to the new account toolbox.
2015-11-13 14:50:07 +01:00
Klaas Freitag
ddcec2971e
ActivityDelegate: Gray out font if account is not connected.
...
This gives a visual indication of the account not being connected
and as a result maybe outdated activity data.
2015-11-13 12:48:25 +01:00
Roeland Jago Douma
72d119a05f
[Sharing] Delete animation when share is removed
2015-11-13 11:03:51 +01:00
Roeland Jago Douma
d423cf2c7f
[Sharedialog] Fix UI stuff
...
Implemented suggestions form
https://github.com/owncloud/client/issues/3737#issuecomment-156036279
* Removed Shares text
* Permissions now next to username
* Simplified permissions by default
* Button to get more detailed permissions
2015-11-13 10:27:26 +01:00
Klaas Freitag
731a13cfd1
ActivityWidget: Take the account state (connected or not) in account.
...
Display the activity entries in a different mode if the account is not
longer connected.
2015-11-12 17:52:00 +01:00
Klaas Freitag
81296fae9d
AccountManager: new method to return AccountStatePtr from the name.
...
It uses the Account displayName to destinguish.
2015-11-12 17:50:00 +01:00
Klaas Freitag
aa38f7a4f2
ActivityWidget: implement removeAccount.
2015-11-12 15:39:07 +01:00
Klaas Freitag
ff4a8c9202
GeneralSettings: Remove references to protocolwidget.
...
The ProtocolWidget is now the Activitytab Widget
2015-11-11 14:49:11 +01:00
Christian Kamm
c871d721fd
Tray tooltip: Use aliasGui #4096
2015-11-11 14:35:56 +01:00
Christian Kamm
05d1cc9a94
Sharing: Fix crash with share deletion #4111
...
The problem was that Share could be deleted *before*
the OcsShareJob itself finished. Since Share was the
parent of the network job, its object would be deleted
too early.
In general, it's unnecessary to assign parents to the OcsJobs
because they delete themselves when finished.
2015-11-11 13:28:20 +01:00
Christian Kamm
196ee05fcc
Share dialog: Initialize expected expire date #4075
2015-11-11 13:01:12 +01:00
Christian Kamm
e50cfa4e1b
Recent Activity: Don't reset for no reason #3889
2015-11-11 12:48:15 +01:00
Daniel Molkentin
3224a959a4
Forward-declare QModelIndex. Fixes Qt4 builds.
2015-11-11 11:52:10 +01:00
Christian Kamm
2ccb3648c7
Recent Activity: Filter metadata updates #3963
2015-11-11 11:19:04 +01:00
Christian Kamm
01aa647527
FolderMan: Fix infinite wait on pause #4093
...
If a folder was paused while being the next item in the scheduling
queue, the whole scheduling could get stuck.
This also fixes the progress information of paused folders possibly
getting stuck.
2015-11-11 10:59:04 +01:00
Christian Kamm
25c177ca3b
SyncJournalFileRecord: Remove unused mode field
2015-11-11 09:42:31 +01:00
Daniel Molkentin
1d9c591c08
Fix OS X compilation: use mode_t instead of __mode_t
2015-11-11 09:36:17 +01:00
Klaas Freitag
5e98894a97
ActivityView: Add a progress indicator widget to indicate action.
2015-11-10 18:10:58 +01:00
Markus Goetz
15fe3b569b
Merge pull request #4100 from mnutt/credentials-from-url
...
Populate account setup credentials from server URL
2015-11-10 16:12:34 +01:00
Klaas Freitag
0e0b6026fc
Activity: Unify the GUI, and reactivate copy to clipboard for all.
2015-11-10 15:12:35 +01:00
Christian Kamm
17dd199cba
Checksums: Treat more carefully in db #4034
...
In particular, preserve them on local rename or remote move.
2015-11-10 15:05:00 +01:00
Christian Kamm
8f7dbe71a1
CleanupPollsJobs: Preserve more journal data
2015-11-10 14:26:25 +01:00
Christian Kamm
4b5c3d8f09
Tray: Show settings dialog on click if it's not active
...
Before, you often had to click twice to bring the window
to the front, because the first click would close it.
2015-11-10 12:33:36 +01:00
Christian Kamm
9955b0756a
Settings: Show first account page on startup #4036
2015-11-10 12:20:08 +01:00
Christian Kamm
76d9b9c0e2
Rename env variables to include unit #2939
2015-11-10 12:07:10 +01:00
Christian Kamm
175ad6fb77
Reflect read-only permissions in filesystem #3244
2015-11-10 10:14:25 +01:00
Christian Kamm
51896902e3
Silence warning by removing extra semicolon
2015-11-10 10:06:49 +01:00
Michael Nutt
bd65eb32b7
SetupWizard: populate credentials from HTTP server URL
...
If a user enters a server URL in the form of
https://user:pass@example.com/ , pre-populate the following credentials
page with those values.
2015-11-09 18:21:33 -05:00
Olivier Goffart
b29d1e94b5
ShareDialog: fix autocompletion took the wrong user
2015-11-09 17:22:17 +01:00
Olivier Goffart
b74e812671
Share dialog: a few layout adjustements
2015-11-09 17:22:17 +01:00
Olivier Goffart
aa27b5db14
Discovery: silent static analysis warning
...
We do a check one line earlier that the size is smaller than the buffer
Then we don't need to call strncpy, strcpy is enough
2015-11-09 17:22:17 +01:00
Markus Goetz
81e3a62360
Account: Show local path in tooltip
2015-11-09 16:39:08 +01:00
Markus Goetz
4784b327e7
Folder Status: Use same fat ... icon as web
2015-11-06 16:10:50 +01:00
Klaas Freitag
cf9fec73cf
ActivityView: Add a second treeview for sync issues.
...
So there are three views now: One displaying the server activities, one for
the sync protocol and a third one for ignored files and issues.
2015-11-06 11:43:43 +01:00
Klaas Freitag
a1551ef6ab
ActivityDelegate: Make the row height public accessible.
...
Now it can be used to be set on the other two treeviews.
2015-11-06 11:41:32 +01:00
Markus Goetz
0163839cfb
OS X: Fix toolbar oddity #3719
2015-11-06 10:18:09 +01:00
Roeland Douma
914a942e33
Merge pull request #4055 from owncloud/user_group_sharing
...
User group sharing
2015-11-06 09:35:42 +01:00
Roeland Jago Douma
6431a2aa46
[Sharing] Build sharee list on every search
2015-11-05 15:01:29 +01:00
Niels van Adrichem
572d9bdf1a
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/gui/share.h
2015-11-05 14:42:26 +01:00
Roeland Jago Douma
4cf2422a83
[Sharing] Clear completer on activation
2015-11-05 13:16:52 +01:00
Roeland Jago Douma
806ec98eab
[Sharing] Properly delete widget
2015-11-05 13:10:32 +01:00
Roeland Jago Douma
20fd349e17
[Sharing] Filter sharee list properly
...
You can't share with a user/group that you've already shared with
You can't share with yourself
2015-11-05 12:30:34 +01:00
Roeland Jago Douma
3e4612a1f0
[Sharing] Reorganized sharedialog code
...
Now we have 1 simple dialog that includes 2 widgets.
* ShareLinkWidget (for link shares)
* ShareUserGroupWidget (for user/group shares)
The ShareUserGroupWidget is only included if the server version is >=
8.2.0
For <8.2.0 the old behavior is preserved
2015-11-05 09:58:16 +01:00
Roeland Jago Douma
90cbd461ab
[Sharing] Allow sharing with users/groups from desktop
2015-11-04 22:00:35 +01:00
Daniel Molkentin
5fccc25f36
Fix Qt4 build
2015-11-04 19:28:54 +01:00
Klaas Freitag
cb1571c6c5
ActivityWidget: Rather use accountState pointer directly.
...
Do not use it via a smart pointer class.
2015-11-04 16:40:22 +01:00
Klaas Freitag
3bccfb8993
ActivityView: Add information about the account.
2015-11-04 13:22:03 +01:00
Roeland Jago Douma
6fb4e59120
[Sharing] First step towards proper group sharing
2015-11-04 12:56:06 +01:00
Roeland Jago Douma
309be57a12
[Sharing] Add user/group sharing dialog
...
Dialog can now retrive current shares for path, set the permissions on
those shares and delete the share.
2015-11-04 12:53:07 +01:00
Roeland Jago Douma
37098c96f9
[Sharing] Add setpermission to sharing code
...
For user/group/remote shares we were just missing the setPermissions
functionality
2015-11-04 12:53:02 +01:00
Klaas Freitag
cb4fba7658
ActivityWidget: Created a delegate for prettier display of the activities
2015-11-03 17:54:37 +01:00
Niels van Adrichem
0bcb13f02e
Fixxed compile error on src/gui/share.h
2015-11-03 13:44:59 +01:00
Niels van Adrichem
1ab44655e0
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
src/cmd/cmd.cpp
2015-11-03 11:58:45 +01:00
Niels van Adrichem
8f5658bc01
Added Non Shibboleth WebDAV authentication and Dav Path customization to owncloudcmd
2015-11-02 22:57:17 +01:00
Klaas Freitag
b600ac882a
ActivityListModel: Add method to refresh one Account (WIP)
2015-11-02 17:52:04 +01:00
Klaas Freitag
71849c4372
ActivityListModel: Add the page and pagesize parameter to ocs query.
2015-11-02 17:51:12 +01:00
Klaas Freitag
9545af0d43
JSONApiJob: Add method to add additional query parameter.
2015-11-02 17:37:23 +01:00
Klaas Freitag
6c6ee358d4
ActivityListModel: Check if the account is connected when fetching more.
2015-11-02 16:39:33 +01:00
Klaas Freitag
060f4f291b
SettingsDialog: Add a tab with the SyncProtocol to ActivityWidget.
2015-11-02 15:46:00 +01:00
Klaas Freitag
3fb43d2322
ActivityWidget UI: Remove the preconfigured tabs from the tabwidget.
...
It is better to create the tabs from the code in SettingsDialog.
2015-11-02 15:45:17 +01:00
Klaas Freitag
4895683bab
ActivityWidget: Do a proper asynchronous model to display the activity.
2015-11-02 15:44:13 +01:00
Klaas Freitag
3b8e1dcd89
SettingsDialog: Make ActivityWidget a member.
2015-11-01 22:30:46 +01:00
Klaas Freitag
302d6b321e
ActivityWidget: Add a job to fetch activities, Activity object added
2015-11-01 22:30:37 +01:00
Olivier Goffart
3993a7f636
OwnSQL: add asserts in case of error that should not happen
2015-10-30 14:05:58 +01:00
Olivier Goffart
aaf16ff0e8
SyncJournalDB, clear all the queries before closing the database
2015-10-30 14:03:08 +01:00
Olivier Goffart
16c078963b
owncloudcmd: add --max-sync-retries #4037
...
And limit by default to 3 retries
2015-10-30 13:36:31 +01:00
Klaas Freitag
9279bcdba4
Add a tabwidget to Settings dialog for activity.
2015-10-30 13:26:27 +01:00
Olivier Goffart
0c467ef5b4
Sync engine: fix signal/slot connection
2015-10-30 13:21:34 +01:00
Olivier Goffart
49cd53ee44
FolderStatusModel: attempt to detect removed undecided files #3612
2015-10-30 12:43:33 +01:00
Olivier Goffart
0e6a463564
Discovery: Don't leak DiscoveryDirectoryResult in case of error
...
Also remove redundent Q_FUNC_INFO
2015-10-30 12:43:33 +01:00
Roeland Douma
d38b190317
Merge pull request #4033 from owncloud/share_object
...
Add share manager and the share objects
2015-10-30 11:01:03 +01:00
Roeland Jago Douma
c7b814337a
Use proper QFlags
...
Now the ShareTypes and Permissions are part of the Share class (which is
a bit better abstracted away).
2015-10-29 21:47:47 +01:00
Roeland Jago Douma
dd8d02b8ef
Act properly if OCS endpoint returned an error (OCS error)
...
For now pass it on to the gui. So at least they know something is wrong.
2015-10-29 16:56:23 +01:00
Olivier Goffart
c3cf6aef7d
SyncEngine: Don't whipe the white list if the sync was aborted
...
Issue #4018
2015-10-29 16:47:39 +01:00
Olivier Goffart
38a8e5ee03
Discovery: conding style: use const references for function parameters
2015-10-29 16:47:36 +01:00
Klaas Freitag
46269dac4e
Merge branch '2.0'
...
Conflicts:
ChangeLog
2015-10-29 16:34:15 +01:00
Roeland Jago Douma
8c0297f688
Use QLatin1Char
2015-10-29 16:03:47 +01:00
Klaas Freitag
ee65315520
Merge branch '2.0.2' into 2.0
...
Conflicts:
ChangeLog
2015-10-29 15:44:56 +01:00
Roeland Jago Douma
12f7cfde87
Shares do not have parents
...
Also some pointer cleanups
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
6d80f3d756
Proper foreach
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
b32f752d31
Properly cleanup OCS jobs
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
cf8be7de91
Proper const usage
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
30a3498c22
Fix typos
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
239603e24c
Make sure enforced passwords are properly respected
...
Fixes for old and new servers
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
390daed3de
Added getPublicUpload to LinkShare
...
so the gui does not have to know abou the internal permissions
2015-10-29 15:42:25 +01:00
Roeland Jago Douma
918c06aba3
Add share manager and the share objects
2015-10-29 15:42:20 +01:00
Klaas Freitag
726be08917
Revert "Config: Use monochrome icons per default on MacOSX."
...
This reverts commit 546cab3f62
.
For OEMs this patch causes an empty tray icon set.
2015-10-29 15:37:31 +01:00
Olivier Goffart
a127debc54
Quota: handle special negative value for the quota #3940
...
Don't show a progress bar if there is an unkown or unlimited total
2015-10-29 14:33:29 +01:00
Olivier Goffart
6aa26654f6
Merge remote-tracking branch 'origin/2.0'
2015-10-29 12:44:28 +01:00
Olivier Goffart
0fde7f0e6b
Propagator: Keep a meaningfull error with old server and invalid file names
...
We changed the discovery code not to ignore files whose filename contains
charachter invalid on windows. (Because newer versions of the server
supports them)
Servers older than 8.1 will just say "Bad Request" as an error and it's a
regression against previous client version. So keep nice error even with
older server.
Relates to #3736
2015-10-29 12:44:08 +01:00
ckamm
251679253a
Merge pull request #3951 from ckamm/checksum
...
Checksums stored in database #3735
2015-10-29 10:40:24 +01:00
Christian Kamm
64756c5dce
--version also shows Qt version
...
That makes it much easier for people reporting bugs.
2015-10-29 09:48:36 +01:00
Christian Kamm
9788055147
Propagator: Add blacklisting of disk space errors #2939
2015-10-29 09:36:59 +01:00
Daniel Molkentin
4737c16996
State application name in update notification
...
Fixes #4020
2015-10-28 20:45:57 +01:00
Christian Kamm
496b1e907d
Checksum: Don't lose it on metadata update #3735
...
Also improve tests.
2015-10-28 14:49:55 +01:00
Christian Kamm
566131209d
Checksum: Fixes after review
2015-10-28 14:46:20 +01:00
Christian Kamm
b7823dc648
Checksum: Put checksum type into separate column #3735
2015-10-28 14:46:20 +01:00
Olivier Goffart
6d28a1b645
Fix Qt4 compilation
2015-10-28 13:26:35 +01:00
Markus Goetz
a6c9e8c5b4
Merge branch 'kill_legacy_propagator'
2015-10-28 11:06:50 +01:00
Markus Goetz
9337927722
legacy propagator: Remove more code
2015-10-28 10:59:02 +01:00
Christian Kamm
5ea09d2668
Checksum: Disallow ADLER32, use Adler32 #3735
2015-10-28 09:59:33 +01:00
Christian Kamm
b9fc4c5994
Checksum: Fix recomputation when forced in cfg file #3735
...
Don't recompute the checksum on each upload when the server does not
advertise supporting checksums.
2015-10-28 09:56:39 +01:00
Christian Kamm
f1b500d3e0
Checksum: Add env variables to disable #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
dff37e11eb
Propagate: Store computed checksums in db during upload #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
b1387f801b
Propagate: On download store checksum header in db #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
60b2312ab6
SyncJournal: Add checksumHeader column to metadata table #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
0354289795
Checksums: Improvement in async computation and validation #3735
2015-10-28 09:56:39 +01:00
Christian Kamm
c11c35c459
Revert "In case of empty checksum type, emit validated."
...
This reverts commit b05ca526a4
.
The checksum type setting should not matter for downloads.
2015-10-28 09:56:39 +01:00
Christian Kamm
7c5e70ac3c
PropagateUpload: Fix double-emission of finished #3844
2015-10-28 09:53:54 +01:00
Klaas Freitag
0c9568f6dc
Merge pull request #4004 from owncloud/fix_hidden_detection
...
Fix hidden detection
2015-10-28 09:28:35 +01:00
Olivier Goffart
f1d48a9356
Folder Model: The item needs to be selectable for the currenIndex to appear selected
...
And we set the current index in AccountSettings::slotLinkActivated
2015-10-27 17:37:12 +01:00
Olivier Goffart
89f2a9e6dc
Account Settings: A link should make sure all the parents are expanded
2015-10-27 17:37:12 +01:00
Klaas Freitag
a203da3919
FolderStatusModel: Check for null argument at start.
2015-10-27 17:37:12 +01:00
Klaas Freitag
1c1ef52cf1
AccountSettings: Display a link for undecided dirs in the sub text.
...
This only works in case the index is known. If not, no link is
shown, but we wait for the next update of the model.
2015-10-27 17:37:12 +01:00
Klaas Freitag
40c82c5c36
AccountSettings: Add index to undecided folder to be able to select it.
2015-10-27 17:37:12 +01:00
Klaas Freitag
81f0c6535e
Enable external links in the label.
2015-10-27 17:37:12 +01:00
Klaas Freitag
46558d79a5
Add slot to handle clicks on folder names.
2015-10-27 17:37:12 +01:00
Olivier Goffart
e86b4203b9
IgnoreFiles: Fix the socket API would not load the new custom ignored files #3496
...
We did not flush or closed the file after having modified it from the UI.
So when the socket api was reloading it, it wouldn't be able to load
the newly added rules
2015-10-27 16:07:59 +01:00
Olivier Goffart
05dd9554f9
SocketApi: Fix returning ignore for the root item all the time
2015-10-27 16:06:38 +01:00
Olivier Goffart
26e1223f9a
FolderStatusModel: reset also if a folder was renamed #4011
2015-10-27 13:51:56 +01:00
Olivier Goffart
84a04de7be
Settings Dialog: don't put padding on the toolbar extension
...
Otherwise the extension just disapear with some styles (see Issue #3795 )
2015-10-27 13:42:25 +01:00
Olivier Goffart
3f2a2cb14b
FolderDelegate: put the progressbar in place of the remote or local folder #3403 #3569
...
So the size of the delegate does not change
2015-10-27 12:52:33 +01:00
Olivier Goffart
fac00348d9
Use the term folder sync connection in more places #3757
2015-10-27 12:12:21 +01:00
Olivier Goffart
3c93fd4fb7
AccountSettings: don't disable pause when offline ( #4010 )
2015-10-27 10:32:33 +01:00
Klaas Freitag
6b71273380
Discovery: Fix detection of hidden files.
...
In the discovery phase we want to detect that dot-files are hidden
on Linux and Mac.
This fixes strange behaviour seen in issue #3980
2015-10-26 14:24:05 +01:00
Olivier Goffart
dccf4e9c34
Download: Soft errors for error while resuming ( #4000 )
2015-10-26 12:31:07 +01:00
Olivier Goffart
39289a3164
SocketAPI: don't trim the command #3297
2015-10-26 10:15:50 +01:00
Olivier Goffart
84f1bdbc87
Folder::wipe: We need to shut the socket API down before removing the DB
...
Because the DB stays open and locked.
Should fix #3824
2015-10-23 17:43:01 +02:00
Olivier Goffart
c93defc82d
SyncEngine: remove unused functions
2015-10-23 17:11:19 +02:00
Olivier Goffart
bd39c64798
Delete all files: make the 'Keep' on by default
...
On windows, we need to specify at least one AcceptRole.
Otherwise the DestructiveRole might become the default
Issue #3824
2015-10-23 17:06:14 +02:00
Olivier Goffart
42a6b242c7
SettingsDialog: use QWidgetAction for the toolbar so the extension works
...
When the toolbar is full because there is no enough room, make the extension
of the toolbar work, by using QWidgetAction::createWidget instead of
QToolBar::insertWidget
There should not be prolem when the window is too narrow.
Relates #3832
2015-10-23 16:23:37 +02:00
Joas Schilling
6d87bd15cd
Make returncode 0 for --version and --help
2015-10-23 15:17:29 +02:00
Olivier Goffart
d657c00b11
FolderStatusModel: fix getting the size of the folder in the selective sync ( #3986 )
...
Regressed since d610693af1
. The problem
is that the _size vector contains the pathToRemove and that it was removed
before.
Reorganize a bit the code so there is only one loop that has still all the
information.
2015-10-23 15:13:15 +02:00
Olivier Goffart
6a0633083d
Network Settings: Adjust the bandwidth limit option with old Qt
...
- Disable the whole group box
- Add a tooltip explaining why it is disabled
- Make sure it is disabled in the settings in case of upgrade
- Do a runtime check in case the running Qt is greater
2015-10-22 17:57:34 +02:00
Daniel Molkentin
899f52be4f
Revert "Settings dialog: remove the close button #3713 "
...
This reverts commit ebee6f0bc2
.
Unix window managers do not have a reliable way of hinting buttons,
so we need the close button.
2015-10-22 16:20:59 +02:00
Olivier Goffart
a608b4e9e0
Folder: set csync verbosity to 0 if the Logger is not there
...
csync_log was still accounting for 8% of the local discovery (because
of vsnprintf and asprintf)
2015-10-22 01:13:35 +02:00
Olivier Goffart
f6a543ada3
Logger: speedup the sync discovery when the log is innactive
...
The sync throw a lot of log message, and QDateTime::fromCurrentTime is
quite expensive. So don't call it if it's not needed.
2015-10-22 00:22:25 +02:00
Daniel Molkentin
c7bf09c3d4
Merge remote-tracking branch 'origin/2.0'
2015-10-21 18:49:58 +02:00
Olivier Goffart
c80e72da83
Sharing: change coding style of enum
...
From all upper case to camel case
This hopefully fix the Windows build which fails because DELETE seems
to be a macro
2015-10-21 18:40:04 +02:00
Roeland Douma
ec351e00ad
Merge pull request #3773 from owncloud/split_sharedialog
...
Split sharedialog code
2015-10-21 16:55:59 +02:00
Olivier Goffart
cf242871ea
SyncEngine: keep a static pointer to the codec
...
The QTextCodec for UTF-8 is not going to change during the application life time.
So no need to look it up for every file
2015-10-21 16:38:26 +02:00
Olivier Goffart
597d36dcf2
csync_statedb: Use the index in csync_statedb_get_below_path
...
Make an index from the path, and make a query that uses the index
2015-10-21 16:38:26 +02:00
Olivier Goffart
9c388787bb
csync_update: Don't fetch the etag in the local discovery from the DB
...
We don't need it, and it's slow.
This saves a lot of DB queries
(Also replaced a strlen>0 with a faster check)
2015-10-21 16:38:26 +02:00
Markus Goetz
f739d8fdd3
sqlite: Update to version 3.9.1
...
For OS X and Windows.
This is in line with the tests/benchmarks Olivier is doing on ArchLinux.
2015-10-21 15:55:41 +02:00
Markus Goetz
c8590c4468
Remove legacy propagator and neon
...
The code was already uneeded/unbuilt on Windows and OS X.
2015-10-20 17:57:43 +02:00
Markus Goetz
98b966d274
OS X: Use Cocoa Pasteboard instead of QClipBoard #3300
2015-10-20 15:42:43 +02:00
Olivier Goffart
674b6f2373
Account Settings: clear the focus of the "Sign In" button when clicked
...
So that the focus does not go to the "Remove Account" button instead
which would be wierd
2015-10-20 13:56:35 +02:00
Olivier Goffart
407ff0a99d
Theme: cache the QIcon::fromTheme
...
We are calling that every time we draw the folder delegate.
Which is a lot when the sync is runing and the progress bar is moving
2015-10-20 13:24:11 +02:00
Olivier Goffart
0b6d21e3d5
Logger: don't call qFormatLog when unessesary
...
That's a lot of string operations that can be avoided if the log window
is not shown
2015-10-20 13:22:48 +02:00
Markus Goetz
4c9bc42b69
Revert libqsqlite changes for now
...
QtWebKit depends on it unfortunately
2015-10-20 13:04:33 +02:00
Olivier Goffart
557b704069
Fix compilation warning
...
shibbolethcredentials.h:59:10: warning: 'askFromUser' overrides a member
function but is not marked 'override' [-Winconsistent-missing-override]
2015-10-20 11:35:25 +02:00
Olivier Goffart
4369e31a49
Folder Model: don't try to fetch data if the account is disconnected
...
Now that it expands automatically, it would do lots of query to the
server when the account is disconnected. (all resulting in 401)
2015-10-19 18:32:34 +02:00
Olivier Goffart
23b5a74c17
Account Settings: Don't expand while clicking on the '...' button
2015-10-19 18:23:56 +02:00
Olivier Goffart
ee69ab2021
Account Settings: Don't disable double click expanding for sub folders
...
The root folder open on simple click, but the sub folder don't, so keep
this behaviour which is the native behaviour
2015-10-19 18:12:49 +02:00
Olivier Goffart
374f29c4d3
Account Settings: Fix crash for acocunts withour folder
...
Was broken by 027a865fbc
2015-10-19 18:08:11 +02:00
Markus Goetz
67910e7d60
Discovery: Call it "Checking for changes in" in UI
...
For #3431
2015-10-19 15:59:16 +02:00
Markus Goetz
ccec186b98
ETagJob: Depth 0 for server >= 8.1 #3730
2015-10-19 15:31:27 +02:00
Klaas Freitag
c66c259447
SettingsDialog: Add new widet called ActivityWidget.
...
This is the new widget to display server activity.
2015-10-19 14:41:53 +02:00
Klaas Freitag
4ad165ce26
Utility: add method fileNameForGuiUse(), pimp up filename for GUI
...
Currently, this one only replaces colons by / on Mac platform. This makes
the function resuseable.
2015-10-19 14:36:55 +02:00
Markus Goetz
24a801dfd3
CMake/NSIS: We don't need QtSql (more)
2015-10-19 13:56:36 +02:00
Markus Goetz
af79bc9211
CMake/NSIS: We don't need QtSql
...
The NSIS change also had a redundant libsqlite3 DLL entry
2015-10-19 13:46:46 +02:00
Klaas Freitag
a3904f4d32
Theme: Revert logic of singleAccount switch.
...
To use the same logic as the other clients and unify ownBrander
implementations, the switch is now called multiAccount() rather
than singleAccount() with a reverse logic.
Desktop Client stays with the default of having multiaacount
enabled.
Note that existing brandings need to rename the switch.
https://github.com/owncloud/ownbrander/issues/443
2015-10-19 12:26:42 +02:00
Olivier Goffart
5cac90b3eb
SelectiveSyncTreeView: show the size for the root item ( #3755 )
2015-10-19 10:58:54 +02:00
Olivier Goffart
df135a0bb2
Merge branch '2.0'
...
Conflicts:
src/gui/folder.cpp
2015-10-19 10:57:37 +02:00
Klaas Freitag
546cab3f62
Config: Use monochrome icons per default on MacOSX.
2015-10-16 18:55:07 +02:00
Roeland Jago Douma
4a04dc1a3e
Typos
2015-10-16 12:51:24 +02:00
Roeland Jago Douma
0e97fbb730
Use overloaded functions
2015-10-16 12:48:48 +02:00
Olivier Goffart
0c59c85127
SyncEngine: Folders with ignored files should not count when counting none files
...
If there is a any none files, we do not show the dialog saying that all
files have been removed. If a directory contiains ignored files, we still
want to show this message box even if the directory will not be deleted
2015-10-16 11:43:52 +02:00
Markus Goetz
0d5f2b5d31
Propagator: Reset upload blacklist if a chunk suceeds
...
For #3934
2015-10-16 10:06:45 +02:00
Olivier Goffart
87fa1794a1
Updater: remove unused function
...
It was even throwing a warning because it is an infinite recursion
2015-10-16 09:56:26 +02:00
Olivier Goffart
81e30cd8d2
Merge pull request #3695 from owncloud/nomkpath3692
...
Folder: Do not create the sync folder if it does not exist #3692
2015-10-16 09:21:15 +02:00
Markus Goetz
983671c8cb
Shibboleth: Add our base user agent to WebKit
...
For #3913
2015-10-16 09:15:47 +02:00
Roeland Jago Douma
40ab3ee751
Now only 1 constructor to ocssharejob
...
* Pass the share_id to the functions that need it
2015-10-16 08:28:13 +02:00
Roeland Jago Douma
f95fea9866
Move permissions to OcsShareJob
2015-10-16 08:09:57 +02:00
Roeland Jago Douma
03719334ea
Remove unused members
2015-10-15 22:27:55 +02:00
Roeland Jago Douma
4441053b1c
Thumbnailjob fixes
...
* Comments
* Use the path of the abstractnetworkjob
2015-10-15 22:18:22 +02:00
Roeland Jago Douma
a34b663828
Now add parameters in a less crappy way
2015-10-15 21:58:16 +02:00
Roeland Jago Douma
db1f4d4016
OCSJob -> OcsJob and more docs
2015-10-15 20:54:52 +02:00
Roeland Jago Douma
3ea944d1b3
Added setPublicUpload to OcsShareJob
2015-10-15 20:34:56 +02:00
Roeland Jago Douma
b293aa762c
Split sharing code
...
There is now a generic OCSJob which must be inherited by other jobs. This is in
prepartion for the other OCS job that will come (for the Sharee API endpoint
for example).
More logic is moved from the sharedialog to the OcsShareJob. So in the GUI code
we now only say what we want (a new share, set the password etc). And the code
in libsync will make that happen. Error handling is for now still done in the
GUI part.
For now the ocsjob and ocssharejob live in gui but probabaly we should
create a libshare or libocs at some point.
2015-10-15 20:05:47 +02:00
Markus Goetz
b5e75afc17
General settings: Align checkbox #3758
2015-10-15 19:15:50 +02:00
Markus Goetz
027a865fbc
Account Settings: Show selective sync buttons after list load
...
Especially nice when having a slower network.
For #3839
2015-10-15 18:52:16 +02:00
Markus Goetz
132b5f5130
Account Settings: Expand selective sync on show #3585
2015-10-15 17:27:38 +02:00
Markus Goetz
c3754e1fdd
folderstatusmodel.h: Fix warning
2015-10-15 17:27:29 +02:00
Christian Kamm
c418d67920
Merge remote-tracking branch 'origin/2.0'
2015-10-15 15:54:09 +02:00
Christian Kamm
67e9a06d30
Progress estimation: Adjust low-transfer detection #3942
...
Progress estimation is usually based on transfer speed. That makes no
sense when we're doing operations like deletes, that need very little
data transfer but nevertheless take a long time.
This hack attempts to detect this case better and switches to a
different estimate.
We should rewrite this to maintain and update estimates for the
transfer speed, per-file overhead and chunk-assembly overhead each
time an item finishes. Then we could provide more consistent progress
estimates without ad-hoc fixes like this one.
Also, there's an issue where resuming a partial download will lead
to exaggerated transfer speed estimates.
2015-10-15 15:04:11 +02:00
Christian Kamm
abd63035c1
ETag: Allow parsing of weak tags #3946
2015-10-15 14:57:34 +02:00
Markus Goetz
745cf55abb
SelectiveSync: Increase folder list timeout to 60
...
Already done for 2.1 in 05eee16959
For #3524
2015-10-15 14:43:11 +02:00
Olivier Goffart
e1c634d000
Don't show the settings if another instance is started less than 10 secs after the apps.
...
Issue #3273
isSessionRestored was not set correctlty so ignore it
2015-10-15 14:25:23 +02:00
Roeland Douma
df2418d9c5
Merge pull request #3661 from rullzer/public_upload
...
Allow setting of public upload on link shares
2015-10-14 15:34:25 +02:00
Roeland Jago Douma
2fdae6d72f
Allow setting op public upload on link shares
2015-10-14 15:30:28 +02:00
Roeland Jago Douma
05471d0acd
Also parse capabilitie for public uploads
2015-10-14 15:30:23 +02:00
Christian Kamm
05eee16959
SelectiveSync: Show in-progress label #3524
...
We now show 'Fetching data...' after a second.
This also increased the timeout to 60s, making the error
condition much less likely.
2015-10-14 13:05:53 +02:00
Roeland Douma
a752eadd0f
Merge pull request #3923 from owncloud/check_shareapi_available
...
Provide information about share availablity for files
2015-10-14 12:38:03 +02:00
Roeland Jago Douma
028dc8d6c3
Add SHARE_STATUS socketAPI command
...
This command allows to retrieve the share status of a file. In other
words if it can be shared.
2015-10-14 12:36:32 +02:00
Roeland Jago Douma
4a7242c8f9
Extended capabilities API
...
* Naming of capabilities is now a bit more consistent
2015-10-14 11:45:34 +02:00
Christian Kamm
efdb29d2f9
AccountSettings: Show disabled 'Add Folder' tooltip on click #3645
2015-10-14 11:34:30 +02:00
Christian Kamm
51a2e6c580
Exclusion: Fix confusion with relative and absolute paths
2015-10-13 12:53:38 +02:00
Christian Kamm
7fe03c715d
SelectiveSync: Don't adjust removed path
2015-10-13 12:37:27 +02:00
Klaas Freitag
419d18c128
FileSystem: Reuse the FileInfo object that is created in the caller.
...
With that, a lot of stats can be avoided, ie. in SocketAPI
2015-10-09 13:02:02 +02:00
Klaas Freitag
74a7755ad9
SocketAPI: String concat optimization as learned on QtWS.
2015-10-08 18:26:30 +02:00
Klaas Freitag
c1ba927b37
Propagatorjobs: Removed superflous semicolon.
2015-10-08 16:20:42 +02:00
Klaas Freitag
a8eb913535
SyncLogDialog: Do not delete SyncLogDialog after close.
...
Keep one instance for the lifetime of the generalsettings widget.
2015-10-07 18:59:48 +02:00
Klaas Freitag
6d6903ef62
Merge pull request #3919 from phil-davis/libsynctypos
...
libsync comment and message typos for master
2015-10-06 14:49:54 +02:00
Phil Davis
b8ccbbc72a
GUI comment and message typos for master
2015-10-05 10:06:19 +05:45
Phil Davis
f0e17fd9c0
libtypos comment and message typos for master
2015-10-05 09:05:09 +05:45
Christian Kamm
d610693af1
SelectiveSync: Apply excludes #3876
2015-10-02 15:56:39 +02:00
Christian Kamm
7d1886684e
FolderWatcher: Use csync exclude code #3805
...
Introduce a global ExcludedFiles instance to avoid loading the global
exclude lists several times.
One could still add per-folder exclude lists by checking these after
the global ones.
2015-10-02 15:56:39 +02:00
Christian Kamm
95fc792745
Tray: Change texts #3657
2015-10-02 15:48:44 +02:00
Christian Kamm
efefc2d986
Merge branch '2.0'
...
Conflicts:
doc/images/menu.png
doc/images/settings_network.png
2015-10-02 15:44:50 +02:00
Christian Kamm
9f8d109a7e
Network errors: Use exception name, if message is empty #2718
2015-10-02 15:25:34 +02:00
Christian Kamm
cf9e5ffb0b
Remove dead code
...
no_recursive_propfind does not exist anymore.
2015-10-02 15:17:19 +02:00
Christian Kamm
3cbd63a77a
Propagation: Try another sync on 423 Locked #3387
...
(cherry picked from commit 24c41ed0da
)
2015-10-02 14:49:38 +02:00
Christian Kamm
62eeed5201
Propagation: Make 423 Locked a soft error #3387
...
(cherry picked from commit 20ea9015ca
)
2015-10-02 14:49:30 +02:00
Christian Kamm
1383023b2e
Fix the Qt4 build.
2015-10-02 11:05:15 +02:00
Klaas Freitag
afd081f40b
Settings: Move synclog widget to a seperate dialog.
...
This a first step to integrate the server activity view, see #3732
2015-10-01 16:57:37 +02:00
Christian Kamm
7bf31e56ab
Ignores: Sync after update #3876
2015-10-01 15:39:28 +02:00
Christian Kamm
3812fd0866
Checksums: Prepare 'supported checksums' capability #3735
...
It currently always returns the empty list and thus has no effect.
2015-10-01 15:00:33 +02:00
Christian Kamm
24c41ed0da
Propagation: Try another sync on 423 Locked #3387
2015-10-01 13:05:07 +02:00
Christian Kamm
36e8e9ebf5
Propagator: Download disk space checks #2939
...
* There's a critical 50 MB threshold under which syncs abort
(OWNCLOUD_CRITICAL_FREE_SPACE)
* The sync client always keeps 250 MB free
(OWNCLOUD_FREE_SPACE)
2015-10-01 12:59:05 +02:00
Christian Kamm
12dc372b21
Sync: An initial diskspace check #2939
...
* Before each sync, check that there are at least
250 MB of space available and abort otherwise.
* Can be overridden with OWNCLOUD_MIN_FREE_SPACE
2015-10-01 10:25:35 +02:00
Christian Kamm
20ea9015ca
Propagation: Make 423 Locked a soft error #3387
2015-09-30 14:00:53 +02:00
Klaas Freitag
0c148025a3
SyncLog Dialog WIP
2015-09-30 12:02:05 +02:00
Christian Kamm
d0c2ce276a
Application: Fix crash on early shutdown #3898
2015-09-30 11:40:33 +02:00
Klaas Freitag
440687af21
AccountSettings: Disable context menu of sync folders when not connected.
...
This is the second part to fix #3860
2015-09-29 18:19:26 +02:00
Klaas Freitag
77a9b28e14
SetupWizard: Removed unused member variables.
2015-09-29 09:30:40 +02:00
Markus Goetz
641dece89a
Linux: Don't show settings dialog always when launched twice
...
For #3273 #3771 #3485
See also d503221b2e
2015-09-28 23:00:19 +02:00
Markus Goetz
574c699382
GUI: Change tray menu order #3657
2015-09-26 00:25:06 +02:00
Klaas Freitag
b72e2b146d
AccountSettings: only expand root elements on single click.
...
Also, toggle expanding on single click for root elements.
2015-09-25 13:57:44 +02:00
Klaas Freitag
a1421ff74f
AccountSettings: Do not allow to expand the folder list when disconnected.
...
This is supposed to fix #3860
2015-09-25 12:22:51 +02:00
Christian Kamm
c1045af500
FolderMan: Fix for removing a syncing folder #3843
...
We can't schedule the next folder if we aren't notified that
the removed folder has finished syncing...
2015-09-18 14:34:40 +02:00
Christian Kamm
c5c1a7a1c3
ConnectionMethodDialog: Don't be insecure on close #3863
2015-09-18 12:12:53 +02:00
Christian Kamm
4144d4672f
Updater: Ensure folders are not removed #3747
2015-09-18 11:59:49 +02:00
Christian Kamm
68947525a0
Settings: Add debug output #3820
2015-09-17 13:49:00 +02:00
Christian Kamm
8f8bf98ca6
Folder settings: Ensure path is cleaned #3811
...
Paths with a trailing backslash lead to a failing sync beforehand.
These paths can appear in some migration scenarios.
2015-09-17 12:31:37 +02:00
Christian Kamm
ef0ab93e05
Propagator: Simplify sub job finished counting #3844
2015-09-17 10:12:23 +02:00
Markus Goetz
c09b4e1477
Share dialog: Hide settings dialog before showing #3783
2015-09-16 11:17:00 -04:00
Markus Goetz
ca95276298
UI: Only expand 1 level in folder list #3585
2015-09-16 11:06:32 -04:00
Markus Goetz
c2431f2c3b
ConnectionValidator: Fix warning
2015-09-15 21:10:21 -04:00
Markus Goetz
15e4d9e317
UI: Allow folder expanding from button click #3585
2015-09-15 21:10:14 -04:00
Markus Goetz
ef607e29de
UI: Expand folder treeview on single click #3585
2015-09-15 20:59:27 -04:00
Daniel Molkentin
abfd97949d
Merge pull request #3810 from owncloud/phil-davis-remove-all
...
Remove all files text edit
2015-09-14 14:06:56 +02:00
Daniel Molkentin
5347a991cf
Merge pull request #3806 from owncloud/phil-davis-sync-remove
...
Adjust message box text for sync removal
2015-09-14 14:05:39 +02:00
Daniel Molkentin
f1a9e669b4
SyncEngine: fix typo
2015-09-14 13:57:51 +02:00
Markus Goetz
5a791ec11e
Merge pull request #3818 from owncloud/phil-davis-patch-1
...
OCUpdater description text
2015-09-14 00:46:55 +02:00
Markus Goetz
cb6522e735
ConnectioNValidator: Fix redundant error message
...
For #3794
2015-09-12 20:57:49 -04:00
Phil Davis
d0aef138c3
OCUpdater decription text
...
Make it say something understandable. Looking at previous versions with git blame, the word "not" fits here.
2015-09-12 07:25:59 +05:45
Phil Davis
6058b507c8
Remove all files text edit
2015-09-11 15:04:53 +05:45
Phil Davis
1aff9bca95
Adjust message box text for account removal
...
Since the context menu text was changed to "Remove Account" it seems sensible to also change the title of this message box to match.
https://github.com/owncloud/client/issues/3793
2015-09-11 08:46:53 +05:45
Phil Davis
d76f76f429
Adjust message box text for sync removal
...
Since the context menu text was changed to "Remove Sync" it seems sensible to also change the title of this message box to match.
https://github.com/owncloud/client/issues/3745
2015-09-11 08:42:02 +05:45
Markus Goetz
1de4d96ab1
Account: Also display non-standard port in tray menu
...
For #3658
2015-09-10 19:27:16 -04:00
Klaas Freitag
eb154de2a1
Merge pull request #3802 from owncloud/alt_webdav_url2
...
Branding option: Alternative WebDAV URL
2015-09-10 17:44:46 +02:00
Klaas Freitag
8c2b5af7f0
Account: Fixed typo in comment.
2015-09-10 17:44:20 +02:00
Klaas Freitag
9004fd6d11
Utility: Fix the size display back to JEDEC standard.
...
Also updated the test.
2015-09-10 17:36:28 +02:00
Klaas Freitag
5f660bf080
GUI: Replace term "sign in" with "Log in" and friends.
...
Also with doc changes.
2015-09-10 17:36:28 +02:00
Klaas Freitag
9eec45f9c4
SetupPage: Fix crash caused by uninitialized Account object.
...
Since the webdav path is read from account now, it needs to be
initialized first thing.
2015-09-10 16:03:22 +02:00
Klaas Freitag
cf7726353a
Always use the webdav path from the Account object.
...
The Account object has the themed webdav path if it is branded.
2015-09-10 15:39:37 +02:00
Klaas Freitag
93e1ad088c
Account: Make sure that davPath() always comes with trailing slash.
2015-09-10 15:38:40 +02:00
Phil Davis
b490be2267
cmd and crashreporter minor typos
...
nothing important here
2015-09-10 17:34:26 +05:45
Klaas Freitag
16d6418d10
Use a themable WebDAV path all over.
...
This is needed for enterprise#481
2015-09-10 13:04:26 +02:00
Klaas Freitag
995b42d0fc
Units: Back to the "usual" mix units.
...
Now we display units again numerically wrong (based on 1024) but back
to how it was before in ownCloud.
2015-09-10 12:08:20 +02:00
Daniel Molkentin
c0f8ff1030
Account: Display non-standard port as part of the hostname
...
Addresses #3658
2015-09-10 10:17:31 +02:00
Daniel Molkentin
be3529ebcb
Adjust strings in settings dialogs
...
Implements #3745 & #3793
2015-09-10 01:46:28 +02:00
Phil Davis
613736aa41
Coin the term 'folder sync connection'
...
Proposed wording for issue
https://github.com/owncloud/client/issues/3757
2015-09-10 01:35:58 +02:00
Daniel Molkentin
d823809021
Merge pull request #3781 from phil-davis/FSC
...
Coin the term 'folder sync connection'
2015-09-10 01:35:25 +02:00
Daniel Molkentin
b83c723e3f
Allow (partial) translations even when run from build dir
...
Makes it easier to catch translation issues earlier
2015-09-10 01:25:16 +02:00
Individual IT Services
6b222c3db7
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
2015-09-10 01:24:11 +02:00
Klaas Freitag
088c0d471a
AccountSettings: Do not prepend the folder alias to the undecided folders
...
This fixes bug #3685
2015-09-09 17:52:39 +02:00
Klaas Freitag
98e6d61d1b
General settings: Set left margin of layout to zero.
...
This fixes the vertical alignment of the checkboxes, see bug #3758
2015-09-09 15:52:22 +02:00
Klaas Freitag
df534753b1
csync_update: Handle permission denied as soft error in discovery.
...
For that, treat the not accessible directory as if it were ignored.
This will fix #3767
2015-09-09 14:12:13 +02:00
Phil Davis
fdfab07d07
Coin the term 'folder sync connection'
...
Proposed wording for issue
https://github.com/owncloud/client/issues/3757
2015-09-08 17:22:57 +05:45
Individual IT Services
cc5f8e5122
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
2015-09-08 13:59:43 +05:45
Olivier Goffart
21dbf97a02
Merge remote-tracking branch 'origin/2.0'
2015-09-07 10:32:16 +02:00
Daniel Molkentin
66f340734c
Consistency: Use folder instead of directory in user visible strings
2015-09-07 08:51:40 +02:00