No description
Find a file
Jonne Haß 5a3d329703 Merge pull request #5049 from kpcyrd/aspect-edit-fix
Fix broken aspect-edit sidebar update

Conflicts:
	app/assets/javascripts/aspect-edit-pane.js
2014-07-01 14:49:53 +02:00
app Merge pull request #5049 from kpcyrd/aspect-edit-fix 2014-07-01 14:49:53 +02:00
config added title_header key for the Help header, only for EN lang so far 2014-07-01 06:19:29 -03:00
db DB fix to work with existing entries 2014-05-15 07:23:44 -04:00
features try to make hovercards cuke even more stable 2014-06-01 12:15:20 +02:00
graphics DG RY; moved actions to the bottom of the show pages; fixed arrows 2012-02-21 15:23:28 -08:00
lib Actually allow false as a value for sidekiq.backtrace in our Sidekiq 2014-06-13 16:04:40 +02:00
public fix image branding logo_caps 2014-02-09 20:31:01 +01:00
script Fix typo 2014-06-20 11:17:54 +02:00
spec Merge pull request #5006 from taratatach/4940-mention-notification-not-marked-as-read-when-viewing-post 2014-06-27 10:17:01 +03:00
vendor/assets/javascripts fix infinitescroll in contacts pages 2014-02-23 16:48:47 +01:00
.foreman Bye Resque. Ohai Sidekiq. 2013-03-21 23:39:07 +01:00
.gitignore added cucumber tests, updated spec with xml class test 2014-03-31 18:14:07 +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
.ruby-gemset Replace .rvmrc by .ruby-version 2014-03-24 15:33:29 +01:00
.ruby-version Replace .rvmrc by .ruby-version 2014-03-24 15:33:29 +01:00
.slugignore added a few more files to ignore for the slugignore [ci skip] 2012-01-15 20:04:46 -08:00
.travis.yml No need anymore to update bundler on travis 2014-03-31 00:02:22 +02:00
AUTHORS
Changelog.md Merge pull request #5049 from kpcyrd/aspect-edit-fix 2014-07-01 14:49:53 +02:00
config.ru add x-frame headers 2012-11-18 09:55:10 +00:00
COPYRIGHT
FederationProcfile basic federation profile testing stuff 2012-02-14 10:58:57 -08:00
Gemfile lock nokogiri to 1.6.1, closes #4996 2014-06-18 11:44:46 +02:00
Gemfile.lock lock nokogiri to 1.6.1, closes #4996 2014-06-18 11:44:46 +02:00
GNU-AGPL-3.0
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