summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10020 from nextcloud/bugfix/spreed-1007/email-address-mis...Roeland Jago Douma2018-06-271-2/+2
|\
| * Fix "parsing" of email-addresses in comments and chat messagesJoas Schilling2018-06-271-2/+2
* | Merge pull request #10018 from nextcloud/rakekniven-patch-2Roeland Jago Douma2018-06-273-3/+3
|\ \
| * | Compile appMorris Jobke2018-06-272-2/+2
| * | Update root.vuerakekniven2018-06-271-1/+1
* | | Merge pull request #10027 from nextcloud/feature/noid/settings-groupwareMorris Jobke2018-06-274-6/+11
|\ \ \
| * | | Add groupware settings sectionJulius Härtl2018-06-274-6/+11
| | |/ | |/|
* | | Merge pull request #10023 from nextcloud/bugfix/noid/class-name-already-in-useMorris Jobke2018-06-271-4/+0
|\ \ \ | |/ / |/| |
| * | Use the correct Base classJoas Schilling2018-06-271-4/+0
|/ /
* | Merge pull request #10016 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-06-272-10/+10
|\ \
| * | Bump webpack from 4.12.1 to 4.12.2 in /apps/accessibilitydependabot[bot]2018-06-272-10/+10
| |/
* | Merge pull request #10013 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/...Roeland Jago Douma2018-06-272-16/+11
|\ \
| * | Bump webpack from 4.12.1 to 4.12.2 in /apps/oauth2dependabot[bot]2018-06-272-16/+11
| |/
* | Merge pull request #10009 from nextcloud/techdebt/noid/replace-headers-with-h...Morris Jobke2018-06-2713-109/+45
|\ \
| * | Do not use HTTP code OC_Response constants anymoreMorris Jobke2018-06-265-26/+16
| * | Replace hardcoded status headers with calls to http_response_code()Morris Jobke2018-06-2612-83/+29
* | | Merge pull request #10019 from nextcloud/accessibility-skip-translatableMorris Jobke2018-06-271-2/+2
|\ \ \
| * | | Make skip navigation links translatableJan-Christoph Borchardt2018-06-271-2/+2
| | |/ | |/|
* / | [tx-robot] updated from transifexNextcloud bot2018-06-27388-13690/+13460
|/ /
* | Merge pull request #10015 from nextcloud/dependabot/npm_and_yarn/apps/updaten...Julius Härtl2018-06-272-16/+11
|\ \
| * | Bump webpack from 4.12.1 to 4.12.2 in /apps/updatenotificationdependabot[bot]2018-06-272-16/+11
|/ /
* | Merge pull request #10014 from nextcloud/dependabot/npm_and_yarn/settings/web...John Molakvoæ2018-06-272-16/+11
|\ \
| * | Bump webpack from 4.12.1 to 4.12.2 in /settingsdependabot[bot]2018-06-272-16/+11
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-06-2770-192/+312
* | Merge pull request #10005 from nextcloud/group-exists-errorMorris Jobke2018-06-261-1/+1
|\ \
| * | show error message when group existsRobin Appelman2018-06-261-1/+1
* | | Merge pull request #10007 from nextcloud/feature/noid/oauth_valid_redirect_uriMorris Jobke2018-06-265-12/+42
|\ \ \ | |_|/ |/| |
| * | Validate OAuth2 redirect uriRoeland Jago Douma2018-06-265-12/+42
| |/
* | Merge pull request #10004 from nextcloud/accessibility-skipMorris Jobke2018-06-262-0/+25
|\ \
| * | Add skip navigation / skip to content linksJan-Christoph Borchardt2018-06-262-0/+25
* | | Merge pull request #10006 from nextcloud/group-exists-detailsMorris Jobke2018-06-261-1/+1
|\ \ \
| * | | Fix groupExists when a backend provides group detailsRobin Appelman2018-06-261-1/+1
| | |/ | |/|
* | | Merge pull request #10003 from nextcloud/accessibility-package-deps-fixRoeland Jago Douma2018-06-264-1346/+5
|\ \ \ | |/ / |/| |
| * | Fix deps securityJohn Molakvoæ (skjnldsv)2018-06-264-1346/+5
* | | Merge pull request #10002 from nextcloud/docs/noid/phpdoc-putContent-resourceMorris Jobke2018-06-265-5/+5
|\ \ \ | |/ / |/| |
| * | Add resource type phpDoc for putContent methodsJulius Härtl2018-06-265-5/+5
| |/
* | Merge pull request #10000 from nextcloud/dependabot/npm_and_yarn/apps/accessi...Roeland Jago Douma2018-06-262-16/+11
|\ \
| * | Bump webpack from 4.12.0 to 4.12.1 in /apps/accessibilitydependabot[bot]2018-06-262-16/+11
* | | Merge pull request #9635 from nextcloud/smb-kerberosRobin Appelman2018-06-265-15/+76
|\ \ \ | |/ / |/| |
| * | Add support for using kerberos ticket to authenticate to smb serversRobin Appelman2018-06-225-15/+76
* | | Merge pull request #9999 from nextcloud/dependabot/npm_and_yarn/apps/accessib...Roeland Jago Douma2018-06-262-4/+4
|\ \ \
| * | | Bump webpack-cli from 3.0.4 to 3.0.8 in /apps/accessibilitydependabot[bot]2018-06-262-4/+4
* | | | Merge pull request #9995 from nextcloud/bugfix/noid/error-page-with-500-http-...Morris Jobke2018-06-266-60/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Server exception error pages by default with a 500 status codeMorris Jobke2018-06-265-44/+14
| * | | Server error/hint pages with a 500 error code to avoid it being seen instead ...Morris Jobke2018-06-266-17/+13
* | | | Merge pull request #9998 from nextcloud/dependabot/npm_and_yarn/apps/accessib...Roeland Jago Douma2018-06-262-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Bump webpack-merge from 4.1.2 to 4.1.3 in /apps/accessibilitydependabot[bot]2018-06-262-4/+4
| | |/ | |/|
* | | Merge pull request #9966 from nextcloud/resend-welcome-emailMorris Jobke2018-06-267-21/+82
|\ \ \
| * | | Resend activation email for new users as adminJohn Molakvoæ (skjnldsv)2018-06-267-21/+82
* | | | Merge pull request #9996 from nextcloud/bugfix/noid/Morikko-config-write-code...Morris Jobke2018-06-262-3/+9
|\ \ \ \ | |_|/ / |/| | |