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,836 Commits 4 Branches 173 Tags 91 MiB
v2.5.0-alpha
Commit Graph

11836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jenkins for ownCloud
ad917d038f [tx-robot] updated from transifex 2018-04-29 02:18:35 +02:00
Jenkins for ownCloud
7710b66498 [tx-robot] updated from transifex 2018-04-28 02:18:31 +02:00
Jenkins for ownCloud
0a14fce639 [tx-robot] updated from transifex 2018-04-27 02:18:33 +02:00
Christian Kamm
642ed1bb70 Merge remote-tracking branch 'origin/master' into 2.5 2018-04-26 10:16:45 +02:00
Christian Kamm
3f9c10e641 Proxy settings: Fix bad behavior with empty host 
Fixes f6a075ef54 for #5885

When no host is given it shouldn't just *appear* that there is no
proxy, there actually shouldn't be a proxy set then.
 2018-04-26 10:07:05 +02:00
Jenkins for ownCloud
4327fede32 [tx-robot] updated from transifex 2018-04-26 02:18:37 +02:00
Markus Goetz
8b45fbfdab Share Dialog: Disable workaround for macOS too #6185 2018-04-25 19:32:01 +02:00
Olivier Goffart
2696c520bd Wizard: fix a layout glitch 2018-04-25 14:47:56 +02:00
Olivier Goffart
1ab3a9fc13 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-04-25 13:58:45 +02:00
Markus Goetz
9d4ece4b3a ShareDialog: macOS grey odditiy #5774 2018-04-25 13:56:19 +02:00
Christian Kamm
e9db52a378 Issues: Show link to conflicts doc if there are some #6396 
The link url is themed.
 2018-04-25 13:31:49 +02:00
Christian Kamm
fc73cde10c Merge branch 'master' into 2.5 2018-04-25 12:30:31 +02:00
Christian Kamm
44071f0892 Nautilus shell integration: Print python version on startup #6406 2018-04-25 12:26:18 +02:00
Jenkins for ownCloud
529649254b [tx-robot] updated from transifex 2018-04-25 02:18:37 +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
Adrien
6520263244 Fix #6394 2018-04-24 13:27:33 +02:00
Christian Kamm
9555f8d75c Show a tray message when a folder watcher becomes unreliable #6119 2018-04-24 13:06:50 +02:00