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
6,445 Commits 4 Branches 173 Tags
v1.7.0-beta4
Commit Graph
2575 Commits
Author SHA1 Message Date
Olivier Goffart 0cf8091705 Merge pull request #1700 from wakeup/master 
Fix non-closed p tag
 2014-04-22 10:08:29 +02:00
Klaas Freitag c24732f641 More debugable code. 2014-04-22 09:33:07 +02:00
Markus Goetz 77ac092975 WiP: Attempt to compile without UI 2014-04-21 19:57:15 +02:00
Volkan Gezer 78e5e4ab66 Fix non-closed p tag 2014-04-21 15:29:42 +02:00
Volkan Gezer 9b71643c1c Space fix 2014-04-20 14:54:40 +02:00
Olivier Goffart b08284e4cc Fix the background check job for the connection 
We can't use the quota job for that as it needs the credidentials and therefore
may re-enter the credidential code when we are currently trying to fetch the credentials.

The quotainfo.cpp part of this patch is basically a revert of d836b80153
 2014-04-19 09:49:52 +02:00
Olivier Goffart fa38bf7029 Make sure the fileid are saved to the database when upgrading from owncloud5 to owncloud6 
We fetch the id from the server, but don't save them in the database.

I Could have used INSTRUCTION_UPDATED for that, but then i would need to update the
reconcile algorithm to take in account the fact that UPDATED is possible there.

Instead, use should_update_etag  which means the db is going to be written again

Remove reference to old instruction _UPDATED and _DELETED which does not make sens with
the new propagator

Improve the test to test this case,  and that etags are properly writen to the DB
when there is a fake conflict
 2014-04-18 18:27:27 +02:00
Klaas Freitag d143044f4a Add missing cases to avoid "unknown action" under some circumstances. 
Most of the translations are not used because they translate pre
propagation states.

Fixes #1674
 2014-04-15 16:54:49 +02:00
Klaas Freitag aee7515d42 Do not dereference the _engine member variable without check. 
This can cause the crash because the _engine member is deleted in the
sync finished slot. The solution is to store the stopWatch object
before the engine is destroyed.

Fixes bug #1675
 2014-04-15 16:28:18 +02:00
Klaas Freitag 82ab5fdcb9 Fix condition if network limit change is logged or not. 2014-04-15 16:28:18 +02:00
Klaas Freitag 4c6e6f6302 Add initialisations for member variables. 
Avoids some valgrind warnings.
 2014-04-15 16:28:18 +02:00
Klaas Freitag 0a2791270a Add a reset method. 2014-04-15 16:28:18 +02:00
Klaas Freitag c920f81562 Add braces. 2014-04-15 16:28:18 +02:00
Daniel Molkentin d836b80153 Fix reconnect after server disconnect 
Fixes #1679
Fixes #1568
Fixes #1659
 2014-04-14 17:51:57 +02:00
Daniel Molkentin efc4ff4d88 Fix redirects in CheckServerJob 2014-04-14 15:12:38 +02:00
Daniel Molkentin dc043b5765 Try scheme://host/owncloud if scheme://host/ did not work 
Fixes #1680
 2014-04-14 15:10:08 +02:00
Daniel Molkentin ef9a318cd9 AbstractNetworkJob Allow finished() to defer Job deletion 
This allows to reuse the Job
 2014-04-14 15:08:43 +02:00
Volkan Gezer 8250fb81b3 Fix typo. 2014-04-11 15:10:47 +02:00
Klaas Freitag 30a14b9f45 Install ocsync library to private lib directory, use rpath to find it. 2014-04-11 13:28:11 +02:00
Klaas Freitag 09e05392bf Ignore all sync log files in the sync dir. 2014-04-09 22:02:28 +02:00
Daniel Molkentin d3d202de68 Fix dataLocation on Linux/BSD 
From the Qt 5 documentation:

  Note: when porting QDesktopServices::DataLocation(obsolete)
        to QStandardPaths::DataLocation, a different path will
        be returned.

        QDesktopServices::DataLocation was GenericDataLocation
        + "/data/organization/application", while
        QStandardPaths::DataLocation is GenericDataLocation
        + "/organization/application".

We'll resort to the deprecated version, since we'll need to fix
data locations to be XDG compliant sooner than later anyway
(currently scheduled for 1.8)
 2014-04-09 14:59:08 +02:00
Daniel Molkentin 87010fbe1a SSL Button: Fix issues around printing Hash sums 
- Use SHA 265 instead of obsolete MD5 where possible (Qt5)
- Remove <tt> formatting: that simply looked ugly
- Wrap SHA 265 hash
- Use spaces as separators

