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
Markus Goetz
963eb1f29b
VERSION.cmake: master is 2.1
2015-10-15 16:51:29 +02:00
Christian Kamm
c418d67920
Merge remote-tracking branch 'origin/2.0'
2015-10-15 15:54:09 +02:00
Christian Kamm
6e09e3af86
Fix test compile
...
I regularly fix errors in the copies of the test sources that are
made in build/. Refactoring how these tests work could be worthwhile.
2015-10-15 15:52:58 +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#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
Jenkins for ownCloud
49a3a3ba7b
[tx-robot] updated from transifex
2015-10-15 02:19:02 -04:00
Carla Schroder
9982211ced
Merge pull request #3950 from owncloud/revert-3931-phil-davis-3dot-menu-doc-20
...
Revert "Update "..." menu documentation for 2.0"
2015-10-14 09:04:06 -07:00
Carla Schroder
10f59bf3ad
Revert "Update "..." menu documentation for 2.0"
2015-10-14 09:03:08 -07: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
Jenkins for ownCloud
7487d02a70
[tx-robot] updated from transifex
2015-10-14 02:19:00 -04:00
Christian Kamm
225da68832
ExcludedFiles: Add test
2015-10-13 15:01:59 +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
Jenkins for ownCloud
c39f6c3fae
[tx-robot] updated from transifex
2015-10-13 02:19:01 -04:00
Jenkins for ownCloud
f4365dcca0
[tx-robot] updated from transifex
2015-10-12 02:18:57 -04:00
Jenkins for ownCloud
fd75d5c679
[tx-robot] updated from transifex
2015-10-11 02:18:57 -04:00
Jenkins for ownCloud
014a53f990
[tx-robot] updated from transifex
2015-10-10 02:19:00 -04: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
Jenkins for ownCloud
da76ba6c64
[tx-robot] updated from transifex
2015-10-09 02:18:57 -04:00
Jenkins for ownCloud
afeb9e07e2
[tx-robot] updated from transifex
2015-10-09 01:15:36 -04: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
Daniel Molkentin
f22535e18a
Merge pull request #3931 from owncloud/phil-davis-3dot-menu-doc-20
...
Update "..." menu documentation for 2.0
2015-10-08 08:53:41 +02:00
Phil Davis
0f4e88eeaa
Update "..." menu documentation for 2.0
...
This menu in 2.0.* now has 4 options.
The small screenshot needs updating also. @carlaschroder it is probably best if you take a new screen shot from whatever client version you have been using for screen shots. That way they will all have a consistent look.
2015-10-08 12:28:15 +05:45
Jenkins for ownCloud
70476c332a
[tx-robot] updated from transifex
2015-10-08 02:18:57 -04:00
Jenkins for ownCloud
79145ff9fd
[tx-robot] updated from transifex
2015-10-07 02:19:00 -04:00
Jenkins for ownCloud
a0eb4b9c85
[tx-robot] updated from transifex
2015-10-07 01:15:35 -04:00
Klaas Freitag
cb3a301f2c
Merge pull request #3899 from sebasje/sebas/cmake
...
fix multiarch library path for Debian/Ubuntu
2015-10-06 15:36:43 +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
Klaas Freitag
f5daf50dc4
Merge pull request #3920 from phil-davis/guitypos
...
GUI comment and message typos for master
2015-10-06 14:46:00 +02:00
Klaas Freitag
f6631443a1
Merge pull request #3922 from RealRancor/backport_3916_2.0
...
Backport #3916 to 2.0 - thanks
2015-10-06 14:42:40 +02:00
Jenkins for ownCloud
87ad4dd264
[tx-robot] updated from transifex
2015-10-06 02:18:57 -04:00
Jenkins for ownCloud
bb289f63f1
[tx-robot] updated from transifex
2015-10-06 01:15:38 -04:00
RealRancor
67a71ff10f
Backport #3916 to 2.0
2015-10-05 16:22:11 +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
Klaas Freitag
b09f1d591c
Merge pull request #3916 from RealRancor/fix_rst_syntax
...
Fix linkname in architecture.rst.
2015-10-04 17:59:45 +02:00
Jenkins for ownCloud
6b1bfb4474
[tx-robot] updated from transifex
2015-10-04 02:18:56 -04:00
RealRancor
8fd2b8d829
Fix linkname in architecture.rst.
2015-10-03 21:42:23 +02:00
