mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-12-16 19:04:43 +03:00
Code Issues Projects Releases Packages Wiki Activity
7086 commits 482 branches 258 tags 451 MiB
Commit graph

7086 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Goffart
291231c561 Merge missing commits from 1.6.2-themefix into 1.7 
Conflicts:
	VERSION.cmake
 2014-08-30 17:57:58 +02:00
Dominik Schmidt
7ad557f2f8 Add crash reporter to osx package and don't build it with BUILD_LIBRARIES_ONLY enabled 2014-08-30 14:45:39 +02:00
Dominik Schmidt
ef70052b0e Package installer if it was built 2014-08-30 14:12:40 +02:00
Dominik Schmidt
202426f536 Make crash reporter application name branded 2014-08-30 11:05:52 +02:00
Dominik Schmidt
d240415671 Make crash reporter logo branded 2014-08-30 11:05:34 +02:00
Dominik Schmidt
1aca22b5f8 Make crash reporter executable branded 2014-08-30 10:46:09 +02:00
Jenkins for ownCloud
ff970ee3f5 [tx-robot] updated from transifex 2014-08-30 02:06:15 -04:00
Jenkins for ownCloud
51a46a8ad7 [tx-robot] updated from transifex 2014-08-30 01:25:30 -04:00
hefee
68792ee9db Fixing spellingerror 
GNU Public License -> GNU General Public License
 2014-08-30 02:18:55 +02:00
Klaas Freitag
bcff1ced5e Merge branch '1.7' 
Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/folderman.cpp
	src/gui/wizard/owncloudadvancedsetuppage.cpp
	src/libsync/account.cpp
 2014-08-29 20:40:33 +02:00
Klaas Freitag
7ce2a93c63 Merge remote-tracking branch 'origin/reuse_oc_config' into 1.7 
Conflicts:
	src/CMakeLists.txt
	src/mirall/folderman.cpp
	src/mirall/folderman.h
	src/mirall/owncloudtheme.h
 2014-08-29 20:23:07 +02:00
Klaas Freitag
4d33773cef Nautilus Overlays: Rename icons according to branding. 
Added a script that renames the icons and patches the python file for
nautilus.
 2014-08-29 20:02:52 +02:00
Olivier Goffart
5d19426930 Propagator: When the server don't support ranges, reset the counter so the progress is not messed up 
Issue #2081
 2014-08-29 19:33:20 +02:00
Olivier Goffart
1b51a10b19 Socket API: be consistant in the VERSION command and add the VERSION at the beginning 2014-08-29 17:28:36 +02:00
Olivier Goffart
aab870af32 desktop file: add a Comment 
Fixes #2130
 2014-08-29 17:14:40 +02:00
Dominik Schmidt
38ff7d87c8 Hide crashreporter config option if not build with crashreporter enabled 2014-08-29 17:07:31 +02:00
Markus Goetz
7c70ada423 Exclude List: Gnucash temp files 
Fixes #2045
 2014-08-29 16:45:08 +02:00
Markus Goetz
12e2bac16b Propagator: Also parse OC-ETag header 
Client side part of https://github.com/owncloud/core/issues/9005
 2014-08-29 16:30:58 +02:00
Olivier Goffart
34a27c748a Progress: in case of resuming chunks, advance directly at startup by the amount of chunk already done 
Fixes #2103
 2014-08-29 16:06:56 +02:00
Markus Goetz
7ec0c52439 Poll URL: Use trimmed() on response 2014-08-29 13:58:33 +02:00
Jenkins for ownCloud
905dd20d0c [tx-robot] updated from transifex 2014-08-29 01:25:25 -04:00
Olivier Goffart
a73fbccf8c t4.pl: add a test to test that ignored file are not deleted 2014-08-28 19:33:52 +02:00
Klaas Freitag
7f1d707d23 ownCloud Theme: Do not have the oCSetupTop custom media, see #1445 2014-08-28 18:10:53 +02:00
Klaas Freitag
f1fb36bcb8 Tests: Get rid of the Carp package that ogoffart does not have. 
Recommendation: Use a decent distribution! But anyway....
 2014-08-28 18:10:53 +02:00
