chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2024-11-27 15:42:46 +01:00
Code
14,674 Commits 4 Branches 173 Tags 91 MiB
v2.7.0-beta3
Commit Graph

14674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Olivier Goffart
b4efcf1627 Compile the tests after merge 
(Still not passing)
 2013-08-18 19:11:36 +02:00
Olivier Goffart
56d5359f5b Fix compilation after merge 
Still untetested
 2013-08-18 18:55:32 +02:00
Klaas Freitag
e0d121d370 More minor cleanups. 2013-08-18 18:18:05 +02:00
Klaas Freitag
a5de9994ec Set a proper error message on in-between-changes. 2013-08-18 18:18:05 +02:00
Olivier Goffart
d098a12321 leak fix 2013-08-18 18:18:05 +02:00
Klaas Freitag
34d7f84fc2 Minor cleanup. 2013-08-18 17:59:03 +02:00
Daniel Molkentin
6cda2f0c24 Do not report removable ignored files 2013-08-18 17:52:45 +02:00
Olivier Goffart
4e04a2ccb0 Addapt to new error codes 2013-08-18 17:29:23 +02:00
Markus Goetz
b923554935 Revert "DB: Don't use metadata_tmp table" 
Let's not do this in the release branch

This reverts commit 79f72a1211.
 2013-08-18 17:13:19 +02:00
Markus Goetz
6474780d80 Revert "DB: More easy IO mode" 
This reverts commit ea6caed5a3.
 2013-08-18 17:12:59 +02:00
Markus Goetz
79f72a1211 DB: Don't use metadata_tmp table 
Not sure why this was ever needed
 2013-08-18 17:05:04 +02:00
Daniel Molkentin
cea9b389bf Account Settings: Use native highlight color 2013-08-18 17:00:37 +02:00
Olivier Goffart
ec8adf2bd7 Fix compilation of src/std after merge 2013-08-18 16:51:02 +02:00
Olivier Goffart
2afdc9d095 Adapt to new multybyte api after merge 
(Search and replace)
 2013-08-18 16:43:46 +02:00
Olivier Goffart
9f5388544a Fix cmake after merge 
iniparser dependency is gone.
 2013-08-18 16:29:35 +02:00
Olivier Goffart
b5ed352aa3 Merge remote-tracking branch 'origin/master' into ocsync 
Only confluct resolution, do not compile or works

Conflicts:
	CMakeLists.txt
	CPackConfig.cmake
	ConfigureChecks.cmake
	client/csync_client.c
	cmake/Modules/DefineCompilerFlags.cmake
	cmake/Modules/DefineInstallationPaths.cmake
	cmake/Modules/FindIconv.cmake
	cmake/Modules/FindIniparser.cmake
	cmake/Modules/FindNeon.cmake
	config.h.cmake
	config/CMakeLists.txt
	config/ocsync.conf
	doc/CMakeLists.txt
	modules/csync_owncloud.c
	modules/csync_sftp2.c
	src/CMakeLists.txt
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_exclude.c
	src/csync_lock.c
	src/csync_macros.h
	src/csync_misc.c
	src/csync_misc.h
	src/csync_private.h
	src/csync_propagate.c
	src/csync_statedb.c
	src/csync_statedb.h
	src/csync_update.c
	src/csync_util.c
	src/csync_util.h
	src/std/c_dir.c
	src/std/c_file.c
	src/std/c_private.h
	src/std/c_string.c
	src/std/c_string.h
	src/std/c_time.c
	src/vio/csync_vio.c
	src/vio/csync_vio.h
	src/vio/csync_vio_file_stat.h
	src/vio/csync_vio_local.c
	src/vio/csync_vio_method.h
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_treewalk.c
	tests/csync_tests/check_csync_update.c
	tests/ownCloud/HTTP/DAV.pm
	tests/ownCloud/ownCloud/Test.pm
	tests/std_tests/check_std_c_str.c
	tests/vio_tests/check_vio.c
 2013-08-18 16:21:18 +02:00
Markus Goetz
ea6caed5a3 DB: More easy IO mode 
We move the DB anyway at the end, no need to be so harsh
 2013-08-18 16:10:30 +02:00
