aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16334 from nextcloud/feature/noid/enterprise-logoRoeland Jago Douma2019-07-156-0/+122
|\
| * Add enterprise logoMorris Jobke2019-07-156-0/+122
* | Merge pull request #16390 from nextcloud/dependabot/npm_and_yarn/nextcloud-vu...Roeland Jago Douma2019-07-158-66/+23
|\ \
| * | Bump nextcloud-vue-collections from 0.5.2 to 0.5.4dependabot-preview[bot]2019-07-148-69/+26
* | | Merge pull request #16404 from nextcloud/dependabot/npm_and_yarn/babel/core-7...Roeland Jago Douma2019-07-154-11/+11
|\ \ \
| * | | Bump @babel/core from 7.5.0 to 7.5.4dependabot-preview[bot]2019-07-154-14/+14
| |/ /
* | | Merge pull request #16369 from nextcloud/rename-parameter-in-ocp-toast-for-co...Morris Jobke2019-07-159-16/+21
|\ \ \
| * | | Rename parameter in OCP.Toast for consistency with OC.NotificationDaniel Calviño Sánchez2019-07-129-16/+21
* | | | Merge pull request #16399 from nextcloud/improvement/noid/fulltextsearch-simp...Morris Jobke2019-07-155-0/+349
|\ \ \ \
| * | | | new model to manage some simple queriesMaxence Lange2019-07-145-0/+349
* | | | | Merge pull request #16400 from nextcloud/bugfix/noid/fixing-addsubtagRoeland Jago Douma2019-07-151-1/+6
|\ \ \ \ \
| * | | | | addsubtag should push to arrayMaxence Lange2019-07-141-1/+6
| |/ / / /
* | | | | Merge pull request #16394 from nextcloud/dependabot/npm_and_yarn/babel/preset...Roeland Jago Douma2019-07-152-19/+19
|\ \ \ \ \
| * | | | | Bump @babel/preset-env from 7.5.2 to 7.5.4dependabot-preview[bot]2019-07-142-22/+22
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexNextcloud bot2019-07-154-8/+8
| |/ / / |/| | |
* | | | Merge pull request #16389 from nextcloud/dependabot/npm_and_yarn/webpack-4.35.3Roeland Jago Douma2019-07-142-15/+8
|\ \ \ \
| * | | | Bump webpack from 4.35.2 to 4.35.3dependabot-preview[bot]2019-07-142-18/+11
| |/ / /
* | | | Merge pull request #16385 from nextcloud/dependabot/npm_and_yarn/lodash-4.17.14Roeland Jago Douma2019-07-144-10/+10
|\ \ \ \
| * | | | Bump lodash from 4.17.13 to 4.17.14dependabot-preview[bot]2019-07-144-10/+10
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2019-07-1424-44/+106
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2019-07-1320-4/+34
* | | Merge pull request #15794 from nextcloud/fix/scss_lockingRoeland Jago Douma2019-07-123-20/+79
|\ \ \ | |/ / |/| |
| * | Lock SCSS so we only run 1 job at a timeRoeland Jago Douma2019-07-123-20/+79
|/ /
* | Merge pull request #16331 from nextcloud/feature/noid/talk-guest-mentionsRoeland Jago Douma2019-07-122-6/+25
|\ \
| * | Add a unit test for guests as wellJoas Schilling2019-07-111-4/+18
| * | Allow guest mentions of talk to be parsedJoas Schilling2019-07-101-2/+7
* | | [tx-robot] updated from transifexNextcloud bot2019-07-1270-146/+294
* | | Merge pull request #16361 from nextcloud/bugfix/noid/drop-foreignkey-on-owncl...Roeland Jago Douma2019-07-111-2/+22
|\ \ \ | |_|/ |/| |
| * | Drop foreign key before trying to drop the accounts tableJoas Schilling2019-07-111-2/+22
* | | Merge pull request #15514 from nextcloud/feature/noid/add-enterprise-channelMorris Jobke2019-07-1110-33/+121
|\ \ \ | |/ / |/| |
| * | Enterprise update channelMorris Jobke2019-07-1010-33/+121
* | | Merge pull request #16343 from nextcloud/dependabot/npm_and_yarn/lodash-4.17.13Roeland Jago Douma2019-07-114-8/+8
|\ \ \
| * | | [Security] Bump lodash from 4.17.11 to 4.17.13dependabot-preview[bot]2019-07-114-8/+8
* | | | Merge pull request #16256 from nextcloud/bugfix/noid/remove-white-space-from-...Roeland Jago Douma2019-07-111-2/+2
|\ \ \ \
| * | | | Remove vertical whitespace between entries in Personal settingsGreta Doci2019-07-101-2/+2
* | | | | Merge pull request #16349 from nextcloud/dependabot/npm_and_yarn/build/lodash...Roeland Jago Douma2019-07-111-3/+3
|\ \ \ \ \
| * | | | | [Security] Bump lodash from 4.17.11 to 4.17.14 in /builddependabot-preview[bot]2019-07-111-3/+3
| | |/ / / | |/| | |
* / | | | [tx-robot] updated from transifexNextcloud bot2019-07-1134-56/+78
|/ / / /
* | | | Merge pull request #16324 from nextcloud/bugfix/noid/workflow-dark-themeRoeland Jago Douma2019-07-102-75/+86
|\ \ \ \
| * | | | Use SCSS nestingJoas Schilling2019-07-101-68/+79
| * | | | Mover workflow to SCSS and support the dark themeJoas Schilling2019-07-101-6/+6
| | |_|/ | |/| |
* | | | Merge pull request #16323 from nextcloud/fix/s3/http1.1Roeland Jago Douma2019-07-101-0/+1
|\ \ \ \
| * | | | Use HTTP1.1 to read S3 objectsRoeland Jago Douma2019-07-101-0/+1
| |/ / /
* | | | Merge pull request #16313 from te-online/masterJohn Molakvoæ2019-07-101-1/+1
|\ \ \ \
| * | | | Stale Bot message – Revert to old phrasing. Remove `it`.Thomas Ebert2019-07-101-1/+1
| * | | | Stale bot message – Take into account that stale bot only acts on issues la...Thomas Ebert2019-07-091-1/+1
| * | | | Stale bot message – Fix plural of information. Include that not every stal...Thomas Ebert2019-07-091-1/+1
* | | | | Merge pull request #16308 from nextcloud/fix/undefined-offset-0Morris Jobke2019-07-102-27/+33
|\ \ \ \ \
| * | | | | Return first value from $usersDaniel Kesselberg2019-07-092-27/+33
* | | | | | Merge pull request #16322 from nextcloud/bugfix/noid/fix-workflow-handlebarsMorris Jobke2019-07-104-6/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |