Diaspora code for the diasp.org pod
Ruby JavaScript HTML Gherkin CSS Shell
Pull request Compare This branch is 1502 commits ahead of diaspora:master.
Latest commit a6b624c Jan 27, 2017 @dmorley dmorley Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/assets/javascripts/app/views/publisher/uploader_view.js
Permalink
Failed to load latest commit information.
app Merge remote-tracking branch 'upstream/master' Jan 27, 2017
bin Merge branch 'stable' into develop Dec 31, 2015
config Merge remote-tracking branch 'upstream/master' Jan 27, 2017
db Schedule a connection-check when receiving a message from an offline pod Nov 6, 2016
features Merge remote-tracking branch 'upstream/master' Jan 27, 2017
graphics Redesign default.haml and add a podmin welcome page Jun 20, 2016
lib Merge remote-tracking branch 'upstream/master' Jan 27, 2017
public updates Nov 29, 2016
script Merge remote-tracking branch 'upstream/master' Jan 27, 2017
spec Merge remote-tracking branch 'upstream/master' Jan 27, 2017
tmp/pids ensure tmp/pids exists [ci skip] May 21, 2015
vendor Merge remote-tracking branch 'upstream/master' Dec 14, 2016
.codeclimate.yml add CodeClimate config Jul 5, 2016
.editorconfig add editorconfig Feb 14, 2015
.eslintrc Change eslint indentation rule for var, let and const Aug 7, 2016
.foreman Add vines as foreman task Nov 13, 2014
.gitignore Add .wti to .gitignore Jan 15, 2017
.haml-lint.yml add haml-lint Aug 23, 2015
.pronto.yml Configure pronto to ignore files in vendor and consolidate comments Aug 9, 2016
.rspec require spec_helper in .rspec Nov 27, 2016
.rubocop.yml Update Rubocop config May 12, 2016
.ruby-gemset Replace .rvmrc by .ruby-version Mar 24, 2014
.ruby-version Recommend Ruby 2.3, keep Ruby 2.1 as supported Aug 5, 2016
.scss-lint.yml Enforce comments before temporary linter rule changes Feb 6, 2016
.slugignore added a few more files to ignore for the slugignore [ci skip] Jan 16, 2012
.travis.yml Merge remote-tracking branch 'upstream/master' Aug 27, 2016
AUTHORS Update AUTHORS file Sep 14, 2015
CODE_OF_CONDUCT.md Update Contributor Covenant to v1.4.0 Jun 19, 2016
COPYRIGHT remove unused social media logos and add attribution May 29, 2015
Changelog.md Enable locales: de-CH, gd, and oc Jan 23, 2017
FederationProcfile basic federation profile testing stuff Feb 19, 2012
Gemfile Merge remote-tracking branch 'upstream/master' Jan 27, 2017
Gemfile.lock Merge remote-tracking branch 'upstream/master' Jan 27, 2017
Guardfile Remove deprecated guard-cucumber arguments Jun 19, 2016
LICENSE Rename GNU-AGPL-3.0 to LICENSE Sep 25, 2016
Procfile replace foreman with eye May 19, 2015
README.md Rename 'stable' to 'next-minor' Aug 21, 2016
Rakefile Bye Resque. Ohai Sidekiq. Mar 21, 2013
browserlist clean and fix adminpanel Oct 29, 2016
config.ru Add secure_header gem to add some security related headers Sep 30, 2016
redis-integration1.conf seperate and move redis dump files so they don't mess with installed … May 8, 2012
redis-integration2.conf seperate and move redis dump files so they don't mess with installed … May 8, 2012

README.md

diaspora*

A privacy-aware, distributed, open source social network

master: Build Status master next-minor: Build Status next-minor Coverage Status next-minor| develop: Build Status develop Coverage Status develop | Dependency Status Code Climate

Project site | Wiki | Bugtracker | Discussions | Mailing lists | License | Authors

Installation

You don't have to install diaspora* to use the network. There are many servers connected to diaspora*s network which are open to anyone, and you can create an account on one of these servers. Have a look at our tips for finding a home, or you can just go straight to the list of open servers to sign up.

Want to own your data and install diaspora*? Whether you just want to try it out, want to install it on your server or want to contribute and need a development setup, our installation guides will get you started!

Questions?

Have a look at our FAQs for users, for pod administrators or for developers.

Still haven't found an answer? Talk to us! Read how we communicate. We're here to answer all your questions.

Contribute

To keep diaspora* growing and improving we need all help we can get. Whether you can contribute code, ideas, translations, bug reports or simply extend the community as a helpful user or pod administrator, your help is welcome!

Everyone interacting in diaspora’s codebases, issue trackers, chat rooms, mailing lists, the wiki, and the Loomio group is expected to follow the diaspora* code of conduct.

Security

Found a security issue? Please disclose it responsibly. We have a team of developers listening to security@diasporafoundation.org. The PGP fingerprint is AB0D AB02 0FC5 D398 03AB 3CE1 6F70 243F 27AD 886A.