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
Klaas Freitag
e6ab047751
ShareLinkWidget: Set state of passwd checkbox always.
2015-12-02 10:05:56 +01:00
Jenkins for ownCloud
4f5cf01cbc
[tx-robot] updated from transifex
2015-12-02 02:19:01 -05:00
Jenkins for ownCloud
442cc63d22
[tx-robot] updated from transifex
2015-12-02 01:15:38 -05:00
Markus Goetz
c24a8ba208
Account removal: More crash fixes for Windows
...
Seems things happen a bit different here, maybe because of paint events.
For #4229 #4202
2015-12-01 19:21:52 +01:00
Markus Goetz
db7d70a929
Account removal: Do it inside global application object
...
For #4229 #4202
2015-12-01 16:32:04 +01:00
Daniel Molkentin
d2f1c141d8
Merge pull request #4224 from owncloud/21update
...
updates for 2.1 release
2015-12-01 15:48:35 +01:00
Roeland Jago Douma
01faf102ba
[Sharing] Do not allow users to uset the password if it is enforced
2015-12-01 12:43:14 +01:00
Olivier Goffart
76d1296053
Disable some code that needs lambda with old GCC
...
It's just a feature that was not there in 2.0
It means that removed folder stay on the undecided list if it is removed
from the server until the user press apply in the selective sync widget.
Not a very bad bug anyway.
2015-12-01 10:30:11 +01:00
Jenkins for ownCloud
559bf75189
[tx-robot] updated from transifex
2015-12-01 02:19:24 -05:00
Carla Schroder
339caf9dc8
updates for 2.1 release
2015-11-30 17:09:27 -08:00
Klaas Freitag
b26c36b4bf
Merge pull request #4219 from owncloud/fix_link_share_stable8
...
[Sharing] Default capabilitie for link sharing
Fixes #4218
2015-11-30 18:13:34 +01:00
Roeland Jago Douma
c79879aa07
[Sharing] Default capabilitie for link sharing
...
Required to fix sharing for pre 8.1 servers
2015-11-30 16:55:06 +01:00
Klaas Freitag
e85475780f
Merge pull request #4217 from owncloud/sane_file_permissions
...
[Sharing] Files should not have create permissions
Fixes #4216
2015-11-30 15:52:24 +01:00
Roeland Jago Douma
b033a8e731
[Sharing] Files should not have create permissions
2015-11-30 15:47:10 +01:00
Jenkins for ownCloud
0b5b4a5eea
[tx-robot] updated from transifex
2015-11-30 02:22:16 -05:00
Daniel Molkentin
af0d0bd2ac
CMake: Fix typo
2015-11-30 01:05:18 +01:00
Daniel Molkentin
48097467f9
CMake: fix CMake 2.6 compatibility
...
... by replacing CONFIG by NO_MODULE option in find package
From the manual: "The CONFIG option may be used to skip Module mode
explicitly and switch to Config mode. It is synonymous to using
NO_MODULE."
2015-11-30 01:05:12 +01:00
Daniel Molkentin
895f0b29aa
Merge remote-tracking branch 'origin/2.1'
2015-11-30 00:47:10 +01:00
Jenkins for ownCloud
499400916d
[tx-robot] updated from transifex
2015-11-29 02:19:01 -05:00
Jenkins for ownCloud
3f0d575df7
[tx-robot] updated from transifex
2015-11-28 02:19:04 -05:00
Roeland Douma
4cb9d6763b
Merge pull request #4213 from owncloud/fix-share-dialog-displaynames-2.1
...
show displaynames of users in share dialog instead of userid
2015-11-27 15:37:54 +01:00
Arthur Schiwon
d62c51890e
show displaynames of users in share dialog instead of userid
2015-11-27 15:19:39 +01:00
Jenkins for ownCloud
10707c8288
[tx-robot] updated from transifex
2015-11-27 02:19:17 -05:00
Klaas Freitag
b896d8aa15
ActivityWidget: Fix type ( #4204 )
2015-11-26 21:41:31 +01:00
