Commit graph

95 commits

Author SHA1 Message Date
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
Jonne Haß
e2d895c636 Merge branch 'stable' into develop 2015-10-05 15:22:55 +02:00
Jonne Haß
c5819b9c57 Enable SQL logging by default in development mode 2015-10-05 15:22:28 +02: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
Dennis Schubert
f75a6147a5 Bump version number
[ci skip]
2015-09-01 03:52:06 +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
Jonne Haß
ccf2fad903 Start 0.5.3.0 development cycle 2015-07-20 00:57:24 +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
Dennis Schubert
b80785e06e Update Changelog for the upcoming 0.5.2.0 2015-06-08 04:32:29 +02:00
efstrian
d64ea15891 Issue #4297: Style fixes - Default theme is configurable 2015-06-07 19:58:14 +03:00
Jonne Haß
63554e222d Fix production override for listen setting 2015-06-04 22:03:07 +02: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
Dennis Schubert
00cb87ce11 Merge branch 'stable' into develop 2015-05-19 02:55:36 +02:00
Jonne Haß
a21de8b190 Make listen directive for Unicorn configurable 2015-05-19 02:55:01 +02:00
Dennis Schubert
642c4597e1 Merge branch 'stable' into develop 2015-05-07 04:03:57 +02:00
Jonne Haß
a7699c2a2c Update configurate and enable missing key exceptions
closes #5934
2015-05-07 04:03:43 +02:00
Jonne Haß
4612937787 Merge branch 'stable' into develop 2015-05-06 23:56:23 +02:00
Jonne Haß
166a152dc0 Merge branch 'master' into stable 2015-05-06 23:53:52 +02:00
Jonne Haß
51918a798a bump to 0.5.0.1 2015-05-06 23:52:40 +02:00
Jonne Haß
4fad5041cf update changelog and version for 0.6.0.0 2015-05-04 00:47:36 +02:00
Jonne Haß
db08cec9c0 update changelog and version for 0.5.1.0 2015-05-04 00:41:55 +02:00
Jonne Haß
69842b84a4 Merge branch 'master' into develop 2015-05-03 15:48:42 +02:00
Jason Robinson
c0b8f03225 bump to 0.5.0.0-RC 2015-03-30 17:49:15 +03:00
Flaburgan
b444cdf1ea Add currency and allow unhosted button to paypal donation 2014-12-28 19:50:45 +01:00
Jonne Haß
6836af89ad Correctly implement OpenGraph tags
Just defining og:site_name indicates that we support the
OpenGraph protocol, but then we didn't set the required
properties.
2014-12-08 02:25:09 +01:00
Steffen van Bergerem
55f881da08 Make source code url configurable 2014-11-29 16:36:17 +01:00
Lukas Matt
94318ca27a Modify diaspora config file and add defaults 2014-11-13 11:31:12 +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
Jason Robinson
69c3566958 Maintenance feature to remove old users
Add Sidetiq webview to the Sidekiq monitoring panel

Add rake task maintenance:queue_users_for_removal
This basically just triggers an immediate run of the normal maintenance remove old users functionality that is normally (if enabled) scheduled to run once a day via sidetiq

Add extra safety when checking for user removal due to inactivity.
Now also user.last_seen will also be checked to make sure a user will not be removed in the event that the Devise rememember me login functionality has stopped the users remove_after timestamp from being removed.

Add initializer for maintenance job.
Add warning about mail being disabled if remove_old_users maintenance is enabled.
2014-10-16 22:53:08 +03:00
Jonne Haß
a1e547f8d7 Merge pull request #5105 from goobertron/jquery_default
Change default for jQuery CDN to false
2014-08-24 13:36:57 +02:00
Jonne Haß
5c60f10022 start new development cycle 2014-08-24 13:28:02 +02:00