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

update all wiki links

Browse source
This commit is contained in:
Jonne Haß 2013-06-17 20:00:48 +02:00
parent a97bc64b58
commit 221c1bf959
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -457,7 +457,7 @@ everything is set up.
* Fix missing X-Frame headers [#3739](https://github.com/diaspora/diaspora/pull/3739)
* Fix image path for padlocks [#3682](https://github.com/diaspora/diaspora/pull/3682)
* Fix posting to Facebook and Tumblr. Have a look at the updated [services guide](https://github.com/diaspora/diaspora/wiki/Howto-setup-services) for new Facebook instructions.
* Fix posting to Facebook and Tumblr. Have a look at the updated [services guide](http://wiki.diasporafoundation.org/Integrating_Other_Social_Networks) for new Facebook instructions.
* Fix overflow button in mobile reset password. [#3697](https://github.com/diaspora/diaspora/pull/3697)
* Fix issue with interacted_at in post fetcher. [#3607](https://github.com/diaspora/diaspora/pull/3607)
* Fix error with show post Community Spotlight. [#3658](https://github.com/diaspora/diaspora/pull/3658)
@ -519,7 +519,7 @@ Fix exception when the root of a reshare of a reshare got deleted [#3546](https:
## New configuration system!
Copy over config/diaspora.yml.example to config/diaspora.yml and migrate your settings! An updated Heroku guide including basic hints on howto migrate is [here](https://github.com/diaspora/diaspora/wiki/Installing-on-heroku).
Copy over config/diaspora.yml.example to config/diaspora.yml and migrate your settings! An updated Heroku guide including basic hints on howto migrate is [here](http://wiki.diasporafoundation.org/Installing_on_Heroku).
The new configuration system allows all possible settings to be overriden by environment variables. This makes it possible to deploy heroku without checking any credentials into git. Read the top of `config/diaspora.yml.example` for an explanation on how to convert the setting names to environment variables.

4
app/views/shared/_right_sections.html.haml
View file

@ -20,7 +20,7 @@
.content
!= t('aspects.index.new_here.follow', :link => link_to("#"+t('shared.publisher.new_user_prefill.newhere'), tag_path(:name => t('shared.publisher.new_user_prefill.newhere'))))
%br
= link_to(t('aspects.index.new_here.learn_more'), "https://github.com/diaspora/diaspora/wiki/Welcoming-Committee")
= link_to(t('aspects.index.new_here.learn_more'), "http://wiki.diasporafoundation.org/Welcoming_Committee")
.section
.title
@ -40,7 +40,7 @@
%br
%br
%p
!= t('aspects.index.help.tutorials_wiki_and_forum', :tutorial => link_to("Diasporial" , "http://diasporial.com/tutorials", :target => '_blank'), :wiki => link_to('Wiki','http://github.com/diaspora/diaspora/wiki', :target => '_blank'), :forum => link_to("Forum", "http://www.diasporaforum.org/", :target => '_blank'))
!= t('aspects.index.help.tutorials_wiki_and_forum', :tutorial => link_to("Diasporial" , "http://diasporial.com/tutorials", :target => '_blank'), :wiki => link_to('Wiki','http://wiki.diasporafoundation.org', :target => '_blank'), :forum => link_to("Forum", "http://www.diasporaforum.org/", :target => '_blank'))
%p
!= t('aspects.index.help.email_feedback', :link => link_to(t('aspects.index.help.email_link'), "mailto:feedback@joindiaspora.com"))

2
config/locales/README.md
View file

@ -1 +1 @@
# Please read the [translation guide](https://github.com/diaspora/diaspora/wiki/How-to-contribute-translations) before contributing!
# Please read the [translation guide](http://wiki.diasporafoundation.org/Contribute_translations) before contributing!

2
config/locales/inflections/README.md
View file

@ -1,2 +1,2 @@
This directory contains the definitions for the [i18n-inflector gem](https://github.com/siefca/i18n-inflector).
Also, look up for our wiki on [How to contribute translations](https://github.com/diaspora/diaspora/wiki/How-to-contribute-translations) for more information.
Also, look up for our wiki on [How to contribute translations](http://wiki.diasporafoundation.org/Contribute_translations) for more information.

2
config/routes.rb
View file

@ -210,7 +210,7 @@ Diaspora::Application.routes.draw do
get 'mobile/toggle', :to => 'home#toggle_mobile', :as => 'toggle_mobile'
#Protocol Url
get 'protocol' => redirect("https://github.com/diaspora/diaspora/wiki/Diaspora%27s-federation-protocol")
get 'protocol' => redirect("http://wiki.diasporafoundation.org/Federation_Protocol_Overview")
# Startpage
root :to => 'home#show'

2
public/default.html
View file

@ -135,7 +135,7 @@
<ul id="links">
<ul class="section">
<li><a href="http://github.com/diaspora/diaspora/" title="Git repository">Codebase</a></li>
<li><a href="http://github.com/diaspora/diaspora/wiki" title="Wiki on github">Documentation</a></li>
<li><a href="http://wiki.diasporafoundation.org" title="Wiki on github">Documentation</a></li>
</ul>
<ul class="section">
<li><a href="http://webchat.freenode.net/?channels=diaspora" title="#diaspora">IRC - General</a></li>

2
script/install.sh
View file

@ -86,7 +86,7 @@ to get a DEVELOPMENT setup of Diaspora* up and running
For a PRODUCTION installation, please do *not* use this script!
Follow the guide in our wiki, instead:
-- https://github.com/diaspora/diaspora/wiki/Installation-Guides
-- http://wiki.diasporafoundation.org/Installation_guides
#####################################################################

2
script/install/defaults
View file

@ -26,7 +26,7 @@ D_GIT_BRANCH="develop"
# a few important web addresses
D_REMOTE_REPO_URL="https://github.com/diaspora/diaspora.git"
D_WIKI_URL="https://github.com/diaspora/diaspora/wiki"
D_WIKI_URL="http://wiki.diasporafoundation.org"
# irc url
D_IRC_URL="irc://freenode.net/diaspora"