Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 |
| | | | |||||
* | | | Merge pull request #1955 from nextcloud/issue_#1776 | Marius Blüm | 2016-10-30 | 1 | -2/+6 |
|\ \ \ | | | | | | | | | Issue-1776: Add unshare function to 3-dot menu. | ||||
| * | | | Issue-1776: Add unshare function to 3-dot menu. | Julia Bode | 2016-10-29 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Julia Bode <julia.bode@lulisaur.us> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-30 | 12 | -0/+52 |
| | | | | |||||
* | | | | Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n | Lukas Reschke | 2016-10-29 | 15 | -28/+26 |
|\ \ \ \ | |/ / / |/| | | | Move away from legacy OC_L10N | ||||
| * | | | Use OCP\\IL10N in tests too | Morris Jobke | 2016-10-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de> | ||||
| * | | | Fix more tests | Roeland Jago Douma | 2016-10-28 | 2 | -15/+13 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | | Move away from OC_L10N | Roeland Jago Douma | 2016-10-28 | 12 | -12/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-29 | 16 | -8/+98 |
| | | | | |||||
* | | | | Merge pull request #1926 from nextcloud/fix-comment-mentions-in-activities | Morris Jobke | 2016-10-28 | 1 | -0/+25 |
|\ \ \ \ | |/ / / |/| | | | Fix comment mentions in activities | ||||
| * | | | Fix comment mentions in activities | Joas Schilling | 2016-10-28 | 1 | -0/+25 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | introduce callForSeenUsers and countSeenUsers (#26361) | Jörn Friedrich Dreyer | 2016-10-28 | 4 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * introduce callForSeenUsers and countSeenUsers * add tests * oracle should support not null on clob * since 9.2.0 | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-28 | 58 | -114/+274 |
| | | | | |||||
* | | | | Merge pull request #1800 from nextcloud/nextcloud-rich-object-strings | Morris Jobke | 2016-10-27 | 2 | -6/+129 |
|\ \ \ \ | |_|_|/ |/| | | | Nextcloud rich object strings | ||||
| * | | | Move federated share notifications to ROS | Joas Schilling | 2016-10-20 | 2 | -6/+129 |
| | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-27 | 20 | -44/+124 |
| |/ / |/| | | |||||
* | | | Merge pull request #1738 from ↵ | Morris Jobke | 2016-10-26 | 9 | -179/+307 |
|\ \ \ | | | | | | | | | | | | | | | | | nextcloud/comments-provide-displaynames-with-mentions comment mentions: show displayname not uid |