mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 23:28:14 +03:00
Code Issues Projects Releases Packages Wiki Activity
11136 commits 474 branches 256 tags 514 MiB
Commit graph

11136 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian Kamm
8865405a32 Version: master branch is future 2.5 now 2017-10-24 09:56:16 +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
Jenkins for ownCloud
30957479a3 [tx-robot] updated from transifex 2017-10-17 02:18:34 +02:00
Jenkins for ownCloud
b4ab53dd32 [tx-robot] updated from transifex 2017-10-16 02:18:33 +02:00
Jenkins for ownCloud
a314eeb892 [tx-robot] updated from transifex 2017-10-15 02:18:35 +02:00
Jenkins for ownCloud
644ddf318c [tx-robot] updated from transifex 2017-10-14 02:18:36 +02:00
Jenkins for ownCloud
104c6edcde [tx-robot] updated from transifex 2017-10-13 02:18:37 +02:00
Jenkins for ownCloud
94b673dc8e [tx-robot] updated from transifex 2017-10-12 02:18:38 +02:00
Jenkins for ownCloud
0a4370236d [tx-robot] updated from transifex 2017-10-11 02:18:35 +02:00
Jenkins for ownCloud
fe8d2b397e [tx-robot] updated from transifex 2017-10-10 02:18:44 +02:00
Christian Kamm
92e90f9c55 Context menu: More detailed status messages 
Previously it could only display synchronization progress or "up to
date". Now it also communicates the same overall state that the icon
shows.

See owncloud/enterprise#2134
 2017-10-09 14:14:31 +02:00
Jenkins for ownCloud
3eb2642b11 [tx-robot] updated from transifex 2017-10-09 02:18:35 +02:00
Jenkins for ownCloud
99192a6dec [tx-robot] updated from transifex 2017-10-08 02:18:36 +02:00
Jenkins for ownCloud
cffc1fd1c4 [tx-robot] updated from transifex 2017-10-07 02:18:37 +02:00
Olivier Goffart
b8f7c6daae CMakeLists.txt: Put -pie as a linker flag were it belongs 
Fixes warning introduced by PR #6040
 2017-10-06 14:35:56 +02:00
Markus Goetz
cd07865da6 Settings Dialog: Fix display name compilation for macOS #6078 2017-10-06 13:34:40 +02:00
Thomas Müller
315e38e814 Use display-name from the ocs call in the settings dialog 2017-10-06 10:59:20 +02:00
Jenkins for ownCloud
95b90271b6 [tx-robot] updated from transifex 2017-10-06 02:18:35 +02:00
Christian Kamm
90befac901 Rename detection: File size must be equal 
Comparison of file sizes for potential conflicts was added in
0eb9401c62, but did not extend to checking
the file size in case of potential local moves.

This commit adds this check and adds tests for various move+change
scenarios.
 2017-10-05 14:17:07 +02:00
Christian Kamm
22f71ce17e t9.pl: Make more reliable 
Sometimes the 'touch' didn't change the mtime since too little time had
passed!
 2017-10-05 14:13:10 +02:00
Markus Goetz
0931f25747 ChangeLog: Re-format and re-order 2017-10-05 13:07:42 +02:00
Markus Goetz
971f2391cf ChangeLog: More 2.4.0 changes 2017-10-05 12:52:50 +02:00
Christian Kamm
43a26eb50a Excludes: Fix bug with escapes in the regex, add tests 2017-10-05 10:40:53 +02:00
Christian Kamm
99d406072f Excludes: optimize csync_is_windows_reserved_word 2017-10-05 10:19:48 +02:00
Markus Goetz
3a1a56c7ad Excludes: During directory traversal, use QRegularExpression 
On Mac, this halves the time spent in csync_excluded_traversal
when using check_csync_excluded_performance. A similar performance
increase is seen on linux.
 2017-10-05 10:19:48 +02:00
Jenkins for ownCloud
57cbba81e7 [tx-robot] updated from transifex 2017-10-05 02:18:35 +02:00
Markus Goetz
e48d55d126 sqlite: Update bundled version to 3.20.1 
For OS X and Windows.
 2017-10-04 17:12:12 +02:00
