Klaas Freitag
506360716a
FolderMan: Removed too explicit logging that scares users.
2015-01-15 20:51:30 +01:00
Olivier Goffart
22ad34fa0e
Merge branch '1.7'
...
Conflicts:
admin/win/nsi/l10n/French.nsh
src/mirall/propagator_qnam.cpp
2015-01-15 17:58:43 +01:00
Olivier Goffart
ce0e7e4a5d
Propagator download: Do not assume the server do not support ranges if we cannot parse the Content-Range header
...
There are several reason why start==0
* The Content-Range header was not present
* We can't parse it
* Or it is actually 0
If we can't parse it, we cannot assume anything and must error out.
So only in the first case we should discard the temporary file and continue.
Issue #2708
2015-01-15 17:56:49 +01:00
Olivier Goffart
907b79d3b8
Utility: Use appropriate unit when converting from bytes to human readable units
...
We must not use the SI units if we use power of 2
I believe that we should use SI units and power of 10
But since the server still use power of 2, we need to show the same numbers
But at least we use the proper standard IEC unit that are explicit
2015-01-15 14:06:17 +01:00
Olivier Goffart
863731fd6a
Revert "Utility: Use SI units"
...
This reverts commit 7445fa7ef7
.
and commit f654c53c35
.
The server still use wrong powers, so we still need to use the same
2015-01-15 13:56:51 +01:00
Olivier Goffart
c9f1b3229b
Add Folder Wizard: fix wording
...
(Relates #2663 )
2015-01-15 13:55:48 +01:00
Olivier Goffart
2b8b204cfc
SelectiveSyncDialog::estimatedSize: return qint64 because -1 in case of error
2015-01-15 13:07:16 +01:00
Olivier Goffart
264471af43
csync: cleanup some unused error code
2015-01-15 12:19:06 +01:00
Olivier Goffart
e31514f769
csync propfind: Rename the directDownload property
...
The owncloud server has a different name because if it was named the same
it would break the 1.7 client
Issue #2614
2015-01-15 11:52:55 +01:00
Olivier Goffart
08d3ae9f02
csync_statedb: Have more granular error reporting when the loaddb fails
...
In order to distiguish error from sqlite_open or from the integrity check
Issue #2673
2015-01-15 11:36:24 +01:00
Olivier Goffart
f654c53c35
fixing testOctetsToString
2015-01-15 09:58:40 +01:00
Jenkins for ownCloud
7121b64c59
[tx-robot] updated from transifex
2015-01-15 01:25:25 -05:00
Roeland Jago Douma
cd0c9b2ddb
Sharedialog: More error checking
2015-01-14 19:47:25 +01:00
Roeland Jago Douma
b80bbe6587
Sharedialog: more const
2015-01-14 19:36:42 +01:00
Roeland Jago Douma
879d41bf2d
Sharedialog: Fix spinners and passwordfield
...
The password field now show correct info when a password is entered etc.
Maybe we should have an extra info part where we state that the user needs to
press enter to submit the password
2015-01-14 19:08:04 +01:00
Roeland Jago Douma
7b1cfd69d7
Sharedialog: use QProgressIndicator
...
This is a merge from the movie in the original commit (which was local) to the
QProgressIndicator. However, on all connections I tested it, it did not add
much since the API is in gernal pretty quick. So maybe we can just remove this.
2015-01-14 18:42:56 +01:00
Daniel Molkentin
ff695f08f7
Merge pull request #2704 from remixtj/master
...
Fix for issue #2703
2015-01-14 17:48:08 +01:00
Luca Lorenzetto
ef9f2a965d
Fix for issue #2703
2015-01-14 17:39:14 +01:00
Olivier Goffart
ac0e8b1fe1
Qt 4 fix
2015-01-14 16:30:10 +01:00
Olivier Goffart
da0f7317b4
Wizard: Show the size of the folders that will be downloaded
...
Part of #2580
2015-01-14 16:11:07 +01:00
Roeland Jago Douma
3e81839af5
Sharedialog: Removed duplicted code
...
Handling of updated shares is identical from users and groups
2015-01-14 15:27:15 +01:00
Christian Kamm
0af5574951
Propagate upload: code cleanup
2015-01-14 15:20:02 +01:00
Olivier Goffart
0ae9055ea6
Propagator upload: Fix UploadDevice::seek
2015-01-14 15:08:09 +01:00
Olivier Goffart
885aafcea3
SelectiveSync dialog: Show the sizes of the folder
2015-01-14 15:08:09 +01:00
Olivier Goffart
7445fa7ef7
Utility: Use SI units
2015-01-14 15:08:09 +01:00
Markus Goetz
a544133d73
Propagator: Guard access to BandwidthManager
...
Shouls fix #2623
2015-01-14 14:28:47 +01:00
Christian Kamm
b3c02798a3
Propagator: Use FILE_SHARE_DELETE on Windows. #2070 #2597
2015-01-14 14:16:05 +01:00
Roeland Jago Douma
0bd6eb1792
Sharedialog: fix changes due to rebase
2015-01-14 13:51:02 +01:00
Olivier Goffart
3ec19ee355
Propatage upload: Preload the chunk in memory and close the file
...
This should solve #2675 and #1981
By preloading the chunks in memory before sending them, we don't keep the
file open and therefore we let other program open the file for writing.
If the file is modified between two chunks, we detect that and abort anyway
2015-01-14 13:46:51 +01:00
Olivier Goffart
0215b250af
UploadDevice: mark overrided method as Q_DECL_OVERRIDE
2015-01-14 13:46:51 +01:00
Olivier Goffart
6a0c9fdd34
Propagate upload: Change the default chunk size to 5MiB and make chunk upload parallel
...
The server is slow to process each chunk. As a result the time between
the chunks is not neglectible. Therefore we gain a lot of time by
uploading the chunks in parallel. So the bandwitdh is used when the
server is waiting between chunks.
2015-01-14 13:46:51 +01:00
Olivier Goffart
7f1593c5d7
PropagateUpload: The PUTJob owns the chunk device, so make it a QScopedPointer instead of a QSharedPointer
2015-01-14 13:46:51 +01:00
Roeland Jago Douma
e420a689dc
Sharedialog: More reply checking and removing some duplicated code
2015-01-14 13:43:01 +01:00
Roeland Jago Douma
9addd56f9b
Sharedialog: follow correct behavior for files when editing permissions
2015-01-14 13:43:01 +01:00
Roeland Jago Douma
a7e69a5dc5
Sharedialog: Started parsing server replies
2015-01-14 13:43:01 +01:00
Roeland Jago Douma
f6a83d5de2
ShareDialog: UI is different for files/dirs
...
Bunch of if statements to make sure that we do not display delete/create on
files.
2015-01-14 13:43:01 +01:00
Roeland Jago Douma
d1d8a40acf
Sharedialog: fix unused var compiler warnings
2015-01-14 13:39:07 +01:00
Roeland Jago Douma
cb18dfaaef
Sharedialog: Of course users can also have create and delete privileges
2015-01-14 13:39:07 +01:00
Roeland Jago Douma
a22a03e501
ShareDialog: Group sharing is now also possible
...
Basically the same functionality as for user sharing. Maybe it would be wise to
merge the two functionalities. Should be rather straight forward if we also
merge the UI parts.
2015-01-14 13:39:06 +01:00
Roeland Jago Douma
9a35b5670e
ShareDialog: Allow sharing with users
...
This commit needs a lot of cleaning up. And a lot of error checking needs to be
added. However it is now possible to change and add new shares with users.
Sharing with groups should be just copy paste.
Also the UI needs some love.
2015-01-14 13:39:06 +01:00
Roeland Jago Douma
017b54f9a8
Sharedialog: Allow modifications of permission for users
2015-01-14 13:39:06 +01:00
Christian Kamm
9b7e6cc5c1
Fix warnings.
...
* remove Unused variable
* zorder for spacers makes no sense
2015-01-14 11:28:53 +01:00
Klaas Freitag
209276efa8
ShareDialog: Moved open slot from Application object to Gui object.
...
Also set auto delete flag for the dialog explicitely.
2015-01-13 13:50:41 +01:00
Jenkins for ownCloud
d2fc3e8023
[tx-robot] updated from transifex
2015-01-13 02:06:12 -05:00
Jenkins for ownCloud
1afdeb7216
[tx-robot] updated from transifex
2015-01-13 01:25:24 -05:00
Klaas Freitag
b754ffb047
Nautilus: Add a context menu that opens the sharing dialog.
2015-01-12 14:49:22 +01:00
Klaas Freitag
89eb4727b4
Nautilus overlays: Add a script to patch the branding name into pyhton script.
2015-01-12 14:49:22 +01:00
Daniel Molkentin
5619947685
Relocate Windows shell extensions
...
The directory was redundant
2015-01-12 14:40:42 +01:00
Daniel Molkentin
31e584e3e3
Fix win32 build
2015-01-12 13:53:40 +01:00
Klaas Freitag
ad09f6491b
ShareDialog: Fix const ref for arguments.
2015-01-12 11:35:11 +01:00