Klaas Freitag
|
101d2268ff
|
SyncFileItem class: Add member _checksum
|
2015-05-19 17:09:39 +02:00 |
|
Klaas Freitag
|
2fcad760b9
|
StopWatch: return the duration from the stop() command.
|
2015-05-19 17:09:39 +02:00 |
|
Jenkins for ownCloud
|
52eb6c95cf
|
[tx-robot] updated from transifex
|
2015-05-19 02:18:46 -04:00 |
|
Jenkins for ownCloud
|
35169e3de4
|
[tx-robot] updated from transifex
|
2015-05-18 02:18:48 -04:00 |
|
Jenkins for ownCloud
|
650b201b33
|
[tx-robot] updated from transifex
|
2015-05-16 02:18:48 -04:00 |
|
Olivier Goffart
|
f595fc2f9c
|
Fix opening external links for some labels
Issue #3135
|
2015-05-15 18:44:19 +02:00 |
|
Markus Goetz
|
06c889630c
|
AccountState: Run only a single validator, allow error message overriding #3236 #3153
|
2015-05-15 12:27:35 +02:00 |
|
Jenkins for ownCloud
|
d6dbabfbc4
|
[tx-robot] updated from transifex
|
2015-05-15 02:18:51 -04:00 |
|
Markus Goetz
|
051ac5e290
|
Merge pull request #3234 from owncloud/typo-in-docs
Fix wrong word in doc
|
2015-05-14 15:52:43 +02:00 |
|
Jenkins for ownCloud
|
bcae146444
|
[tx-robot] updated from transifex
|
2015-05-14 02:18:47 -04:00 |
|
Markus Goetz
|
8a39748654
|
SyncJournalDB: Don't use NULL value
Olivier says we should try to not be the same as the possible value
for not existing entries.
|
2015-05-13 14:57:14 +02:00 |
|
Joas Schilling
|
f4b82a9892
|
Fix typo in doc
|
2015-05-13 14:31:21 +02:00 |
|
Markus Goetz
|
3556ed416c
|
SyncJournalDB: Simplify code
|
2015-05-13 13:15:53 +02:00 |
|
Olivier Goffart
|
d7fa03cf2e
|
Systray menu: consider multiple account to choose the status
|
2015-05-13 13:10:14 +02:00 |
|
Markus Goetz
|
e5e2ce2b22
|
SyncEngine: Force re-read of folder Etags for upgrades from 1.8.0 and 1.8.1
This is a better fix than the previous one for the local-files-missing bug
because it does not depend on the sync run to run fully through.
|
2015-05-13 12:54:49 +02:00 |
|
Olivier Goffart
|
af94e8943d
|
Systray menu: show one entry per account to open in a browser
|
2015-05-13 12:54:31 +02:00 |
|
Markus Goetz
|
39d103adf7
|
OwnSql: Fix numRowsAffected()
|
2015-05-13 12:54:03 +02:00 |
|
Markus Goetz
|
afd1406e61
|
Update VERSION.cmake to 1.8.2
|
2015-05-13 12:52:13 +02:00 |
|
Jakob Nixdorf
|
a0e3858a7c
|
Install architecture-independent files to DATADIR.
Change the installation target for the translations and the .desktop
file to the architecture-independent DATADIR.
|
2015-05-13 09:54:01 +02:00 |
|
Jenkins for ownCloud
|
a4c411af99
|
[tx-robot] updated from transifex
|
2015-05-13 02:18:48 -04:00 |
|
Markus Goetz
|
08184d07cf
|
Merge branch '1.9'
|
2015-05-12 23:03:45 +02:00 |
|
Markus Goetz
|
ac0e08cc91
|
Merge branch '1.8' into 1.9
|
2015-05-12 23:02:58 +02:00 |
|
Markus Goetz
|
bcc896fb6e
|
Qt4: Fix test
|
2015-05-12 22:55:54 +02:00 |
|
Olivier Goffart
|
76166c6252
|
SyncEngine: Fix comment
A comment should descibe the code, and not a patch.
|
2015-05-12 17:53:02 +02:00 |
|
Olivier Goffart
|
dd5a49bc78
|
Application: Disable to workaround of QLockFile bug for Qt versions that are fixed
|
2015-05-12 17:26:32 +02:00 |
|
Markus Goetz
|
2a45ebde33
|
Networkjobs: Fix Qt 4 compile (again)
|
2015-05-12 17:19:17 +02:00 |
|
Markus Goetz
|
cdfafa2180
|
Propagator: Mention name of conflict file (for debugging)
|
2015-05-12 17:11:21 +02:00 |
|
Markus Goetz
|
6b16e18eb8
|
tx.pl: Use HTTP Keep-Alive
|
2015-05-12 17:11:21 +02:00 |
|
Olivier Goffart
|
299fa2dee6
|
FolderMan: fix a #warning in the migration path
|
2015-05-12 16:49:37 +02:00 |
|
Olivier Goffart
|
c2dacd03a5
|
BandwidthManager: fix warnings
Unused variables
|
2015-05-12 16:35:27 +02:00 |
|
Olivier Goffart
|
505dba5b23
|
csync walk tree: Try to find the 'other_node' in the source directory in case of renames
This fixes t2.pl
|
2015-05-12 16:32:00 +02:00 |
|
Olivier Goffart
|
de9770f52a
|
FolderMan: fix some signal-slot broken connection
In many cases the alias was changed to a Folder pointer
|
2015-05-12 15:50:38 +02:00 |
|
Olivier Goffart
|
389c4f8ef9
|
AccountManager: remove unused variable
|
2015-05-12 15:38:16 +02:00 |
|
Olivier Goffart
|
3a7bd3f95c
|
AccountManager: save the config after removing an account
|
2015-05-12 15:37:16 +02:00 |
|
Olivier Goffart
|
1136b969b2
|
Folder: fix compilation after merge
|
2015-05-12 15:27:20 +02:00 |
|
Olivier Goffart
|
716b0c68da
|
Merge remote-tracking branch 'origin/master' into new-ui
|
2015-05-12 15:20:40 +02:00 |
|
Olivier Goffart
|
1edd46b995
|
Multi-Account: add possibility to delete an account
|
2015-05-12 15:16:32 +02:00 |
|
Markus Goetz
|
00a075b0d8
|
Merge branch '1.9'
|
2015-05-12 13:49:55 +02:00 |
|
Markus Goetz
|
3b34d5b54e
|
Account: Fix Qt4 compile
|
2015-05-12 13:49:07 +02:00 |
|
Jocelyn Turcotte
|
0f51de20c4
|
Fix the neon build
|
2015-05-12 13:04:47 +02:00 |
|
Jocelyn Turcotte
|
ea39e457f5
|
Fix the build
|
2015-05-12 10:35:57 +02:00 |
|
Daniel Molkentin
|
b54f2b3b31
|
Merge remote-tracking branch 'origin/1.9'
Conflicts:
VERSION.cmake
src/libsync/propagatedownload.cpp
src/libsync/propagateupload.cpp
|
2015-05-12 10:03:38 +02:00 |
|
Daniel Molkentin
|
a36df4aa4b
|
Merge remote-tracking branch 'origin/1.8' into 1.9
|
2015-05-12 09:57:22 +02:00 |
|
Jenkins for ownCloud
|
af5a7063c9
|
[tx-robot] updated from transifex
|
2015-05-12 02:18:49 -04:00 |
|
Markus Goetz
|
9e7779a476
|
Bandwidth Manager: Comment out qDebug
We have not received any grave bug reports for it, not needed anymore.
|
2015-05-11 16:07:34 +02:00 |
|
Markus Goetz
|
625e61516f
|
Propagator: Limit length of temporary file name #2789 (fixup)
Fix 22c35c4d15
|
2015-05-11 15:42:35 +02:00 |
|
Klaas Freitag
|
41614ec851
|
Application: ifdef lock file issue as it only happens on Qt>5.1
However, the fix breaks Qt4 compile, so it needs to be ifdefed.
Not viel hilft viel.
|
2015-05-11 13:35:04 +02:00 |
|
Jenkins for ownCloud
|
4d3a0ed250
|
[tx-robot] updated from transifex
|
2015-05-11 02:18:44 -04:00 |
|
Jenkins for ownCloud
|
cac15988f0
|
[tx-robot] updated from transifex
|
2015-05-10 02:18:49 -04:00 |
|
Jenkins for ownCloud
|
1e131f4732
|
[tx-robot] updated from transifex
|
2015-05-09 02:18:53 -04:00 |
|