Jürgen Weigert
1c03fa8642 use IS_DIRECTORY ${CMAKE_SOURCE_DIR}/admin 
We need to test presence of admin folder using ${CMAKE_SOURCE_DIR}, or it is always false. Bad for ox, (good for everything else)
 2017-10-04 07:49:27 +02:00
Jenkins for ownCloud
670ff36024 [tx-robot] updated from transifex 2017-10-04 02:18:35 +02:00
Jenkins for ownCloud
6b3f6d9860 [tx-robot] updated from transifex 2017-10-03 02:18:33 +02:00
Jenkins for ownCloud
ac5876e94e [tx-robot] updated from transifex 2017-10-02 02:18:33 +02:00
Jenkins for ownCloud
b13f44023d [tx-robot] updated from transifex 2017-10-01 02:18:33 +02:00
Jenkins for ownCloud
2f15d8aef5 [tx-robot] updated from transifex 2017-09-30 02:18:32 +02:00
rockihack
ecaa37efbe Linux Hardening 
see: https://wiki.debian.org/Hardening#User_Space
 2017-09-29 14:34:30 +02:00
Jenkins for ownCloud
33e421473c [tx-robot] updated from transifex 2017-09-29 02:18:33 +02:00
Jürgen Weigert
eb1a96c164 Update clean_tarball.sh 
warning against removing sqlite. it is used with Linux with cmake switch on CentOS6
USE_OUR_OWN_SQLITE3=TRUE
 2017-09-28 21:09:43 +02:00
Jürgen Weigert
2afcac763d Update CMakeLists.txt 
Make admin folder optional. It is needed for osx, but it is deleted from Linux builds for the sake of easier license review as discussed in https://github.com/owncloud/client/issues/6005
 2017-09-28 19:32:55 +02:00
Jürgen Weigert
28fe903aee support old sqlite before 3.7.7 
quickfix: define the symbol for backwards compat
or FIXME: better solution #ifdef SQLITE_IOERR_SHMMAP where needed...
 2017-09-28 19:01:55 +02:00
Olivier Goffart
253d197ccb fixup! [tx-robot] updated from transifex 2017-09-28 18:38:33 +02:00
Olivier Goffart
0ceb806f1a Test OAuth2 
Include a test for PR #6057
 2017-09-28 18:38:33 +02:00
Olivier Goffart
800b9cf167 SyncEngine: _hasNoneFiles should be set when there are INSTRUCTION_UPDATE_METADATA 2017-09-28 11:15:36 +02:00
Olivier Goffart
1da398e6c6 OAuth: fix compilation with old gcc 
We need to used QPointer::data in the signal slot connection

Relates to pr #6065
 2017-09-28 10:55:28 +02:00
Jenkins for ownCloud
074cb132bb [tx-robot] updated from transifex 2017-09-28 02:18:36 +02:00
Markus Goetz
2df74fd9d7 Updater: Rudimentary support for beta channel 
So we can get people update from our alpha to the beta and rc
 2017-09-27 16:23:34 +02:00
Olivier Goffart
d68b07dfc7 Fix encoding of version string 2017-09-27 12:06:49 +02:00
Olivier Goffart
a52dff713b csync_rename: optimize lookup 
Avoid many memory allocations in reconcile
 2017-09-27 11:41:55 +02:00
Olivier Goffart
041c5e6d44 csync_reconcile: Optimize reconcile by avoiding alocations 
Fix performence regression from commit d66c2b5fae
For every new file we would look up every parent directories. Allocating
a new QByteArreay for every parent riectory just to know if it is in the other
tree is wasting lots of CPU.
Use a ByteArrayRef trick, similar to QStringRef
 2017-09-27 11:41:55 +02:00
Dominik Schmidt
a2ce739192 Set CMAKE_INSTALL_RPATH as RPATH for installed executables 2017-09-27 09:13:44 +02:00
Christian Kamm
ca4ad58a06 Packaging: Add options for fine-grained builds #5957 
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
 2017-09-27 09:13:44 +02:00
Christian Kamm
89df8fb692 Packaging: Adjust APPNAME handling #5957 
Extracted and adjusted from packaging.diff by @jnweiger and @dschmidt
 2017-09-27 09:13:44 +02:00