Daniel Molkentin
c3468b7ed6
Merge remote-tracking branch 'origin/master' into accountstate
...
Conflicts:
src/gui/owncloudsetupwizard.cpp
src/gui/owncloudsetupwizard.h
src/libsync/propagatedownload.cpp
src/libsync/propagatedownload.h
2015-01-08 15:33:39 +01:00
Daniel Molkentin
3f5c1d2ade
Merge pull request #2678 from chrodan/master
...
Hide Ignored files in context menu
2015-01-08 14:29:36 +01:00
Daniel Molkentin
dd063d0207
Add hack to make old themes work
2015-01-08 14:21:58 +01:00
Christoph Dann
309ff2997c
potential fix for #1865
...
Do not show ignored files in context menu
2015-01-08 11:42:14 +01:00
Daniel Molkentin
8e8ca97eec
Fix build
2015-01-08 09:42:26 +01:00
Daniel Molkentin
51d7559a2c
Simplify checkDowngradeAdvised logic
...
Also, show() and back() belong into slotConnectionCheck only
2015-01-07 18:22:44 +01:00
Daniel Molkentin
5c4f706fe4
Setup Wizard: Make sure to reset auth type when URL changes
2015-01-07 18:01:18 +01:00
Daniel Molkentin
7ac32a19b5
Do not show the HTTP-reconnect popup when its not warranted
...
Fixes usability issues in the workaround of #2607
2015-01-07 18:01:11 +01:00
Daniel Molkentin
6e4da53e31
Merge pull request #2638 from owncloud/add-slash-as-ignored-character
...
fix link and add slash as bad character
2015-01-07 15:36:09 +01:00
Olivier Goffart
8e3dbcb7c0
SocketAPi: use absoluteFilePath unstead of canonicalFilePath
...
Because canonicalFilePath is way too slow.
Issue #2671
2015-01-07 14:37:05 +01:00
Jenkins for ownCloud
5539f1d498
[tx-robot] updated from transifex
2015-01-06 02:06:11 -05:00
Olivier Goffart
ab0bc75e43
PropagateUploadFileQNAM::slotUploadProgress: Fix inverted condition
...
( Apply this commit 2d8053a9df
2015-01-05 17:32:12 +01:00
Olivier Goffart
2d8053a9df
Dolphin plugin for KF5
2015-01-05 17:23:36 +01:00
Markus Goetz
c4dd64940e
Update VERSION.cmake
2015-01-05 15:47:27 +01:00
Olivier Goffart
414ac5433d
Merge branch '1.7'
...
Conflicts:
binary
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
doc/troubleshooting.rst
2015-01-05 14:40:53 +01:00
Olivier Goffart
b2c01ffe21
SyncEngine: Show an error when a file name is not encoded with valid UTF-8
...
... instead of uploading the file with replacement character, and asserting
on the next sync.
Issue #2649
If the file or folder on the file system has a name with invalid UTF-8,
We would convert the name to utf-8, and the conversion would result in
replacement character placeholder. And we would upload that file on the server
with that name, and save it with this name on the database.
Fix this issue by showing an error to the user for invalid files.
2015-01-05 13:54:31 +01:00
Olivier Goffart
517dea6958
accountsettings: Use right palette when using reversed palette
...
Issue #2654
The problem is that the WindowsVistaStyle does something wierd with the palette
when drawing the text, and we should do the same then.
2015-01-05 12:17:05 +01:00
Jenkins for ownCloud
225e6c6b9f
[tx-robot] updated from transifex
2015-01-05 01:25:21 -05:00
Jenkins for ownCloud
1dd4fecffb
[tx-robot] updated from transifex
2015-01-04 02:06:13 -05:00
Jenkins for ownCloud
5f2645b84a
[tx-robot] updated from transifex
2015-01-04 01:25:22 -05:00
Jenkins for ownCloud
fc4b11e224
[tx-robot] updated from transifex
2015-01-03 01:25:19 -05:00
Jenkins for ownCloud
cf3383dd59
[tx-robot] updated from transifex
2015-01-02 01:25:21 -05:00
Jenkins for ownCloud
ead6ba50e7
[tx-robot] updated from transifex
2015-01-01 01:25:23 -05:00
Carla Schroder
7127b989c6
Update navigating.rst
2014-12-31 14:50:54 -08:00
Carla Schroder
3fc755d92f
Markup fixes
2014-12-31 14:48:17 -08:00
Carla Schroder
0dc43e5211
Markup corrections
2014-12-31 14:46:22 -08:00
Carla Schroder
4ddbb17a11
Update architecture.rst
...
Markup corrections
2014-12-31 14:37:28 -08:00
Carla Schroder
bfe31645ab
Markup fixes
2014-12-31 14:34:45 -08:00
Carla Schroder
09f843727d
Update and correct desktop client manual
...
Conflicts:
doc/accountsetup.rst
doc/architecture.rst
doc/navigating.rst
doc/owncloudcmd.rst
2014-12-31 14:31:35 -08:00
Carla Schroder
191a6b7d2b
Merge pull request #2656 from owncloud/clienttweaks
...
Update and correct desktop client manual
2014-12-31 11:29:52 -08:00
Carla Schroder
096511fc89
Update and correct desktop client manual
2014-12-31 11:27:52 -08:00
Jenkins for ownCloud
85687ce4a2
[tx-robot] updated from transifex
2014-12-31 01:25:23 -05:00
Carla Schroder
a6bfb23d20
Update troubleshooting.rst
...
Markup corrections
2014-12-30 18:41:50 -08:00
Carla Schroder
c2f3413dc5
Merge pull request #2652 from RealRancor/fix_typos
...
Fixed typos in docs
2014-12-29 13:41:22 -08:00
Carla Schroder
755daeb024
Update troubleshooting.rst
...
More markup fixes
2014-12-29 10:09:42 -08:00
Carla Schroder
26233ac078
Update troubleshooting.rst
...
Markup fixes
2014-12-29 10:07:52 -08:00
RealRancor
2ee2876855
Fixed typos in docs
2014-12-29 18:11:12 +01:00
Carla Schroder
5c7795bb63
Merge pull request #2646 from owncloud/notefix
...
Markup correction
2014-12-26 08:18:57 -08:00
Carla Schroder
f7ebd2e793
Markup correction
2014-12-26 08:17:15 -08:00
Jenkins for ownCloud
9298891d00
[tx-robot] updated from transifex
2014-12-25 01:25:22 -05:00
Jenkins for ownCloud
3a1dc6f23e
[tx-robot] updated from transifex
2014-12-24 01:25:22 -05:00
Morris Jobke
e250153204
fix link and add slash as bad character
2014-12-23 11:25:55 +01:00
Daniel Molkentin
a2e5a6628d
v1.7.1
2014-12-22 11:38:07 +01:00
Daniel Molkentin
6b3278cd8e
Amend and edit ChangeLog for 1.7.1
2014-12-22 11:38:07 +01:00
Jenkins for ownCloud
11f225aada
[tx-robot] updated from transifex
2014-12-21 01:25:21 -05:00
Jenkins for ownCloud
8979981553
[tx-robot] updated from transifex
2014-12-19 01:25:31 -05:00
Christian Kamm
4fa212c43b
CSync callbacks: Don't use global account.
2014-12-18 15:39:51 +01:00
Christian Kamm
a9da5ebff6
Wizard: Sometimes preserve folders when folder config is skipped.
...
* When folder config is used, other folder definitions are always
removed.
* Fix a bug with the wizard becoming stuck when 'skip folder config'
is used.
2014-12-18 15:39:51 +01:00
Christian Kamm
38ebfec1fb
Use global Account/AccountState less.
...
* Use a shared pointer to Account everywhere to ensure
the instance stays alive long enough for a sync to terminate
* Folder is now tied to an AccountState
* SyncEngine and OwncloudPropagator tie to an Account and use that
for all jobs they run
Issue: Since the setup wizard currently always replaces the
account, it will always wipe all folder definitions, even when
the actual changes to the account were minor.
2014-12-18 15:39:51 +01:00
Christian Kamm
6c7acd585e
Account: Split into libsync/Account and gui/AccountState.
...
This allows all the account state information to live in gui
while the sync-relevant data stays in libsync.
I also moved quotainfo to gui since it depends on the account state.
2014-12-18 15:39:51 +01:00
