chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-04 17:31:01 +02:00
Code Activity
11,855 Commits 4 Branches 173 Tags
v2.5.0-alpha1
Commit Graph
413 Commits
Author SHA1 Message Date
Olivier Goffart 64e351c6d3 Merge remote-tracking branch 'origin/2.5' 2018-05-14 09:44:42 +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
Christian Kamm e9ac35b2e5 Doc: Adjust step-by-step guide for creating log files #6442 2018-05-03 11:13:03 +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 https://github.com/owncloud/client/pull/6505/commits/0ce287d96dff585b61da491b347e11694fbc64ad
	- 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
Matthew Setter 0ce287d96d Use external theme in documentation 2018-05-02 21:40:49 +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
Samuel Alfageme 1ec5d5b0cf Fix 'client/doc/conffile.rst:36: ERROR: Malformed table' 2018-04-24 16:13:45 +02:00
Olivier Goffart 7053a9c3d9 Update installing.rst 2018-04-24 13:33:56 +02:00
Jürgen Weigert 5ccf5fd9a1 update supported linux platforms 2018-04-24 13:33:56 +02:00
Christian Kamm 9555f8d75c Show a tray message when a folder watcher becomes unreliable #6119 2018-04-24 13:06:50 +02:00
Christian Kamm 9e8464e114 Merge branch 'placeholder-prototype' 2018-04-18 11:02:53 +02:00
Christian Kamm a9561f494b Doc: Add showExperimentalOptions to conffile.rst 2018-04-18 10:27:51 +02:00
Markus Goetz 9ed937a6d3 Documentation: Update building.rst #6154 #5594 2018-04-17 19:03:08 +02:00
Christian Kamm db64b217b8 Doc: Explaining conflict files and resolving them #6396 2018-04-11 09:02:15 +02:00
Christian Kamm ca36da6037 Doc: Remove out of date changelog copy 2018-04-10 09:20:22 +02:00
Christian Kamm 73777beb00 Doc: fix for new conflict tag 2018-04-10 09:17:05 +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
Oleg Solovyov ec26388826 - doc: linux-only setting 2018-01-29 09:41:42 +01:00
Oleg Solovyov f0822d648d - add description for moveToTrash variable 2018-01-29 09:41:42 +01:00
Olivier Goffart e0a14cac5b ConfigFile: use QStandardPaths::AppConfigLocation for the config file 
Also use appName instead of appNameGui in order to compute the path

Issue: #2245

The reason is to respect the XDG spec on Unix (#1601) and might help
on windows roaming profiles (#684)
 2017-12-07 17:39:16 +01:00
Olivier Goffart ed5385faa3 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libsync/connectionvalidator.cpp
     	src/libsync/networkjobs.cpp
 2017-12-05 15:58:13 +01:00
Hefee 1a1ab92ed9 make doc-man working again. 2017-12-04 12:37:30 +01:00
Christian Kamm aafe7c4732 Merge remote-tracking branch 'origin/2.4' 2017-11-20 11:54:56 +01:00
Michael Stingl d832312acc Add 2.3.3 System Requirements to client repo (#5996) 
I would like to maintain the System Requirements in the client repo.
 2017-11-17 15:05:42 +01:00
Matthew Setter b13fd786b6 Fix broken download link 2017-11-14 12:25:48 +01:00
Matthew Setter 89d55d0af8 Fix broken images in the FAQ 2017-11-14 12:25:48 +01:00
Matthew Setter d46335aba1 Minor formatting fixes 
Fix broken header and table
 2017-11-14 12:25:48 +01:00
Matthew Setter e417a4b159 Fix title casing to match style guide 2017-11-14 12:25:48 +01:00
Christian Kamm 05c1bfb6cf Merge remote-tracking branch 'origin/2.4' 2017-10-27 10:29:31 +02:00
Christian Kamm e85a339d94 Local discovery: Use db instead of filesystem 
We mostly trust the file watchers meaning that we don't re-scan the
local tree if we have done that recently and no file watcher events
have arrived. If the file watchers invalidate a subtree, we rescan
only that subtree.

Since we're not entirely sure the file watchers are reliable, we still
do full local discoveries regularly (1h by default). There is a config
file setting as well as an environment variable to control the interval.
 2017-10-24 10:00:20 +02:00
Dominik Schmidt 7f51803d04 Only use $(MAKE) in doc target if make is used as generator 
The old behavior broke builds with other CMake generators like Ninja as it obviously has no concept of $(MAKE)
 2017-10-17 12:50:34 +02:00
Christian Kamm 096cd348f0 Doc: Update FAQ entry on deeply nested directories #1067 2017-10-11 16:01:46 +02:00
Christian Kamm 82e87805c3 Packaging: Change directory for docs #5957 
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
 2017-09-27 09:13:44 +02:00
Olivier Goffart 8f5110900c Gui: Allow to add multiple sync folder connection of the same folder 
... or child folders

There is also no real reason to forbid the user from syncing the same
folder to multiple location on its hardrive.
A real use case is when the user uncheck a big directory using "choose
what to sync", but would still like to sync a folder within this disabled
tree. The user can now do this with the "add folder" feature

Since 2.3, we even support syncing the same local folder to multiple
remote folder, so why not allow syncing the same remote folder several
times?

Relates to issue #3645
 2017-09-18 15:17:06 +02:00
Jocelyn Turcotte 013eba0e79 Update sync-algorithm.md 
The rbtree was replaced by a std::map.
 2017-09-18 14:00:52 +02:00
Matthew Setter ab8061a57f Fix link to download the ownCloud client 
This was requested in https://github.com/owncloud/documentation/issues/3354.
 2017-09-06 09:09:14 +02:00
Matthew Setter f414355680 Fix broken images in FAQ 
This relates to https://github.com/owncloud/documentation/issues/3354.
 2017-09-06 09:08:53 +02:00
Martin 6e47d9a2e5 Documentation improvement for #5969 2017-08-20 18:17:58 +02:00
Matthew Setter 119ecb4259 Merge pull request #5762 from owncloud/update-docs-to-2.3.2 
Update client docs version string to 2.3.2
 2017-08-03 13:56:39 +02:00
Matthew Setter 8bd047174a Update client docs version string to 2.4.0 
Need to update this to match the latest version.
 2017-08-01 17:28:50 +02:00
Matthew Setter 3731eba9b6 Clean up the client docs removing old, outdated, content 
This makes changes as suggested by @michaelstingl in
https://github.com/owncloud/documentation/issues/3240.
 2017-07-31 14:04:02 +02:00
Olivier Goffart 075c423c62 buildint.rst: Put back reference to openssl on windows 
OpenSSL might no longer be needed to build the client, but we still need
it to run it.

That reverts part of commit 6e57b0219e for
this file.

Fix #5858
Reported in https://central.owncloud.org/t/locally-built-client-error-creating-ssl-context/8264
 2017-07-21 08:57:57 +02:00
Jürgen Weigert 186f16e688 Update building.rst 2017-07-07 16:01:20 +02:00
Olivier Goffart 6e57b0219e Don't link dirrectly against openssl 
All our crypto code is handled by qt nodaways.
No need to carry this dependency.

Especially since it causes warnings on system where there are
twp openssl version installed:
/usr/bin/ld: warning: libcrypto.so.1.0.0, needed by /usr/lib/libQt5Network.so.5.9.0, may conflict with libcrypto.so.1.1
 2017-06-13 11:27:23 +02:00
Christian Kamm 5eaae83a01 Merge remote-tracking branch 'origin/2.3' 2017-05-17 13:10:19 +02:00