1
0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-28 09:42:46 +01:00
Commit Graph

11855 Commits

Author SHA1 Message Date
Markus Goetz
55414d4c1d macOS: Don't hardcode path in Installer source 2018-04-04 16:45:42 +02:00
Markus Goetz
3bafa1ec89 macOS: Offer only standard installation in installer 2018-04-04 16:23:18 +02:00
Markus Goetz
dfc0545994 create_mac.sh: Also name properly in source dir 2018-04-04 15:46:16 +02:00
Markus Goetz
71de396a5d macosx.pkgproj; This is a .cmake preprocessed file 2018-04-04 15:42:31 +02:00
Jenkins for ownCloud
f9299826b1 [tx-robot] updated from transifex 2018-04-04 02:18:36 +02:00
Markus Goetz
e9646364a0 macdeployqt: Adjust minimum version based on our Qt #5932 2018-04-03 21:31:02 +02:00
Markus Goetz
75241c6cd6 Remove admin/osx/sign_dmg.sh
We don't do dmh anymore.
2018-04-03 19:27:20 +02:00
Joss Brown
fc4582ddf6 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-04-03 16:00:08 +02:00
Christian Kamm
02a2056543 Notify if an explicitly excluded folder is created #6222 2018-04-03 14:03:46 +02:00
Christian Kamm
afec3ccf6e Conflicts: Change tags to be more user friendly #6365
From "_conflict-user-yyyymmdd-hhmmss"
to   " (conflicted copy user yyyy-mm-dd hhmmss)"
2018-04-03 14:03:03 +02:00
Jenkins for ownCloud
49b1a32251 [tx-robot] updated from transifex 2018-04-03 02:18:32 +02:00
Jenkins for ownCloud
a450859789 [tx-robot] updated from transifex 2018-04-02 02:18:31 +02:00
Jenkins for ownCloud
8b1b572935 [tx-robot] updated from transifex 2018-04-01 02:18:34 +02:00
Jenkins for ownCloud
cc4149c125 [tx-robot] updated from transifex 2018-03-31 02:18:33 +02:00
Jenkins for ownCloud
073fda3d03 [tx-robot] updated from transifex 2018-03-30 02:18:32 +02:00
Jenkins for ownCloud
6f44cc3d98 [tx-robot] updated from transifex 2018-03-29 02:18:50 +02:00
Christian Kamm
9f346037ee 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-03-28 15:30:05 +02:00
Olivier Goffart
39d909b05a csync_update: add the checksum in the discovery log
Issue #6414
2018-03-28 13:42:54 +02:00
Christian Kamm
28f68369be Blacklist: Add unittest #6411 2018-03-28 11:25:32 +02:00
Christian Kamm
2641a6af21 Rename local discovery option for clarity
It's using full relative filepaths, not just dir paths.
2018-03-28 11:25:32 +02:00
Olivier Goffart
d69936e065 FolderStatusModel: fix potential assert
OCC::FolderStatusModel::slotUpdateDirectories: ASSERT: "parentInfo->_fetching" in file /home/olivier/kdegit/owncloud/mirall/src/gui/folderstatusmodel.cpp, line 599

This can happen if the structure of a folder is change while the user
expands the root folder. In this case, resetSubs() is called which
resets _fetching to false.
Instead, we need to keep a pointer to the job so we can abort it by
deleting it.
2018-03-28 10:19:05 +02:00
Christian Kamm
1ac45be94e Readme: Update list of maintainers 2018-03-28 10:11:40 +02:00
Christian Kamm
3d002468ae Readme: Fix link to binary downloads 2018-03-28 10:11:40 +02:00
Christian Kamm
5e75d224ee Blacklisting must prevent parent etag updates #6411 2018-03-28 10:01:33 +02:00
Jenkins for ownCloud
8e7f7cfec8 [tx-robot] updated from transifex 2018-03-28 02:18:35 +02:00
Markus Goetz
31f13c8846 SslButton: Improve speed (especially on macOS) #6031
From 1+n*450msec to 1*450msec
2018-03-27 17:43:57 +02:00
Christian Kamm
25deaed9e5 Excludes: Expand doc, Desktop.ini only in root folder
The Desktop.ini exclude was added for 2.4 because we add such a file to
the synced folder on Windows. It doesn't need to cover subdirectories.
2018-03-27 12:43:53 +02:00
Christian Kamm
17342031d7 Upload: Simplify 'finished' flag
* Sometimes there was 'finished' and '_finished'
* Make each done() call automatically set _finished to true
2018-03-27 12:42:48 +02:00
Olivier Goffart
26b991c0c0 Folder: normalize the local path.
We otherwise normalize all path in the C form, so we must have
the Folder's path normalized the same. Or all comparizon will fail
(such as knowing if a file from the SocketAPI or the FilesystemWatcher
are part of the folder)