Daniel Molkentin
25c274a0bd X11: Bring Settings window to front when launched 2014-08-28 17:25:00 +02:00
Olivier Goffart
d4bbd28757 csync: remove ignored_cleanup: it's not used anymore 2014-08-28 17:16:51 +02:00
Olivier Goffart
98b7248df0 reconcile/update: don't remove directory that contains ignored files 2014-08-28 17:16:17 +02:00
Olivier Goffart
0fb0f2c204 Selective sync: start a sync when the selective sync settings changes 2014-08-28 16:27:46 +02:00
Dominik Schmidt
6abaad1ae8 Show crash reporter if trying to read the crash-reporter-enabled config crashes 2014-08-28 16:23:14 +02:00
Dominik Schmidt
89aec52503 Add checkbox to general settings to disable the crash reporter 2014-08-28 16:19:17 +02:00
Olivier Goffart
79d13d9242 Selective sync: deselecting a folder removes it from the local file system 2014-08-28 15:53:49 +02:00
Markus Goetz
b6f42a91f4 OS X: Fix Finder bundle NVTY->OWNC 2014-08-28 15:45:07 +02:00
Daniel Molkentin
cc5f5cf3a6 Set the minimum supported OS X version to 10.7 
We dropped 10.6 support quite a while ago.
This should avoid bug reports from 10.6 users.

Fixes #2122
 2014-08-28 14:50:00 +02:00
Markus Goetz
2aef6a2174 Poll URL: Don't delete from DB in case of 503 2014-08-28 13:44:21 +02:00
Olivier Goffart
79f00c2a2a Wizard: adjust alignements 2014-08-28 13:32:14 +02:00
Olivier Goffart
e5068e7543 Selective sync: if one click twice on the button in the wizard, it should keep the blacklist 2014-08-28 12:25:44 +02:00
Olivier Goffart
858218ac34 Wizard: new layout 2014-08-28 12:18:19 +02:00
Dominik Schmidt
b8e8d975aa Add CRASHREPORTER_SUBMIT_URL to OWNCLOUD.cmake 2014-08-28 12:08:07 +02:00
Markus Goetz
6e0330ff65 SyncEngine: Error out if we don't have a sync dir 2014-08-28 11:47:40 +02:00
Markus Goetz
3aa7178382 PollJob: Increase timeout 2014-08-28 11:27:08 +02:00
Dominik Schmidt
439bf7641e Use include path for libcrashreporter-qt instead of lengthy relative include 2014-08-28 11:11:42 +02:00
Dominik Schmidt
34042028b3 Add CRASHREPORTER_SUBMIT_URL define and default it to some placeholder owncloud url 2014-08-28 11:05:46 +02:00
Markus Goetz
d69049ce10 OS X: Fix Finder plugin 2014-08-28 10:21:56 +02:00
Jenkins for ownCloud
44a281534d [tx-robot] updated from transifex 2014-08-28 01:25:30 -04:00
Daniel Molkentin
59a9cc7c12 OS X build: use correct macro for version number 2014-08-28 00:08:24 +02:00
Markus Goetz
2f34b046d0 Overlay Icons: Improve OS X version, improve general feedback 
Now the update phase of the syncing algorithm pushes stuff the notification socket too.
 2014-08-27 19:15:43 +02:00
Olivier Goffart
a73316306d Selective sync: new design in the wizard 2014-08-27 19:03:11 +02:00
Daniel Molkentin
cf12a56b4c Merge remote-tracking branch 'origin/1.7' 
Conflicts:
	src/gui/socketapi.cpp
 2014-08-27 18:22:07 +02:00
Olivier Goffart
928652e4cf Selective sync: rename the button 'choose what to sync' 2014-08-27 17:31:57 +02:00
Olivier Goffart
7950b49cb1 Selective sync dialog: fix fetching sub directory when the folder is not the root folder 2014-08-27 17:19:36 +02:00