Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Run code checker on more shipped apps | Lukas Reschke | 2016-11-03 | 1 | -1/+2 |
| | | | | | | | | | | Adds: - sharebymail - systemtags - theming - workflowengine Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | Merge pull request #1978 from nextcloud/remove-send-mail-option | Morris Jobke | 2016-11-02 | 9 | -30/+49 |
|\ | | | | | Remove send mail option | ||||
| * | remove the 'shareapi_allow_mail_notification' setting | Bjoern Schiessle | 2016-11-02 | 4 | -4/+47 |
| | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | remove 'send mail notification' option from sharing, replaced by ↵ | Bjoern Schiessle | 2016-11-02 | 5 | -26/+2 |
| | | | | | | | | | | | | send-by-mail feature Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | Merge pull request #1511 from nextcloud/master-kill-upload-limit | Roeland Jago Douma | 2016-11-02 | 6 | -37/+2 |
|\ \ | | | | | | | Remove upload_limit in files app as it is not needed with PUT upload | ||||
| * | | Remove upload_limit in files app as it is not needed with PUT upload (#26069) | Vincent Petry | 2016-11-02 | 6 | -37/+2 |
| | | | | | | | | | | | | | | | | | | | | | 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> | ||||
* | | | Merge pull request #1984 from nextcloud/improve-error-messages-federated-sharing | Lukas Reschke | 2016-11-02 | 2 | -8/+15 |
|\ \ \ | | | | | | | | | improved error messages in case federated sharing fails | ||||
| * | | | catch all exception and return a user friendly exception message | Bjoern Schiessle | 2016-11-02 | 2 | -8/+15 |
| |/ / | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | Merge pull request #1971 from nextcloud/fix-checkbox-glitch | Roeland Jago Douma | 2016-11-02 | 2 | -5/+5 |
|\ \ \ | |/ / |/| | | Fix checkbox left margin glitch | ||||
| * | | Fix #1782 | John Molakvoæ | 2016-11-02 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fix checkbox left margin glitch Fix tests fix unit tests Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
* | | | Merge pull request #1940 from nextcloud/new-appstore | Michael Grosser | 2016-11-02 | 4 | -27/+8 |
|\ \ \ | |/ / |/| | | Use new appstore API | ||||
| * | | Add update support | Lukas Reschke | 2016-10-31 | 1 | -2/+1 |
| | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Fix tests | Lukas Reschke | 2016-10-31 | 1 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
| * | | Use new appstore API | Lukas Reschke | 2016-10-31 | 2 | -24/+5 |
| | | | | | | | | | | | | | | | | | | This change introduces the new appstore API in Nextcloud. Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | Merge pull request #1887 from nextcloud/downstream-26370 | Morris Jobke | 2016-11-02 | 1 | -2/+8 |
|\ \ \ | | | | | | | | | Added functions to check etag of elements - integration tests | ||||
| * | | | Fix OCS API to be able to remove group shares from self as recipient | Roeland Jago Douma | 2016-11-02 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | Merge pull request #1975 from ↵ | Roeland Jago Douma | 2016-11-02 | 4 | -38/+66 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | nextcloud/federated-sharing-always-https-by-default use https by default if no protocol is given. | ||||
| * | | | use https by default if no protocol is given. Only use unsecure connection ↵ | Bjoern Schiessle | 2016-11-02 | 4 | -38/+66 |
| |/ / | | | | | | | | | | | | | | | | if it is explicitely given Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | Merge pull request #657 from nextcloud/share-by-mail | Joas Schilling | 2016-11-02 | 14 | -263/+1919 |
|\ \ \ | |/ / |/| | | New share provider: Share by mail | ||||
| * | | import exception | Bjoern Schiessle | 2016-11-01 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | remove unused variable | Bjoern Schiessle | 2016-11-01 | 1 | -1/+0 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | add new method getSharesInFolder(), see #339 | Bjoern Schiessle | 2016-11-01 | 2 | -1/+84 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | add tests for the share-by-mail provider | Bjoern Schiessle | 2016-11-01 | 2 | -8/+622 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | always show correct place holder, mention share by mail only if the share ↵ | Bjoern Schiessle | 2016-11-01 | 3 | -0/+126 |
| | | | | | | | | | | | | | | | | | | provider is enabled Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | enabled by default and add to shipped.json | Bjoern Schiessle | 2016-11-01 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | unit tests updated and new added | Bjoern Schiessle | 2016-11-01 | 4 | -186/+159 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | find and show share-by mail links | Bjoern Schiessle | 2016-11-01 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | don't show 'notify by mail' option or permissions not available for mail shares | Bjoern Schiessle | 2016-11-01 | 2 | -2/+3 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | send mail for share-by-mail shares | Bjoern Schiessle | 2016-11-01 | 3 | -6/+177 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | if we have a exact match, either for the federated cloud id or for the | Bjoern Schiessle | 2016-11-01 | 1 | -26/+41 |
| | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | unified way to display remote shares and mail shares | Bjoern Schiessle | 2016-11-01 | 2 | -2/+4 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | show correct display name if we have the user in one of our address books | Bjoern Schiessle | 2016-11-01 | 1 | -4/+24 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | improve search for federated cloud ids and email adresses | Bjoern Schiessle | 2016-11-01 | 1 | -8/+58 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | handle case if no share-by-mail share provider is loaded | Bjoern Schiessle | 2016-11-01 | 2 | -1/+11 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | update permissions | Bjoern Schiessle | 2016-11-01 | 2 | -2/+10 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | add share by mail share provider | Bjoern Schiessle | 2016-11-01 | 3 | -1/+626 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | introduce share by mail, ui part | Bjoern Schiessle | 2016-11-01 | 1 | -67/+23 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-02 | 16 | -0/+70 |
|/ / | |||||
* | | Merge pull request #339 from nextcloud/share-types-by-folder | Lukas Reschke | 2016-11-01 | 4 | -4/+138 |
|\ \ | | | | | | | Add getShareTypesInFolder to optimize folder listening | ||||
| * | | Add defaultShareProvider & federatedshareprovider tests | Roeland Jago Douma | 2016-11-01 | 1 | -0/+45 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Fix merging backend results | Roeland Jago Douma | 2016-11-01 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Merge share types correctly * Filter share types * Order share types Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Add remoteprovider getsharesinfolder function | Roeland Jago Douma | 2016-10-31 | 1 | -2/+40 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | Add getShareTypesInFolder to optimize folder listening | Robin Appelman | 2016-10-31 | 3 | -4/+52 |
| |/ | | | | | | | Signed-off-by: Robin Appelman <icewind@owncloud.com> | ||||
* / | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-01 | 22 | -42/+290 |
|/ | |||||
* | Merge pull request #1935 from nextcloud/downstream-ldap-26 | Lukas Reschke | 2016-10-31 | 1 | -1/+1 |
|\ | | | | | Add prefix to the connection | ||||
| * | Add prefix to the connection | Juan Pablo Villafáñez | 2016-10-27 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | | Merge pull request #1903 from nextcloud/fix-log-in-button | Lukas Reschke | 2016-10-31 | 2 | -10/+3 |
|\ \ | | | | | | | remove slight transparency of primary action button, ref #1615 | ||||
| * | | also fix log in button confirm arrow when theming, fix #1615 | Jan-Christoph Borchardt | 2016-10-25 | 2 | -0/+3 |
| | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
| * | | remove slight transparency of primary action button, ref #1615 | Jan-Christoph Borchardt | 2016-10-25 | 2 | -10/+0 |
| | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-31 | 24 | -10/+96 |
| | | |