nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Steffen van Bergerem 2015-07-20 01:31:33 +02:00
commit 94b745d5c8
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -54,6 +54,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
## Refactor ## Refactor
## Bug fixes ## Bug fixes
* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
## Features ## Features

16
app/views/home/default.haml
View file

@ -18,13 +18,13 @@
= image_tag "landing/cog.png" = image_tag "landing/cog.png"
%p %p
Look at Look at
%code.helpful{title: "General pod configuration (location to upload photos, SSL certs, etc.)"} %code.helpful{title: "General pod configuration (location to upload photos, SSL certs, etc.)"}
config/diaspora.yml.example config/diaspora.yml.example
and and
%code.helpful{title: "MySQL username/password"} %code.helpful{title: "MySQL username/password"}
config/database.yml.example config/database.yml.example
for help. for help.
.col-md-4 .col-md-4
%h2 Try it out %h2 Try it out
@ -48,7 +48,7 @@
%ul#links %ul#links
%ul.section %ul.section
%li= link_to "Codebase", "http://github.com/diaspora/diaspora", title: "Git repository" %li= link_to "Codebase", "http://github.com/diaspora/diaspora", title: "Git repository"
%li= link_to "Documentation", "http://wiki.diasporafoundation.org", title: "Wiki on github" %li= link_to "Documentation", "http://wiki.diasporafoundation.org", title: "Project wiki"
%ul.section %ul.section
%li= link_to "IRC - General", "http://webchat.freenode.net/?channels=diaspora", title: "#diaspora" %li= link_to "IRC - General", "http://webchat.freenode.net/?channels=diaspora", title: "#diaspora"
%li= link_to "IRC - Development", "http://webchat.freenode.net/?channels=diaspora-dev", title: "#diaspora-dev" %li= link_to "IRC - Development", "http://webchat.freenode.net/?channels=diaspora-dev", title: "#diaspora-dev"