Commit Graph

14739 Commits

Author SHA1 Message Date
Joas Schilling 52dd27892b
Use the event dispatcher
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 12:07:59 +01:00
Joas Schilling d3e8463de2
Use a different type for events and todos
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 12:07:59 +01:00
Joas Schilling 43b46bcc6a
Activities for events and todos
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 12:07:58 +01:00
Joas Schilling 07f6747305
Move the methods into a new class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 12:07:58 +01:00
Joas Schilling 776622f3de
Add activities for shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 12:07:58 +01:00
Joas Schilling 35ce4c772c
Fix unshare actions for author != owner
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 12:07:58 +01:00
Joas Schilling 9a7c522cc6
Add activity for unshare from group
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 12:07:58 +01:00
Joas Schilling 83d51afab1
Unshare user activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 12:07:57 +01:00
Joas Schilling 90578327d5
Start working on calendar activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-03 12:07:57 +01:00
Morris Jobke 9ebbb3c654 Merge pull request #1991 from nextcloud/code-check-more-shipped-apps
Run code checker on more shipped apps
2016-11-03 09:16:20 +01:00
Nextcloud bot 8471219b7c
[tx-robot] updated from transifex 2016-11-03 01:07:06 +00:00
Lukas Reschke ffba8297df
Run code checker on more shipped apps
Adds:
- sharebymail
- systemtags
- theming
- workflowengine

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-03 00:11:28 +01:00
Morris Jobke 39573e602d Merge pull request #1978 from nextcloud/remove-send-mail-option
Remove send mail option
2016-11-02 22:36:05 +01:00
Roeland Jago Douma a8d9bf48ff Merge pull request #1511 from nextcloud/master-kill-upload-limit
Remove upload_limit in files app as it is not needed with PUT upload
2016-11-02 21:24:10 +01:00
Bjoern Schiessle d235c4833f
remove the 'shareapi_allow_mail_notification' setting
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 21:17:05 +01:00
Vincent Petry 7e701504be
Remove upload_limit in files app as it is not needed with PUT upload (#26069)
The web UI now uses for PUT uploads which aren't restricted by PHP's
upload_max_filesize and post_max_size

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-02 20:43:35 +01:00
Lukas Reschke 50cb3a5e5a Merge pull request #1984 from nextcloud/improve-error-messages-federated-sharing
improved error messages in case federated sharing fails
2016-11-02 20:19:44 +01:00
Roeland Jago Douma 3bdec28dad Merge pull request #1971 from nextcloud/fix-checkbox-glitch
Fix checkbox left margin glitch
2016-11-02 20:02:36 +01:00
Bjoern Schiessle f556c58c22
remove 'send mail notification' option from sharing, replaced by send-by-mail feature
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:30:38 +01:00
Bjoern Schiessle 4623b70cc9
catch all exception and return a user friendly exception message
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 18:05:14 +01:00
Michael Grosser e81d04cd8d Merge pull request #1940 from nextcloud/new-appstore
Use new appstore API
2016-11-02 17:00:24 +00:00
John Molakvoæ bc5268bdc8
Fix #1782
Fix checkbox left margin glitch
Fix tests
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-02 15:07:24 +01:00
Morris Jobke ffebc050d0 Merge pull request #1887 from nextcloud/downstream-26370
Added functions to check etag of elements - integration tests
2016-11-02 14:57:45 +01:00
Roeland Jago Douma acf01b7f06 Merge pull request #1975 from nextcloud/federated-sharing-always-https-by-default
use https by default if no protocol is given.
2016-11-02 12:09:11 +01:00
Joas Schilling 7da3ba3f91 Merge pull request #657 from nextcloud/share-by-mail
New share provider: Share by mail
2016-11-02 11:04:33 +01:00
Bjoern Schiessle 76b1dee499
use https by default if no protocol is given. Only use unsecure connection if it is explicitely given
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-02 10:44:55 +01:00
Roeland Jago Douma e5bc45c349
Fix OCS API to be able to remove group shares from self as recipient
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-02 08:49:58 +01:00
Nextcloud bot 122fbf0092
[tx-robot] updated from transifex 2016-11-02 01:07:09 +00:00
Bjoern Schiessle f2b2b8d894
import exception
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:12:01 +01:00
Bjoern Schiessle 6e52091c8e
remove unused variable
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:11:30 +01:00
Bjoern Schiessle 32dbf32bc5
add new method getSharesInFolder(), see #339
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 20:05:09 +01:00
Bjoern Schiessle 16ec0f2177
add tests for the share-by-mail provider
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle 86b362809b
always show correct place holder, mention share by mail only if the share provider is enabled
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle ce08682c2f
enabled by default and add to shipped.json
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle 6d7520b1e2
unit tests updated and new added
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle 1e930df91f
find and show share-by mail links
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle 561dd80d57
don't show 'notify by mail' option or permissions not available for mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:41 +01:00
Bjoern Schiessle 31c8c38bd6
send mail for share-by-mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle 7436e45c91
if we have a exact match, either for the federated cloud id or for the
email address we only return the exact match. It is highly unlikely
that the exact same email address and federated cloud id exists

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle 392c8a115f
unified way to display remote shares and mail shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle 8c8a019b7e
show correct display name if we have the user in one of our address books
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle 60a3893ca8
improve search for federated cloud ids and email adresses
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle 77f74b9780
handle case if no share-by-mail share provider is loaded
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:54:40 +01:00
Bjoern Schiessle 96c40d14a1
update permissions
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
Bjoern Schiessle a17c6a485d
add share by mail share provider
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
Bjoern Schiessle 0a6f02801f
introduce share by mail, ui part
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-01 19:51:11 +01:00
Lukas Reschke ef467c3195 Merge pull request #339 from nextcloud/share-types-by-folder
Add getShareTypesInFolder to optimize folder listening
2016-11-01 18:44:00 +01:00
Roeland Jago Douma 7e2159e9bb
Add defaultShareProvider & federatedshareprovider tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-01 13:52:37 +01:00
Roeland Jago Douma fc4d0a86ef
Fix merging backend results
* Merge share types correctly
* Filter share types
* Order share types

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-01 12:16:05 +01:00
Nextcloud bot 20f45e6fe4
[tx-robot] updated from transifex 2016-11-01 01:06:57 +00:00