Issue #4424
2018-03-27 10:54:10 +02:00
Olivier Goffart
3f4d504c34 propagateuploadv1: don't finalize after a done()
Should fix an assert when "Server does not support X-OC-MTime"
(Which only happens with owncloud 5)

Issue #6403
2018-03-27 10:50:40 +02:00
Olivier Goffart
6a4486df3b
Merge pull request #6402 from whitequark/patch-1
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
2018-03-27 10:32:12 +02:00
Jenkins for ownCloud
9516519165 [tx-robot] updated from transifex 2018-03-27 02:18:34 +02:00
Markus Goetz
7739157bfc SslButton: Add HTTP/2 info #3146 2018-03-26 22:49:54 +02:00
Markus Goetz
b34878c16d macOS: Put Qt version in .pkg name 2018-03-26 19:21:27 +02:00
Jenkins for ownCloud
962c38583f [tx-robot] updated from transifex 2018-03-26 02:18:32 +02:00
whitequark
9bd30cf003
Dolphin plugin: fall back if $XDG_RUNTIME_DIR is empty
As per XDG Base Directories specification:
> If $XDG_RUNTIME_DIR is not set applications should fall back
> to a replacement directory [...]

In practice, the ownCloud client has the fallback, but the plugin
helper does not, and if $XDG_RUNTIME_DIR is not set, the plugin
mysteriously does not work.
2018-03-24 08:12:25 +00:00
Jenkins for ownCloud
20881cd004 [tx-robot] updated from transifex 2018-03-24 02:18:32 +01:00
Jenkins for ownCloud
e5b93c7584 [tx-robot] updated from transifex 2018-03-23 02:18:33 +01:00
Markus Goetz
24e2c809e4 macOS: Fix .app icon 2018-03-22 16:30:22 +01:00
Markus Goetz
75a269acb6 About section: Try to lower height #6075 #6215 2018-03-22 15:37:04 +01:00
Jenkins for ownCloud
8357f1ea9a [tx-robot] updated from transifex 2018-03-22 02:18:32 +01:00
Markus Goetz
20bd943a87 macdeployqt: Qt 5.10.1 #5932 2018-03-21 19:20:50 +01:00
Olivier Goffart
424898603a mirall.desktop.in: Remove all the Translations comments
Relates to #5767
2018-03-21 15:03:45 +01:00
Jenkins for ownCloud
c1592e34c7 [tx-robot] updated from transifex 2018-03-21 11:56:01 +01:00
Christian Kamm
edacaae15f Merge remote-tracking branch 'origin/2.4' 2018-03-21 11:47:29 +01:00
Christian Kamm
29557ea550 Fix nautilus/nemo shell integration encoding issues #6393
The problem was that plain encode()/decode() in python2 use ascii
encoding, not utf8.
2018-03-21 11:25:37 +01:00
Jenkins for ownCloud
37a93dca63 [tx-robot] updated from transifex 2018-03-21 02:18:33 +01:00
Jenkins for ownCloud
b632b7e0fa [tx-robot] updated from transifex 2018-03-20 02:18:30 +01:00
Jenkins for ownCloud
fc8e3b0914 [tx-robot] updated from transifex 2018-03-19 02:18:32 +01:00
Jenkins for ownCloud
861d777899 [tx-robot] updated from transifex 2018-03-18 02:18:31 +01:00