Jenkins for ownCloud
fa606b38b7
[tx-robot] updated from transifex
2014-09-21 02:06:11 -04:00
Jenkins for ownCloud
497b7808b6
[tx-robot] updated from transifex
2014-09-21 01:25:21 -04:00
Jenkins for ownCloud
b10c2b5946
[tx-robot] updated from transifex
2014-09-20 01:25:29 -04:00
Christian Kamm
fa881ba1c7
Notifications: Don't emit one per error. #1777
2014-09-19 15:59:03 +02:00
Christian Kamm
eb1b17e8e4
CSync tests: Add t1.cfg to gitignore.
2014-09-19 14:21:14 +02:00
Olivier Goffart
9ae4d45243
Restart the sync when we detect we need to redo a sync
...
Fixes #1968
Relates #2038
(cherry picked from commit a84b7dc27e
2014-09-19 11:51:17 +02:00
Christian Kamm
2eec85a97c
NetworkJobs: Propagator jobs keep others from expiring. #2155
...
In some owncloud server setups multiple concurrent connections for the
same session are not supported: owncloud/core#11153
This causes issues with multiple uploads and downloads. A usual symptom
is the quota job failing and the sync aborting.
This workaround lets activity on the propagator's GET and PUT jobs
reset the timeout of all network jobs. That way, queries like the quota
job would not time out while a large up/download is in progress.
2014-09-19 11:22:57 +02:00
Olivier Goffart
1cd5681967
permissions: Remember the permissions for the root folder
2014-09-19 10:58:52 +02:00
Jenkins for ownCloud
c85b6193d5
[tx-robot] updated from transifex
2014-09-19 01:25:29 -04:00
Olivier Goffart
eab488e64f
compile after merge
2014-09-18 19:58:04 +02:00
Olivier Goffart
50e718b1e7
Merge branch '1.7'
...
Conflicts:
src/CMakeLists.txt
src/cmd/cmd.cpp
src/gui/folder.cpp
src/gui/socketapi.cpp
translations/mirall_ca.ts
translations/mirall_cs.ts
translations/mirall_de.ts
translations/mirall_el.ts
translations/mirall_en.ts
translations/mirall_es.ts
translations/mirall_es_AR.ts
translations/mirall_et.ts
translations/mirall_eu.ts
translations/mirall_fa.ts
translations/mirall_fi.ts
translations/mirall_fr.ts
translations/mirall_gl.ts
translations/mirall_hu.ts
translations/mirall_it.ts
translations/mirall_ja.ts
translations/mirall_nl.ts
translations/mirall_pl.ts
translations/mirall_pt.ts
translations/mirall_pt_BR.ts
translations/mirall_ru.ts
translations/mirall_sk.ts
translations/mirall_sl.ts
translations/mirall_sv.ts
translations/mirall_th.ts
translations/mirall_tr.ts
translations/mirall_uk.ts
translations/mirall_zh_CN.ts
translations/mirall_zh_TW.ts
2014-09-18 17:10:21 +02:00
Klaas Freitag
fc36e7eccf
tests: Add a csync exclude test to check toplevel excludes.
2014-09-18 15:34:24 +02:00
Klaas Freitag
0cc2bbf5d9
csync exclude: Export the csync_exclude_add function in debug mode
2014-09-18 15:34:24 +02:00
Olivier Goffart
7c36e5c0e6
parallel chunk upload: allow "true" for the value of OWNCLOUD_PARALLEL_CHUNK
2014-09-18 14:29:38 +02:00
Jürgen Weigert
d2669debb9
Merge branch '1.7' of https://github.com/owncloud/mirall into 1.7
2014-09-18 12:37:17 +02:00
Olivier Goffart
1b62ed1e7e
Parallel chunk upload: Fix progress
2014-09-18 12:36:30 +02:00
Jürgen Weigert
637fb449c6
Fixed https://github.com/owncloud/mirall/issues/1699
...
Added missing copyright headers.
2014-09-18 12:30:42 +02:00
Daniel Molkentin
e82b319ee7
Fix owncloud man page formatting
2014-09-18 12:30:20 +02:00
Jürgen Weigert
c3d41f0d48
Fixed https://github.com/owncloud/mirall/issues/1699
...
Missing copyright headers added.
2014-09-18 12:26:55 +02:00
Klaas Freitag
e9248066df
SyncJournal: Better error report for sql statements in updateDbStructure
...
Also, even if the updateDatabaseStructure fails, precompile the sql
statements.
This will help to debug and maybe solve bug #2106
2014-09-18 12:02:28 +02:00
Daniel Molkentin
819472d366
Fix owncloud man page formatting
2014-09-18 11:44:25 +02:00
Daniel Molkentin
21bbdd6f49
Update owncloudcmd documentation
2014-09-18 11:36:14 +02:00
Christian Kamm
a88ac00115
SyncEngine: Better reporting when ignoring hardlinks. #2217
...
Also touch csync to actually let us know it's ignoring the file
due to it having hard links.
2014-09-18 11:32:29 +02:00
Christian Kamm
30683b38a8
Updater: Add "didn't check for updates" message. #2175
...
Don't show "Checking server..." when we are not.
(cherry picked from commit ece11dc3d8
2014-09-18 09:43:13 +02:00
Christian Kamm
45aefeb146
SelectiveSyncDialog: Change 'partial' behavior.
...
The real bug in #2219 actually was that the gui allowed users to
choose to not sync the root folder. That's not supported and no
longer possible in the UI.
Instead you may now sync a folder's files without syncing its sub-
folders.
2014-09-18 09:42:50 +02:00
Jenkins for ownCloud
9daacd7aee
[tx-robot] updated from transifex
2014-09-18 02:06:15 -04:00
Jenkins for ownCloud
580ecbff0c
[tx-robot] updated from transifex
2014-09-18 01:25:28 -04:00
Daniel Molkentin
db3318886e
Merge pull request #2214 from owncloud/2211
...
Implement (most of) #2211
2014-09-18 00:09:26 +02:00
Daniel Molkentin
54eb837950
Remove unused confdir option
2014-09-18 00:07:33 +02:00
Christian Kamm
0bd73788f4
Doc: Update csync test script README.
2014-09-17 16:18:55 +02:00
Christian Kamm
e395282e0e
SelectiveSyncDialog: Fix sync-nothing case. #2219
2014-09-17 16:13:47 +02:00
Christian Kamm
1f129d0bcb
Propagator: Don't upload files that were changed recently.
...
Instead skip them and try another sync later.
See #2167 , #2169 , #2210 .
2014-09-17 15:30:18 +02:00
Christian Kamm
c2ae5e5fd1
FolderMan: Ensure a 1s delay between sync request and start.
...
That way the propagator can detect files that are still being
changed right now and skip them.
2014-09-17 15:30:18 +02:00
Olivier Goffart
292a7357bd
t1.cfg.in: saner placeholder executable name
...
Now it is owncloudcmd and not csync
2014-09-17 14:39:34 +02:00
Christian Kamm
ece11dc3d8
Updater: Add "didn't check for updates" message. #2175
...
Don't show "Checking server..." when we are not.
2014-09-17 11:41:04 +02:00
Christian Kamm
99aa2cdf2a
Log: Print client version on sync start. #2178
2014-09-17 09:39:04 +02:00
Christian Kamm
0eb9401c62
File change detection: Also look at file sizes.
...
See #2167 and #2169 .
* csync_detect_update: Reupload a file if the sizes differ, similar
to how we reupload if the mtimes differ.
* PropagateUploadFileQNAM::slotPutFinished(): Abort an upload if the
size changed, similar to how we abort an upload if the mtimes changed.
2014-09-17 09:05:13 +02:00
Jenkins for ownCloud
ab14a589c8
[tx-robot] updated from transifex
2014-09-17 01:25:27 -04:00
Daniel Molkentin
122fa596b3
Remove stray file that was not meant to be committed
2014-09-17 00:55:55 +02:00
Daniel Molkentin
5406407ed6
Implement --non-interactive as per Juergens' request
2014-09-17 00:12:16 +02:00
Daniel Molkentin
b72cee2783
Fix passing URLs not ending in /remote.php/webdav
2014-09-16 23:53:01 +02:00
Daniel Molkentin
fe023e2229
Allow passing user/pass explicitly or via netrc
...
#2211
2014-09-16 23:52:28 +02:00
Olivier Goffart
66595a3597
Parallel chunk uploads
...
This does not include progress indicator
2014-09-16 17:40:42 +02:00
Jenkins for ownCloud
1dae928a7c
[tx-robot] updated from transifex
2014-09-16 01:25:22 -04:00
Olivier Goffart
9b1779bb06
Fix compilation
...
qFatal does not work with <<
2014-09-15 18:03:44 +02:00
Olivier Goffart
97cc05eeea
journaldb: Assert in case of SQL error
...
relates issue #2106
2014-09-15 14:27:39 +02:00
Christian Kamm
20dd3b0a69
FolderMan: Fix startFromScratch logic. #1989
...
(cherry picked from commit 4566ca3127
2014-09-15 13:53:38 +02:00
Christian Kamm
f348eabf19
Account: Fix cert save/restore from settings. #2160
...
(cherry picked from commit cc1121ef00
2014-09-15 13:53:38 +02:00
Olivier Goffart
5870a57002
wizard: fix start a clean sync
...
The problem was that the backup function failed as we tried to
move /home/xxx/ownCloud/ to /home/xxx/ownCloud/.oC_bak
The intention was to move it to /home/xxx/ownCloud.oC_bak
Issue #1989
2014-09-15 13:49:13 +02:00
Olivier Goffart
278bc5a8cd
owncloudcmd: ask for the login and password and put it in the url (if it's not there already)
...
Because we cannot rely on HTTPCredentials to open windows in a command line tool
Fixes #1860
2014-09-15 13:24:31 +02:00
