summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge pull request #1929 from nextcloud/share_email_to_OCSLukas Reschke2016-10-273-63/+0
|\
| * Remove notify recipient optionRoeland Jago Douma2016-10-263-63/+0
* | Merge pull request #1930 from nextcloud/fix_avatars_exifLukas Reschke2016-10-271-0/+1
|\ \
| * | Fix avatar on exif rotated imagesRoeland Jago Douma2016-10-261-0/+1
| |/
* / [tx-robot] updated from transifexNextcloud bot2016-10-274-0/+16
|/
* [tx-robot] updated from transifexNextcloud bot2016-10-266-0/+24
* Missing returns + autoloader fileLukas Reschke2016-10-251-0/+2
* Inlince oc.js if possible!Roeland Jago Douma2016-10-253-0/+15
* Move oc.js to a proper classRoeland Jago Douma2016-10-252-3/+91
* Merge pull request #1891 from nextcloud/downstream-26430Lukas Reschke2016-10-251-3/+3
|\
| * add upgrade command before repair, handle NeedsUpgradeExcaption betterJörn Friedrich Dreyer2016-10-241-3/+3
* | Merge pull request #1871 from nextcloud/use-csp-noncesMorris Jobke2016-10-253-3/+3
|\ \
| * | Add ContentSecurityPolicyNonceManagerLukas Reschke2016-10-243-3/+3
| * | Add support for CSP noncesLukas Reschke2016-10-243-3/+3
| |/
* | [tx-robot] updated from transifexNextcloud bot2016-10-2562-68/+86
* | Merge pull request #1452 from nextcloud/appconfig-endpointJoas Schilling2016-10-257-110/+175
|\ \
| * | Fix missing semicolonJoas Schilling2016-10-241-1/+1
| * | Make AppConfig part of the public APIJoas Schilling2016-10-217-110/+175
* | | Merge pull request #1283 from nextcloud/us_files-ui-webdav-uploadLukas Reschke2016-10-253-1/+127
|\ \ \