nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
20975 commits 4 branches 0 tags 121 MiB
Commit graph

4028 commits

Author SHA1 Message Date
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
Dennis Schubert
9771a96add
Start 0.7.15.0 cycle. 
[ci skip]
 2020-06-14 21:49:07 +02:00
Dennis Schubert
bcf5406f53
Issue #8126 - Allow CORS on all API routes. 2020-06-11 20:13:46 +02:00
Jonne Haß
2d28ddc1ef Add API route to (un)block a user 2020-03-20 12:38:27 +01:00
Jonne Haß
00df0b7bda API: add new route to search for tags 2020-02-17 10:58:04 +01:00
Benjamin Neff
984b739eb4
Merge branch 'next-minor' into develop 2020-02-12 00:38:14 +01:00
Benjamin Neff
c432a658dd
Start 0.7.14.0 cycle 2020-02-12 00:36:21 +01:00
Benjamin Neff
c2a991fec1
Merge branch 'release/0.7.13.0' 2020-02-12 00:33:50 +01:00
Benjamin Neff
6f65d9f96c
updated 11 locale files [ci skip] 2020-02-12 00:29:37 +01:00
Benjamin Neff
4139ae2549
Merge branch 'next-minor' into develop 2020-02-12 00:13:19 +01:00
Dennis Schubert
71023a8713
Replace secret_token with secret_key_base. 
secrets.secret_token is deprecated in favor of secret_key_base and will be removed in Rails 6.0.
 2020-02-11 23:54:55 +01:00
Jonne Haß
dcbd02cf7f Return 403 for unauthorized API requests 
Also cleanup error handling code and remove last translatable
API error messages
 2020-02-02 21:49:20 +01:00
Jonne Haß
6bbcb7415b API: don't make error messages translatable 2020-02-02 18:04:11 +01:00
Jonne Haß
39c863ead9 Merge branch 'develop' into api 2020-01-21 23:35:01 +01:00
cmrd Senya
c348a763cf API: add profile:read_private scope 2020-01-21 23:34:43 +01:00
Jonne Haß
d08b31f2ed OpenID: remove private profile data claims that are not returned anyway and fix return values for profile and picture 2020-01-21 23:34:43 +01:00
Jonne Haß
ab04633474 fix styling on the new authorization page 2020-01-21 23:34:43 +01:00
Jonne Haß
cb679371ac Merge branch 'develop' into api 2020-01-21 23:34:43 +01:00
Jonne Haß
16e754f4c7 API: don't return default avatar 2020-01-21 23:34:00 +01:00
Benjamin Neff
1cbb3f9a7c
Merge pull request #8069 from denschub/remove-chat 
Remove the JSXC/Prosody integration.
 2019-10-25 01:32:37 +02:00
Benjamin Neff
6bb2e2fadd
Merge branch 'next-minor' into develop 2019-10-25 01:24:19 +02:00
Jonne Haß
36b4076af6
set better example values for unicorn stdout/stderr log settings 
[ci skip]

closes #8058
 2019-10-25 01:24:08 +02:00
Dennis Schubert
862fa38f8b
Remove the JSXC/Prosody integration. 
As per discussion on https://discourse.diasporafoundation.org/t/removing-diaspora-s-current-chat-integration/2718, nobody raised serious concerns or objections. Given future plans, we do not think having an unfinished implementation of something that likely will not get finished in the current form is worth it. So let's get rid of it.
 2019-10-18 23:14:14 +02:00
Benjamin Neff
a26e20ab7d
Merge branch 'next-minor' into develop 2019-07-03 13:25:49 +02:00
Benjamin Neff
df4e79b842
Cleanup pending photos which were never posted with cronjob 
Only delete photos older than a day, so we don't delete photos for posts
which were uploaded 10 minutes ago and the author is still writing the
post for it.

closes #8041
 2019-07-03 13:24:27 +02:00
Benjamin Neff
e92eb88782
Merge branch 'next-minor' into develop 2019-06-25 02:14:52 +02:00
Benjamin Neff
4cef2a4325
Merge branch 'master' into next-minor 2019-06-25 02:14:45 +02:00
Benjamin Neff
09a425cbbc
Merge branch 'release/0.7.12.0' 2019-06-25 02:13:50 +02:00
Benjamin Neff
1e8a96d817
updated 64 locale files [ci skip] 2019-06-25 02:06:07 +02:00
Benjamin Neff
6f14f1b850
Merge branch 'next-minor' into develop 2019-06-17 01:20:42 +02:00
Benjamin Neff
d674f53910
Start 0.7.13.0 cycle 2019-06-17 01:19:44 +02:00
Benjamin Neff
88e35d3f3a
Use :database_authenticatable strategy to check password for OTP user 
This:
* makes sure that after_database_authentication is called for users with
enabled 2fa.
* handles paranoid mode correctly
 2019-06-17 01:12:42 +02:00
