Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 68 lines (49 sloc) 3.182 kb
d8c49e8 moved stuff around in the readme
ilya authored
1 # Diaspora
2
3 The privacy aware, personally controlled, do-it-all, open source social
4 network.
5
6 **DISCLAIMER: THIS IS PRE-ALPHA SOFTWARE AND SHOULD BE TREATED ACCORDINGLY.**
7 **PLEASE, DO NOT RUN IN PRODUCTION. IT IS FUN TO GET RUNNING, BUT EXPECT THINGS
8 TO BE BROKEN**
9
10 Initial installation instructions are [here](http://github.com/diaspora/diaspora/wiki/Installing-and-Running-Diaspora).
11
12 We are continuing to build features and improve the code base.
13 When we think it is ready for general use, we will post more final
14 instructions.
15
ec3102c Fixed typo in readme
Crimer authored
16 ## Commit Guidelines
2d7b72e Added a newline after headings where it was missing.
Pistos authored
17
40afef0 Merge branch 'master' of github.com:diaspora/diaspora
Raphael authored
18 You are welcome to contribute, add to and extend Diaspora however you see fit. We
fa1e09c Hard-wrapped README text to confirm to an 80-character screen width.
Pistos authored
19 will do our best to incorporate everything that meets our guidelines.
89f2cdd adjusting readme
Raphael authored
20
82e6e29 A small readme change
Raphael authored
21 You can find an introduction to the source code [here](http://github.com/diaspora/diaspora/wiki/An-Introduction-to-the-Diaspora-Source).
22
23 Make a topic branch. By making your changes in a topic branch, you ensure that new commits to your master are not included in the pull request, and it's easier for us to merge your commits.
e26ad0b topic branch
Raphael authored
24
d7bbb66 Run whitespace:cleanup
Raphael authored
25 Please do not rebase our tree into yours.
a2209d4 Add a link to authoritative rebase instructions
Raphael authored
26 See [here](http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html)
27 for when to rebase.
1d8d35c Add contributor agreement to readme
Raphael authored
28
82e6e29 A small readme change
Raphael authored
29 Patches must be tested, and all your tests should be green
fa1e09c Hard-wrapped README text to confirm to an 80-character screen width.
Pistos authored
30 before a pull request is sent. Please write your tests in Rspec.
89f2cdd adjusting readme
Raphael authored
31
fa1e09c Hard-wrapped README text to confirm to an 80-character screen width.
Pistos authored
32 GEMS: We would like to keep external dependencies unduplicated. We're using
33 Nokogiri, Mongomapper, and EM::HttpRequest as much as possible. We have a few
34 gems in the project we'd rather not use, but if you can, use dependencies we
35 already have.
89f2cdd adjusting readme
Raphael authored
36
a2209d4 Add a link to authoritative rebase instructions
Raphael authored
37 We need you to fill out a
38 [contributor agreement form](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq)
39 before we can accept your patches. The agreement gives Diaspora joint
40 ownership of the patch so the copyright isn't scattered. You can find it
41 [here](https://spreadsheets.google.com/a/joindiaspora.com/viewform?formkey=dGI2cHA3ZnNHLTJvbm10LUhXRTJjR0E6MQ&theme=0AX42CRMsmRFbUy1iOGYwN2U2Mi1hNWU0LTRlNjEtYWMyOC1lZmU4ODg1ODc1ODI&ifq).
42
ea0d0cb link to tracker and wishlist
Daniel Vincent Grippi authored
43 ## Resources
44
fa1e09c Hard-wrapped README text to confirm to an 80-character screen width.
Pistos authored
45 We are maintaining a
46 [public tracker project](http://www.pivotaltracker.com/projects/61641)
47 and a
48 [roadmap](https://github.com/diaspora/diaspora/wiki/Roadmap). Also, you can
49 file [bug reports](https://github.com/diaspora/diaspora/issues) right here on
50 github.
ea0d0cb link to tracker and wishlist
Daniel Vincent Grippi authored
51
52 Ongoing discussion:
7dc813a Added a newline before a list, so that the list can be properly inter…
Pistos authored
53
e72b558 fixed links in readme. added description used in our blog.
Daniel Vincent Grippi authored
54 - [Diaspora Developer Google Group](http://groups.google.com/group/diaspora-dev)
55 - [Diaspora Discussion Google Group](http://groups.google.com/group/diaspora-discuss)
abf121f @patcito added link to diaspora Q&A shapado site
patcito authored
56 - [Diaspora Q&A site](http://diaspora.shapado.com/)
5b6215d Replicating a bunch of Pistos' commits, because the HEADs diverged
Raphael authored
57 - [#diaspora-dev IRC channel](irc://irc.freenode.net/#diaspora-dev)
58 ([join via the web client](http://webchat.freenode.net?channels=diaspora-dev))
c60c803 made a quick set of instructions in the readme
Daniel Vincent Grippi authored
59
486b9e8 Merge branch 'master' into HEAD
Raphael authored
60 More general info and updates about the project can be found on:
61 [Our blog](http://joindiaspora.com),
86f462c Strip trailing whitespace.
Pistos authored
62 [and on Twitter](http://twitter.com/joindiaspora).
3e7d4b1 @jbhannah Fixed mailing list link typo in README.md.
jbhannah authored
63 Also, be sure to join the official [mailing list](http://eepurl.com/Vebk).
c60c803 made a quick set of instructions in the readme
Daniel Vincent Grippi authored
64
fa1e09c Hard-wrapped README text to confirm to an 80-character screen width.
Pistos authored
65 If you wish to contact us privately about any exploits in Diaspora you may
66 find, you can email
67 [exploits@joindiaspora.com](mailto:exploits@joindiaspora.com).
Something went wrong with that request. Please try again.