Markus Goetz
29932004ae
Shibboleth: Load username from config for UI ( #4751 )
...
For https://github.com/owncloud/enterprise/issues/1034
2016-04-28 14:55:29 +02:00
Daniel Molkentin
b43a9421d2
Revert "Disambiguate socket API pathes on Windows with user name"
2016-04-28 13:52:15 +02:00
Klaas Freitag
e70b78d14b
Merge pull request #4738 from owncloud/fix_3411
...
Disambiguate socket API pathes on Windows with user name
2016-04-28 13:46:10 +02:00
Christian Kamm
a36b4ec863
FolderWizard: Sort remote folders #4612
2016-04-28 09:29:07 +02:00
Christian Kamm
074f8eadb1
Selective sync: Sort folders in FolderStatusModel #4612
2016-04-28 09:29:07 +02:00
Christian Kamm
af5f2d3860
Protocol: Make timestamp column width fit the text #4721
2016-04-28 07:37:42 +02:00
ckamm
38bad564a0
Merge pull request #4739 from ckamm/trackdirty
...
Overlay icons: Track touched files #4730
2016-04-28 07:17:17 +02:00
Christian Kamm
c2fa3fb4c8
Overlay icons: Track touched files #4730
...
This uses the file watcher to keep track of files that were modified
in order to assign them the blue icon.
This is transient state that's not persisted across restarts.
2016-04-28 07:16:49 +02:00
Markus Goetz
f7082ee3df
sqlite: Update to version 3.12.2
...
For OS X and Windows
2016-04-27 12:22:12 +02:00
Markus Goetz
f7c6efb391
ConnectionValidator: Also set short timeout for capabilities job
...
Default timeout was 5 min.
2016-04-27 12:19:49 +02:00
Olivier Goffart
d0af3ede05
AccountSettings: context menu: don't rely on the alias
...
Don't rely on the alias to know weather we shuld show a context menu or not.
Use the classify function to know if it's a root folder instead
2016-04-27 11:21:58 +02:00
Olivier Goffart
0da2adcbe0
Workaround ubuntu 16.04 systemtray bug ( #4693 ) ( #4747 )
2016-04-27 11:21:13 +02:00
Christian Kamm
0829a94c92
Remote folder selection: improve path typing #4745 #4746
...
* Scroll to the target typed path
* Show non-404 errors that were triggered by typing paths
2016-04-27 10:37:17 +02:00
Markus Goetz
4ea2edcf4a
Merge pull request #4741 from owncloud/fix-alias
...
Accountsettings: Generate an alias for new folders
2016-04-26 17:34:10 +02:00
Olivier Goffart
cd29875b76
Folder: Generate an alias for new folders
...
Before commit 1a51b6718a
, the wizard was
making sure folder had an alias but this is no longer the case.
So generate still an unique alias.
Alias is not used in the UI any longer, it's just use for internal purposes.
For issue #4737
2016-04-26 16:53:24 +02:00
Markus Goetz
ce5ca8a42e
UI: Fix account name/alias display oddities #4577
2016-04-26 16:47:47 +02:00
Daniel Molkentin
ce6a365328
Disambiguate socket API pathes on Windows with user name
...
Addresses #3411
2016-04-26 14:49:45 +02:00
Christian Kamm
09eea7f5f2
Checksums: Use the first supported type if nothing is preferred
2016-04-26 13:10:53 +02:00
Christian Kamm
12bf6e39b7
Share link: Consistent order of options owncloud/core#24122
...
(cherry picked from commit 8dc178a9f3
)
2016-04-26 10:44:29 +02:00
Olivier Goffart
4e7c09de83
QTokenizer: fix Qt4 build
...
QSharedPointer::reset is new in Qt5
2016-04-26 10:38:20 +02:00
Roeland Jago Douma
d3a93322d2
Only 1 : between namespace and property
2016-04-22 14:38:43 +02:00
Olivier Goffart
0711abbf56
Theme: missing virtual keyword
2016-04-22 10:09:07 +02:00
Olivier Goffart
84ac2e64e0
Quota: Add branding option for the base folder ( #4714 )
...
As discussed on issue ##4460
Having the quote to be queried on subfolder is wrong in the generic case,
so add a branding option to configure it.
This partially reverts commit ff4cdc3161
2016-04-22 10:05:50 +02:00
Klaas Freitag
e5a5b95b9a
Merge pull request #4689 from owncloud/overlays_handle_root
...
SyncFileStatusTracker: Add a method to handle the root folder of the sync.
Also, handle new files put in the sync in the statustracker logic.
2016-04-21 15:01:11 +02:00
Klaas Freitag
7acdf50a2c
SocketAPI: Code simplifications as asked for in the review.
2016-04-21 14:54:13 +02:00
Klaas Freitag
361ebf5464
SyncFileStatusTracker: Remember the state of new files.
...
In the before-propagate slot, new files that wait to be
pushed to the server are remembered in the _syncProblems
map. That way, the parents show a sync icon properly as
asked for in #4682 .
After the item has been transfered properly, the item is
removed from the map again because success is the default.
2016-04-21 13:56:08 +02:00
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
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
Klaas Freitag
b56919d0c4
SocketAPI: Return NOP state if folder is diconnected or paused.
...
Later, we can send a specific state for that.
2016-04-20 17:14:12 +02: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
Klaas Freitag
bd37eab3ad
SocketAPI: Display a warning on the directory if there are errors
...
Errors with individual files within a directory now result in
a warning label on the parent directories.
2016-04-19 18:18:00 +02: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 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
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
Daniel Molkentin
c0ec481436
No need for WebKitWidgets in libsync anymore
2016-04-16 10:58:12 +02:00
Klaas Freitag
0f3d6d4160
SyncFileStatusTracker: Add a method to handle the root item.
2016-04-15 15:02:02 +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
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
Klaas Freitag
8007331462
SocketAPI: Remove unneeded logging.
2016-04-14 15:39:46 +02:00