RealRancor
|
6ba3324035
|
Backport #3004 and #2978 to 1.8
|
2015-05-28 17:11:03 +02:00 |
|
Daniel Molkentin
|
e2a26f0eaf
|
Merge pull request #3289 from RealRancor/backport_3279_1.8
Backport #3279 to 1.8
|
2015-05-28 17:03:27 +02:00 |
|
RealRancor
|
8cfb17bca6
|
Backport #3279 to 1.8
|
2015-05-28 17:00:59 +02:00 |
|
Carla Schroder
|
524aa507e6
|
Merge pull request #3279 from RealRancor/fix_docs
Fix syntax issues in troubleshooting docs
|
2015-05-28 07:32:03 -07:00 |
|
Jenkins for ownCloud
|
211e5ec82e
|
[tx-robot] updated from transifex
|
2015-05-28 02:18:51 -04:00 |
|
Christian Kamm
|
2435ba7e7d
|
Windows: Fix unit test build.
|
2015-05-27 14:59:28 +02:00 |
|
Jenkins for ownCloud
|
be77e4f57e
|
[tx-robot] updated from transifex
|
2015-05-27 02:18:51 -04:00 |
|
Olivier Goffart
|
28a66cb393
|
SettingsDialogMac: adapt to multi-account
|
2015-05-26 17:37:15 +02:00 |
|
Olivier Goffart
|
507206367f
|
Merge branch 'master' into new-ui
|
2015-05-26 14:56:08 +02:00 |
|
Olivier Goffart
|
9e17ddffae
|
Confirm feature: document the white/black/unconfirmed lists
|
2015-05-26 14:41:29 +02:00 |
|
Olivier Goffart
|
a621223cc8
|
SyncEngine: add an api to set the maximum size of new shared folder that do not require confirmation
|
2015-05-26 14:41:01 +02:00 |
|
RealRancor
|
d0f81f466e
|
Fix syntax issues in troubleshooting docs
|
2015-05-26 12:55:49 +02:00 |
|
Olivier Goffart
|
7bb2834d8b
|
Confirm feature (The sync engine part)
|
2015-05-26 12:34:07 +02:00 |
|
Olivier Goffart
|
10d9e53159
|
Confirm feature: Use selective sync in the database
|
2015-05-26 12:34:07 +02:00 |
|
Olivier Goffart
|
2c67692958
|
JournalDb: add a table in the db for the selective sync
|
2015-05-26 12:33:54 +02:00 |
|
Olivier Goffart
|
5cb10bf6a1
|
PropfindJob: fix parsing of properties that have a sub element
The default argument of readElementText is ErrorOnUnexpectedElement which
abort the parsing of remaining elements
|
2015-05-26 12:33:54 +02:00 |
|
Olivier Goffart
|
54a42e401b
|
More compilation fixes after the merge
|
2015-05-26 12:33:19 +02:00 |
|
Olivier Goffart
|
6b27d2e703
|
Merge remote-tracking branch 'origin/1.8'
|
2015-05-26 12:28:31 +02:00 |
|
Daniel Molkentin
|
abaf2138cf
|
Merge pull request #2978 from RealRancor/doc_virus_scanner
Add note for on-access virus scanner solutions
|
2015-05-26 10:32:17 +02:00 |
|
Jenkins for ownCloud
|
f344b42aa9
|
[tx-robot] updated from transifex
|
2015-05-26 02:19:54 -04:00 |
|
Jenkins for ownCloud
|
90f4a20a50
|
[tx-robot] updated from transifex
|
2015-05-26 01:15:28 -04:00 |
|
Daniel Molkentin
|
793130a533
|
Win32: Make Setup/Update Mutex theme-unique (2/2)
Fixes #3272
|
2015-05-25 21:54:03 +02:00 |
|
Vidar Tysse
|
1ddb162338
|
Adding Norwegian translation to Client
|
2015-05-25 21:50:33 +02:00 |
|
Daniel Molkentin
|
070d9d3147
|
NSIS Installer: Fix Basque, Galician, Slovak, Turkish
Not sure when this broke, but those languages could never have worked...
|
2015-05-25 21:48:21 +02:00 |
|
Daniel Molkentin
|
9b73308edd
|
NSIS: Add Norwegian (Bokmål) translation
|
2015-05-25 21:41:23 +02:00 |
|
Daniel Molkentin
|
b46a8239e2
|
NSIS installer tx: Sort/de-whitespace translation file config
|
2015-05-25 19:45:02 +02:00 |
|
Daniel Molkentin
|
265b4415c3
|
Merge pull request #3277 from vidaren/master
Adding Norwegian translation to Client
|
2015-05-25 18:33:16 +02:00 |
|
Vidar Tysse
|
f8b52ffdd3
|
Adding Norwegian translation to Client
|
2015-05-25 18:11:00 +02:00 |
|
Jenkins for ownCloud
|
e9d0f5a022
|
[tx-robot] updated from transifex
|
2015-05-25 02:18:46 -04:00 |
|
Jenkins for ownCloud
|
5721d8eb64
|
[tx-robot] updated from transifex
|
2015-05-24 02:18:48 -04:00 |
|
Daniel Molkentin
|
e708c145fa
|
Win32: Make Setup/Update Mutex theme-unique
Fixes #3272
|
2015-05-23 09:40:31 +02:00 |
|
Jenkins for ownCloud
|
713beeb2a5
|
[tx-robot] updated from transifex
|
2015-05-23 02:18:53 -04:00 |
|
Klaas Freitag
|
6c46713701
|
include qtconcurrentrun header rather than QtConcurrent for Qt4
|
2015-05-22 14:46:29 +02:00 |
|
Olivier Goffart
|
3754e6c781
|
Disable the curruption workaround on mac and windows
The binaries we ship have a patched Qt
|
2015-05-22 14:19:44 +02:00 |
|
Klaas Freitag
|
6401b1cfc3
|
Updated Changelog and set version to 1.8.2 beta1
|
2015-05-22 12:25:40 +02:00 |
|
Olivier Goffart
|
6b9e123816
|
Merge remote-tracking branch 'origin/checksum_1.8' into 1.8
|
2015-05-22 10:32:37 +02:00 |
|
Olivier Goffart
|
fb2295fcec
|
Merge branch 'recall' into 1.8
|
2015-05-22 10:32:26 +02:00 |
|
Christian Kamm
|
0af2f7e5ed
|
ConValidator: Always run with new credentials. #3266
|
2015-05-22 09:38:44 +02:00 |
|
Christian Kamm
|
1c84d01584
|
Windows: Fix build of tests.
|
2015-05-22 09:17:24 +02:00 |
|
Olivier Goffart
|
3fcce08a22
|
recall: move the recall code in a namespace
|
2015-05-21 16:23:54 +02:00 |
|
Olivier Goffart
|
289800c1ba
|
Recall: make it work even if it is not in the root directory
|
2015-05-21 16:06:53 +02:00 |
|
Olivier Goffart
|
49fb37fefc
|
t_recall.pl: add a test for the recall feature
|
2015-05-21 16:06:53 +02:00 |
|
Olivier Goffart
|
9a02a0f3a8
|
Recall feature: Fix some style issues
|
2015-05-21 16:06:52 +02:00 |
|
Jakub Moscicki
|
4e79093f84
|
recall file prototype
|
2015-05-21 16:06:52 +02:00 |
|
Klaas Freitag
|
d2fff2c3e3
|
Theme: Allow to change the transmission checksum through theming.
|
2015-05-21 15:59:24 +02:00 |
|
Klaas Freitag
|
8f277e46d6
|
TransmissionChecksumming: Remove SyncFileItem dependency.
|
2015-05-21 15:51:48 +02:00 |
|
Klaas Freitag
|
c33d962712
|
TransmissonChecksumValidator: Add documentation.
|
2015-05-21 14:32:08 +02:00 |
|
Klaas Freitag
|
3870915118
|
TransmissionChecksumValidator: Reduce verbosity.
|
2015-05-21 14:31:39 +02:00 |
|
Klaas Freitag
|
b05ca526a4
|
In case of empty checksum type, emit validated.
|
2015-05-21 14:31:18 +02:00 |
|
Klaas Freitag
|
4e28a24af3
|
Let checksumType() read the config to destinguish checksum type.
|
2015-05-21 14:30:21 +02:00 |
|