Commit graph

95 commits

Author SHA1 Message Date
Benjamin Neff
ec8a49b338
Add settings for CSP to diaspora.yml
closes #7128
2016-09-30 02:11:32 +02:00
Benjamin Neff
0e5141dd67
Fix mapbox API URL
closes #7066
2016-09-25 02:58:56 +02:00
Lance Gilbert
a9d77c6b1b Enable setting BOSH access protocol via chat configuration
closes #7100
2016-09-18 22:31:11 +02:00
Denis Hovart
bcace2def2 6840 : meta tags update (#6998)
* Adds a new metadata helper and methods to PostPresenter to have metas on post pages.

* Adds tests to post controller to check correctness of metas

* Add methods to PersonPresenter to have metas on profile pages

* Correct meta data helper test

* Update PersonPresenter, add test to PeopleController

* Creates TagPresenter. Display tag metas on tag index page

* Updata meta data helper spec

* Not displaying bio as the description meta on profile page for now. Privacy concerns to be cleared.

* Set meta info as hashes in presenters

* Move original hardcoded metas info to config/defaults.yml

* metas_tags include by default the general metas, update views

* Update code style, clean views

* Renames TagPresenter StreamTagPresenter, updates TagController spec

* Add a default_metas entry to diaspora.yml.example

* Align metas hash in presenters, refactor meta data helper

* Use bio as description meta if user has a public profile

* Rename StreamTagPresenter to TagStreamPresenter
2016-08-18 21:52:39 +02:00
Jonne Haß
c5849b4724
Correct default value explanation in diaspora.yml.example [ci skip] 2016-07-20 21:51:44 +02:00
Jonne Haß
58a355ed01
Expose Sidekiq dead job queue configuration options
Set the default limit of dead jobs to 5k, which should equal to about 50M memory
usage in the worst case. Sidekiq's default is 10k. Set the expiration
timeout to 6 weeks, matching our minor release schedule. Sidekiq's
default is 6 months.

Given the new federation code stores the XML payload in the job
parameters, fine-tuning here can give more significant memory savings.
2016-07-20 15:21:17 +02:00
Steffen van Bergerem
58c7478133
Remove messagebus_ruby_api gem
Messagebus closed in 2015. See https://web.archive.org/web/20150623093956/https://www.messagebus.com/ for more information.
2016-07-07 18:48:31 +02:00
Benjamin Neff
645034800d deliver public posts to relay 2016-06-26 06:21:01 +02:00
Benjamin Neff
d68c1ad974 remove REDISTOGO_URL deprecation 2016-06-14 06:40:34 +02:00
Jonne Haß
a5c9579c77
Merge branch 'stable' into develop 2016-06-07 12:30:40 +02:00
Jonne Haß
27569d4baa
OpenSSL verification modes other than none and peer make no sense for
TLS client connection, remove them from the examples.
2016-06-07 12:29:21 +02:00
Lukas Matt
c10c31b52b Adjust links and description in diaspora config 2016-04-25 15:30:28 +02:00
Lukas Matt
f0d5ff12a2 Diaspora configuration wrapper for Prosody
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2016-04-25 15:30:28 +02:00
Dennis Schubert
5f986464da Drop Redis namespace support 2016-01-24 07:29:28 +01:00
Steffen van Bergerem
b40d5362cf Merge pull request #6256 from TeamDeltaQuadrant/5813-show-geolocation-on-osm
5813 show geolocation on osm
2015-09-23 01:43:49 +02:00
Jonne Haß
c3c84b95a4 Merge branch 'stable' into develop 2015-09-19 11:33:10 +02:00
Achilleas Pipinellis
9888b4ce43 Add option to set a pid file for unicorn in diaspora.yml
http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-pid

closes #6411
2015-09-19 11:33:04 +02:00
zaziemo
263dc6f119 refactor code that choses the tile server based on podmin's choice
and remove the possibility to disable the map feature.
By default the application uses the itles of Heidelberg University that
don't need any credentials. If podmins enable the mapbox option in the
diaspora.yml and enter their credentials the mapbox tiles are used for the map
rendering.
2015-09-09 17:03:46 +02:00
zaziemo
0f3eff8f88 add correct attributions for map tiles of Heidelberg University
remove personal credentials from mapbox and refactored some code
#5813

Signed-off-by: zaziemo <maren.heltsche@gmail.com>
2015-09-09 15:24:00 +02:00
realtin
57b7c05c4f set maptile default to OpenMapSurfer
- refactor code for toggle map function
- adjust jasmine tests for maps and add tests for SPV
- change name of access token in defaults.yml according to naming conventions
- add explanation of map use for podmins
- add location to post_presenter
- fix opening multiple maps inside the stream when clicking on a reshare location
(#5813)
2015-09-09 12:26:47 +02:00
zaziemo
e5cc8dff0e outsource map credentials
and allow podmin to enable and disable the feature
(#5813)
2015-09-09 12:25:45 +02:00
Jonne Haß
ac6e9fd7c7 Merge branch 'stable' into develop 2015-09-03 21:39:24 +02:00
Lukas Matt
23c016cf36 Update wiki links in diaspora config
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-09-03 21:38:56 +02:00
Dennis Schubert
39fb1a6db2 Merge branch 'stable' into develop 2015-08-30 10:17:28 +02:00
Jason Robinson
0087fefd14 Change default autofollow_on_join_user
Due to performance of joindiaspora.com, a decision was made to set up a project pod that hosts the official support and news autofollow account (see https://www.loomio.org/d/tyZdcGNo/diasporahq-account-move-to-a-project-pod). The new account is hq@pod.diaspora.software.

closes #6369
2015-08-30 10:17:05 +02:00
Jason Robinson
bdf6c71772 Implement social relay functionality
* .well-known/social-relay - to serve subscription preferences to relays
* Workers.deferred_dispatch relay carbon copy functionality for outbound sending

See discussion here: https://www.loomio.org/d/9vpoe0UR/public-post-federation#comment-730911 and spec here: https://wiki.diasporafoundation.org/Relay_servers_for_public_posts
2015-07-18 21:29:31 +03:00
Jonne Haß
188e554b7b Merge branch 'stable' into develop 2015-06-21 20:48:57 +02:00
fap
1061e101fd Adds welcome message on registration Welcome message is only send out if podmin account is defined and welcome message is enabled in the config.
This also enables the podmin account to send messages
to any local user.

closes #6128
2015-06-21 20:48:48 +02:00
fap
073f028f88 Adds welcome message options to config 2015-06-21 20:48:20 +02:00
Jonne Haß
1be1bec9c9 Merge branch 'stable' into develop 2015-06-09 22:55:23 +02:00
Benjamin Neff
ce380d78c9 make sql and federation debug-logging configurable
by default both are disabled now, you can enable them in the
diaspora.yml if you need them.

closes #6090
2015-06-09 22:55:16 +02:00
efstrian
69c3a4100d Issue #4297: Color themes can override bootstrap variables 2015-06-07 19:58:54 +03:00
efstrian
d64ea15891 Issue #4297: Style fixes - Default theme is configurable 2015-06-07 19:58:14 +03:00
Dennis Schubert
d34878df55 Merge branch 'stable' into develop 2015-05-28 01:26:53 +02:00
Benjamin Neff
5655eead7c make the logrotation configurable
closes #5994
2015-05-28 01:26:48 +02:00
Dennis Schubert
f9f73f56db Merge branch 'stable' into develop 2015-05-25 04:18:46 +02:00
Jason Robinson
7c0e50c2c2 Introduce 'authorized' configuration option for services
Since the Facebook API has changed and additional permissions are required for all users on a pod to cross-post, an additional 'authorized' flag is needed to be set for the Facebook service.
This flag allows either all users, one user or no users to use the cross-posting service.

Clarifies the situation for #5923, #5260 and #5085.

closes #5985
2015-05-25 04:18:38 +02:00
Jonne Haß
ebe0c76040 Listen to unix socket in production by default 2015-05-21 17:23:36 +02:00
Jonne Haß
898e8d5912 Remove deprecated port setting 2015-05-19 11:07:03 +02:00
Jonne Haß
a21de8b190 Make listen directive for Unicorn configurable 2015-05-19 02:55:01 +02:00
Flaburgan
b444cdf1ea Add currency and allow unhosted button to paypal donation 2014-12-28 19:50:45 +01:00
Jonne Haß
2ab16d473c Merge pull request #5410 from svbergerem/configurable-source-url
Make source code url configurable

Conflicts:
	config/diaspora.yml.example
2014-11-29 23:46:45 +01:00
Achilleas Pipinellis
10453e53c2 Refactor diaspora.yml.example [skip ci].
- Fix typos and punctuation
- Add double '#' for comments where missed
- Add newlines where needed
2014-11-29 18:40:11 +02:00
Steffen van Bergerem
55f881da08 Make source code url configurable 2014-11-29 16:36:17 +01:00
Jonne Haß
827b68fe63 Improve wording on mail configuration section [ci skip] 2014-11-20 20:19:56 +01:00
Lukas Matt
94318ca27a Modify diaspora config file and add defaults 2014-11-13 11:31:12 +01:00
Dennis Schubert
6808150920 Method calling convention and doc improvements
... and a stealth-commit of an already introduced bug prevention system.
;)
2014-11-09 07:20:30 -08:00
Dennis Schubert
df4063fd45 Documentation improvements and changelog entry
I just assume camo is cool enough to get an own section.
2014-11-09 06:51:17 +01:00
Dennis Schubert
92cd4e6b78 Use camo for Markdown images
just a quick proof of concept
2014-11-08 05:14:18 +01:00
Dennis Schubert
9024d1a9b7 Add Camo configs 2014-11-08 05:14:18 +01:00