Olivier Goffart
7a82fac0d5
owncloudcmd: Save the selective sync list on the first run
...
For issue #4690
In the first run, the journal might not exist, we should not cancel
setting the selective sync list
2016-04-21 12:58:10 +02:00
Daniel Molkentin
8b39c6e6ce
Merge pull request #4709 from owncloud/fix_4691
...
Use QTokenizer to properly parse netrc
2016-04-21 12:50:43 +02:00
Daniel Molkentin
e29d7e0128
Use QTokenizer to properly parse netrc
...
Addresses #4691
2016-04-21 12:46:03 +02:00
Daniel Molkentin
dbcb94e7d4
Update doc and Dockerfile for 2.2 builds
2016-04-21 12:25:12 +02:00
Olivier Goffart
522f7afa9e
Merge pull request #4663 from 'ckamm/disabletransmissionchecksum'
...
Disable validation of transmission checksums by default
2016-04-21 11:46:01 +02:00
Olivier Goffart
fa69d089cf
Checksums: remove the downloadChecksumValidationEnabled option
...
Added in previous commit from pull request #4663
As discussed, we do not need this option so no need to introduce
a new dependency on the config file in the sync engine
2016-04-21 11:43:44 +02:00
Jenkins for ownCloud
1935c78f17
[tx-robot] updated from transifex
2016-04-21 02:19:12 -04:00
Markus Goetz
f9fb7a59dd
Merge pull request #4708 from owncloud/aliasGui
...
UI: Remove alias from more places #4577 #4695
2016-04-20 15:54:05 +02:00
Markus Goetz
1a51b6718a
UI: Remove alias from more places #4577 #4695
2016-04-20 14:27:50 +02:00
Jenkins for ownCloud
a3a9417630
[tx-robot] updated from transifex
2016-04-20 02:19:08 -04:00
Markus Goetz
edb942ba61
Merge pull request #4696 from owncloud/issue4573_negative_content_length
...
Discovery: Be more explicit about files with unknown size #4573
2016-04-19 16:09:48 +02:00
Markus Goetz
a17f37d8ae
Discovery: Be more explicit about files with unknown size #4573
...
Also related https://github.com/owncloud/core/issues/23468
2016-04-19 15:31:16 +02:00
Roeland Douma
33459b48c8
Merge pull request #4700 from owncloud/fix_4409
...
Use expireDate if returned by the OCS Share API
2016-04-19 13:14:04 +02:00
Roeland Jago Douma
598941948c
Use expireDate if returned by the OCS Share API
...
If an app modifies the expiration date (for example the password policy
app) then on more recent versions of the server we will get the share
object back REST style. We should use that info!
Fixes #4409
2016-04-19 11:22:32 +02:00
Jenkins for ownCloud
038b7db606
[tx-robot] updated from transifex
2016-04-19 02:19:15 -04:00
Roeland Douma
9f30e83413
Merge pull request #4687 from owncloud/fix_share-permissions-namespace
...
The share-permissions namespace was moved
2016-04-18 21:29:26 +02:00
Klaas Freitag
2ab4caf007
ProtocolWidget: Display the recalculated number of issues.
...
Should fix #3222
2016-04-18 16:48:37 +02:00
Klaas Freitag
11d3aa3c4f
Protocolwidget: Removed some leftovers from refactoring.
2016-04-18 16:47:14 +02:00
Jenkins for ownCloud
93ad61aeef
[tx-robot] updated from transifex
2016-04-18 02:19:02 -04:00
Jenkins for ownCloud
6a36d1b4fb
[tx-robot] updated from transifex
2016-04-17 02:19:07 -04:00
Daniel Molkentin
c0ec481436
No need for WebKitWidgets in libsync anymore
2016-04-16 10:58:12 +02:00
Jenkins for ownCloud
df0833d7f9
[tx-robot] updated from transifex
2016-04-16 02:19:16 -04:00
Markus Goetz
6a9655aab6
OS X: Fix overlay installation on El Capitan #4650
...
The sleep is somehow needed, probably for pkg to rebuild its DB?
The case fix fixes a warning but did not fix the issue itself.
2016-04-15 16:58:58 +02:00
Markus Goetz
c4577cb2a1
Merge pull request #4683 from owncloud/fix4657
...
OS X: Allow ampersand in APPLICATION_NAME #4657
2016-04-15 14:28:38 +02:00
Olivier Goffart
fafca26144
AccountManager: take theURL from the Theme rather than from the config if the theme specify it ( #4591 )
...
That way an upgrade of the client can actually change the URL
Issue https://github.com/owncloud/enterprise/issues/1113
https://github.com/owncloud/enterprise/issues/1126
In addition to restoring commit 7e5d89293d
, this
add a way to override the auth type
2016-04-15 13:16:49 +02:00
Markus Goetz
06c19b0b6f
sqlite: Update to version 3.12.1
...
For OS X and Windows.
2016-04-15 12:02:00 +02:00
Markus Goetz
d1649ce4df
OS X: Allow ampersand in APPLICATION_NAME #4657
2016-04-15 11:30:49 +02:00
Christian Kamm
ea40e314d4
Add server capabilities for checksums #4638
...
* Add checksums/supportedTypes and checksums/preferredUploadType
capabilities. The default is that no checksum types are supported.
* Remove the transmissionChecksum config option. Servers must now
use the capabilities to indicate that they are fine with the
client sending checksums.
Note: This intentionally breaks brandings that overrode
Theme::transmissionChecksum. The override must be removed and the
server's capabilities must be adjusted to include the new values.
2016-04-15 10:58:14 +02:00
Klaas Freitag
e2622310df
Merge pull request #4670 from owncloud/implement_ep_1136_2nd_attempt
...
Make postfixlineedit more userfriendly, rename email id string to "Email"
2016-04-15 10:17:03 +02:00
Klaas Freitag
4ad8e04bc3
Merge pull request #4684 from owncloud/less_socket_api_updates
...
Less socket api updates
2016-04-15 10:15:07 +02:00
Roeland Jago Douma
74301e4373
The share-permissions namespace was moved
...
See https://github.com/owncloud/core/pull/24017
This was done since other services we want to intergrate with don't use
the ownCloud namespace.
2016-04-15 10:14:05 +02:00
Markus Goetz
053dcbf1f5
Merge pull request #4686 from owncloud/allow_0_mtime_files
...
CSync: Allow files with 0 mtime #1603
2016-04-15 09:22:39 +02:00
Jenkins for ownCloud
700c7bcbc6
[tx-robot] updated from transifex
2016-04-15 02:19:14 -04:00
Markus Goetz
bc6c57aa0b
Exclude: .Trash-* trash folders #4600
2016-04-14 18:27:33 +02:00
Markus Goetz
a0521caf52
CSync: Allow files with 0 mtime #1603
...
I don't see a reason we should not allow this. We detect
a "failed stat reply" in other ways. Maybe this was a legacy
csync decision somewhow that is not valid anymore?
2016-04-14 18:15:16 +02:00
Klaas Freitag
8007331462
SocketAPI: Remove unneeded logging.
2016-04-14 15:39:46 +02:00
Klaas Freitag
12330b38e9
Folderman: Remove one call to updateFolderView.
...
The reason is that updateFolderView is invoked by the
emitted signal folderSyncStateChange() anyway.
This will reduce the traffic over the SocketAPI nicely,
maybe this was the reason why it was slower than before.
2016-04-14 15:26:11 +02:00
Klaas Freitag
8eb53fa9ae
nautilus integration: Handle NOP as empty.
2016-04-14 15:24:46 +02:00
Christian Kamm
dfd7d4d2f9
Activity tab visibility fixes #4651
2016-04-14 11:35:16 +02:00
Christian Kamm
484a2c800d
Fix typo
2016-04-14 10:59:40 +02:00
Christian Kamm
8d300b049f
ShareDialog: Tell a user early if resharing is impossible #4679
2016-04-14 10:16:37 +02:00
ckamm
48e594ebbf
Merge pull request #4673 from ckamm/shareperm
...
Disable unavailable sharing permissions #4383
2016-04-14 09:44:58 +02:00
Christian Kamm
910c61b492
Disable unavailable sharing permissions #4383
...
Users can't reshare with more permissions than they have themselves.
2016-04-14 09:44:37 +02:00
Jenkins for ownCloud
8155c1c426
[tx-robot] updated from transifex
2016-04-14 02:19:23 -04:00
Daniel Molkentin
97a6d3df82
document Theme::wizardUrlHint()
2016-04-13 15:59:25 +02:00
Olivier Goffart
f7aafb081f
Dolphin Plugin: rename the files to the branded name #4669 ( #4672 )
2016-04-13 15:05:04 +02:00
Daniel Molkentin
9cc981c8c7
Make postfixlineedit more userfriendly, rename email id string to "Email".
2016-04-13 14:56:49 +02:00
Klaas Freitag
ed3203d25d
Merge pull request #4659 from owncloud/fix_client_4651
...
Fix client #4651
2016-04-13 12:02:45 +02:00
Jenkins for ownCloud
a4f606ceab
[tx-robot] updated from transifex
2016-04-13 02:19:05 -04:00
Klaas Freitag
15988c6fda
SocketAPI: Use NOP only, not NONE in the share api protocol.
...
Otherwise, plugins might brake, as the linux one did.
2016-04-12 18:28:27 +02:00