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

11855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Goetz
0365653055 Sparkle: Delegate calls work now with 1.18.1 (maybe even before) 
We can extend on this to give UI feedback.
 2018-05-16 11:29:27 +02:00
Jenkins for ownCloud
d8078d43fb [tx-robot] updated from transifex 2018-05-16 02:19:12 +02:00
Olivier Goffart
fabc706e43 SyncRunFileLog: Add the requestid 
https://github.com/owncloud/client/pull/6427#issuecomment-383879509
 2018-05-15 18:11:01 +02:00
Olivier Goffart
e7e8a62bb7 Blacklist: remember the X-Request-ID 
Issue #6420
Store the X-Request-ID in the SyncFileItem and also in the blacklist.
Note that for consistency reason, the X-Request-ID is also in the
SyncFileItem if the request succeeds.

Currently there is no UI to access it, but it can be queried with sql
commands
 2018-05-15 18:11:01 +02:00
Christian Kamm
f396f2f41d IgnoreEditor: Preserve comments, add #!readonly 
Useful in case we ever want to make use of directives inside the ignore
list.
 2018-05-15 14:26:35 +02:00
Christian Kamm
8d14f4357a Placeholder: Stop adding ignore pattern 
Because we can't make older clients preserve the version directive that
was attached to it.

See #6504 and #6498
 2018-05-15 14:26:35 +02:00
Christian Kamm
34d40e6c67 Placeholder: Don't contain "stub" 2018-05-15 14:26:35 +02:00
Christian Kamm
c80ee0ea48 Placeholders: Save to key that's invisible to <2.5 clients #6504 2018-05-15 14:26:35 +02:00
Olivier Goffart
fb71a90756 FolderWizard: fix crash when experimental feature are disabled 
The _placeholderCheckBox only exists if the experimental features are enabled

Found via the crash reporter
https://sentry.io/owncloud/desktop-win-and-mac/issues/556407777/
 2018-05-15 12:33:09 +02:00
Olivier Goffart
41dc87c748 Update binary submodule 2018-05-15 12:18:54 +02:00
Christian Kamm
8b952d3741 TestChunkingNG: Remove unneeded test code 2018-05-15 09:42:54 +02:00
Christian Kamm
33b0726390 PropagateUpload: Fix miscount in abort() #6516 
Previously it tried to abort even jobs that had already finished, which
was not going to work as they wouldn't emit finished() again.

Also, in some cases the abortCount would never go to zero and that case
wasn't well documented.
 2018-05-15 09:42:54 +02:00
Christian Kamm
40e23d3da7 PropagateUpload: Remove unused PropagateUploadFileCommon::abort 2018-05-15 09:42:54 +02:00
Jenkins for ownCloud
97ff3dccb8 [tx-robot] updated from transifex 2018-05-15 02:18:53 +02:00
Dominik Schmidt
fd18ece619 Use newer craft cache 2018-05-14 13:40:12 +02:00
Dominik Schmidt
fe5e5fcb32 Fix for png2ico 2018-05-14 13:40:12 +02:00
Dominik Schmidt
0f57326057 Fix create_windows_icon_and_rc invocation for png2ico 2018-05-14 13:40:12 +02:00
Dominik Schmidt
886f31456a Add FindIcoTool.cmake 2018-05-14 13:40:12 +02:00
Dominik Schmidt
2d7841204c Support icotool in ECMAddAppIcon macro 2018-05-14 13:40:12 +02:00
Olivier Goffart
5f6f5f5789 Merge remote-tracking branch 'origin/2.5' 2018-05-14 09:46:15 +02:00
Olivier Goffart
64e351c6d3 Merge remote-tracking branch 'origin/2.5' 2018-05-14 09:44:42 +02:00
Christian Kamm
5e4aca8988 ShareLink: Preserve password when unrelated ui changes #6512 2018-05-14 09:44:21 +02:00
Christian Kamm
d917f52779 Remove debug code 2018-05-14 09:37:28 +02:00
Jenkins for ownCloud
cca7914204 [tx-robot] updated from transifex 2018-05-14 02:18:41 +02:00
Jenkins for ownCloud
974b6a8845 [tx-robot] updated from transifex 2018-05-13 02:18:40 +02:00
Jenkins for ownCloud
52aa5754c3 [tx-robot] updated from transifex 2018-05-12 02:18:39 +02:00
Jenkins for ownCloud
2bfcd60d18 [tx-robot] updated from transifex 2018-05-11 02:18:42 +02:00
Jenkins for ownCloud
2e64b291da [tx-robot] updated from transifex 2018-05-10 02:18:42 +02:00
Jenkins for ownCloud
ce42080cc7 [tx-robot] updated from transifex 2018-05-09 02:18:31 +02:00
Matthew Setter
600a98e2e9
Merge pull request #6502 from owncloud/correct-osx-ui-nomenclature 
Correct incorrect reference to OSX Menu bar
 2018-05-08 14:17:37 +02:00