Benjamin Neff
0df2f519f0
Merge branch 'next-minor' into develop 2019-05-13 22:52:23 +02:00
Benjamin Neff
4a22f08539
Merge branch 'master' into next-minor 2019-05-13 22:52:08 +02:00
Benjamin Neff
dc7c5ffef6
Merge branch 'release/0.7.11.0' 2019-05-13 22:51:22 +02:00
Benjamin Neff
5aec9b966c
updated 74 locale files [ci skip] 2019-05-13 22:49:16 +02:00
Benjamin Neff
314239ff2a
Merge branch 'next-minor' into develop 2019-05-12 00:25:52 +02:00
Benjamin Neff
e5ba9a1a46
Move translations to registrations.closed 
And remove unused translations and make "another pod" translatable.

closes #7896
 2019-05-12 00:25:36 +02:00
flaburgan
4feab5219e
Use a partial to share code between mobile and desktop, add the new route to the RegistrationController, drop flash message for closed registrations 2019-05-12 00:25:36 +02:00
alebor-5
469983a623
Improve communication about signing up on closed pods 
fixes #7767
 2019-05-12 00:25:08 +02:00
flaburgan
6826e89a95
Change design, add a link to the official website 
fixes #7910

closes #7966
 2019-05-12 00:12:12 +02:00
David Moseler
e04ddd0bcc
Clarify pod is part of diaspora in splash screen 2019-05-12 00:09:58 +02:00
Dennis Schubert
3704be8bec
Prepare 0.7.12.0 cycle 
[ci skip]
 2019-05-05 04:22:10 +02:00
Benjamin Neff
d25d9f96f9
Merge branch 'next-minor' into develop 2019-04-30 22:52:00 +02:00
Benjamin Neff
54fd4846c0
Use password to disable 2FA instead of a token 
Using token doesn't make much sense when you can generate new tokens
right below.

closes #8006
 2019-04-30 22:51:51 +02:00
Benjamin Neff
d486fbce8c
Merge branch 'next-minor' into develop 2019-04-30 00:21:55 +02:00
Benjamin Neff
607659939d
Enable paranoid mode for devise 
fixes #8001

closes #8003
 2019-04-30 00:21:00 +02:00
