Roeland Jago Douma
8a539ec0f6
Move shareinfo over to proper controller
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-10 13:49:06 +02:00
Nextcloud bot
0ef9f943b2
[tx-robot] updated from transifex
2017-08-10 00:08:15 +00:00
Roeland Jago Douma
c81e79f8b9
Fix files_sharing CacheTests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-09 16:15:27 +02:00
Nextcloud bot
8549fcf6e4
[tx-robot] updated from transifex
2017-08-09 00:08:20 +00:00
Morris Jobke
585e5c6ea5
Logo claim is not used anymore
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-08-02 23:08:45 +02:00
Morris Jobke
6ca4b9eee9
Merge pull request #5920 from nextcloud/gallery-share-view-fix
...
Top bar buttons in share view are wrong positioned
2017-08-02 16:59:24 +02:00
Morris Jobke
6290ba8299
Merge pull request #4790 from nextcloud/fix-comparisons-in-apps
...
Fix comparisons in apps
2017-08-02 16:28:33 +02:00
Lukas Reschke
f93a82b8b0
Remove explicit type hints for Controller
...
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-08-01 17:32:03 +02:00
Morris Jobke
6010c4f267
Merge pull request #5877 from nextcloud/typehint_middleware
...
Prop argument type for Middleware
2017-08-01 14:28:16 +02:00
Joas Schilling
80febeae21
Fix comparisons in the sharing app
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-08-01 13:56:12 +02:00
Roeland Jago Douma
c8452803ef
Merge pull request #5897 from nextcloud/add-share-mail-for-user-share
...
Send an email once a file/folder is shared with a user
2017-08-01 13:27:15 +02:00
Nextcloud bot
456392e627
[tx-robot] updated from transifex
2017-08-01 00:08:26 +00:00
Roeland Jago Douma
3548603a88
Fix middleware implementations signatures
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-31 16:54:19 +02:00
Marin Treselj
f53db38c03
Change id to class in the main share template
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-31 12:19:19 +02:00
Morris Jobke
a309fa7d6b
Disable default activity email for incoming shares
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-31 08:19:54 +02:00
Nextcloud bot
98b664a000
[tx-robot] updated from transifex
2017-07-30 00:08:03 +00:00
Nextcloud bot
b43abf7512
[tx-robot] updated from transifex
2017-07-29 00:08:31 +00:00
Nextcloud bot
65ade4b6d5
[tx-robot] updated from transifex
2017-07-27 00:08:03 +00:00
Nextcloud bot
da31a30edb
[tx-robot] updated from transifex
2017-07-26 00:08:06 +00:00
Nextcloud bot
11e182fff2
[tx-robot] updated from transifex
2017-07-25 00:08:02 +00:00
Roeland Jago Douma
6d4731024a
Some app fixes of phpstorm inspections
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-24 11:42:07 +02:00
Nextcloud bot
d95b46ffb7
[tx-robot] updated from transifex
2017-07-24 00:08:01 +00:00
Nextcloud bot
46332b0d8e
[tx-robot] updated from transifex
2017-07-23 00:07:58 +00:00
Morris Jobke
b6c67f585e
Merge pull request #5827 from nextcloud/improve-public-share-header
...
Add filename and sharer in public page
2017-07-22 10:59:33 +02:00
Morris Jobke
50fc5a1e25
Merge pull request #5823 from nextcloud/improve-error-handling
...
Improve error handling for accepting federated shares
2017-07-21 22:54:14 +02:00
Morris Jobke
b2b4691e48
Add filename and sharer in public page
...
* shows the filename and sharer on the public page
* allows the user to identify, that this is a user page and not an official page of the Nextcloud hosting
* remove link on logo that redirects to login (fixes #5720 )
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-21 18:55:37 +02:00
Roeland Jago Douma
86d2fe516e
Merge pull request #5753 from nextcloud/fed-unshare-fail-remote
...
still remove the federated share even if we cant notify the remote
2017-07-21 12:45:01 +02:00
Bjoern Schiessle
e78040d250
improved error handling
...
check if table was updated successfully and only then send a notification
mail and return "true".
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-21 12:07:32 +02:00
Nextcloud bot
964d5338dc
[tx-robot] updated from transifex
2017-07-21 00:08:06 +00:00
Lukas Reschke
d8ec399454
Run phan over code base
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-07-19 10:28:11 +02:00
Morris Jobke
58f72309cc
Merge pull request #5736 from smueller18/patch-2
...
do not show hyphen in og:title if slogan does not exist
2017-07-18 09:04:47 +02:00
Robin Appelman
7fa02905aa
still remove the federated share even if we cant notify the remote
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-17 14:19:44 +02:00
Nextcloud bot
a23cdd04bb
[tx-robot] updated from transifex
2017-07-15 00:08:54 +00:00
Stephan Müller
7cf3dc4e29
do not show hyphen in og:title if slogan does not exist
2017-07-14 15:26:44 +02:00
Nextcloud bot
3865c77279
[tx-robot] updated from transifex
2017-07-14 00:08:37 +00:00
Nextcloud bot
261513b04a
[tx-robot] updated from transifex
2017-07-13 00:08:31 +00:00
Roeland Jago Douma
08d3cb9107
Merge pull request #5685 from nextcloud/jail-propagator
...
Fix propagating changes within jail wrapper
2017-07-12 12:14:51 +02:00
Nextcloud bot
13295c2d1d
[tx-robot] updated from transifex
2017-07-12 00:08:43 +00:00
Robin Appelman
dfe662ad42
Fix propagating changes within jail wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 17:55:04 +02:00
Maxence Lange
6e7be6acfd
upstream
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 13:21:24 +02:00
Joas Schilling
b69ddfba8b
Fix activity emails for accept/decline of remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:10:36 +02:00
Nextcloud bot
4f7fafb5c5
[tx-robot] updated from transifex
2017-07-10 00:08:41 +00:00
Morris Jobke
b4deba2078
Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
...
Use PNGs for icons in activity emails
2017-07-07 11:05:00 +02:00
Nextcloud bot
d23bc9a99a
[tx-robot] updated from transifex
2017-07-07 00:08:24 +00:00
Bjoern Schiessle
c46b158e10
update sharing test to new master key default
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-07-06 11:47:12 +02:00
Morris Jobke
f3c25e177f
Merge pull request #5407 from nextcloud/5157-simple-logo
...
Simplified Nextcloud logo icon #2
2017-07-04 12:56:05 +02:00
Nextcloud bot
c94dbddd12
[tx-robot] updated from transifex
2017-07-03 00:08:21 +00:00
Marin Treselj
3470d0a44e
Simplified Nextcloud logo icon
...
Signed-off-by: Marin Treselj <marin@pixelipo.com>
2017-07-02 14:14:49 +02:00
Nextcloud bot
928b6a376e
[tx-robot] updated from transifex
2017-06-29 00:08:26 +00:00
Jan-Christoph Borchardt
fd63577089
Improve wording of various error messages
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-06-21 14:51:59 -05:00