Markus Goetz
f195648b90
OS X: Fix overlay icons
...
a3e7f513e6
2014-12-15 11:34:44 +01:00
Jenkins for ownCloud
06f77acfa1
[tx-robot] updated from transifex
2014-12-15 01:25:23 -05:00
Jenkins for ownCloud
f04a693fbe
[tx-robot] updated from transifex
2014-12-14 01:25:21 -05:00
Jenkins for ownCloud
c012711763
[tx-robot] updated from transifex
2014-12-13 01:25:29 -05:00
Klaas Freitag
c6daa8e59b
Overlays: In case of folders, make sure to append slashes at end.
...
This fixes #2373
2014-12-12 16:38:07 +01:00
Klaas Freitag
7cc6c1a10f
Theme: Add a missing dot.
2014-12-12 13:37:02 +01:00
Klaas Freitag
7f73cc1694
Theme: split the about string apart to have small translation units.
2014-12-12 13:33:38 +01:00
Jenkins for ownCloud
87973ac692
[tx-robot] updated from transifex
2014-12-12 01:25:26 -05:00
Daniel Molkentin
9a13ec736d
Fix OS X compilation
2014-12-11 15:08:13 +01:00
Christian Kamm
1a3041690f
ConValidator: Simplify and cleanup.
...
* This way using it with multiple accounts will be easier.
* Timeouts on the authed requests are handled.
2014-12-11 14:48:01 +01:00
Christian Kamm
84e5ad7346
FolderMan: Delete old journal file when adding folder. #2606
2014-12-11 12:28:01 +01:00
Christian Kamm
4559bb5553
Fix counting of affected files. #1132
...
* Also ensure the maximum is always >= the current value.
* Take care to handle the ULLONG_MAX value that's sometimes used
as _completedFileCount.
2014-12-11 11:33:42 +01:00
Jenkins for ownCloud
2d51a78ee7
[tx-robot] updated from transifex
2014-12-11 01:25:23 -05:00
Carla Schroder
95a380ae9e
fix typos
2014-12-10 08:24:12 -08:00
Christian Kamm
d8c59fcb73
Use connection validator to ping the server. #2485
...
* Stop the quota job from having an effect on account status
as it can sometimes take a long time to reply. See #2485 and
owncloud/core#12744 .
* Instead of indirectly using the quota job, use the connection
validator to regularly ping the server with a basic PROPFIND for
'getlastmodified' on /.
This request was usually fast for users even when the quota PROPFIND
was slow.
2014-12-10 13:40:11 +01:00
Christian Kamm
8dff17d78b
Rename: Fix icon location in theme.qrc.
2014-12-10 13:12:06 +01:00
Christian Kamm
53d5de685c
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/gui/folder.cpp
src/gui/folder.h
src/libsync/networkjobs.cpp
src/libsync/owncloudpropagator.h
src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
Jenkins for ownCloud
f0ce8b8fd4
[tx-robot] updated from transifex
2014-12-10 01:25:29 -05:00
Daniel Molkentin
aeb1f10621
NSIS: Reload shell after registering shellextension, use blackslashes
...
It also registers and unregisters the shell extensions properly and
forces explorer to reload/unload the DLLs so they can be removed.
This obsoletes #2377 .
Fixes #2487
Fixes #2377
2014-12-09 23:52:07 +01:00
Olivier Goffart
a3e7f513e6
SocketAPI: use the canonical path
...
Issue #2591
2014-12-09 20:48:51 +01:00
Klaas Freitag
8b63a6f29b
Adding changelog
2014-12-09 20:27:38 +01:00
Klaas Freitag
133a8ec225
Added a fixme for an edge case detected by QuickCheck.
2014-12-09 17:02:51 +01:00
Klaas Freitag
131747ea4b
Bumped version to 1.7.1 beta1
2014-12-09 15:25:37 +01:00
Daniel Molkentin
e982790ad5
Mirall--
2014-12-09 09:27:47 +01:00
Jenkins for ownCloud
a7f1f886d3
[tx-robot] updated from transifex
2014-12-09 01:25:28 -05:00
Daniel Molkentin
d034f10af3
Fix compilation
2014-12-08 19:25:57 +01:00
Daniel Molkentin
a2b817f0c0
mirall.qrc -> client.qrc
2014-12-08 18:00:29 +01:00
Daniel Molkentin
bce6d44e06
README: Fix typo
2014-12-08 17:57:09 +01:00
Daniel Molkentin
d5f2c36abd
Mirall -> (Desktop) Client
2014-12-08 17:54:32 +01:00
Daniel Molkentin
d86b3f04b1
Merge branch 'master' into rename_client
2014-12-08 17:44:04 +01:00
Klaas Freitag
72a90199db
Wizard: Removed superflous text, as it is already in the header.
...
This fixes mirall#2358
2014-12-08 11:12:15 +01:00
Jenkins for ownCloud
e69702799f
[tx-robot] updated from transifex
2014-12-08 01:25:21 -05:00
Jenkins for ownCloud
118aead9b9
[tx-robot] updated from transifex
2014-12-07 01:25:25 -05:00
Klaas Freitag
49bb861045
Removed useless debug output
2014-12-06 12:37:53 +01:00
Klaas Freitag
1d6661e7e4
Fix the number of displayed items in progress display for removes.
...
This fixes mirall#1132
A variable that counts the affected items of the propagator operation
done on a item was added to SyncFileItem. Usually that is 1 because
most operations affect only the item itself. But for removes, the
number can be higher for directories (one remove removes a whole tree).
Some rearrangements were needed.
2014-12-06 12:31:45 +01:00
Jenkins for ownCloud
a43173fa90
[tx-robot] updated from transifex
2014-12-06 01:25:23 -05:00
Jenkins for ownCloud
d2a24b5186
[tx-robot] updated from transifex
2014-12-05 01:25:29 -05:00
Christian Kamm
40f44c2389
DB: Delete corrupt database. #2547
...
* Also use readonly DB access for SocketAPI.
2014-12-04 15:35:55 +01:00
Olivier Goffart
441b5bd1dc
Setup Wizard: remove all folder definition before starting a new sync
...
Issue #1989
2014-12-04 15:18:27 +01:00
Christian Kamm
dc2f0d59cb
FolderWizard: Clean up naming of 'add folder' button. #2371
2014-12-04 10:47:26 +01:00
Christian Kamm
4dcfacf2d5
Fix compile. :/
2014-12-04 09:59:24 +01:00
Christian Kamm
b7485106ef
NetworkJobs: Set timeout to 5 minutes everywhere.
2014-12-04 09:54:17 +01:00
Christian Kamm
f82893496b
Fix typo.
2014-12-04 09:54:15 +01:00
Christian Kamm
c418e58f88
Etag job scheduling: Silence warnings, make prettier.
2014-12-04 09:52:13 +01:00
Jenkins for ownCloud
054e557531
[tx-robot] updated from transifex
2014-12-04 02:06:11 -05:00
Jenkins for ownCloud
3020dc75ab
[tx-robot] updated from transifex
2014-12-04 01:25:22 -05:00
Klaas Freitag
9ea359de52
GUI: Check if there are sync folders configured and how proper msg.
...
This fixes #2264
2014-12-03 17:11:42 +01:00
Klaas Freitag
c5daf7d1b6
Mac installer: Make the installer background brandable for MacOSX.
2014-12-03 14:37:59 +01:00
Christian Kamm
b7d7f424c5
FolderMan: only touch _currentSyncFolder when done #2407
...
Also simplity terminateSyncProcess() to always terminate the
*current* sync run. Only one can be running at a time anyway.
2014-12-03 13:46:37 +01:00
Daniel Molkentin
e1fa6f1a0d
fix_frameworks is no longer required
...
This is taken care of by macdeployqt.py, which is
run during "make install"
2014-12-03 13:41:12 +01:00
