chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2026-08-19 20:08:02 +02:00
Code Activity
17,214 Commits 4 Branches 173 Tags
v3.4.0-do-not-use
Commit Graph
17214 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jenkins for ownCloud 62dcfe85e4 [tx-robot] updated from transifex 2014-04-23 01:25:49 -04:00
Markus Goetz f6711b2842 CMake: Find libraries also on Win host compile 2014-04-22 21:02:08 +02:00
Olivier Goffart f2519e9d87 Fix function signature: pass argument by const reference 2014-04-22 19:52:09 +02:00
Markus Goetz 94f380c1f0 Updater: Ignore files matching with CSYNC_CONFLICT_FILE_USERNAME 2014-04-22 17:05:59 +02:00
Markus Goetz 197d180cb9 Propagator: Add support for CSYNC_CONFLICT_FILE_USERNAME 2014-04-22 16:17:49 +02:00
Markus Goetz 4be20db670 Propagator: Add makeConflictFileName function 2014-04-22 16:07:18 +02:00
Olivier Goffart 46d6191bc2 Also list folder for which the alias starts with '.' 
Fixes #1695
 2014-04-22 14:26:08 +02:00
Olivier Goffart ee22f377af Start the folder watcher when new folder are added 
Before, we would only set up a file system watcher when we read the
config at startup.  But we also need to do it in the other case when
the user configure new folder to watch
 2014-04-22 14:15:43 +02:00
Olivier Goffart 44a04227f1 Update dynamically the error message in the account settings 
This let the error be shown when the conneciton is missing at startup

And also remove the red background when there is no longer an error
 2014-04-22 14:08:37 +02:00
Olivier Goffart 707c6fcc5d An abort on the reply is not usually a password error. 
Copy the code from HTTPCredidentials
 2014-04-22 12:52:13 +02:00
Olivier Goffart edb1f61241 Fix compilation without the BUILD_ONLY_LIBRARIES mode 2014-04-22 12:44:01 +02:00
Olivier Goffart 3fac5f91c8 In case of error, report the right error instead of missing etag 
also, missing etag is not a fatal error
 2014-04-22 12:43:38 +02:00
Olivier Goffart 1338c08622 Fix compilation on linux with BUILD_LIBRARIES_ONLY 2014-04-22 11:33:38 +02:00
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 521373f075 More specific log output. 2014-04-22 09:33:07 +02:00
Klaas Freitag c24732f641 More debugable code. 2014-04-22 09:33:07 +02:00
Jenkins for ownCloud 655188d7b3 [tx-robot] updated from transifex 2014-04-22 01:25:41 -04: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
Jenkins for ownCloud 934eda128b [tx-robot] updated from transifex 2014-04-21 01:27:00 -04:00
Daniel Molkentin ece41921ff Merge pull request #1697 from wakeup/master 
Space fix
 2014-04-20 15:44:03 +02:00
Volkan Gezer 9b71643c1c Space fix 2014-04-20 14:54:40 +02:00
Jenkins for ownCloud ed48b4bbf2 [tx-robot] updated from transifex 2014-04-20 01:26:54 -04: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
Jenkins for ownCloud 4731b506e5 [tx-robot] updated from transifex 2014-04-19 01:27:02 -04:00
Olivier Goffart 7d3b0fe0c5 Fix memory leak: Don't need to call strdup here 
The other_node outlive the trav structure, so we can just use the same pointer
 2014-04-18 19:16:10 +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
Olivier Goffart bfdf638334 Add the files required by the tests. 
Somehow they got removed with all the moving and merging.
Especially kernelcrash.txt is required for t1.pl
 2014-04-18 17:20:42 +02:00
Jenkins for ownCloud e6664c7790 [tx-robot] updated from transifex 2014-04-17 15:03:55 -04:00
Mr. Jenkins a90779910a [tx-robot] updated from transifex 2014-04-17 01:26:53 -04:00
Mr. Jenkins edc7a9596a [tx-robot] updated from transifex 2014-04-16 01:26:58 -04:00
Volkan Gezer a7a19fad71 Fix note template label 2014-04-16 03:53:37 +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
Mr. Jenkins 9dcbafc307 [tx-robot] updated from transifex 2014-04-15 01:26:01 -04: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
Mr. Jenkins 9f4ffd44d6 [tx-robot] updated from transifex 2014-04-14 01:25:55 -04:00
Mr. Jenkins 598bfe6d1a [tx-robot] updated from transifex 2014-04-13 01:25:56 -04:00
Mr. Jenkins 5f37c7b1b8 [tx-robot] updated from transifex 2014-04-12 01:26:00 -04: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
Mr. Jenkins b0734f2791 [tx-robot] updated from transifex 2014-04-11 01:25:58 -04:00
Mr. Jenkins d66b0910c6 [tx-robot] updated from transifex 2014-04-10 01:26:05 -04:00