Skip to content
This repository has been archived by the owner on Dec 3, 2017. It is now read-only.

Feature/gitignore #12

Merged
merged 2 commits into from
Oct 13, 2017
Merged

Feature/gitignore #12

merged 2 commits into from
Oct 13, 2017

Conversation

lsjroberts
Copy link
Collaborator

Fixes #10.

Nothing in media/content/ is now tracked, except the icon.svg so that users have a default avatar. However since that is unlikely to change frequently this shouldn't cause conflicts.

When you pull, the files deleted here should remain in your local directory.

Also, when a new user opens the site for the first time it will create a portal.json with:

{
  name: "new_name",
  desc: "new_desc",
  port: [
    // @neauoire
    "dat://2f21e3c122ef0f2555d3a99497710cd875c7b0383f998a2d37c02c042d598485/"
  ],
  feed: [],
  site: "",
  dat: ""
}

@neauoire neauoire merged commit 2d46ce3 into Rotonde:master Oct 13, 2017
@neauoire
Copy link
Contributor

That's a much better behaviour! Thank you!

@lsjroberts lsjroberts deleted the feature/gitignore branch October 13, 2017 22:04
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants