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
Olivier Goffart
a23e0fef8d
Update binary submodule
2014-12-03 11:18:01 +01:00
Olivier Goffart
0fd0b08c09
Windows shell integration: Always release the lock before calling win32 API
...
May help for 2515
2014-12-03 09:11:38 +01:00
Jenkins for ownCloud
ce1690b450
[tx-robot] updated from transifex
2014-12-03 01:25:27 -05:00
Markus Goetz
46bd473664
Folders: Move ETag check scheduling to FolderMan
...
Only 1 check per time is able to run now.
For #2553
Might improve #2479 #2485 #2534
2014-12-02 22:32:54 +01:00
Daniel Molkentin
6030fec6cb
Fix typo
2014-12-02 15:08:15 +01:00
Daniel Molkentin
b7323dc403
Merge branch 'master' into rename_client
2014-12-02 14:33:28 +01:00
Daniel Molkentin
c6d74d6c12
Fix typo
2014-12-02 14:33:17 +01:00
Daniel Molkentin
a42709f814
Namespace fixes
2014-12-02 14:20:13 +01:00
Daniel Molkentin
3016844dd7
Merge branch 'master' into rename_client
...
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
2014-12-02 13:37:22 +01:00
Olivier Goffart
8fbb55a0c8
Wizard: Fix escaping of error message.
...
An url can contains % signs, so if it does, the errors formating was wrong
because of the use of QString::args
Also, the error is in html format, and we need to let the message box know
that, otherwise we will just see <br/>
2014-12-02 10:22:46 +01:00
Olivier Goffart
f046a7e7fe
Wizard: Attempts to really close the database when starting the backup
...
Still for issue #1989
2014-12-02 10:22:46 +01:00
Markus Goetz
92ce707268
Bandwidth: Fix issue with removed download jobs
...
The measuring broke when a job that is currently measuring was removed.
2014-12-02 09:37:48 +01:00
Daniel Molkentin
3f5887cc03
Merge pull request #2565 from owncloud/accountsettings_itemsontop
...
Refactor generic settings dialog
2014-12-01 15:01:45 +01:00
Olivier Goffart
fb3f5d86cf
Fix compilation after merge
2014-12-01 14:41:39 +01:00
Olivier Goffart
512492bf30
Merge remote-tracking branch 'origin/1.7'
...
Conflicts:
src/libsync/propagatedownload.cpp
2014-12-01 14:37:47 +01:00
Olivier Goffart
2477c3914e
csync_update: Ignore a difference of time of exactly one hour
...
Issue #2438
2014-12-01 13:53:30 +01:00
Daniel Molkentin
afee1ee1c0
Make all ptr-based members either const or check for their existance
2014-12-01 13:08:49 +01:00
Daniel Molkentin
f233593909
Add missing accounts icon
2014-12-01 13:07:44 +01:00
Olivier Goffart
3253cc38b2
Propagator upload: Mark error while opening the file as SoftError
...
Because otherwise a lot of error are shown to the user when
the user deletes a directory that is syncing
Task #1981
2014-12-01 12:22:52 +01:00
Olivier Goffart
b154e1baa1
Nautilus shell integration: Use fallback when XDG_RUNTIME_DIR is not defined
...
Same fallback as in Qt5
Task #2477
2014-12-01 12:06:09 +01:00
Daniel Molkentin
714599aeaa
Refactor generic settings dialog
...
- move items on top like on Mac OS (right is free for accounts now)
- The account icon no longer reflects the current status (in prep for multi-account)
2014-12-01 11:37:06 +01:00
Jenkins for ownCloud
119a9983a9
[tx-robot] updated from transifex
2014-11-30 01:25:22 -05:00
Jenkins for ownCloud
8866494c94
[tx-robot] updated from transifex
2014-11-29 02:06:10 -05:00
