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
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
Olivier Goffart
e8efaa5ed8
Direct download URL: Fix resuming
...
The server might support resuming, so don't always erase the temporary file
and pass the startSize, so the temporary file will be remove if the server
does not support it after all (because it is not sending the "bytes" header
Also pass the expected etag for consistency even if it's not used in this case.
2014-12-18 12:13:12 +01:00
Jenkins for ownCloud
5a83b30303
[tx-robot] updated from transifex
2014-12-18 01:25:29 -05:00
Daniel Molkentin
986b23856f
Make setup page usable from shibboleth
...
Second patch to address #2607
2014-12-17 18:13:59 +01:00
Olivier Goffart
96872e2b3b
Download: When direct URL don't work, retry through webdav
2014-12-17 14:28:13 +01:00
Daniel Molkentin
42ffed3f57
Wizard: Show server errors when coming from shibboleth
...
The wizard needs to be restored and rewound to the first page
First patch to address #2607
2014-12-17 14:24:07 +01:00
Jenkins for ownCloud
cc3f7995fb
[tx-robot] updated from transifex
2014-12-17 02:06:12 -05:00
Jenkins for ownCloud
3f399225fa
[tx-robot] updated from transifex
2014-12-17 01:25:22 -05:00
Markus Goetz
dc5d0e367c
OS X: Improve installer
...
This should mostly fix #2105 and #2044
2014-12-16 19:08:12 +01:00
Olivier Goffart
a2803e4f5f
csync_update: do not force writing on the db for directory with a changed date
...
Fixes #2584
2014-12-16 13:02:32 +01:00
Olivier Goffart
b1d392e415
Download job: allow redirect on direct download link
...
Issue #2614
2014-12-16 11:51:25 +01:00
Olivier Goffart
cbf00e9378
Connection Validator: Fix connection warning
...
The timeout signal does not exist.
Timeout is handled as a normal network arror.
2014-12-16 11:48:15 +01:00
Olivier Goffart
414838cae8
Settings dialog: remove the code that was updating the account icon
...
I just wanted to fix the warning:
QObject::connect: No such slot OCC::SettingsDialog::slotUpdateAccountIcon(QIcon) in settingsdialog.cpp:108
It turns out we don't need anymore the signal or any of the code that
was updating the account icon in the settings dialog since it we now have a fixed icon
2014-12-16 11:36:52 +01:00
Olivier Goffart
3ee14164db
network jobs: Refactor the redirect handling in AbdtractNetworkJob
...
Move the redirect handling from CheckServerJob to AbstractNetworkJob, so we can
later use it in any job (in preparation for task #2614 )
2014-12-16 11:27:02 +01:00
Daniel Molkentin
63712de170
1.7.1 rc1
2014-12-16 07:30:23 +01:00
Jenkins for ownCloud
43673d6694
[tx-robot] updated from transifex
2014-12-16 01:25:24 -05:00
Markus Goetz
f195648b90
OS X: Fix overlay icons
...
a3e7f513e6
broke them.
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