Klaas Freitag
a759ba1d9e
Do not use nullptr, old compilers die on it.
2015-12-22 15:07:51 +01:00
Klaas Freitag
7ed243d3cd
Move version to 2.1.1 git.
2015-12-22 11:18:20 +01:00
Klaas Freitag
afa8d671be
shell integration: Create a plugin for nemo out of the nautilus one.
2015-12-22 11:05:00 +01:00
Klaas Freitag
c607707580
Backport of #4245
2015-12-22 10:26:13 +01:00
Klaas Freitag
8f26bb698d
Merge pull request #4245 from masoudcs/masoudcs-patch-1
...
Fixing bug in opening Activity log from tray icon menu 'Recent Changes/Details...'
2015-12-22 10:15:14 +01:00
Olivier Goffart
a0b913f65d
gui: Word Wrap in QInputDialog ( #4197 )
2015-12-22 10:08:17 +01:00
Jenkins for ownCloud
271b2f8c5b
[tx-robot] updated from transifex
2015-12-22 02:19:06 -05:00
Olivier Goffart
cf5b1e401c
csync_vio_local_stat: Win: fetch mtime and size if not previously fetched
...
Since owncloud 2.1, csync_vio_local_stat was optimized because readdir
would already fetch most of the info. This works for the discovery,
but not later. And we used this function later for symliks and co.
So this fixes the .lnk on windows
Issue #4300
2015-12-21 14:25:30 +01:00
Olivier Goffart
11174ddf4c
PropagateLocalRemove: Make it possible to remove read only files ( #4277 )
2015-12-21 13:25:10 +01:00
Olivier Goffart
48a0ffdc9e
Systray: Use the original name for the rename notification #4295
...
Otherwise it shows twice as "newname was renamed to newname".
Because _file is set to the new name in PropagateLocalRename::start
2015-12-21 11:06:39 +01:00
Jenkins for ownCloud
3664be1480
[tx-robot] updated from transifex
2015-12-21 02:18:42 -05:00
Jenkins for ownCloud
c5cd584b63
[tx-robot] updated from transifex
2015-12-19 02:19:06 -05:00
Jenkins for ownCloud
ca1c8a0121
[tx-robot] updated from transifex
2015-12-17 02:19:04 -05:00
Jenkins for ownCloud
3649c90605
[tx-robot] updated from transifex
2015-12-16 02:19:03 -05:00
Jenkins for ownCloud
89cb27f224
[tx-robot] updated from transifex
2015-12-13 02:18:46 -05:00
Jenkins for ownCloud
0d808114b6
[tx-robot] updated from transifex
2015-12-11 02:19:06 -05:00
Christian Kamm
0555c88425
User Sharing: Match user names and case insensitive #4269
2015-12-10 14:56:15 +01:00
Christian Kamm
e2d1a5a41d
Share UI: Allow typing in a sharee
...
Previously you *had* to select one of the completion options, even
if the text in the lineedit was identical to one of the options.
2015-12-10 13:49:47 +01:00
Christian Kamm
df1b309b36
FolderWatcher: Remove IN_DONT_FOLLOW #3475
...
This fixes the case of the root folder being symlinked.
2015-12-10 13:05:43 +01:00
Christian Kamm
e3b53b7e74
Log: Remove scary messages :)
2015-12-10 11:50:19 +01:00
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
