summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Fix the push stateJoas Schilling2016-11-071-1/+1
* [tx-robot] updated from transifexNextcloud bot2016-11-078-32/+94
* [tx-robot] updated from transifexNextcloud bot2016-11-064-0/+44
* Merge pull request #2018 from nextcloud/firefox-svg-workaroundMorris Jobke2016-11-051-0/+11
|\
| * Workaround for disappearing app icons for Firefox before version 51Julius Haertl2016-11-041-0/+11
* | [tx-robot] updated from transifexNextcloud bot2016-11-056-0/+50
|/
* [tx-robot] updated from transifexNextcloud bot2016-11-0462-186/+230
* Merge pull request #1109 from nextcloud/add-more-secrets-to-password-reset-linkMorris Jobke2016-11-032-5/+32
|\
| * [WIP] Use mail for encrypting the password reset token as wellLukas Reschke2016-11-032-5/+32
* | Add cache 1 day cache to preview endpointRoeland Jago Douma2016-11-031-2/+20
* | More testsRoeland Jago Douma2016-11-031-7/+4
* | Move Ipreview to more of DI thingyRoeland Jago Douma2016-11-031-27/+21
* | Move fileRoeland Jago Douma2016-11-031-1/+1
* | Move preview endpoint to controllerRoeland Jago Douma2016-11-034-121/+125
* | Move to AppDataRoeland Jago Douma2016-11-032-4/+8
* | New preview generatorRoeland Jago Douma2016-11-033-10/+56
|/
* Merge pull request #1954 from nextcloud/issue_#1953Christoph Wurst2016-11-031-3/+3
|\
| * Fixes https://github.com/nextcloud/server/issues/1953Andreas Hechenberger2016-11-031-3/+3
* | [tx-robot] updated from transifexNextcloud bot2016-11-0362-632/+606
* | Merge pull request #1978 from nextcloud/remove-send-mail-optionMorris Jobke2016-11-0210-423/+4
|\ \
| * | Remove from core.jsonRoeland Jago Douma2016-11-021-1/+0
| * | remove the 'shareapi_allow_mail_notification' settingBjoern Schiessle2016-11-021-1/+0
| * | remove 'send mail notification' option from sharing, replaced by send-by-mail...Bjoern Schiessle2016-11-029-421/+4
* | | Merge pull request #1347 from nextcloud/bring-back-remember-meMorris Jobke2016-11-021-3/+8
|\ \ \
| * | | bring back remember-meChristoph Wurst2016-11-021-3/+8
| |/ /
* | | Merge pull request #1940 from nextcloud/new-appstoreMichael Grosser2016-11-021-2/+3
|\ \ \ | |/ / |/| |
| * | Fix testsLukas Reschke2016-10-311-2/+3
* | | Merge pull request #657 from nextcloud/share-by-mailJoas Schilling2016-11-024-24/+70
|\ \ \
| * | | always show correct place holder, mention share by mail only if the share pro...Bjoern Schiessle2016-11-012-10/+25
| * | | enabled by default and add to shipped.jsonBjoern Schiessle2016-11-011-0/+1
| * | | don't show 'notify by mail' option or permissions not available for mail sharesBjoern Schiessle2016-11-011-4/+11
| * | | unified way to display remote shares and mail sharesBjoern Schiessle2016-11-012-8/+13
| * | | handle case if no share-by-mail share provider is loadedBjoern Schiessle2016-11-011-1/+5
| * | | add share by mail share providerBjoern Schiessle2016-11-011-6/+6
| * | | introduce share by mail, ui partBjoern Schiessle2016-11-011-6/+20
* | | | Merge pull request #1964 from nextcloud/color-the-trusted-domain-to-alert-the...Roeland Jago Douma2016-11-021-2/+21
|\ \ \ \
| * | | | Color the trusted domain to alert the admin a bit moreJoas Schilling2016-10-311-2/+21
| | |/ / | |/| |
* | | | Merge pull request #1951 from nextcloud/settingsmaxheightRoeland Jago Douma2016-11-021-0/+3
|\ \ \ \
| * | | | restricted the height of the settings area in core/css/apps.css to max 80%pgys2016-10-291-0/+3
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2016-11-024-2/+40
| |_|/ |/| |
* | | [tx-robot] updated from transifexNextcloud bot2016-11-0162-2796/+2826
| |/ |/|
* | Remove config.php for oc.jsRoeland Jago Douma2016-10-311-207/+0
* | [tx-robot] updated from transifexNextcloud bot2016-10-312-0/+10
* | Merge pull request #1955 from nextcloud/issue_#1776Marius Blüm2016-10-302-4/+7
|\ \
| * | Issue-1776: Add unshare function to 3-dot menu.Julia Bode2016-10-292-4/+7
* | | [tx-robot] updated from transifexNextcloud bot2016-10-302-2/+12
| |/ |/|
* | Merge pull request #1948 from nextcloud/move_away_lagacy_oc_l10nLukas Reschke2016-10-294-4/+4
|\ \ | |/ |/|
| * Move away from OC_L10NRoeland Jago Douma2016-10-284-4/+4
* | [tx-robot] updated from transifexNextcloud bot2016-10-292-0/+36
|/
* [tx-robot] updated from transifexNextcloud bot2016-10-2862-62/+68