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
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
Jenkins for ownCloud
f302da81b1
[tx-robot] updated from transifex
2014-04-09 02:07:10 -04:00
Mr. Jenkins
3af53f5984
[tx-robot] updated from transifex
2014-04-09 01:26:26 -04: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
af3af94a01
Allow tests to run against SSL-self-signed servers
2014-04-08 12:39:46 +02:00
Klaas Freitag
7d79d3d30d
Fix Search for Qt5 version Qt4
2014-04-08 12:08:01 +02:00
Klaas Freitag
990e2f0beb
Ignore the new sync log file in the sync dir.
...
It is required to have all ownCloud system files in the ignore list
that have to be ignored, because the ignore list is fed into the
folderwatcher, which needs to ignore changes to both the journal and
the logfile.
2014-04-08 11:55:31 +02:00
Daniel Molkentin
b34b4e37aa
Add Qt Keychain also when building with Qt5
2014-04-08 10:56:07 +02:00
Mr. Jenkins
02697a7c4d
[tx-robot] updated from transifex
2014-04-08 01:27:22 -04:00
Daniel Molkentin
4ff39d8114
Cleanups, build if Qt5 is not on system
2014-04-07 18:08:28 +02:00
Daniel Molkentin
69bdccfd2f
Include correct QtKeychain headers
...
..depending on Qt version
2014-04-07 17:46:06 +02:00
Daniel Molkentin
9f8d867ce2
About correctly when Qt5Keychain isn't found
2014-04-07 17:41:33 +02:00
Daniel Molkentin
d416c97eac
Fix Qt5 detection
2014-04-07 17:38:30 +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
8ed0fdcfa5
Fix info print in test script.
2014-04-07 16:36:35 +02:00
Klaas Freitag
ebf3c78237
More fine granular chunking test - improved t6.pl
2014-04-07 16:30:02 +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
Klaas Freitag
fc2923aa9b
Unlink the compare file after the remote cleanup.
2014-04-07 15:10:55 +02:00
Jenkins for ownCloud
6d325e6557
[tx-robot] updated from transifex
2014-04-07 02:07:45 -04:00
Daniel Molkentin
7d7d03071a
Add Copyright.txt for cmake modules
...
Fixes #1438
2014-04-07 01:27:59 +02:00
Mr. Jenkins
657f7613a1
[tx-robot] updated from transifex
2014-04-06 01:26:58 -04:00