summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 time
| * Lock SCSS so we only run 1 job at a timeRoeland Jago Douma2019-07-123-20/+79
|/ | | | | | | | | This is bit hacky but a start to lock the SCSS compiler properly Retry during 10s then give up Properly get error message Do not clear locks and properly debug scss caching Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #16331 from nextcloud/feature/noid/talk-guest-mentionsRoeland Jago Douma2019-07-122-6/+25
|\ | | | | Allow guest mentions of talk to be parsed
| * Add a unit test for guests as wellJoas Schilling2019-07-111-4/+18
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Allow guest mentions of talk to be parsedJoas Schilling2019-07-101-2/+7
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [tx-robot] updated from transifexNextcloud bot2019-07-1270-146/+294
| |
* | Merge pull request #16361 from ↵Roeland Jago Douma2019-07-111-2/+22
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/drop-foreignkey-on-owncloud-migration Drop foreignkey on owncloud migration
| * | Drop foreign key before trying to drop the accounts tableJoas Schilling2019-07-111-2/+22
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #15514 from nextcloud/feature/noid/add-enterprise-channelMorris Jobke2019-07-1110-33/+121
|\ \ \ | |/ / |/| | Update channels for updater server
| * | Enterprise update channelMorris Jobke2019-07-1010-33/+121
| | | | | | | | | | | | | | | | | | Allows to select the enterprise update channel for instances that have a valid subscription. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | 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.13
| * | | [Security] Bump lodash from 4.17.11 to 4.17.13dependabot-preview[bot]2019-07-114-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.13. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.13) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #16256 from ↵Roeland Jago Douma2019-07-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/remove-white-space-from-personal-settings Remove vertical whitespace between entries in Personal settings
| * | | | Remove vertical whitespace between entries in Personal settingsGreta Doci2019-07-101-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | | | | Merge pull request #16349 from ↵Roeland Jago Douma2019-07-111-3/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/build/lodash-4.17.14 [Security] Bump lodash from 4.17.11 to 4.17.14 in /build
| * | | | | [Security] Bump lodash from 4.17.11 to 4.17.14 in /builddependabot-preview[bot]2019-07-111-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [lodash](https://github.com/lodash/lodash) from 4.17.11 to 4.17.14. **This update includes security fixes.** - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.11...4.17.14) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* / | | | [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
|\ \ \ \ | | | | | | | | | | Improve dark theme handling in workflow apps
| * | | | Use SCSS nestingJoas Schilling2019-07-101-68/+79
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Mover workflow to SCSS and support the dark themeJoas Schilling2019-07-101-6/+6
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #16323 from nextcloud/fix/s3/http1.1Roeland Jago Douma2019-07-101-0/+1
|\ \ \ \ | | | | | | | | | | Use HTTP1.1 to read S3 objects
| * | | | Use HTTP1.1 to read S3 objectsRoeland Jago Douma2019-07-101-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the READs otherwise use HTTP/1.0 which is not always supported by all backends. HTTP/1.1 is there since 1999 way longer than S3 so safe to assume it is always there IMO. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16313 from te-online/masterJohn Molakvoæ2019-07-101-1/+1
|\ \ \ \ | | | | | | | | | | Adjust stale bot message
| * | | | 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 ↵Thomas Ebert2019-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | labelled as `needs info`.
| * | | | Stale bot message – Fix plural of information. Include that not every ↵Thomas Ebert2019-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | stale issue is missing information.
* | | | | Merge pull request #16308 from nextcloud/fix/undefined-offset-0Morris Jobke2019-07-102-27/+33
|\ \ \ \ \ | | | | | | | | | | | | Prevent undefined offset 0 in findByUserIdOrMail
| * | | | | Return first value from $usersDaniel Kesselberg2019-07-092-27/+33
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Merge pull request #16322 from nextcloud/bugfix/noid/fix-workflow-handlebarsMorris Jobke2019-07-104-6/+7
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix files_automatedtagging settings
| * | | | | Bump bundlesJulius Härtl2019-07-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Make sure we merge webpack rules properlyJulius Härtl2019-07-102-4/+5
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | [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-Data
| * | | | | Don't send executionContexts for Clear-Site-DataDaniel Kesselberg2019-07-092-3/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are plans to remove executionContexts from the spec: https://github.com/w3c/webappsec-clear-site-data/issues/59 Firefox already removed it https://bugzilla.mozilla.org/show_bug.cgi?id=1548034 Chromium implementation is not finish: https://bugs.chromium.org/p/chromium/issues/detail?id=898503&q=clear-site-data&sort=-modified&colspec=ID%20Pri%20M%20Stars%20ReleaseBlock%20Component%20Status%20Owner%20Summary%20OS%20Modified Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #16206 from nextcloud/feature/remote-wipe-allRoeland Jago Douma2019-07-0914-48/+281
|\ \ \ \ \ | |_|/ / / |/| | | | Make it possible to wipe all tokens/devices of a user as (sub) admin
| * | | | Update testsRoeland Jago Douma2019-07-091-4/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Make it possible to wipe all tokens/devices of a userChristoph Wurst2019-07-0910-31/+171
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | Refactor: move remote wipe token logic to RW serviceChristoph Wurst2019-07-095-13/+97
|/ / / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #15881 from PhieF/toggle-password-loginRoeland Jago Douma2019-07-094-3/+25
|\ \ \ \ | | | | | | | | | | adding toggle password to be able to see it when login
| * | | | adding toggle password to be able to see itPhie2019-07-094-3/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Phie <phie@phie.ovh>
* | | | | Merge pull request #16307 from ↵Roeland Jago Douma2019-07-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/previewv1adapter-isAvailable Fix ProviderV1Adapter isAvailable wrapper
| * | | | | Fix ProviderV1Adapter isAvailable wrapperJulius Härtl2019-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #15867 from nextcloud/preview-versioningRoeland Jago Douma2019-07-094-17/+70
|\ \ \ \ \ \ | | | | | | | | | | | | | | allow keeping multiple preview "versions" of the same file
| * | | | | | allow keeping multiple preview "versions" of the same fileRobin Appelman2019-07-084-17/+70
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main use case here is storage provided versioning where we dont have separate file ids for all the versions, by allowing a prefix for the version we can store separate previews for all the versions. Additionally, by keeping all the version previews in the same folder as the "normal" previews they will be cleaned up properly when the file is deleted Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #15730 from nextcloud/enh/14179/event_for_cspRoeland Jago Douma2019-07-099-6/+167
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add an event to edit the CSP
| * | | | | | Add an event to edit the CSPRoeland Jago Douma2019-07-089-6/+167
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces and event that can be listend to when we actually use the CSP. This means that apps no longer have to always inject their CSP but only do so when it is required. Yay for being lazy. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #16301 from nextcloud/dep/js/markedRoeland Jago Douma2019-07-098-12/+12
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Bump marked to 0.7.0
| * | | | | Bump marked to 0.7.0Roeland Jago Douma2019-07-098-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | Merge pull request #16295 from nextcloud/csrftokenmanager-injectMorris Jobke2019-07-091-2/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | allow injecting CsrfTokenManager by class