No description
Find a file
Fabian Rodriguez c339090f6e Merge branch 'release/0.2.0.1' into develop
Conflicts:
	Changelog.md
	config/defaults.yml
2013-12-05 09:11:41 -02:00
app Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings. 2013-12-02 22:35:18 +02:00
config bump to 0.2.0.1 2013-12-05 08:50:49 -02:00
db Merge pull request #4337 from oliverbarnes/4312-index-key-too-long 2013-08-06 20:52:37 +02:00
features Merge pull request #4593 from Flaburgan/improve-mobile-design 2013-11-20 12:05:28 -08:00
graphics DG RY; moved actions to the bottom of the show pages; fixed arrows 2012-02-21 15:23:28 -08:00
lib refactor ConversationsController, move query builing to User model 2013-09-30 01:44:57 +02:00
public Fix regression in 404.html 2013-09-22 20:29:35 -07:00
script Merge branch 'release/0.2.0.1' into develop 2013-12-05 09:11:41 -02:00
spec Statistics route with general info, some user and total posts stats. By default statistics off, enabled in settings. 2013-12-02 22:35:18 +02:00
vendor/assets/javascripts Add the ability to upload photos from the mobile site 2013-02-26 23:25:58 +01:00
.foreman Bye Resque. Ohai Sidekiq. 2013-03-21 23:39:07 +01:00
.gitignore Fix path ignores in .gitignore to not ignore files inside the paths, but to ignore the path itself. Otherwise git clean -fd is scary as it says its removing them even if not 2013-12-05 09:50:04 +02:00
.pairs for now, check in index as a flat file 2011-11-14 17:16:13 -08:00
.powenv MS DC; admins are now always redirected to new profile 2012-04-24 18:39:09 -07:00
.powrc add poduptime asset 2012-08-19 17:34:33 -07:00
.rspec just stop settingslogic from breaking rspec output for now 2012-09-26 18:54:14 +02:00
.rvmrc bump recommended ruby version to 1.9.3-p429 2013-05-17 10:19:20 +02:00
.slugignore added a few more files to ignore for the slugignore [ci skip] 2012-01-15 20:04:46 -08:00
.travis.yml remove allowed failures from .travis.yml 2012-12-08 01:15:51 +01:00
AUTHORS Adding in COPYRIGHT, AUTHORS, and blueprint attribution 2010-09-15 10:09:42 -07:00
Changelog.md Merge branch 'release/0.2.0.1' into develop 2013-12-05 09:11:41 -02:00
config.ru add x-frame headers 2012-11-18 09:55:10 +00:00
COPYRIGHT Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
FederationProcfile basic federation profile testing stuff 2012-02-14 10:58:57 -08:00
Gemfile Merge branch 'release/0.2.0.1' into develop 2013-12-05 09:11:41 -02:00
Gemfile.lock Merge branch 'release/0.2.0.1' into develop 2013-12-05 09:11:41 -02:00
GNU-AGPL-3.0 added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Guardfile guard: minimize running all specs [ci skip] 2012-11-26 14:30:30 +01:00
Procfile Bye Resque. Ohai Sidekiq. 2013-03-21 23:39:07 +01:00
Rakefile Bye Resque. Ohai Sidekiq. 2013-03-21 23:39:07 +01:00
README.md rewrite readme [ci skip] 2013-08-03 19:32:13 +02:00
redis-integration1.conf seperate and move redis dump files so they don't mess with installed redis 2012-05-08 12:41:57 +02:00
redis-integration2.conf seperate and move redis dump files so they don't mess with installed redis 2012-05-08 12:41:57 +02:00

diaspora*

a privacy aware, distributed, open source social network

master: Build Status master develop: Build 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!

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