Commit graph

20275 commits

Author SHA1 Message Date
Jonne Haß
e167584f7f Merge branch 'next-minor' into develop 2020-11-04 18:09:41 +01:00
Jonne Haß
cfd5397cfc GHA: Run Jasmine in separate, time limited step for now
closes #8182
2020-11-04 18:09:36 +01:00
Benjamin Neff
9021583d37
Merge branch 'next-minor' into develop 2020-11-04 14:22:29 +01:00
Benjamin Neff
d9013250fd
Upgrade docker image to ruby 2.6 and debian buster
closes #8180
2020-11-04 14:22:22 +01:00
Benjamin Neff
f51ad14c1b
Cleanup dependencies in docker image
Replace ghostscript with gsfonts, the captcha only needs gsfonts to
work.
2020-11-04 14:22:02 +01:00
Jonne Haß
bbd4a68151 Merge branch 'next-minor' into develop 2020-11-02 19:55:41 +01:00
Jonne Haß
6f3d68110a bump jasmine to 3.6.0
closes #8179
2020-11-02 19:55:38 +01:00
Jonne Haß
8bca84422e cucumber: don't fail on flaky tests, fail-fast 2020-11-02 19:55:36 +01:00
Jonne Haß
e1aff7e3ab drop coveralls 2020-11-02 19:55:36 +01:00
Jonne Haß
89b2e9ed3a Merge branch 'next-minor' into develop 2020-11-02 16:08:19 +01:00
Jonne Haß
203ca77a2f github actions ci: don't stop other jobs in matrix if one fails 2020-11-02 16:08:10 +01:00
Jonne Haß
6a4a983fa1 Merge branch 'next-minor' into develop 2020-11-02 15:34:08 +01:00
David Morley
9793f89761 Update poduptime link to diaspora only list
closes #8174
2020-11-02 15:33:38 +01:00
Jonne Haß
a57ee1efb3 Merge branch 'next-minor' into develop 2020-11-02 15:31:11 +01:00
David Morley
e24eb65ca4 update poduptime to diaspora list in readme
closes #8173
2020-11-02 15:31:01 +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
5304fb0c6f
Merge pull request #8172 from denschub/api-scope-polish
Slightly polish the OAuth Scope descriptions.
2020-11-01 18:48:15 +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
Dennis Schubert
25a70c2b16
Merge pull request #8169 from jhass/openid_issuer_url
OpenID Connect: ensure consistent issuer URL
2020-10-25 17:18:25 +01:00
Jonne Haß
0aba20f85c OpenID Connect: ensure consistent issuer URL
root_url does not know the right protocol in all contexts,
some clients are strict when validating this.
2020-10-24 22:30:43 +02:00
Benjamin Neff
d27cd175df
Merge pull request #8167 from SuperTux88/fix-TagFollowingsController
Fix error in TagFollowingsController#create when duplicate is created
2020-10-24 21:04:55 +02:00
Dennis Schubert
31e13dcff7
Merge branch 'next-minor' into develop 2020-10-24 14:25:45 +02:00
Thorsten Claus
d0eb711ca0
In single post view deleting a comment updates the counter 2020-10-24 14:25:32 +02:00
Benjamin Neff
81bc438c98
Fix error in TagFollowingsController#create when duplicate is created 2020-10-23 21:10:15 +02:00
Jonne Haß
7fabd9d17f OpenID Connect: Disable form-action CSP on authorization page
Some browsers apply this CSP rules even to the redirect response
after the POST requests, blocking the redirect_uri redirect
2020-10-20 18:10:52 +02:00
Jonne Haß
651a271450 Merge branch 'next-minor' into develop 2020-10-20 11:54:48 +02:00
Jonne Haß
2aaf37659d bump kostya-sigar to 2.0.8
closes #8165
2020-10-20 11:54:45 +02:00
Jonne Haß
1f32999125 Merge branch 'next-minor' into develop 2020-09-17 08:48:45 +02:00
Jonne Haß
c268495e04 Switch to toml-rb gem
For them dotted keys

closes #8152
2020-09-17 08:48:39 +02:00
Jonne Haß
e81f07f0cf Drop config/script_server.yml warning 2020-09-04 22:00:23 +02:00
Jonne Haß
e10cf9cc85 Drop fallback to bitcoin_wallet_id 2020-09-04 22:00:14 +02: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
9df2e95724
Merge pull request #8141 from denschub/add-ip-to-admin-ui
Expose a user's .current_sign_in_ip in the admin panel
2020-09-02 21:51:20 +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
f2b118dc32
Merge branch 'next-minor' into develop 2020-07-08 22:05:52 +02:00
Jonne Haß
9dff9642b6
bundler: disable post install messages in production
closes #8131
2020-07-08 22:05:45 +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