Klaas Freitag
8ba08d7e87
Activity View: honor error string even if no warning
...
that allows to specify a more specific user message to be displayed.
2014-09-25 15:03:54 +02:00
Klaas Freitag
8915f94931
Mac Overlays: handle filenames with slashes properly.
...
There are filenames with slashes on MacOSX, they can be created
in Finder. Internally they are converted to colons.
2014-09-25 12:24:32 +02:00
Markus Goetz
1543899795
Upload Chunking: Fix progress DB values
2014-09-25 11:32:54 +02:00
Klaas Freitag
31bf844452
DownloadJob: Refresh the FileInfo after renaming the target file.
...
Otherwise the activity view reports file size 0.
2014-09-25 10:59:08 +02:00
Markus Goetz
6d94acee8f
permissions: Fix root properties if no permissions used
2014-09-25 10:24:51 +02:00
Jenkins for ownCloud
0c8b74a025
[tx-robot] updated from transifex
2014-09-25 01:25:30 -04:00
Olivier Goffart
dad8c1c27c
propagator: Do not check for case clash when renaming
...
Issue #1385
When renaming, we would normaly already have an error if the file already exist.
And we want to allow the renaming to chang ethe case (Eg. "hello" -> "HELLO"
2014-09-24 16:43:01 +02:00
Klaas Freitag
2e12acdf32
doc: add a memo about the issue that defines the permission flags.
2014-09-24 16:35:50 +02:00
Jenkins for ownCloud
d6156dd755
[tx-robot] updated from transifex
2014-09-24 01:25:22 -04:00
Klaas Freitag
2c67a7ca71
progress: Set a clear start indication in the progress.
...
Before, 0 was used to indicate the sync start which wipes the activity
window. However, if there _are_ no synced items but only ignored items
the overall counter stays zero which wipes the list all the time.
This fixes bug #2171
2014-09-23 15:58:06 +02:00
Klaas Freitag
688b8dcc38
MacOverlays: Pass isDir flag to isRegisteredPath method
...
With that, a path can be added to directories to also detect the
sync top directory.
This fixes bug #2053
2014-09-23 10:25:11 +02:00
Klaas Freitag
280edee1db
cmake: fix typo
2014-09-23 10:25:11 +02:00
Jenkins for ownCloud
37a7ad4795
[tx-robot] updated from transifex
2014-09-23 02:08:06 -04:00
Jenkins for ownCloud
b9ea72f189
[tx-robot] updated from transifex
2014-09-23 01:49:01 -04:00
Klaas Freitag
8f8265b219
Mac Installer: Add file name quoting.
2014-09-22 16:45:33 +02:00
Klaas Freitag
00ae3c3120
Mac Installer: Rename the final package to branded.
2014-09-22 16:38:51 +02:00
Klaas Freitag
1e49f152be
Mac create pkg: Adjust background image path
2014-09-22 16:25:23 +02:00
Klaas Freitag
f72ca4d83e
Mac installer: Use template value for bundle name
2014-09-22 16:18:30 +02:00
Klaas Freitag
5b10a9f3a7
Minor: Remove unused definition
2014-09-22 13:47:45 +02:00
Klaas Freitag
d0fb1acebb
Win32: Define HANDLE variable, make win compile again.
2014-09-22 13:47:17 +02:00
Klaas Freitag
09be4d22ee
Nautilus: Renamed nautilus plugin script to make it branding friendly
2014-09-22 12:24:06 +02:00
Klaas Freitag
11a64320f0
git: fix entry in .gitattributes to not export binary dir.
2014-09-22 11:24:24 +02:00
Olivier Goffart
d7d241196e
tests: add the source dir in the include paths
2014-09-22 08:58:35 +02:00
Jenkins for ownCloud
4eac66b84a
[tx-robot] updated from transifex
2014-09-22 01:25:21 -04:00
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
)
Conflicts:
src/mirall/owncloudpropagator.h
src/mirall/propagator_qnam.cpp
src/mirall/syncengine.h
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