Daniel Molkentin
71b1e881d8 Setup Wizard: Only label button "Connect" where suitable 2013-08-18 15:23:52 +02:00
Daniel Molkentin
7ba47e9d44 Code formatting fixes 2013-08-18 15:23:52 +02:00
Daniel Molkentin
be48cb646c Setup wizard: Start sync when displaying result page 2013-08-18 15:23:52 +02:00
Klaas Freitag
47eb5ff1d9 Do not keep the log if the log window is not visible. 2013-08-18 13:28:40 +02:00
Klaas Freitag
b608f5a670 Progressbar and quota bar tweaking. 2013-08-17 22:56:02 +02:00
Klaas Freitag
e81dc34c4e Add a tooltip in the sync protocol list. 2013-08-17 17:57:33 +02:00
Klaas Freitag
1603e627a3 Remove superflous conflict case. 2013-08-17 17:57:33 +02:00
Klaas Freitag
bf978b3e0f Handle Progress as a namespace rather than a class. 2013-08-17 17:57:33 +02:00
Klaas Freitag
0fdaf33288 Use correct translation call from QCoreApplication. 2013-08-17 17:57:33 +02:00
Klaas Freitag
367c4153c1 Show a bubble if the quota was exceeded. 2013-08-17 17:57:33 +02:00
Klaas Freitag
395c673a24 Fix the quota bar for quotas larger 100%. 2013-08-17 17:57:32 +02:00
Olivier Goffart
22de23c651 Fix the 'no limit' upload setting 
Fix issue #879
 2013-08-17 16:11:45 +02:00
Olivier Goffart
23926d2461 small leak 2013-08-16 20:18:35 +02:00
Olivier Goffart
c03f31b6ba put the 'Account' item first 2013-08-16 15:09:54 +02:00
Olivier Goffart
a1060a8538 fixup the layout of the account settings 2013-08-16 15:03:38 +02:00
Daniel Molkentin
24251bc223 Add "Keyword" to the desktop template 
Fixes #876
 2013-08-16 12:29:11 +02:00
Olivier Goffart
868f8029a2 Close the database file in all cases. 
If the database was empty, we forgot to close the file descriptor,
making it impssible to remove the database and replace it with the real
one
 2013-08-16 12:23:26 +02:00
Jenkins for ownCloud
f78749d2cd [tx-robot] updated from transifex 2013-08-15 16:57:02 -04:00
Olivier Goffart
14219a1ea5 Log error of sqlite3_close 2013-08-15 18:39:26 +02:00
Daniel Molkentin
1663c84db7 Return an error if rename fails on win32. 
Amends 9ea39dbaa9.
 2013-08-15 18:06:27 +02:00
Klaas Freitag
9ea39dbaa9 win32: Retry renaming in case of access denied. 2013-08-15 17:40:30 +02:00
Klaas Freitag
d3ec897fee Bump version to 0.82.0 2013-08-15 17:39:00 +02:00
Daniel Molkentin
0995377d39 1.4.0 beta2 2013-08-15 17:32:46 +02:00
Daniel Molkentin
b9228e64ff Make Folder Reset an expert option (F5) 
This feature should not be required, but might be helpful
in the debugging process.
 2013-08-15 17:00:07 +02:00
Olivier Goffart
c4084de716 Remove the 'Remove Account' button 
It is not doing anything right now, and we have no plans to implement it
in a short future

Fix Issue #866
 2013-08-15 16:42:08 +02:00
Olivier Goffart
3c667918e7 Fix Reconfiguration keeps sync folder definition 
Issue #875
 2013-08-15 16:35:03 +02:00
Olivier Goffart
e55745cbcf Remove connection from unexisting signal to unexisting slot 2013-08-15 16:16:22 +02:00
Daniel Molkentin
e01ce20431 Wizard: Do not use FormLayout for URL line edit 
Looks ugly on Mac

Fixes #870
 2013-08-15 15:58:20 +02:00
Olivier Goffart
dce8cb83d9 Do not forget the config on the second page of the wizzard 
Fixes mirral issue #874 where certificate was not stored on the first
page
 2013-08-15 15:45:16 +02:00
Olivier Goffart
8dc956c55b Put all the debug in the log window 
Don't emit debug before we installed the hook and created he log window
Also no debug if we use --help
 2013-08-15 15:45:16 +02:00
Olivier Goffart
38a5ff42e0 show the errno in the debug when renaming the db fails 2013-08-15 13:51:57 +02:00
Daniel Molkentin
6c77921a32 Admendment of last commit 2013-08-15 13:09:20 +02:00
Daniel Molkentin
55e4748f06 allow relative directories for --confdir 2013-08-15 13:01:05 +02:00