summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-07-2422-0/+22
|
* [tx-robot] updated from transifexNextcloud bot2017-07-232-114/+198
|
* Merge pull request #5827 from nextcloud/improve-public-share-headerMorris Jobke2017-07-222-4/+16
|\ | | | | Add filename and sharer in public page
| * Add filename and sharer in public pageMorris Jobke2017-07-212-4/+16
| | | | | | | | | | | | | | | | * 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>
* | Merge pull request #5823 from nextcloud/improve-error-handlingMorris Jobke2017-07-212-11/+20
|\ \ | |/ |/| Improve error handling for accepting federated shares
| * improved error handlingBjoern Schiessle2017-07-212-11/+20
| | | | | | | | | | | | | | check if table was updated successfully and only then send a notification mail and return "true". Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #5753 from nextcloud/fed-unshare-fail-remoteRoeland Jago Douma2017-07-211-2/+7
|\ \ | | | | | | still remove the federated share even if we cant notify the remote
| * | still remove the federated share even if we cant notify the remoteRobin Appelman2017-07-171-2/+7
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-212-80/+80
| |/ |/|
* | Run phan over code baseLukas Reschke2017-07-192-0/+3
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #5736 from smueller18/patch-2Morris Jobke2017-07-181-1/+1
|\ \ | |/ |/| do not show hyphen in og:title if slogan does not exist
| * do not show hyphen in og:title if slogan does not existStephan Müller2017-07-141-1/+1
| |
* | [tx-robot] updated from transifexNextcloud bot2017-07-152-2/+2
|/
* [tx-robot] updated from transifexNextcloud bot2017-07-142-2/+2
|
* [tx-robot] updated from transifexNextcloud bot2017-07-132-20/+20
|
* Merge pull request #5685 from nextcloud/jail-propagatorRoeland Jago Douma2017-07-122-56/+0
|\ | | | | Fix propagating changes within jail wrapper
| * Fix propagating changes within jail wrapperRobin Appelman2017-07-112-56/+0
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-07-122-40/+40
| |
* | upstreamMaxence Lange2017-07-112-3/+3
|/ | | Signed-off-by: Maxence Lange <maxence@nextcloud.com>
* Fix activity emails for accept/decline of remote sharesJoas Schilling2017-07-101-1/+5
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2017-07-102-2/+2
|
* Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emailsMorris Jobke2017-07-075-10/+50
|\ | | | | Use PNGs for icons in activity emails
| * Use PNG version of the icons for shipped activitiesJoas Schilling2017-06-205-10/+50
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2017-07-072-66/+66
| |
* | update sharing test to new master key defaultBjoern Schiessle2017-07-061-0/+2
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #5407 from nextcloud/5157-simple-logoMorris Jobke2017-07-041-1/+1
|\ \ | | | | | | Simplified Nextcloud logo icon #2
| * | Simplified Nextcloud logo iconMarin Treselj2017-07-021-1/+1
| | | | | | | | | | | | Signed-off-by: Marin Treselj <marin@pixelipo.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-07-032-8/+8
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-06-294-4/+4
| |
* | Improve wording of various error messagesJan-Christoph Borchardt2017-06-211-1/+1
|/ | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* Merge pull request #5091 from nextcloud/shared-cache-during-initRobin Appelman2017-06-191-1/+8
|\ | | | | dont die if we try to access the shared cache while setting up the shared storage
| * dont die if we try to access the shared cache while setting up the shared ↵Robin Appelman2017-05-241-1/+8
| | | | | | | | | | | | storage Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2017-06-174-4/+4
| |
* | Merge pull request #5375 from nextcloud/share-folder-for-remote-sharesMorris Jobke2017-06-141-2/+4
|\ \ | | | | | | Use the share_folder config for remote shares
| * | Use the share_folder config for remote sharesJoas Schilling2017-06-131-2/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2017-06-152-0/+2
| | |
* | | Merge pull request #5384 from nextcloud/allow-to-share-to-local-users-via-emailMorris Jobke2017-06-142-7/+72
|\ \ \ | | | | | | | | Allow to find local users by their email address
| * | | Add unit testJoas Schilling2017-06-141-0/+15
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Make sure to only add system users onceJoas Schilling2017-06-141-8/+35
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Allow to find local users by their email addressJoas Schilling2017-06-131-7/+30
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / / fix 'add to your nextcloud' input field, this is not an email addressBjoern Schiessle2017-06-132-2/+2
|/ / | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | [tx-robot] updated from transifexNextcloud bot2017-06-082-4/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2017-06-074-6/+6
| |
* | [tx-robot] updated from transifexNextcloud bot2017-06-062-30/+206
| |
* | [tx-robot] updated from transifexNextcloud bot2017-06-044-4/+6
| |
* | [tx-robot] updated from transifexNextcloud bot2017-06-034-44/+44
| |
* | [tx-robot] updated from transifexNextcloud bot2017-06-022-2/+2
| |
* | [tx-robot] updated from transifexNextcloud bot2017-06-014-6/+6
| |
* | [tx-robot] updated from transifexNextcloud bot2017-05-304-58/+168
| |
* | [tx-robot] updated from transifexNextcloud bot2017-05-292-2/+2
| |