Matthew Setter
a547e228d3 Correct incorrect reference to OSX Menu bar 
This fixes https://github.com/owncloud/documentation/issues/4109.
 2018-05-08 14:17:12 +02:00
Jenkins for ownCloud
369d833610 [tx-robot] updated from transifex 2018-05-08 02:18:32 +02:00
Jenkins for ownCloud
80e0f03f1b [tx-robot] updated from transifex 2018-05-07 02:18:30 +02:00
Jenkins for ownCloud
63935f086d [tx-robot] updated from transifex 2018-05-06 02:18:33 +02:00
Jenkins for ownCloud
905877ecc0 [tx-robot] updated from transifex 2018-05-05 02:18:31 +02:00
Jenkins for ownCloud
af4e40c3fc [tx-robot] updated from transifex 2018-05-04 02:18:32 +02:00
Christian Kamm
e9ac35b2e5 Doc: Adjust step-by-step guide for creating log files #6442 2018-05-03 11:13:03 +02:00
Matthew Setter
ce260909a8
Merge pull request #6505 from owncloud/integrate-external-themes-repo 
Integrate external themes repository
 2018-05-03 10:18:12 +02:00
Samuel Alfageme
d1304b2c05 Set copyright's upper bound dynamically based on the compilation date 
Ref. https://github.com/owncloud/client/pull/6505\#discussion_r185712624
 2018-05-03 09:39:56 +02:00
Samuel Alfageme
6b3f9ee4c9 Remove the outdated submodule reference from the git tree 
This completes the rename started in 0ce287d96d
	- As suggested in https://github.com/owncloud/client/pull/6505\#discussion_r185496084

Also, fixes its reference on CMakeLists.txt so the whole thing builds again
 2018-05-03 09:20:45 +02:00
Jenkins for ownCloud
b7eb9b2040 [tx-robot] updated from transifex 2018-05-03 02:18:34 +02:00
Matthew Setter
0ce287d96d Use external theme in documentation 2018-05-02 21:40:49 +02:00
Samuel Alfageme
5e13d519d9 Use HTTPS rather than SSH schema for the _shared_assets submodule 2018-05-02 16:56:44 +02:00
Samuel Alfageme
2c53025b0a Removed CMake-generated files and referenced the right themes path 
- i.e. Makefile and conf.py (generated via pyconfigure's conf.py.in) - included both into local .gitignore
- Fixed the reference to _shared_assets in the CMake script and the copyright used in the metadata.
 2018-05-02 13:49:49 +02:00
Samuel Alfageme
0d51b32722 Fix broken LTS link to point to Ubuntu's release policy 
- To fix make's client/doc/installing.rst:39: ERROR: Unknown target name: 'lts' on build.
- Also removed references to wizard's last page after https://github.com/owncloud/client/pull/5729
 2018-05-02 13:12:04 +02:00
Matthew Setter
489342018f Use external theme in documentation 2018-05-02 12:06:32 +02:00
Matthew Setter
e5dd54d4f4 Add the docs-themes repository as a submodule 
This provides a simpler way of integrating the external theme.
Relates to:

- owncloud/client#6163
- owncloud/client#6169
- #3240
- owncloud/client#6497
 2018-05-02 12:04:14 +02:00
Jenkins for ownCloud
f470b045d7 [tx-robot] updated from transifex 2018-05-02 02:18:34 +02:00
Jenkins for ownCloud
2b7a726acf [tx-robot] updated from transifex 2018-05-01 02:18:33 +02:00
Jenkins for ownCloud
7cac493a6e [tx-robot] updated from transifex 2018-04-30 02:18:31 +02:00