chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-10-31 00:17:15 +01:00
Code Activity
13,590 Commits 4 Branches 173 Tags
2.6.2-buildtest1
Commit Graph

13590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julius Härtl
fc4f8fb2d5 Merge pull request #372 from nextcloud/upstream/pr/6488 
ShareDialog: macOS grey odditiy #5774
 2018-06-01 15:42:26 +02:00
Julius Härtl
4be565c56f Merge pull request #369 from nextcloud/upstream/issue/6406 
Nautilus shell integration: Print python version on startup #6406
 2018-06-01 15:40:23 +02:00
Julius Härtl
e4981931ac Merge pull request #373 from nextcloud/upstream/pr/6490 
Nautilus: Fix Python3 and remove many debug
 2018-06-01 15:39:56 +02:00
Olivier Goffart
5f969580ac Nautilus: Fix Python3 and remove many debug 
Use b'\n' in the call to rfind, as the _remainder is bytes, not a string.

Remove most of the debug message which happens during normal operation.
They are mostly spamming the nautilus console, and can also cause bug
as they may throw exception in case of wrong encoding.

Relates to issue: #6406
 2018-06-01 13:35:19 +02:00
Markus Goetz
b8b9b93a6e ShareDialog: macOS grey odditiy #5774 2018-06-01 13:31:22 +02:00
Olivier Goffart
4d7617d64b Propagator: remove a bunch of code related to the 'Shared' directory 
This no longer exists since the owncloud server 7.0 which we no longer
allow to connect to
 2018-06-01 13:17:20 +02:00
Olivier Goffart
8484b493e4 ConnectionValidator: change the minimum server version 
Forbit connection with server older than 7.0. These server did not have
permission.

Also warn for anything older than 9.1. 9.0 is end of life according to
https://github.com/owncloud/core/wiki/Maintenance-and-Release-Schedule
 2018-06-01 13:17:11 +02:00
Christian Kamm
70f0792d4a Nautilus shell integration: Print python version on startup #6406 2018-06-01 13:02:13 +02:00
Roeland Jago Douma
335298f4e2 Merge pull request #312 from nextcloud/upstream/pr/6374 
Move ClientProxy and and ConnectionValidator out of libsync
 2018-06-01 11:08:20 +02:00
Olivier Goffart
1b587a1241 ConnectionValidator::Status use Q_ENUM 
So no need to have a manual conversion to QString
This is only used in debug message anyway.
 2018-05-31 21:56:55 +02:00
Olivier Goffart
311307e8cb Move ClientProxy and ConnecitonValidator to gui 
They are using the ConfigFile and are used to control
when to sync rather than for the sync itself
 2018-05-31 21:56:55 +02:00
Olivier Goffart
7e05e1e411 owncloudcmd: Do not overwrite the http timeout for json jobs 
The AbstractNetworkJob already has a sensible timeout that depends
on an environment variable.
No need to overwrite that with some arbitrary value. (The connection
validator does that because it could cause problems if two connection
validator were to run at the same time. Not a problem here)
 2018-05-31 21:56:55 +02:00
Olivier Goffart
204cb470b4 owncloudcmd: Do not read the proxy settings from the gui's config file 
The proxy settings for the owncloudcmd client can be set via the
--httpproxy command line argument. owncloudcmd should not depends
on the gui's config
 2018-05-31 21:56:55 +02:00
Olivier Goffart
9fe8713bdc Folder: remove unused member 2018-05-31 21:56:44 +02:00
Nextcloud bot
08024f69c8 [tx-robot] updated from transifex 2018-05-31 00:48:48 +00:00
Roeland Jago Douma
c6ef8eec0a Merge pull request #305 from nextcloud/upstream/pr/6363 
SyncEngine: Use separate state for two unicode conversions
 2018-05-30 08:04:05 +02:00
Roeland Jago Douma
86741de622 Merge pull request #299 from nextcloud/upstream/pr/6349 
Don't delete contents behind directory junctions #6322
 2018-05-30 08:03:04 +02:00
Roeland Jago Douma
c6c42c3c70 Merge pull request #311 from nextcloud/upstream/pr/6371 
Utility::fsCasePreserving: remove UNIT_TESTING ifdef
 2018-05-29 20:33:34 +02:00
Roeland Jago Douma
d410b8e057 Merge pull request #310 from nextcloud/upstream/version-cmake 
VERSION.cmake: This is 2.4.2 now
 2018-05-29 20:32:27 +02:00
Markus Goetz
68601240f8 VERSION.cmake: This is 2.4.2 now 2018-05-29 20:19:42 +02:00
Roeland Jago Douma
6ebcc638e0 Merge pull request #300 from nextcloud/upstream/pr/6351 
SettingsDialogMac: Also start timer for notifications
 2018-05-29 20:19:03 +02:00
Markus Goetz
13b2e51dfe Notifications: Immediately request when getting account online 2018-05-29 20:09:08 +02:00
Markus Goetz
00d8343e76 SettingsDialogMac: Also start timer for notifications 2018-05-29 20:09:06 +02:00
Nextcloud bot
4089456bc6 [tx-robot] updated from transifex 2018-05-28 00:49:03 +00:00
Roeland Jago Douma
1b756ac80f Merge pull request #318 from nextcloud/upstream/pr/6402 
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
 2018-05-26 21:33:45 +02:00
