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:
Dennis Schubert 2015-08-30 10:17:28 +02:00
commit 39fb1a6db2
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -83,6 +83,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
* Extract user/profile discovery into the diaspora\_federation-rails gem [#6310](https://github.com/diaspora/diaspora/pull/6310) * Extract user/profile discovery into the diaspora\_federation-rails gem [#6310](https://github.com/diaspora/diaspora/pull/6310)
* Refactor PostPresenter [#6315](https://github.com/diaspora/diaspora/pull/6315) * Refactor PostPresenter [#6315](https://github.com/diaspora/diaspora/pull/6315)
* Convert BackToTop to a backbone view [#6279](https://github.com/diaspora/diaspora/pull/6279) and [#6360](https://github.com/diaspora/diaspora/pull/6360) * Convert BackToTop to a backbone view [#6279](https://github.com/diaspora/diaspora/pull/6279) and [#6360](https://github.com/diaspora/diaspora/pull/6360)
* Automatically follow the new HQ-Account [#6369](https://github.com/diaspora/diaspora/pull/6369)
## Bug fixes ## Bug fixes
* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212) * Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)

2
config/defaults.yml
View file

@ -98,7 +98,7 @@ defaults:
pod_name: 'diaspora*' pod_name: 'diaspora*'
enable_registrations: true enable_registrations: true
autofollow_on_join: true autofollow_on_join: true
autofollow_on_join_user: 'diasporahq@joindiaspora.com' autofollow_on_join_user: 'hq@pod.diaspora.software'
welcome_message: welcome_message:
enabled: false enabled: false
subject: 'Welcome Message' subject: 'Welcome Message'

4
config/diaspora.yml.example
View file

@ -404,11 +404,11 @@ configuration: ## Section
## follow an account upon creation. ## follow an account upon creation.
#autofollow_on_join: true #autofollow_on_join: true
## Auto-follow account (default='diasporahq@joindiaspora.com') ## Auto-follow account (default='hq@pod.diaspora.software')
## The diaspora* HQ account keeps users up to date with news about Diaspora. ## The diaspora* HQ account keeps users up to date with news about Diaspora.
## If you set another auto-follow account (for example your podmin account), ## If you set another auto-follow account (for example your podmin account),
## please consider resharing diaspora* HQ's posts for your pod's users! ## please consider resharing diaspora* HQ's posts for your pod's users!
#autofollow_on_join_user: 'diasporahq@joindiaspora.com' #autofollow_on_join_user: 'hq@pod.diaspora.software'
## Welcome Message settings ## Welcome Message settings
welcome_message: ##Section welcome_message: ##Section