summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Bump bundlesJulius Härtl2019-07-102-2/+2
| * | | | | Make sure we merge webpack rules properlyJulius Härtl2019-07-102-4/+5
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2019-07-108-0/+8
* | | | | Merge pull request #16310 from nextcloud/enh/drop-execution-contextRoeland Jago Douma2019-07-092-3/+3
|\ \ \ \ \
| * | | | | Don't send executionContexts for Clear-Site-DataDaniel Kesselberg2019-07-092-3/+3
| |/ / / /
* | | | | Merge pull request #16206 from nextcloud/feature/remote-wipe-allRoeland Jago Douma2019-07-0914-48/+281
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update testsRoeland Jago Douma2019-07-091-4/+13
| * | | | Make it possible to wipe all tokens/devices of a userChristoph Wurst2019-07-0910-31/+171
| * | | | Refactor: move remote wipe token logic to RW serviceChristoph Wurst2019-07-095-13/+97
|/ / / /
* | | | Merge pull request #15881 from PhieF/toggle-password-loginRoeland Jago Douma2019-07-094-3/+25
|\ \ \ \
| * | | | adding toggle password to be able to see itPhie2019-07-094-3/+25
* | | | | Merge pull request #16307 from nextcloud/bugfix/noid/previewv1adapter-isAvail...Roeland Jago Douma2019-07-091-1/+1
|\ \ \ \ \
| * | | | | Fix ProviderV1Adapter isAvailable wrapperJulius Härtl2019-07-091-1/+1
* | | | | | Merge pull request #15867 from nextcloud/preview-versioningRoeland Jago Douma2019-07-094-17/+70
|\ \ \ \ \ \
| * | | | | | allow keeping multiple preview "versions" of the same fileRobin Appelman2019-07-084-17/+70
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #15730 from nextcloud/enh/14179/event_for_cspRoeland Jago Douma2019-07-099-6/+167
|\ \ \ \ \ \
| * | | | | | Add an event to edit the CSPRoeland Jago Douma2019-07-089-6/+167
| |/ / / / /
* | | | | | Merge pull request #16301 from nextcloud/dep/js/markedRoeland Jago Douma2019-07-098-12/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Bump marked to 0.7.0Roeland Jago Douma2019-07-098-12/+12
* | | | | | Merge pull request #16295 from nextcloud/csrftokenmanager-injectMorris Jobke2019-07-091-2/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | allow injecting CsrfTokenManager by classRobin Appelman2019-07-091-2/+3
| |/ / / /
* | | | | Merge pull request #16195 from nextcloud/bugfix/7556/smb-symlink-share-mtimeRoeland Jago Douma2019-07-091-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Ignore forbidden exception when fetching share mtime on SMB for symlinksMorris Jobke2019-07-081-0/+2
* | | | | Merge pull request #16300 from nextcloud/deps/js/babelRoeland Jago Douma2019-07-094-322/+174
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Update babel depsRoeland Jago Douma2019-07-084-322/+174
| |/ / /
* / / / [tx-robot] updated from transifexNextcloud bot2019-07-0940-34/+22
|/ / /
* | | Merge pull request #16292 from nextcloud/techdebt/noid/cleanup-outdated-repai...Roeland Jago Douma2019-07-0810-1130/+0
|\ \ \