Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | visually reflect sharing state of current folder | Christoph Wurst | 2016-11-07 | 1 | -1/+4 |
| | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | Fix the push state | Joas Schilling | 2016-11-07 | 1 | -1/+1 |
| | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-07 | 8 | -32/+94 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-06 | 4 | -0/+44 |
| | |||||
* | Merge pull request #2018 from nextcloud/firefox-svg-workaround | Morris Jobke | 2016-11-05 | 1 | -0/+11 |
|\ | | | | | Workaround for disappearing app icons for Firefox before version 51 | ||||
| * | Workaround for disappearing app icons for Firefox before version 51 | Julius Haertl | 2016-11-04 | 1 | -0/+11 |
| | | | | | | | | Signed-off-by: Julius Haertl <jus@bitgrid.net> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-05 | 6 | -0/+50 |
|/ | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-04 | 62 | -186/+230 |
| | |||||
* | Merge pull request #1109 from nextcloud/add-more-secrets-to-password-reset-link | Morris Jobke | 2016-11-03 | 2 | -5/+32 |
|\ | | | | | Use mail for encrypting the password reset token as well | ||||
| * | [WIP] Use mail for encrypting the password reset token as well | Lukas Reschke | 2016-11-03 | 2 | -5/+32 |
| | | |||||
* | | Add cache 1 day cache to preview endpoint | Roeland Jago Douma | 2016-11-03 | 1 | -2/+20 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | More tests | Roeland Jago Douma | 2016-11-03 | 1 | -7/+4 |
| | | | | | | | | | | | | | | | | | | * PreviewController test * PublicPreview test * Versions Preview test * Trash Preview test Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Move Ipreview to more of DI thingy | Roeland Jago Douma | 2016-11-03 | 1 | -27/+21 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Move file | Roeland Jago Douma | 2016-11-03 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Move preview endpoint to controller | Roeland Jago Douma | 2016-11-03 | 4 | -121/+125 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | Move to AppData | Roeland Jago Douma | 2016-11-03 | 2 | -4/+8 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | New preview generator | Roeland Jago Douma | 2016-11-03 | 3 | -10/+56 |
|/ | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | Merge pull request #1954 from nextcloud/issue_#1953 | Christoph Wurst | 2016-11-03 | 1 | -3/+3 |
|\ | | | | | #1953 add can to subshare options | ||||
| * | Fixes https://github.com/nextcloud/server/issues/1953 | Andreas Hechenberger | 2016-11-03 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Andreas Hechenberger <world@greenstation.de> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-03 | 62 | -632/+606 |
| | | |||||
* | | Merge pull request #1978 from nextcloud/remove-send-mail-option | Morris Jobke | 2016-11-02 | 10 | -423/+4 |
|\ \ | | | | | | | Remove send mail option | ||||
| * | | Remove from core.json | Roeland Jago Douma | 2016-11-02 | 1 | -1/+0 |
| | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
| * | | remove the 'shareapi_allow_mail_notification' setting | Bjoern Schiessle | 2016-11-02 | 1 | -1/+0 |
| | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | remove 'send mail notification' option from sharing, replaced by ↵ | Bjoern Schiessle | 2016-11-02 | 9 | -421/+4 |
| | | | | | | | | | | | | | | | | | | send-by-mail feature Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | Merge pull request #1347 from nextcloud/bring-back-remember-me | Morris Jobke | 2016-11-02 | 1 | -3/+8 |
|\ \ \ | | | | | | | | | fix remember me login | ||||
| * | | | bring back remember-me | Christoph Wurst | 2016-11-02 | 1 | -3/+8 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * try to reuse the old session token for remember me login * decrypt/encrypt token password and set the session id accordingly * create remember-me cookies only if checkbox is checked and 2fa solved * adjust db token cleanup to store remembered tokens longer * adjust unit tests Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> | ||||
* | | | Merge pull request #1940 from nextcloud/new-appstore | Michael Grosser | 2016-11-02 | 1 | -2/+3 |
|\ \ \ | |/ / |/| | | Use new appstore API | ||||
| * | | Fix tests | Lukas Reschke | 2016-10-31 | 1 | -2/+3 |
| | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch> | ||||
* | | | Merge pull request #657 from nextcloud/share-by-mail | Joas Schilling | 2016-11-02 | 4 | -24/+70 |
|\ \ \ | | | | | | | | | New share provider: Share by mail | ||||
| * | | | always show correct place holder, mention share by mail only if the share ↵ | Bjoern Schiessle | 2016-11-01 | 2 | -10/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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> | ||||
| * | | | don't show 'notify by mail' option or permissions not available for mail shares | Bjoern Schiessle | 2016-11-01 | 1 | -4/+11 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | unified way to display remote shares and mail shares | Bjoern Schiessle | 2016-11-01 | 2 | -8/+13 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | handle case if no share-by-mail share provider is loaded | Bjoern Schiessle | 2016-11-01 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | add share by mail share provider | Bjoern Schiessle | 2016-11-01 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
| * | | | introduce share by mail, ui part | Bjoern Schiessle | 2016-11-01 | 1 | -6/+20 |
| | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | | | | Merge pull request #1964 from ↵ | Roeland Jago Douma | 2016-11-02 | 1 | -2/+21 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | nextcloud/color-the-trusted-domain-to-alert-the-admin Color the trusted domain to alert the admin a bit more | ||||
| * | | | | Color the trusted domain to alert the admin a bit more | Joas Schilling | 2016-10-31 | 1 | -2/+21 |
| | |/ / | |/| | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | | | Merge pull request #1951 from nextcloud/settingsmaxheight | Roeland Jago Douma | 2016-11-02 | 1 | -0/+3 |
|\ \ \ \ | | | | | | | | | | | restricted the height of the settings area in core/css/apps.css | ||||
| * | | | | restricted the height of the settings area in core/css/apps.css to max 80% | pgys | 2016-10-29 | 1 | -0/+3 |
| | |_|/ | |/| | | | | | | | | | | Signed-off-by: pgys <info@pexlab.space> | ||||
* | | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-02 | 4 | -2/+40 |
| |_|/ |/| | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-11-01 | 62 | -2796/+2826 |
| |/ |/| | |||||
* | | Remove config.php for oc.js | Roeland Jago Douma | 2016-10-31 | 1 | -207/+0 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-31 | 2 | -0/+10 |
| | | |||||
* | | Merge pull request #1955 from nextcloud/issue_#1776 | Marius Blüm | 2016-10-30 | 2 | -4/+7 |
|\ \ | | | | | | | Issue-1776: Add unshare function to 3-dot menu. | ||||
| * | | Issue-1776: Add unshare function to 3-dot menu. | Julia Bode | 2016-10-29 | 2 | -4/+7 |
| | | | | | | | | | | | | Signed-off-by: Julia Bode <julia.bode@lulisaur.us> | ||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-30 | 2 | -2/+12 |
| |/ |/| | |||||
* | | Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10n | Lukas Reschke | 2016-10-29 | 4 | -4/+4 |
|\ \ | |/ |/| | Move away from legacy OC_L10N | ||||
| * | Move away from OC_L10N | Roeland Jago Douma | 2016-10-28 | 4 | -4/+4 |
| | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-10-29 | 2 | -0/+36 |
|/ |