chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-10-05 02:53:40 +02:00
Code Activity
11,836 Commits 4 Branches 173 Tags
v2.5.0-alpha
Commit Graph
5475 Commits
Author SHA1 Message Date
Olivier Goffart 18966bf061 Add missing include 2014-01-27 12:36:52 +01:00
Olivier Goffart bf95509dbe Do not include "private" header from "public" header 2014-01-27 12:31:54 +01:00
Olivier Goffart 50b9a7b191 remove unused include from header file 2014-01-27 11:58:50 +01:00
Olivier Goffart 08c03d19b9 Only one quote should be enough 
Should fix #1295
 2014-01-24 20:28:17 +01:00
Daniel Molkentin 42f5aa072d Link against Sparkle if available 2014-01-24 11:58:11 +01:00
Klaas Freitag 688d394576 Check for INotify if compiling for Linuxe and friends 2014-01-23 16:05:35 +01:00
Klaas Freitag 5841cf4020 Add and remove watches for folders independent from sync dir. 
Before it was just in case of download.
 2014-01-23 13:23:27 +01:00
Klaas Freitag e9e132c06c Make use of the new linux folder watcher. 2014-01-23 13:23:27 +01:00
Klaas Freitag e3723fcfc2 Add a new folder watcher implementation for Linux. 2014-01-23 13:23:27 +01:00
Daniel Molkentin 8485a7fd30 Fix typo 2014-01-22 16:09:22 +01:00
Daniel Molkentin 129aef5beb Revert "Formatting hashes with : seems to be out of fashion" 
This reverts commit c52e3a0732.
 2014-01-22 00:00:34 +01:00
Daniel Molkentin 54c0c4057b Improve SSL detail display 2014-01-21 15:54:06 +01:00
Daniel Molkentin c52e3a0732 Formatting hashes with : seems to be out of fashion 2014-01-21 15:25:51 +01:00
Klaas Freitag 699f6a62f8 Do not set sync-state to Prepare in setSyncEnabled(). 
This method is also called if the sync was disabled due to
network problems and such, ie. from the ETag change check.
In that case, we do not want to go to the Prepare state as
we not neccessarily want to have the folder synced now.

This fixes the problem that the folders were resynced way
to often which we had in master for a couple of days now.
 2014-01-21 15:25:05 +01:00
Olivier Goffart 61f3b839ab Fix compilation in Qt5 
Some Qt SSL function used to return QString now return a QStringList.

By having  QStringList(...).join(':')   the code will compile both
if the ... is a QString or a QStringList. So the code will still
compile in Qt4.
 2014-01-21 15:09:12 +01:00
Olivier Goffart 29590fa00b Revert "Commented opening of files from the activity view as it does not work." 
This reverts commit c50b0a995b.

This was only broken on windows and probabyl fixed by commit 23f52bcd
 2014-01-21 13:01:05 +01:00
Olivier Goffart 0c33fc6e8a Do not block while launching the explorer on linux 
Fixes #1338
 2014-01-21 13:01:05 +01:00
Daniel Molkentin c4c36d641b Remove garbage include 2014-01-21 12:34:51 +01:00
Klaas Freitag 4d8e65cfd0 Hide useless logging that indicates an error. 2014-01-21 12:10:49 +01:00
Daniel Molkentin 2370060ac5 Implement Certificate Information Widget 
Currently used in status window. Before, there was no way to know
about the current certificate situation.

Fixes #44
 2014-01-21 09:21:33 +01:00
Daniel Molkentin d4bb0e44cd Wizard: Gracefully fall back to HTTP if HTTPS connection fails 
If the connection fails, the user is now being asked if he does
agree to a new attempt via an unencrypted connection. If he complies,
the connection will be reattempted using plain HTTP.

Fixes #1356
 2014-01-20 19:46:09 +01:00
Daniel Molkentin 9b9b62d4e3 Wizard: Prepend 'https://' if no scheme is set 
First part of fix for #1356
 2014-01-20 17:53:46 +01:00
Daniel Molkentin 2780dae569 Setup Wizard: Fix http(s) label size 2014-01-20 17:41:57 +01:00
Daniel Molkentin 562513d5a5 Propagator: Don't pass arbitrary strings as formating string 
Not a security issue since this code was never in any release.
 2014-01-20 17:22:29 +01:00