lislis
9d5b981809 Two factor authentication (#7751) 2019-04-28 23:24:40 +02:00
lislis
1da118780e Two factor authentication (#7751) 2019-04-28 19:06:48 +02:00
Benjamin Neff
6ba9b24c1a
Merge branch 'next-minor' into develop 2019-04-27 18:00:40 +02:00
flaburgan
2073791cee
Add a manifest.json file as a first step to make diaspora* a PWA 
fixes #7997

closes #7998
 2019-04-27 18:00:14 +02:00
flaburgan
5b6cef0679
Remove legacy mobile web-capable 2019-04-27 17:56:51 +02:00
Jonne Haß
99411fced7 Merge branch 'develop' into api 2019-04-26 17:54:08 +02:00
Benjamin Neff
fc0de7bbd0
Merge branch 'next-minor' into develop 2019-02-26 01:02:52 +01:00
Benjamin Neff
a4031e09e1
Merge branch 'master' into next-minor 2019-02-26 01:02:42 +01:00
Benjamin Neff
663da1ef25
Merge branch 'release/0.7.10.0' 2019-02-26 01:01:51 +01:00
Benjamin Neff
7595168e01
updated 7 locale files [ci skip] 2019-02-26 00:57:43 +01:00
Benjamin Neff
4687d7e1ea
Start 0.7.11.0 cycle 2019-02-19 01:48:11 +01:00
Benjamin Neff
cdfcccd75d
Merge branch 'next-minor' into develop 2019-01-14 03:15:51 +01:00
Benjamin Neff
3ea4396ddb
Merge branch 'master' into next-minor 2019-01-14 03:13:44 +01:00
Benjamin Neff
1edcb0013c
Merge branch 'release/0.7.9.0' 2019-01-14 03:11:54 +01:00
Benjamin Neff
1925127964
updated 87 locale files [ci skip] 2019-01-14 03:09:05 +01:00
Benjamin Neff
71595b4cbd
Start 0.7.10.0 cycle 2019-01-07 02:03:06 +01:00
Benjamin Neff
2b2852267a
Merge branch 'next-minor' into develop 2019-01-06 22:18:48 +01:00
flaburgan
c8a1f308c6
Rename 'toggle mobile' to 'switch to touch-optimized mode' or 'switch to standard mode' 
closes #7926
 2019-01-06 22:04:22 +01:00
Hank Grabowski
58d2ce7ba6
Ignore Users in Mobile UI 
fixes #7840

closes #7884
 2019-01-06 21:55:33 +01:00
Hank Grabowski
9c730fc0f3 OpenID Scopes and Security updates 2018-12-30 22:33:04 +01:00
Hank Grabowski
16bf5d8130 Add Poll Voting Method to Interactions Endpoint 2018-12-30 22:33:04 +01:00
Hank Grabowski
02cf6a9eb2 Photos API Endpoint and unit tests complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
7dba616e4e Search API Endpoint and unit test complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
2f432eb560 Users Controller and unit tests complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
09c13fdf67 Notifications API Endpoint and unit test complete 2018-12-30 22:33:04 +01:00
Hank Grabowski
803abba5c1 Interactions API endpoint complete with full tests 2018-12-30 22:33:04 +01:00
HankG
0f4789a5cb Contacts API Feature complete with full tests 2018-12-30 22:33:04 +01:00
Hank Grabowski
7ae36de2cf Tags API Endpoint complete with full tests 2018-12-30 22:33:04 +01:00
Hank Grabowski
db7fe69ce4 Aspects API Endpoint complete with full tests 2018-12-30 22:31:33 +01:00
Hank Grabowski
173461ac3d Reshares API Endpoint complete with full unit tests 2018-12-30 22:31:33 +01:00
HankG
4923338bcf Conversations API Endpoint Feature complete with full tests 2018-12-30 22:31:33 +01:00
HankG
48b1428c57 Streams Controller API feature complete and fully tested 2018-12-30 22:31:33 +01:00
Hank Grabowski
bb2261b47d Posts API Endpoint feature complete with full unit tests 2018-12-30 22:31:33 +01:00
Hank Grabowski
f64a8e04ed Comments API Endpoint complete with full unit tests 2018-12-30 22:31:33 +01:00
Hank Grabowski
7ee9565a04 Likes API endpoint complete 2018-12-30 22:31:33 +01:00
Frank Rousseau
84ac19a090 Clean API routes 
* Remove routes without matching controller
* Rename stream routes to match specifications
* Remove public stream route and related controller
 2018-12-30 22:31:33 +01:00
Frank Rousseau
ec47fc67ab Make the comment API match the API specs 2018-12-30 22:31:33 +01:00
Frank Rousseau
bf2a188f82 Remove default paramter for api routes 2018-12-30 22:31:33 +01:00
Frank Rousseau
ffd5f575bc Make API likes controller match specs 2018-12-30 22:31:33 +01:00
Frank Rousseau
646c743385 Fix stream API routes 
Put streams under the subpath `/streams`.
 2018-12-30 22:31:33 +01:00
Frank Rousseau
ec18844e8f Move API controllers from v0 to v1 2018-12-30 22:31:33 +01:00
Frank Rousseau
b4dc13f1ce Fix code styles 2018-12-30 22:31:33 +01:00
Frank Rousseau
36bc122510 Adapt some API route syntax 2018-12-30 22:31:33 +01:00
Frank Rousseau
72a3b92b50 Make syntax compliant with the pronto configuration 2018-12-30 22:31:33 +01:00
Frank Rousseau
f9e0dee2dc Make messages API conformed with docs 2018-12-30 22:31:33 +01:00
Frank Rousseau
f0aecd5790 Add routes for conversation 
Including messages and visibilities
 2018-12-30 22:31:33 +01:00
Frank Rousseau
35860e2866 Add locales for conversation API controller 2018-12-30 22:31:33 +01:00
theworldbright
6cad0a965a Add likes API route 2018-12-30 22:31:33 +01:00
theworldbright
41750e38da Add streams API routes 2018-12-30 22:31:33 +01:00
theworldbright
c9ba1ee197 Combine Comment index with Post show API route 2018-12-30 22:31:33 +01:00
theworldbright
47dd44ff39 Add comments API routes 2018-12-30 22:31:33 +01:00
theworldbright
552d3efb29 Add posts API routes 2018-12-30 22:31:33 +01:00
Benjamin Neff
6824ef5baf
Merge branch 'next-minor' into develop 2018-11-25 22:38:03 +01:00
Benjamin Neff
5a0381f832
Merge branch 'master' into next-minor 2018-11-25 22:37:43 +01:00
Benjamin Neff
6185355e92
Merge branch 'release/0.7.8.0' 2018-11-25 22:36:59 +01:00
Benjamin Neff
09a8c84ae0
updated 51 locale files [ci skip] 2018-11-25 22:34:46 +01:00