Benjamin Neff
4c46ca1a94
Merge branch 'next-minor' into develop
2021-07-04 22:09:32 +02:00
Dennis Schubert
805a35e985
Point /protocol route to the current federation documentation.
2021-07-04 22:07:51 +02:00
Dennis Schubert
407f51d5a3
Allow points and dashes in the username.
...
This reverts b3ca504c40 . We don't quite know why that was added, but we assume it's because of format strings. Some pre-2011 users exist that still have dots or dashes in their username, and those accounts are somewhat broken now.
closes #8266
2021-07-04 22:07:21 +02:00
Benjamin Neff
d27eefeb34
Merge branch 'next-minor' into develop
2021-06-30 23:27:57 +02:00
Benjamin Neff
dc3bef6a93
Bump carrierwave
2021-06-28 01:28:15 +02:00
Benjamin Neff
1dd2382d03
Merge pull request #8243 from tclaus/8192_drop_relay_example
...
drop relay example and implementation
closes #8192
2021-06-13 01:35:42 +02:00
Thorsten Claus
47a603a346
Remove route to social relay
2021-05-20 07:59:18 +02:00
Thorsten Claus
61de6e117d
8192 drop relay example and implementation
2021-05-12 23:23:46 +02:00
Thorsten Claus
c937e17335
Set correct defaults for local mode stream
2021-04-18 13:23:17 +02:00
Jonne Haß
ba905334f7
Start 0.7.16.0 cycle
2021-04-18 13:14:29 +02:00
Thorsten Claus
2db1d5d641
Fixing PR Rewview issues
2021-04-18 13:11:25 +02:00
Thorsten Claus
4147249d2d
Makes the local posts link be configured for special audiences
2021-04-18 13:11:25 +02:00
Thorsten Claus
ddee980426
Adds a local-public tag on the sidebar that shows all posts local to this pod
2021-04-18 13:11:25 +02:00
Jonne Haß
1d0982822b
Merge branch 'next-minor'
2021-04-18 13:09:59 +02:00
Jonne Haß
69c6305e62
Merge branch 'next-minor' into develop
2021-04-11 20:50:31 +02:00
Jonne Haß
0fcd166387
Redis#client.disconnect is Redis#close now
2021-04-11 20:49:41 +02:00
Jonne Haß
28213b1a47
Merge branch 'next-minor' into develop
2021-04-11 17:29:57 +02:00
Jonne Haß
62bb4dc7b6
Update to Sidekiq 6
...
closes #8153
closes #8162
2021-04-11 17:25:18 +02:00
Jonne Haß
e0af180c9b
Merge branch 'next-minor' into develop
2021-04-11 01:46:52 +02:00
Thorsten Claus
a98fdc8079
Remove 'heidelberg' tile map service.
...
Updated settings for MapTiles as recommended by leaflet.js
Updating current licence text
Closes #8209
closes #8215
2021-04-11 01:45:05 +02:00
Jonne Haß
7d9f18fda1
Merge branch 'next-minor' into develop
2021-04-10 23:17:47 +02:00
Jonne Haß
7154fc3ccc
Port cukes from poltergeist to aparition
...
closes #8234
2021-04-10 23:17:39 +02:00
Dennis Schubert
d4f92a8fae
Merge branch 'next-minor' into develop
2021-02-21 19:45:00 +01:00
Thorsten Claus
d7941230a4
Replace some http links with their https counterparts.
...
closes #8207
2021-02-21 19:44:42 +01:00
Dennis Schubert
195dfe6970
Merge pull request #8188 from jhass/converations_api_read
...
API: Conversations read handling through explicit route
2021-02-13 04:36:23 +01:00
Jonne Haß
4ea2a77a86
Merge branch 'next-minor' into develop
2020-12-30 13:29:43 +01:00
Benjamin Neff
98e70c8221
Fix syntax error for default_color_theme in diaspora.toml.example
...
closes #8194
2020-12-30 13:29:39 +01:00
Jonne Haß
d9db761c79
API: Add endpoint to toggle conversation read status
2020-11-30 18:03:38 +01:00
Dennis Schubert
e0995e540b
updated 17 locale files [ci skip]
2020-11-06 01:10:18 +01:00
Dennis Schubert
611e445e17
Fix private/public confusion.
2020-11-04 16:21:43 +01:00
Jonne Haß
5c2e454ebd
Merge branch 'next-minor' into develop
2020-11-02 15:20:58 +01:00
Jonne Haß
b8a85850e1
Migrate from Travis to Github Actions
...
closes #8178
2020-11-02 15:20:53 +01:00
Dennis Schubert
04138da009
Slightly polish the OAuth Scope descriptions.
2020-11-01 18:40:28 +01:00
Jonne Haß
0b51bff255
fix wording for api.openid_connect.scopes.notifications
2020-10-30 15:23:01 +01:00
Dennis Schubert
6109c93556
Add de-fallback for de_moo
2020-10-30 02:10:12 +01:00
Dennis Schubert
146045dbf8
Enable de_moo locale
2020-10-30 02:06:11 +01:00
Dennis Schubert
f842da5488
updated 68 locale files [ci skip]
2020-10-30 02:04:19 +01:00
Dennis Schubert
af649adcd9
Fix typo in en.api.openid_connect.authorizations.scopes.interactions.description
2020-10-30 02:02:30 +01:00
Jonne Haß
b75254bdda
Warn about using diaspora.yml
2020-09-04 21:59:36 +02:00
Jonne Haß
15c11b87ca
Merge branch 'next-minor' into develop
2020-09-04 21:58:57 +02:00
Jonne Haß
ce82ba3dde
Drop spring
...
it does more harm than good at this point
closes #8133
2020-09-04 21:52:24 +02:00
Jonne Haß
2acdc8e095
Add chat configuration to diaspora.toml.example
2020-09-04 21:49:30 +02:00
Jonne Haß
08395cc877
Migrate configuration to TOML
...
YAML is just too easy to get wrong
closes #8132
2020-09-04 21:48:54 +02:00
Dennis Schubert
517e3b22ba
Expose a user's .current_sign_in_ip in the admin panel
2020-09-02 21:06:13 +02:00
Dennis Schubert
2f608d4a78
Merge branch 'next-minor' into develop
2020-06-24 18:48:01 +02:00
Dennis Schubert
0937bfc420
updated 9 locale files [ci skip]
2020-06-24 18:46:08 +02:00
Dennis Schubert
44bbb44c81
Merge branch 'next-minor' into develop
2020-06-14 22:13:08 +02:00
Dennis Schubert
d061c4e2cf
Merge branch 'master' into next-minor
2020-06-14 22:12:58 +02:00
Dennis Schubert
4ca68a71d9
Merge branch 'release/0.7.14.0'
2020-06-14 22:11:23 +02:00
Dennis Schubert
3c124cefc3
updated 6 locale files [ci skip]
2020-06-14 22:10:24 +02:00