Roeland Jago Douma
bb1b86b087 Merge pull request #307 from nextcloud/upstream/pr/6366 
test/testsyncengine: testNoLocalEncoding is for Linux
 2018-05-26 21:30:21 +02:00
Nextcloud bot
e9be7fc18a [tx-robot] updated from transifex 2018-05-26 00:54:16 +00:00
Nextcloud bot
37cac61f49 [tx-robot] updated from transifex 2018-05-25 00:55:04 +00:00
Nextcloud bot
c2e0a4a73c [tx-robot] updated from transifex 2018-05-23 16:56:31 +00:00
István Váradi
76c4b05270 Patch the OSX CMakeLists.txt for Xenial 2018-05-22 07:04:09 +02:00
Camila Ayres
122daf4199 Merge pull request #335 from nextcloud/rakekniven-patch-1 
Fixed tiny grammar issue (adds dot to the end of a sentence)
 2018-05-21 17:43:35 +02:00
rakekniven
8d90c8c17b Fixed tiny grammar issue 2018-05-20 11:17:46 +02:00
Julius Härtl
6a5654d6d2 Merge pull request #294 from nextcloud/upstream/pr/6330 
SocketAPI: "Open in browser" and disable Share entries when sharing i…
 2018-05-19 16:09:50 +02:00
Julius Härtl
9196ab1c98 Merge pull request #246 from k1l1/master 
scary wording on big changes #216 (translations missing)
 2018-05-19 15:44:04 +02:00
Kilian Pfeiffer
bb65eb8cdd changed wording 
https://github.com/nextcloud/client/issues/216
 2018-05-19 13:17:25 +02:00
Julius Härtl
b7a67863a7 Merge pull request #306 from nextcloud/upstream/pr/6347 
Set launch-on-startup when the first account is set up
 2018-05-18 16:08:52 +02:00
Roeland Jago Douma
b7d5aff901 Merge pull request #303 from nextcloud/upstream/issue/6322 
SyncJournal: Don't use LIKE with paths
 2018-05-18 13:56:25 +02:00
Roeland Jago Douma
1dc3c156d4 Merge pull request #304 from nextcloud/upstream/pr/6364 
Conflicts: Add user name to conflict file name #6325
 2018-05-18 13:56:14 +02:00
Julius Härtl
0283e1bfaa Merge pull request #295 from nextcloud/upstream/pr/6329 
Tray: Change icon for unresolved conflicts #6277
 2018-05-18 08:53:49 +02:00
Julius Härtl
5f0b56e13a Merge pull request #326 from nextcloud/upstream/pr/6415 
Nautilus integration: Not a ColumnProvider
 2018-05-17 22:56:57 +02:00
Joss Brown
df8708dd46 postinstall macOS: check if Finder is running 
Some users have disabled Finder, and the postinstall will always reenable Finder, unless it checks Finder status first.
 2018-05-17 21:14:57 +02:00
Roeland Jago Douma
cf4e156fa0 Merge pull request #321 from nextcloud/upstream/qtversion-pkg-name 
macOS: Put Qt version in .pkg name
 2018-05-17 21:13:42 +02:00
Roeland Jago Douma
3b4fcfcc65 Merge pull request #302 from nextcloud/upstream/pr/6352 
Sharing: Use maximum allowed permissions for new share #6346
 2018-05-17 21:11:33 +02:00
Christian Kamm
629b14266b Nautilus integration: Not a ColumnProvider 
The nautilus plugin doesn't actually define get_columns(), so pretending
to be a ColumnProvider lead to a critical warning on startup.
 2018-05-17 20:52:40 +02:00
Roeland Jago Douma
33555292ae Merge pull request #301 from nextcloud/upstream/pr/6353 
HTTP2: Only from Qt 5.9.4 #6285
 2018-05-17 15:39:09 +02:00
Roeland Jago Douma
36572b79c3 Merge pull request #298 from nextcloud/upstream/no-shibboleth 
NO_SHIBBOLETH: Fix warning
 2018-05-17 15:38:04 +02:00
Roeland Jago Douma
2e0d724e3e Merge pull request #297 from nextcloud/upstream/pr/6336 
- add description for moveToTrash variable
 2018-05-17 15:37:40 +02:00
Roeland Jago Douma
cbeb9af7fd Merge pull request #296 from nextcloud/upstream/issue/6337 
FolderStatusModel: Refresh folders on Problem sync #6337
 2018-05-17 15:37:20 +02:00
Camila Ayres
19ae3e4326 Merge pull request #293 from nextcloud/upstream/pr/6265 
Move remote-deleted files to trash
 2018-05-17 12:20:53 +02:00
Markus Goetz
9ef42b4835 SslButton: Improve speed (especially on macOS) #6031 
From 1+n*450msec to 1*450msec
 2018-05-16 21:03:06 +02:00