Skip to content

Conversation

@michielbdejong
Copy link
Member

@jaxoncreed @angelo-v should we merge dev into master?

bourgeoa and others added 17 commits November 19, 2019 23:14
mime-type named container gets mime-type
Making use of the new context object
Upgraded to mashlib@1.2.1
Updated default node version to 13.2.0
tweaked markup and punctuation for readability
Build production ready docker-image
In the latest npm, node_modules is flattened, so it shouldn't be located based on the location of solid-server.

This solves #1382
Get valid mashlib html file location
@linonetwo
Copy link
Contributor

linonetwo commented Jan 22, 2020

I really need it...I'm tired of modifying files in node_modules.

@kjetilk
Copy link
Member

kjetilk commented Jan 22, 2020

FWIW, when I developed, we stopped using a dev branch, had feature branches of course, but released off master and merged onto a released branch, which then behaves like the current master.

@linonetwo
Copy link
Contributor

linonetwo commented Jan 25, 2020

I'm making an electron app that start a local server, I really need a new npm release!

The version in npm always errors ENOENT: no such file or directory, stat '/Users/linonetwo/repo/solid-box/node_modules/solid-server/node_modules/mashlib/dist/index.html' !

@mikeadams1
Copy link

we stopped using a dev branch, had feature branches of course, but released off master and merged onto a released branch, which then behaves like the current master.

I am confused, so are there numerous NSS repos that are not visible to the general public and those are whats being worked on? I did not see any updates on the alleged NSS master? and not sure what /tree/dev is, can you help me understand that?

@kjetilk
Copy link
Member

kjetilk commented Jan 25, 2020

we stopped using a dev branch, had feature branches of course, but released off master and merged onto a released branch, which then behaves like the current master.

I am confused, so are there numerous NSS repos that are not visible to the general public and those are whats being worked on? I did not see any updates on the alleged NSS master? and not sure what /tree/dev is, can you help me understand that?

No, there's just one repo, but the nature of git is so that you can branch off any way and anywhere, it is completely decentralised. Typically, a developer will work on their own branch, and then submit a Pull Request to some more authoritative branch, so projects prefer to use the default master branch for that, some prefer a dev branch, some have more complex arrangements. If you look at the "Insights" tab, you find a lot of information about this, for example, all the branches that have been pushed way back to github (which is kind of a central hub in the decentralised git), can be seen here: https://github.com/solid/node-solid-server/network

Copy link
Contributor

@jaxoncreed jaxoncreed left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready for release

@jaxoncreed jaxoncreed merged commit ca5bffb into master Jan 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.