Vincent Petry
1caee3ac2e
Move comment delete action into edit mode
2016-02-03 21:06:55 +01:00
Vincent Petry
bbefe1ed64
Comment owner can now edit or delete
2016-02-03 21:06:55 +01:00
Thomas Müller
da04620155
Merge pull request #22101 from owncloud/comments-filerow
...
Add file row indicator for unread comments
2016-02-03 20:53:40 +01:00
Thomas Müller
dd2f62e3e4
Merge pull request #22088 from owncloud/share2_ishare
...
[Share 2.0] Pass around userid/groupid/federatedid
2016-02-03 20:53:25 +01:00
Thomas Müller
81b9721700
Remove entries in dav_shares on deletion of a calendar
2016-02-03 20:18:56 +01:00
Lukas Reschke
eee6d1f41b
Also check daily and testing channel
2016-02-03 20:08:40 +01:00
Lukas Reschke
5f300ac275
Allow specifing the signing path
2016-02-03 20:08:40 +01:00
Arthur Schiwon
9370491822
types shall always be plural
2016-02-03 19:28:15 +01:00
Roeland Jago Douma
453ea6698d
[Share 2.0] Fix public link sharing
2016-02-03 19:25:29 +01:00
Roeland Jago Douma
c1841892d0
[Share 2.0] Fix OCS endpoint
2016-02-03 19:25:29 +01:00
Roeland Jago Douma
96662c4d0d
[Share 2.0] Fix shareManager
2016-02-03 19:25:29 +01:00
Roeland Jago Douma
eb904c7aa9
[Share 2.0] Fix defaultshare provider
2016-02-03 19:25:29 +01:00
Roeland Jago Douma
78be766cf5
[Share 2.0] Use strings for ids
...
* sharedWith
* sharedBy
* shareOwner
Now all set/get strings with the id. (userId, groupId,
federatedsharerId).
This to avoid a huge amount of if statements
2016-02-03 19:25:29 +01:00
Lukas Reschke
a06b62f901
Use intermediate root authority
...
Danimo proposed to use an intermediate root authority for signing purposes which makes sense considering that we may also sign updates this way in the future. So this uses now an intermediate authority.
2016-02-03 19:07:50 +01:00
Daniel Molkentin
c0322b3f98
Merge pull request #22106 from owncloud/use-newly-generated-keys
...
Use newly generated certificate authority
2016-02-03 18:19:24 +01:00
Lukas Reschke
1d27a53338
Use newly generated certificate authority
2016-02-03 18:17:43 +01:00
Thomas Müller
a3cc448c9d
Adding propfind property to retrieve sharee information from a dav resource
2016-02-03 17:18:23 +01:00
Thomas Müller
8c14ce01ba
Deleting a shared address book results in unshare
2016-02-03 17:18:22 +01:00
Thomas Müller
ef06d6bdaa
Deleting a shared calendar results in unshare
2016-02-03 17:18:22 +01:00
Thomas Müller
6f933fde60
Disallow to share with the owner of the resource
2016-02-03 17:18:22 +01:00
Thomas Müller
4b14ca672f
Fix ACLs on shared calendars
2016-02-03 17:18:22 +01:00
Thomas Müller
0753067bcd
No duplicate address book if shared with user and group and the user is part of the group
2016-02-03 17:18:22 +01:00
Thomas Müller
18c35bf812
No duplicate calendars if shared with user and group and the user is part of the group
2016-02-03 17:18:22 +01:00
Thomas Müller
9106595608
Add calendar sharing
2016-02-03 17:18:22 +01:00
Erik Pellikka
4f3cf66ba3
Fixes #22097
...
Updated with more specific css selector
Moved the curly brace to the same line as the selector
firefox fix
2016-02-03 10:38:46 -05:00
Vincent Petry
85bec3ffcb
Reset comments read marker after loading comments
2016-02-03 16:18:14 +01:00
Thomas Müller
dfeb6ea491
Merge pull request #22086 from RealRancor/RealRancor-patch-1
...
Remove files_locking from shipped.json
2016-02-03 16:09:02 +01:00
Thomas Müller
e34ec0a138
Merge pull request #22095 from owncloud/public_link_with_port
...
Public link downloads should work on instance on non default port
2016-02-03 16:06:54 +01:00
Thomas Müller
ab1c79827e
Merge pull request #22071 from owncloud/cache-split-insert
...
split cache->insert from cache->put
2016-02-03 14:32:28 +01:00
Thomas Müller
74abbbc0d6
Merge pull request #22098 from owncloud/cleanup-core-apps
...
Cleanup core apps
2016-02-03 14:17:10 +01:00
Vincent Chan
cc17ac9ff9
move whitspace check to user manager
2016-02-03 14:09:15 +01:00
Thomas Müller
f2ada30888
Merge pull request #21996 from owncloud/flysystem-1.0.16
...
[3rdparty] Bump flysystem to 1.0.16
2016-02-03 13:57:09 +01:00
Arthur Schiwon
c1871f5787
Port of test_ldap_2nddispname to master
2016-02-03 13:55:39 +01:00
Thomas Müller
aaf7299d28
Merge pull request #22070 from owncloud/share2_exceptions
...
Add sharing exceptions to OCP
2016-02-03 13:36:14 +01:00
Thomas Müller
cf81574e87
Merge pull request #22099 from owncloud/revert-22090-skip-migration-tests-setting
...
Revert "setting to skip migration tests by default"
2016-02-03 13:03:43 +01:00
Vincent Petry
8bb1437e24
Add file row indicator for unread comments
2016-02-03 13:00:55 +01:00
Morris Jobke
0a66734416
Revert "setting to skip migration tests by default"
2016-02-03 12:59:47 +01:00
Joas Schilling
599eb141b4
Make sure tests don't leave a stray directory behind
2016-02-03 12:57:22 +01:00
Joas Schilling
78d5c89e86
Make sure encryption has a valid licence tag
2016-02-03 12:57:03 +01:00
Joas Schilling
d79b0886d0
Remove deprecated and unused standalone tag
2016-02-03 12:56:42 +01:00
Joas Schilling
13c8fd4558
Remove invalid app user doc links
2016-02-03 12:56:17 +01:00
Robin Appelman
f2bba59b79
split cache->insert from cache->put
2016-02-03 12:55:36 +01:00
Thomas Müller
621f54da51
Merge pull request #21997 from owncloud/checksums
...
Checksums
2016-02-03 11:36:22 +01:00
Thomas Müller
459a12c8b3
Merge pull request #22081 from owncloud/mount-cache-invalid-storage
...
filter invalid storages from the mount cache early
2016-02-03 11:36:04 +01:00
Thomas Müller
85174d8526
Merge pull request #22084 from owncloud/configphp-fixes
...
small corrections; Web is capitalized, webroot is one lowercase word
2016-02-03 11:35:43 +01:00
Thomas Müller
a66a575859
Merge pull request #22090 from owncloud/skip-migration-tests-setting
...
setting to skip migration tests by default
2016-02-03 11:35:16 +01:00
Roeland Jago Douma
4bb96a5553
Construct valid URL
2016-02-03 11:29:36 +01:00
Roeland Jago Douma
aef43816c2
host and hostname are different things
...
host can contain the port (host of http://example.com:1234 is
example.com:1234) while hostname never contains a port. They can however
be similar. If you navigate to http://example.com then both host and
hostname will be example.com.
* Fixed docs
* added getHostName function
2016-02-03 11:28:07 +01:00
Carla Schroder
7d49bb6323
small corrections; Web is capitalized, webroot is one lowercase word
2016-02-03 10:06:44 +01:00
RealRancor
9bbb7b1c3e
Remove files_locking from shipped.json
2016-02-03 09:42:01 +01:00