Daniel Molkentin
5e0d4ab31d
Further Windows compile fix
2015-01-12 09:50:37 +01:00
Daniel Molkentin
488f993f45
Fix compilation on Windows
2015-01-12 09:40:11 +01:00
Jenkins for ownCloud
876407e2e7
[tx-robot] updated from transifex
2015-01-12 01:25:23 -05:00
Roeland Jago Douma
811cbc27c0
Sharedialog: Construct correct public url for existing shares
2015-01-11 14:16:49 +01:00
Daniel Molkentin
214f925b2f
Merge pull request #2692 from owncloud/typo
...
fix typo
2015-01-11 14:12:43 +01:00
Volkan Gezer
cefa31eb82
fix typo
...
suggested by transifex translator
2015-01-11 14:07:04 +01:00
Roeland Jago Douma
25e90ff658
Sharedialog: use Q_FOREACH
2015-01-11 13:56:23 +01:00
Roeland Jago Douma
fa390299f9
Added Q_FUNC_INFO at several places
2015-01-11 13:41:15 +01:00
Roeland Jago Douma
accb036507
Removed some unused outcommented code
2015-01-11 13:36:45 +01:00
Roeland Jago Douma
44690ff596
ShareDialog: fixed "" -> QString
2015-01-11 13:27:32 +01:00
Roeland Jago Douma
e20f819c1d
Sharedialog: QString("") -> QString()
2015-01-11 13:24:40 +01:00
Roeland Jago Douma
1d011a2f9a
ShareDialog: make visible text translatable
2015-01-11 13:22:48 +01:00
Roeland Jago Douma
bc84a78b0f
ShareDialog: Made slot arguments const
2015-01-11 11:19:12 +01:00
Daniel Molkentin
6034bd0946
Wizard: Never attempt to hide server page
...
The wizard code used to call hide() on hardcoded wizards.
This means that for a brief moment, the first page with the URL
(disabled line edit) may be seen. I think that's completely
legitimate from a feedback perspective. The alternative would
be to unhide on error, but this is rather unelegant...
2015-01-11 07:38:09 +01:00
Jenkins for ownCloud
6abe714dff
[tx-robot] updated from transifex
2015-01-11 01:25:22 -05:00
Jenkins for ownCloud
37606dab4b
[tx-robot] updated from transifex
2015-01-10 01:25:25 -05:00
Markus Goetz
f9b98d6d1d
OS X: Fix exclude file install
2015-01-09 14:38:27 +01:00
Klaas Freitag
786a877986
SocketAPI: Some cleanups plus added some consts
2015-01-09 11:44:01 +01:00
Jenkins for ownCloud
b637ae1e53
[tx-robot] updated from transifex
2015-01-09 04:26:16 -05:00
Jenkins for ownCloud
cc8a54d314
[tx-robot] updated from transifex
2015-01-09 01:25:28 -05:00
Daniel Molkentin
c86d8e5acf
Clean up BSD support patch
2015-01-08 22:40:47 +01:00
Daniel Molkentin
4a819026df
Merge pull request #2634 from ryo-on/netbsd-support
...
Support NetBSD like FreeBSD or Linux.
2015-01-08 22:35:44 +01:00
Olivier Goffart
7671ae8df7
Application: Initialize the folderman after we checked for existance
...
So we don't start the SocketAPI if we are going to quit.
We also do not log any message anymore before we install the hooks
Should solve #2666
2015-01-08 16:52:23 +01:00
Daniel Molkentin
94d0c28f69
Merge pull request #2629 from owncloud/accountstate
...
Refactor Account in preparation for multi account feature
2015-01-08 15:39:09 +01:00
Daniel Molkentin
df555d5321
Merge remote-tracking branch 'origin/master' into accountstate
...
Conflicts:
src/cmd/cmd.cpp
2015-01-08 15:38:41 +01:00
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
Olivier Goffart
bbf0e7c0a5
owncloudcmd: add --unsyncedfolders to test selective sync
2015-01-08 15:27:02 +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
Jenkins for ownCloud
b734958ab9
[tx-robot] updated from transifex
2015-01-08 01:25:22 -05: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
5287984307
[tx-robot] updated from transifex
2015-01-07 01:25:23 -05:00
Jenkins for ownCloud
5539f1d498
[tx-robot] updated from transifex
2015-01-06 02:06:11 -05:00
Jenkins for ownCloud
e8cce4d1a1
[tx-robot] updated from transifex
2015-01-06 01:25:30 -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