As usual, the default needs to remain ':' separation, because
it's needed to pass valid hashes to csync.
 2014-04-09 14:30:51 +02:00
Klaas Freitag 7c40dc1a9a Ignore changes on .owncloudsync.log in the linux filewatcher. 
Also remove some verbose and unused logging.
 2014-04-08 13:06:34 +02:00
Daniel Molkentin b34b4e37aa Add Qt Keychain also when building with Qt5 2014-04-08 10:56:07 +02:00
Daniel Molkentin 69bdccfd2f Include correct QtKeychain headers 
..depending on Qt version
 2014-04-07 17:46:06 +02:00
Daniel Molkentin 1d70426bb7 Build with BOTH Qt4 and 5 2014-04-07 17:25:25 +02:00
Daniel Molkentin 6a2fe6be67 Build fix: QAtomicInt has no implicit integer conversion in Qt5 2014-04-07 16:49:01 +02:00
Klaas Freitag 3d67d203fe Fix content-length calculation for sizes multiple of the chunk size. 2014-04-07 16:29:06 +02:00
Klaas Freitag fc06945b26 use the lowercase app name for icon in the desktop file. 
fixes #1642
 2014-04-07 15:14:58 +02:00
Klaas Freitag 9cdcc925c1 Do not log useless stuff. 2014-04-07 15:10:55 +02:00
Markus Goetz d35c0f3ade Propagator: Fix chunking for real 
The reset() (using seek()) didn't work.
 2014-04-05 14:26:24 +02:00
Markus Goetz 0f7d448058 Propagator: Fix chunking 2014-04-04 15:41:35 +02:00
Klaas Freitag 435e7e3eec HACK to avoid continuation: See task #1448 
We do not know the _modtime from the server, at this point, so just set
the current one.  (rather than the one locally)
 2014-04-04 10:56:33 +02:00
Klaas Freitag 08dd9796d1 HACK to avoid continuation: See task #1448 
We do not know the _modtime from the server, at this point, so just set
the current one.  (rather than the one locally)
 2014-04-04 10:50:40 +02:00
Olivier Goffart 462ba7d942 Don't dead lock when all the files are removed 
SyncEngine is on the main thread, no need of the legacy BlockingConnection
 2014-04-03 17:47:49 +02:00
Klaas Freitag cf87fdff7f Keep the updater data in the log struct for the synclog. 
Also, shorten the timestamp and add the sync direction.
 2014-04-03 16:56:50 +02:00
Markus Goetz 565bb540d6 Propagator: Add debug message regarding legacy vs QNAM 2014-04-03 16:37:40 +02:00
Olivier Goffart eaf5681f61 Put the sync log in the actual folder 2014-04-02 16:36:32 +02:00
Olivier Goffart 03ef2aadde Remove undeeded includes 
And don't use 'using namespace' in headers
 2014-04-02 16:23:57 +02:00
Olivier Goffart f09076180d don't add the list of field on the log for every sync 2014-04-02 16:21:07 +02:00
Olivier Goffart d5d3c1a23a Fix compilation with Qt5 
We don't need QtWidgets,  and we don't need Uility::escape
 2014-04-02 16:21:06 +02:00
Markus Goetz b18f1ad386 SyncEngine: Removed unused signal 2014-04-02 12:47:15 +02:00
Klaas Freitag 8625ec250b Add a trust ssl certificate switch 2014-04-01 16:14:24 +02:00
Klaas Freitag d731f4718d Add an simple SSL error handler for owncloudcmd. 2014-04-01 16:14:24 +02:00
Olivier Goffart 607e48a68b let configure the default count of the blacklist 2014-04-01 13:54:47 +02:00
Olivier Goffart bfe6a50b19 Fix some error cases in the SyncEngine 
Always cleanup properly when we bail out.

Also fix thread safety of the SyncJournalDB
 2014-04-01 13:41:47 +02:00
Olivier Goffart 3acdfc0004 Make configurable the maximum amount of job in parallel 
Bia the environement variable OWNCLOUD_MAX_PARALLEL
 2014-03-28 11:20:07 +01:00
Olivier Goffart a1fc7f0a25 Make the chunk size configurable via an environement variable 
OWNCLOUD_CHUNK_SIZE
 2014-03-28 11:11:02 +01:00
Olivier Goffart 8de9bec122 Remove progress info from csync 
csync doesn't do no propagation no more
 2014-03-28 10:50:15 +01:00
Olivier Goffart 765a18b74a Fix compilation with Qt4 2014-03-28 10:26:42 +01:00