chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-28 00:42:46 +01:00
Code
12,110 Commits 4 Branches 173 Tags 91 MiB
v2.5.0-oem
Commit Graph

12110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ckamm
043350f49d Merge pull request #4736 from ckamm/socketapi_nautilus_invalidate 
Overlay icons: Fix invalidation with nautilus #3249
 2016-04-26 12:04:53 +02:00
Christian Kamm
f657bd0cd9 Overlay icons: Fix invalidation with nautilus #3249 
This avoids an extra socketapi call after invalidate_extension_info
is called from a STATUS message.
 2016-04-26 11:49:56 +02:00
Christian Kamm
b4cf17d99d Overlay icons: Fix duplicate icons in nautilus #3249 2016-04-26 11:02:59 +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
Jenkins for ownCloud
31f2c3e76a [tx-robot] updated from transifex 2016-04-26 02:19:11 -04:00
Christian Kamm
8dc178a9f3 Share link: Consistent order of options owncloud/core#24122 2016-04-26 07:45:41 +02:00
Jenkins for ownCloud
64b6486327 [tx-robot] updated from transifex 2016-04-25 08:26:49 -04:00
Klaas Freitag
35d4b96339 Set base version to 2.3.0. For 2.2, please use the branch 2.2 2016-04-25 14:15:17 +02:00
Jenkins for ownCloud
335e333e28 [tx-robot] updated from transifex 2016-04-24 02:19:04 -04:00
Jenkins for ownCloud
41eb5f0a3f [tx-robot] updated from transifex 2016-04-24 01:15:28 -04:00
Carla Schroder
030184fad9 Merge pull request #4704 from owncloud/doc_overlay_icons 
Doc: Draft overlay icons
 2016-04-22 08:40:09 -07:00
Roeland Douma
7d285d0225 Merge pull request #4717 from owncloud/fix_webdav_property 
Only 1 : between namespace and property
 2016-04-22 14:40:55 +02:00
Roeland Jago Douma
d3a93322d2
Only 1 : between namespace and property 2016-04-22 14:38:43 +02:00
Jenkins for ownCloud
8694db1c49 [tx-robot] updated from transifex 2016-04-22 06:16:18 -04:00
Daniel Molkentin
19eca84d4f Merge pull request #4715 from owncloud/translate-desktop-ini 
Adding new resource for the desktop.ini file
 2016-04-22 12:05:15 +02:00
Daniel Molkentin
665c3f40e1 Fix search & replace error in Dockerfile 2016-04-22 11:26:46 +02:00
Thomas Müller
f8f394eb0a
Adding new resource for the desktop.ini file 2016-04-22 10:58:57 +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
57f0603e0e Doc: Applied review feedback for overlay icon docs. 2016-04-22 09:56:53 +02:00
Klaas Freitag
b61ae351dd Merge pull request #4713 from owncloud/fix_win-sis 
Fix sync to Windows deduplication enabled storages
 2016-04-22 09:47:06 +02:00
Jenkins for ownCloud
277a1cfb5a [tx-robot] updated from transifex 2016-04-22 02:19:11 -04:00
Klaas Freitag
6ba7c6e2d3 Windows VIO: Remove unused variable. 2016-04-21 17:40:01 +02:00
Klaas Freitag
055c2ef73f local_vio_win: Fix handling files that have been deduplicated 
as part of Windows SIS or Data Deduplication. Fixes #4056
 2016-04-21 17:38:43 +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
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
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
Klaas Freitag
f72c7f43bf Nautilus plugin: Be more robust against new states from socketapi 
Do not bail out if an unknown state comes from SocketApi
 2016-04-20 17:13:06 +02:00
Klaas Freitag
add29befee Nautilus plugin: Remove the bogus logging 2016-04-20 17:12:21 +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
Jenkins for ownCloud
a3a9417630 [tx-robot] updated from transifex 2016-04-20 02:19:08 -04:00
Carla Schroder
53a72148d3 a bit of editing on new section 2016-04-19 10:28:46 -07:00
Klaas Freitag
c379593c0f Doc: Draft overlay icons 2016-04-19 18:20:23 +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 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