Daniel Molkentin a2e9353296 Fix copy & paste problem in Ignore List Editor 
Fixes #1355
 2014-01-20 17:08:30 +01:00
Olivier Goffart 7f76fcff5e Do not account the size of deleted or renamed file in the progress 
Fixes #1360
 2014-01-20 17:00:28 +01:00
Olivier Goffart 0afbb264e0 cleanup mutex usage in CSyncThread 
The only method which is used from another thread is abort().
So the only thing that needs protection is that function, and the
function which may race with.  Which are csync_request_abort which
should not race with csync_resume
 2014-01-20 17:00:28 +01:00
Klaas Freitag 7bb7b1d73b Remove wipeAllJournals after rebase mistake. 2014-01-20 16:19:30 +01:00
Klaas Freitag 0eebc0e5be Add folder to schedule queue in setupFolders method. 
This fixes bug #1352
 2014-01-20 16:19:30 +01:00
Klaas Freitag a6b0ccfa12 Remove explicit logging. 2014-01-20 16:19:30 +01:00
Klaas Freitag ce077f97c6 Checks if the folder from map is still defined. 
I saw a crash were a folder which was deleted was dereferenced later
in the Quota check slot. There the folder pointer returned from folder
map was zero.
 2014-01-20 16:19:29 +01:00
Klaas Freitag c705a6360d Rather removeFolder than addFolder to watcher (typo fix). 2014-01-20 16:19:29 +01:00
Olivier Goffart be874e36da remove unused variable and functions 2014-01-20 15:10:53 +01:00
Olivier Goffart 3a9c485515 Fix crashwhile removing a folder 
in a QMap, Accessing an entry that does not exists create the null entry
We should not use operator[] if we are not sure the folder indeed exists
 2014-01-20 14:59:35 +01:00
Olivier Goffart 4df1d7d893 Remove unused variables 2014-01-20 14:59:23 +01:00
Olivier Goffart bbf3a64c02 Fix crash. 
toUtf8() returns a temporary QByteArray wuich is only valid until the
end of the statement (the next ';').  QByteArray::data() returns a
pointer to the QByteArray's data which is only valid if the QByteArray
is valid.
Keeping the char* is therefore wrong.
 2014-01-20 14:24:20 +01:00
Olivier Goffart 316aade340 Merge branch 'csync_merge' 
Conflicts:
	src/CMakeLists.txt
 2014-01-20 13:27:33 +01:00
Klaas Freitag 45c75f722c Show an indicator if the url is encrypted or not in connection wizard. 
Fixes bug #1350
 2014-01-16 17:40:46 +01:00
Olivier Goffart 6257ed6605 Make sure that the jobs have the Q_OBJECT macro. 
so tr()  works there
 2014-01-16 14:06:17 +01:00
Klaas Freitag 0455d96462 Fix untranslated error messages. 2014-01-16 13:04:57 +01:00
Klaas Freitag d2e8043a4a Use ClientProxy that reads the client config in commandline client. 
Fixes mirall#1347
 2014-01-16 12:52:11 +01:00
Klaas Freitag 98689d48f1 Check if configuration actually exists. 
If not, set System Proxy as default.
 2014-01-16 12:52:11 +01:00
Klaas Freitag ec9efd7894 Make use of the new Proxy handling class. 2014-01-16 12:52:11 +01:00
Klaas Freitag 671100ce5c Add a class ClientProxy that handles proxy setting for Qt and csync. 2014-01-16 12:52:11 +01:00
Daniel Molkentin 96633307c0 Move owncloudcmd into Bundle on OS X 
Fixes #1300
 2014-01-15 18:14:37 +01:00
Daniel Molkentin 2009fbc886 Deploy all of Sparkle manually 2014-01-15 17:52:19 +01:00
Daniel Molkentin 4caa038de6 More sparkle fixes 2014-01-15 16:01:35 +01:00
Daniel Molkentin f5dc2b3127 Compile on OS X 2014-01-15 12:45:43 +01:00
Olivier Goffart c7227297af Make it compile with the merge of csync mirall 2014-01-15 12:20:03 +01:00
Daniel Molkentin dc9f145a24 New Updater for Windows, passive notification on Linux, Sparkle on Mac 2014-01-15 11:09:31 +01:00