Christian Kamm
d8d9fcf2f4
Silence warning about zorder in .ui file.
2015-12-10 11:10:49 +01:00
Christian Kamm
ae806e8214
Merge remote-tracking branch 'origin/2.1'
2015-12-10 11:07:20 +01:00
Christian Kamm
8b5474ff67
SocketAPI: Don't use ERROR for SoftErrors #3944
2015-12-10 11:02:38 +01:00
Christian Kamm
f65a29df5d
SocketAPI: Ensure messages are consistent #3944
...
Before we blindly broadcasted the result of a sync action. That was
often different from what a subsequent FILE_STATUS query would report.
2015-12-10 10:43:17 +01:00
Christian Kamm
fd18c565b0
SocketAPI: Fix file error cache #3944
2015-12-10 10:43:17 +01:00
Christian Kamm
fbb85fab81
Activity tab doesn't vanish with too many accounts #4188
...
The bug was introduced by a bad merge.
2015-12-10 09:43:16 +01:00
Jenkins for ownCloud
db0674dc76
[tx-robot] updated from transifex
2015-12-10 02:40:19 -05:00
Christian Kamm
3572e7ffa4
Activity: Improve formatting of copied data #3498
2015-12-09 15:49:30 +01:00
Christian Kamm
fe75c6ad28
Wizard: Find user:pw even if redirected #4265
2015-12-09 14:48:51 +01:00
Christian Kamm
3de8f27a02
Force account wizard when last account is deleted #4266
2015-12-09 11:41:43 +01:00
Christian Kamm
4dfce57a58
Creds: Forget password on explicit sign-out #4241
2015-12-09 11:31:37 +01:00
Christian Kamm
179b25d289
AccountWizard: Don't crash when sync is running #4221
...
Running FolderMan::setupFolders() is redundant and just a leftover
from before multiaccount.
2015-12-09 09:08:21 +01:00
Jenkins for ownCloud
230b6bc547
[tx-robot] updated from transifex
2015-12-09 02:19:07 -05:00
Christian Kamm
a2eee7e349
Share UI: Hide 'allow editing' for files #4211
2015-12-08 15:37:17 +01:00
Christian Kamm
cec4b803cf
Share UI: Hide 'can share' if capability missing #4231
2015-12-08 12:58:56 +01:00
Christian Kamm
1a519ac1fb
Share UI: Respect enfore-expire #4235
2015-12-08 12:16:05 +01:00
Christian Kamm
d92c8bec86
UI: Sign in/out -> Log in/out #4249
2015-12-08 12:05:14 +01:00
Christian Kamm
eb28d171f3
Doc: Add checksum overview
2015-12-08 10:59:42 +01:00
Jenkins for ownCloud
fdeb7ccda6
[tx-robot] updated from transifex
2015-12-08 02:21:51 -05:00
Daniel Molkentin
73acad2c92
FF doc subrepo to adjust to new .org theming
2015-12-08 01:02:46 +01:00
Jenkins for ownCloud
7eca3c9d3b
[tx-robot] updated from transifex
2015-12-07 02:18:25 -05:00
Jenkins for ownCloud
64ca94d960
[tx-robot] updated from transifex
2015-12-05 02:18:34 -05:00
Jenkins for ownCloud
c01220fd95
[tx-robot] updated from transifex
2015-12-04 02:18:36 -05:00
Daniel Molkentin
4d175ae77b
Merge pull request #4247 from owncloud/desktopshare
...
added desktop sharing
2015-12-03 20:19:47 +01:00
Carla Schroder
78df3a35b4
added desktop sharing
2015-12-03 10:29:44 -08:00
Olivier Goffart
68057c1c5a
Sharee.cpp: Get rid of lambdas because we still need to support GCC 4.4
2015-12-03 14:47:59 +01:00
Jürgen Weigert
e67bb1c5ce
Merge pull request #4201 from owncloud/jnweiger-patch-1
...
improved linux build instructions.
2015-12-03 14:05:24 +01:00
Jürgen Weigert
f2c9a49c50
fixed formatting lines 212 215
2015-12-03 14:04:43 +01:00
Masoud Kazemi
903dd8acef
Fixing bug in opening Activity log from tray icon menu 'Recent Changes/Details...'
2015-12-03 15:25:59 +03:30
Daniel Molkentin
480861efb6
Editorial changes to ChangeLog
2015-12-03 10:06:06 +01:00
Daniel Molkentin
9a252995c2
Merge pull request #4243 from owncloud/more21update
...
more updates to 2.1 user manual
2015-12-03 09:47:02 +01:00
Jenkins for ownCloud
9a9446d13d
[tx-robot] updated from transifex
2015-12-03 02:18:58 -05:00
Carla Schroder
3d71d6c96f
more image fixes
2015-12-02 12:10:20 -08:00
Carla Schroder
41c3c107d4
clean up screenshot
2015-12-02 12:06:43 -08:00
Carla Schroder
24cad42a86
corrections to 2.1 user manual
2015-12-02 12:02:55 -08:00
Carla Schroder
1a564b1672
more updates to 2.1 user manual
2015-12-02 11:52:42 -08:00
Markus Goetz
c4006795cc
OS X: Attempt to fix account add oddities #4237
2015-12-02 17:59:41 +01:00
Klaas Freitag
cf06083d1b
Utilities: Include math.h because of floor()
2015-12-02 17:56:37 +01:00
Jenkins for ownCloud
89004437c5
[tx-robot] updated from transifex
2015-12-02 11:47:06 -05:00
Jenkins for ownCloud
f0e3eca8a1
[tx-robot] updated from transifex
2015-12-02 11:24:47 -05:00
Markus Goetz
d15cf0c2ff
Sharing: Remove mentioning of remote users from dialog #4234
2015-12-02 16:44:29 +01:00
Klaas Freitag
770ad54229
AccountSettings: Update the visibility of the add account button.
...
That fixes #4238
2015-12-02 16:33:37 +01:00
Markus Goetz
a75209d104
Account: Invalidate credentials when clicking "Sign out" #4241
2015-12-02 16:31:58 +01:00
Daniel Molkentin
ab5e543099
Use user-readable short folder path in the context menu
2015-12-02 15:46:42 +01:00
Klaas Freitag
451ebd447b
Merge pull request #4169 from owncloud/2.1_file_exists_before_share
...
[Sharing] Make sure the file is actually synced to the server
2015-12-02 13:40:42 +01:00
Olivier Goffart
1f8af40361
Dolphin plugin: Fix compiler warnings
2015-12-02 13:14:15 +01:00
Olivier Goffart
685f2a259f
csync: remove PLUGIN install patch from cmake files
...
This conflicts with the KDE_INSTALL_PLUGINDIR and prevent the
dolphin plugin to be installed at the right location.
Since csync no longer have plugin, this can be removed
2015-12-02 13:13:41 +01:00
Olivier Goffart
e27374324d
AccountSettings: Remove the F5 reset folder shortcut
...
This secret key was used to wipe the database. In the past this was
usefull because of many bugs, but now this is not usefull anymore.
And cause trouble because it also erase the selective sync list.
Issue #4182
2015-12-02 12:27:53 +01:00
Klaas Freitag
4a2b5f7cc8
Merge pull request #4228 from owncloud/enforce_password-block
...
[Sharing] Do not allow users to uset the password if it is enforced
2015-12-02 10:07:04 +01:00
Klaas Freitag
52dc55d044
ShareLinkWidget: Stop editing progress animation if passwd is required.
2015-12-02 10:06:34 +01:00
