3d859a7c2b
[Glitch] Fix various things in the directory
...
Port ac437d6b25
2018-12-09 16:08:10 +01:00
6259051853
Port directory CSS changes from upstream
...
Port fd8ca11f19
2018-12-09 16:08:10 +01:00
b62953b3d2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb
Moved public.js changes to settings.js.
2018-12-09 16:08:04 +01:00
097d866028
Add setting to not aggregate reblogs ( #9248 )
...
* Add setting to not aggregate reblogs
Fixes #9222
* Handle cases where user is nil in add_to_home and add_to_list
* Add hint for setting_aggregate_reblogs option
* Reword setting_aggregate_reblogs label
2018-12-09 13:03:01 +01:00
f551383e4a
Cache hashtag sample accounts, and exclude ineligible ones ( #9465 )
2018-12-08 01:32:26 +01:00
d72487aef6
Make notification time smaller and reduce contrast ( #9464 )
2018-12-08 00:40:11 +01:00
03289a4d14
Escape HTML in profile name preview in profile settings ( #9446 )
...
* fix non-escaped html in the profile settings
* provide a default profile text in case if there's no custom one
* update haml syntax
* simplify default profile name to username
* sanitize user-input html but display emojified icons
2018-12-07 16:42:22 +01:00
ac437d6b25
Fix various things in the directory ( #9449 )
...
* Fix missing variable in directory page title
* Order hashtags by number of people instead of alphabetically
* Add icon to OpenGraph preview of directory page
* Prevent line breaks in hashtags and ensure lowercase in the table
2018-12-07 16:37:32 +01:00
f2ca159c3b
Fix tag mb_chars comparison of profile directory ( #9448 )
2018-12-07 04:18:37 +01:00
b34053e888
Merge pull request #848 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-12-06 17:40:43 +01:00
fd8ca11f19
Add profile directory ( #9427 )
...
Fix #5578
2018-12-06 17:36:11 +01:00
467786f29b
Fix mention links in detailed statuses not opening in the WebUI
2018-12-06 15:31:21 +01:00
4aca9b4e0f
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-06 12:44:38 +01:00
88faa4ff2d
Attempt fixing deadlocks by moving account stats update outside transaction ( #9437 )
...
* Use `update_column` instead of `update_attribute` in callback
`update_attribute` would normally cause callbacks to be called.
Called from a callback, it seems to stop further callbacks from executing.
`update_column` does the same work, but without calling callbacks or
preventing other callbacks from executing.
* Fix deadlocks by moving account stats update outside transaction
2018-12-05 22:51:12 +01:00
2a9843a021
Add visible dates for notifications in Notification column ( #9423 )
...
* add RelativeTimestamp elements
* style the elements properly with CSS
2018-12-05 05:08:43 +01:00
5e2cd7f672
Fix thread depth computation in statuses_controller ( #9426 )
...
* Add test that should currently fail
* Fix depth computation (will still fail if statuses have been filtered out)
* Fix handling of broken threads
2018-12-05 02:12:29 +01:00
626a544d08
Improve account suspension speed and completeness ( #9290 )
...
- Some associations were missing from the clean-up
- Some attributes were not reset on suspension
- Skip federation and streaming deletes when purging a dead domain
- Move account association definitions to concern
2018-12-03 01:32:08 +01:00
3988b60bc2
Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries
...
Display a double reply arrow on public pages for toots that are replies
2018-12-02 16:30:52 -06:00
d67776ac83
Merge branch 'master' into glitch-soc/merge-upstream
2018-12-01 21:00:16 +01:00
606f0df712
Fix since_id
2018-12-01 18:59:24 +01:00
a3f01ec6f8
Fix last_status parameter for notifications and conversations ( #9407 )
2018-12-01 18:36:41 +01:00
d69ee38a7b
[i18n] update and corrections for Occitan locale ( #9404 )
...
* Update + correction
Colomna and not columna
Pòt, verb missing
* Correction
D’aquí is followed by a time period, and dins by a season.
Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details.
* Correction admin zone
* Correction
Reïnicializacion, with the funny ï
2018-12-01 17:39:13 +01:00
49fe8fa425
Add a tooltip explaining what a locked account is ( #9403 )
...
* create a title tooltip explaining what a locked account is
* improve phrasing
* minor phrasing fix to unify default and english
2018-12-01 14:25:15 +01:00
c430672460
Merge pull request #837 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-11-30 22:37:58 +01:00
a281d3ebd3
Scroll to selected toot even if the ancestors happen to be loaded
2018-11-30 22:37:38 +01:00
8117ba2cb1
Scroll to detailed status when new ancestors get inserted
2018-11-30 22:37:38 +01:00
5a03b30f13
[Glitch] Fix bug in order of conversations in web UI
...
Port 2af43c3dce
2018-11-30 22:37:38 +01:00
ff50412846
[Glitch] Replace recursion in status mapStateToProps
...
Port 20a23c7d08
2018-11-30 22:37:38 +01:00
45ba4e83e0
[Glitch] Fix context building in the reducer
...
Port a5c740ba41
2018-11-30 22:37:38 +01:00
05d7c498ba
[Glitch] Introduce flat layout to contexts reducer
...
Port 4e718bbb25
2018-11-30 22:37:38 +01:00
b808ba6a77
Display a double reply arrow on public pages for toots that are replies
2018-11-30 22:09:52 +01:00
fda8506a9c
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-30 20:16:26 +01:00
88e40d03d9
Fix that translation is not applied to "joining hashtags" ( #9397 )
2018-11-30 19:36:09 +01:00
272c58904f
Remove npm-run-all dependency ( #9401 )
...
Fix #9359
2018-11-30 19:16:32 +01:00
77b9249250
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-29 19:22:52 +01:00
fc707adcde
Improve detailed status component lifecycle
...
- Move componentWillMount and componentWillReceiveProps logic to
getDerivedStateFromProps.
- Compute CW auto-unfold status earlier
2018-11-29 18:32:42 +01:00
a6b5451df5
Swap avatar and header input fields in profile page ( #9271 )
...
Fixes #9211
2018-11-29 02:56:09 +01:00
c37a81a5d7
Do not hardcode preferences link, pleroma doesn't have it
2018-11-28 22:36:01 +01:00
cb2822b68a
Add error boundary component to catch Web UI crashes
2018-11-28 22:36:01 +01:00
c0675a272e
Do not crash the whole UI when loading an invalid column
2018-11-28 22:36:01 +01:00
76603a189a
Switch “cycling” reply policy link to set of radio inputs
...
Fixes #832
2018-11-28 22:35:42 +01:00
f21f359653
Add basic UI to set list replies setting in glitch-soc
2018-11-28 14:46:07 +01:00
5b84011025
Add backend support to read and update list-specific show_replies settings
2018-11-28 14:46:07 +01:00
b2e9a23ac9
Add database support for list show-reply preferences
2018-11-28 14:46:07 +01:00
50b7d2f002
Merge pull request #829 from ThibG/glitch-soc/features/volume-sliders
...
[Glitch] Volume sliders for videos
2018-11-27 15:27:21 -06:00
030ce53623
Fix TLS handshake timeout not being enforced ( #9381 )
...
Follow-up to #9329
2018-11-27 19:46:05 +01:00
12ee020187
Skip deliveries to inboxes that have already been marked as unavailable ( #9358 )
2018-11-27 19:15:08 +01:00
81536e07ab
Don't count suspended users in user count ( #9380 )
...
Fix #7637
2018-11-27 18:49:37 +01:00
8c7ba82dc1
Fix nil error when no DNS addresses are found for host ( #9379 )
2018-11-27 18:13:36 +01:00
c81ad5a2cb
[Glitch] Volume sliders for videos
...
Port b7229bef1a
2018-11-27 15:21:57 +01:00
35b6fb4e62
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-27 15:10:58 +01:00
9606e4dabf
Change identities id column to a bigint ( #9371 )
...
* fix: change Identity's id column to a bigint
This appears to be the last model created using a 5.0 migration,
where column types defaulted to `integer` rather than `bigint`.
This migration changes the column type to match that of all of the
other ID columns.
* Change user_id column in identities to bigint and fix down-migration
2018-11-27 13:56:25 +01:00
a04a39668e
[Glitch] check_boxes label should use display: inline-block
...
Port 057097e8ad
2018-11-27 13:29:12 +01:00
478abe3a58
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
Resolved by taking both changes (not a real conflict, just changes too close
to each other).
2018-11-27 13:23:02 +01:00
13f080b204
Weblate translations (2018-11-27) ( #9367 )
...
* Translated using Weblate (Malay)
Currently translated at 0.4% (3 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ms/
* Added translation using Weblate (Malay)
* Translated using Weblate (Bulgarian)
Currently translated at 14.0% (98 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/
* Translated using Weblate (Croatian)
Currently translated at 14.3% (100 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hr/
* Translated using Weblate (Asturian)
Currently translated at 31.1% (218 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Translated using Weblate (Arabic)
Currently translated at 96.0% (673 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Czech)
Currently translated at 99.9% (700 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/
* Translated using Weblate (Malay)
Currently translated at 28.7% (201 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ms/
* Translated using Weblate (Polish)
Currently translated at 98.0% (687 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/
* Translated using Weblate (Serbian (latin))
Currently translated at 68.3% (479 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr_Latn/
* Translated using Weblate (Hebrew)
Currently translated at 43.1% (302 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/
* Translated using Weblate (Indonesian)
Currently translated at 31.2% (219 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/
* Translated using Weblate (Turkish)
Currently translated at 32.0% (224 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/
* Translated using Weblate (Ido)
Currently translated at 19.3% (135 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/io/
* Translated using Weblate (Asturian)
Currently translated at 49.3% (167 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ast/
* Translated using Weblate (Ido)
Currently translated at 36.9% (125 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/io/
* Translated using Weblate (Hungarian)
Currently translated at 70.2% (238 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/
* Translated using Weblate (Slovenian)
Currently translated at 45.7% (155 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Indonesian)
Currently translated at 62.5% (212 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/
* Translated using Weblate (Serbian (latin))
Currently translated at 72.0% (244 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr_Latn/
* Translated using Weblate (Catalan)
Currently translated at 99.4% (337 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Polish)
Currently translated at 98.2% (333 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/
* Translated using Weblate (Galician)
Currently translated at 99.4% (337 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (Occitan)
Currently translated at 99.4% (337 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/
* Translated using Weblate (Spanish)
Currently translated at 97.3% (330 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/
* Translated using Weblate (Romanian)
Currently translated at 97.1% (329 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/
* Translated using Weblate (Turkish)
Currently translated at 45.4% (154 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/tr/
* Translated using Weblate (Welsh)
Currently translated at 97.9% (332 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/
* Translated using Weblate (Portuguese)
Currently translated at 72.6% (246 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/
* Translated using Weblate (Bulgarian)
Currently translated at 22.4% (76 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/bg/
* Translated using Weblate (Norwegian (old code))
Currently translated at 74.0% (251 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/
* Translated using Weblate (Slovenian)
Currently translated at 89.9% (80 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/
* Translated using Weblate (Czech)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/
* Translated using Weblate (Slovenian)
Currently translated at 13.3% (93 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/
* Translated using Weblate (Czech)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.9% (700 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Korean)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/
* Translated using Weblate (Corsican)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/
* Translated using Weblate (French)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Asturian)
Currently translated at 29.0% (18 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ast/
* Translated using Weblate (Asturian)
Currently translated at 50.0% (1 of 2 strings)
Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/ast/
* Translated using Weblate (Asturian)
Currently translated at 36.2% (254 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/
* Translated using Weblate (Asturian)
Currently translated at 43.9% (43 of 98 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ast/
* Translated using Weblate (Asturian)
Currently translated at 68.1% (231 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ast/
* Translated using Weblate (Asturian)
Currently translated at 59.6% (53 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/
* Translated using Weblate (Asturian)
Currently translated at 68.1% (231 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ast/
* Translated using Weblate (Persian)
Currently translated at 99.7% (699 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/
* Translated using Weblate (Persian)
Currently translated at 100.0% (89 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/
* Translated using Weblate (Slovenian)
Currently translated at 15.5% (109 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/
* Translated using Weblate (Slovenian)
Currently translated at 46.0% (156 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/
* Translated using Weblate (Galician)
Currently translated at 100,0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/
* Translated using Weblate (German)
Currently translated at 99,7% (699 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/
* Translated using Weblate (Czech)
Currently translated at 99.9% (700 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Basque)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/
* Translated using Weblate (Basque)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Corsican)
Currently translated at 99.9% (700 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/
* Translated using Weblate (Danish)
Currently translated at 98.9% (693 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/
* Translated using Weblate (Danish)
Currently translated at 99.4% (337 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Danish)
Currently translated at 91.0% (81 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/
* Translated using Weblate (Finnish)
Currently translated at 97.9% (332 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Italian)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/
* Translated using Weblate (Italian)
Currently translated at 100.0% (89 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/
* Translated using Weblate (Welsh)
Currently translated at 91.0% (638 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (French)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/
* Translated using Weblate (Malay)
Currently translated at 42.9% (301 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ms/
* Translated using Weblate (Japanese)
Currently translated at 99.4% (337 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 99.9% (700 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/
* Translated using Weblate (Japanese)
Currently translated at 99.7% (338 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (Czech)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Danish)
Currently translated at 100,0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/
* Translated using Weblate (Czech)
Currently translated at 100,0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/
* Translated using Weblate (Basque)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (698 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Basque)
Currently translated at 100.0% (89 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Czech)
Currently translated at 100.0% (89 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 94.4% (84 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Czech)
Currently translated at 99.9% (700 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Czech)
Currently translated at 99.9% (700 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Japanese)
Currently translated at 99.7% (699 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Japanese)
Currently translated at 99.6% (698 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/
* Translated using Weblate (Telugu)
Currently translated at 0.6% (4 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/te/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (89 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 96.6% (677 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 96.6% (677 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Czech)
Currently translated at 99.9% (700 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Slovak)
Currently translated at 97.7% (685 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.7% (685 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Greek)
Currently translated at 99.6% (698 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (89 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.7% (685 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Basque)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Basque)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Basque)
Currently translated at 100.0% (89 of 89 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/
* Translated using Weblate (Telugu)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/
* Translated using Weblate (Czech)
Currently translated at 99.9% (700 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/
* Translated using Weblate (Telugu)
Currently translated at 100.0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/
* Translated using Weblate (Catalan)
Currently translated at 100,0% (339 of 339 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/
* Translated using Weblate (Slovak)
Currently translated at 97.7% (685 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Slovak)
Currently translated at 97.9% (686 of 701 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Normalize translations
* Normalize translations
ran yarn build:development && i18n-tasks normalize && yarn
manage:translations && i18n-tasks remove-unused
Also ran i18n-tasks check-consistent-interpolations
* Fix ast translation
* Fix missing plurals for ar
* Add missing plurals for cs
* Add missing plurals for sk
* Add missing plurals for sl
* Normalize translations
2018-11-27 12:50:26 +01:00
80ef517747
Allow hyphens in the middle of remote user names ( #9345 )
...
Fixes #9309
This only allows hyphens in the middle of a username, much like dots,
although I don't have a compelling reason to do so other than keeping
the changes minimal.
2018-11-27 12:28:01 +01:00
b7229bef1a
Volume sliders for videos #7429 ( #9366 )
...
* Volume sliders for videos #7429
* Code formatting updates
* Code formatting updates
2018-11-27 12:25:38 +01:00
92238e2f7a
add loglevel to ffmpeg in gif upload ( #9368 )
2018-11-27 12:19:12 +01:00
305556274a
Redesign admin accounts index ( #9340 )
...
* Improve overview of accounts in admin UI
- Display suspended status, role, last activity and IP prominently
- Default to showing local accounts
- Default to not showing suspended accounts
* Remove unused strings
* Fix tests
* Allow filtering accounts by IP mask
2018-11-26 15:53:27 +01:00
2178c50fed
Ensure replied-to is a status not a boost ( #9129 )
...
* Ensure replied-to is a status not a boost
* Consider case of not a reply
* Add test case for replying to boost
* Move reblog-reply resolution to model
* Remove unnecessary comment
2018-11-25 16:35:21 +01:00
057097e8ad
check_boxes label should use display: inline-block ( #9348 )
2018-11-25 16:26:15 +01:00
550c523233
Update MediaGallery and Video props when folding/unfolding CWs in detailed statuses
2018-11-25 11:29:56 +01:00
b8018a1bcb
Render placeholder when inline video container width isn't known
2018-11-25 11:29:56 +01:00
e80f770118
Render placeholder instead of image when MediaGallery container width isn't known
2018-11-25 11:29:56 +01:00
1d16575d71
Sort self-replies to the top of descendants ( #9320 )
...
Fix #6463
2018-11-24 20:48:50 +01:00
e49abb3b4f
Revert "Sort self-replies to the top of the thread ( #9296 )" ( #9335 )
...
This reverts commit 76a0c28687Fix #9315
2018-11-23 21:58:01 +01:00
f3fee3cd27
Fix connect timeout not being enforced ( #9329 )
...
* Fix connect timeout not being enforced
The loop was catching the timeout exception that should stop execution, so the next IP would no longer be within a timed block, which led to requests taking much longer than 10 seconds.
* Use timeout on each IP attempt, but limit to 2 attempts
* Fix code style issue
* Do not break Request#perform if no block given
* Update method stub in spec for Request
* Move timeout inside the begin/rescue block
* Use Resolv::DNS with timeout of 1 to get IP addresses
* Update Request spec to stub Resolv::DNS instead of Addrinfo
* Fix Resolve::DNS stubs in Request spec
2018-11-22 20:12:04 +01:00
a6ebcda59b
Ignore JSON-LD profile in mime type comparison ( #9179 )
...
Ignore JSON-LD profile in mime type comparison
2018-11-22 12:49:07 +01:00
6d38e81021
Include replies to list owner and replies to list members in list statuses ( #9324 )
2018-11-21 17:02:58 +01:00
0ebb6c1480
Revert connect timeout from 1s to 10s ( #9319 )
...
The failure rate in Sidekiq is too high
2018-11-21 17:00:56 +01:00
d51ed0a0a1
WebSub: ATOM before RSS ( #9302 )
...
Hello,
The ATOM feed contains the hub declaration for WebSub, but the RSS
version does not.
RSS/ATOM readers will typically pick whichever version comes first, and
will thus not see the WebSub feature.
I therefore suggest putting the ATOM version first, as it is more
feature-rich than its RSS counterpart is.
Clients not compatible with ATOM would not pick it anyway due to the
different type attribute.
A more complicated alternative would be to declare the WebSub feature in
the RSS version as well, using something like the following code, and
ensuring that clients subscribed to the RSS version would receive PuSH
updates just like those subscribed to the ATOM version.
````xml
<rss version="2.0" xmlns:webfeeds="http://webfeeds.org/rss/1.0 "
xmlns:atom="http://www.w3.org/2005/Atom ">
<channel>
<atom:link rel="self" type="application/rss+xml"
href="https://diaspodon.fr/users/test.rss "/>
<atom:link rel="hub" href="https://diaspodon.fr/api/push "/>
</channel>
</rss>
```
2018-11-20 22:25:04 +01:00
a217abb71c
Cast status_count to integer ( #9314 )
...
It is returned as a double because the sum is now over bigint columns
Fix #9312
2018-11-20 02:52:52 +01:00
e7c0ad6ac4
Move URLs to backend in their own file
2018-11-19 15:56:38 +01:00
b874d9dac7
Simplify hashtag query service, perf increase for 'any' tags ( #9298 )
2018-11-19 12:49:50 +01:00
7c9a655933
Fix filter ID not being a string in REST API ( #9303 )
2018-11-19 10:37:57 +01:00
62c0e112ea
Extract counters from accounts table to account_stats table ( #9295 )
2018-11-19 00:43:52 +01:00
98c9ad366b
Deep compare tags for hashtag column reload ( #9297 )
...
* Deep compare tags for hashtag column reload
* Don't use global lodash
2018-11-17 11:07:48 +01:00
4ec133ef93
Prevent multiple handlers for Delete of Actor from running ( #9292 )
2018-11-16 19:46:23 +01:00
76a0c28687
Sort self-replies to the top of the thread ( #9296 )
...
Fix #6463
2018-11-16 19:34:10 +01:00
7a1ec950a8
Fix composer not displaying on iPad
2018-11-16 15:04:32 +01:00
7a939f7cfc
Remove intermediary arrays when creating hash maps from results ( #9291 )
2018-11-16 15:02:18 +01:00
6d9f63dba6
Change the password form order ( #9267 )
...
* Change order of password.
* Update Japanese translation for "Show thread".
* Separate the translation PR.
2018-11-16 11:18:43 +01:00
d8ea8569c0
Update Japanese translation for "Show thread". ( #9287 )
2018-11-16 11:16:10 +09:00
ca163ec35d
In detailed status view, take displayMedia setting into account when changing media
...
Fixes #819
2018-11-15 16:38:50 +01:00
ca7f2284cd
Add field to serialized local-only statuses
2018-11-13 18:55:57 +01:00
c2c8cc7fc3
Exclude local-only toots from atom feeds
2018-11-13 18:55:57 +01:00
a1848008a9
[Glitch] Fix race condition when interacting with deleted toots
...
Port 7083838a54
2018-11-13 16:30:07 +01:00
b3553f992d
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-13 16:28:07 +01:00
b22501154e
[Glitch] Prepend account header even when status list is empty
...
Partially port bc464619f3
2018-11-13 15:54:04 +01:00
07e0f1023d
[Glitch] Fix loading indicator inconsistency
...
Port 0562e258b3
2018-11-13 15:54:04 +01:00
f40a7b2616
[Glitch] Use local instead of global loading indicator for timelines, account timelines
...
Port 9a32abcbac
2018-11-13 15:54:04 +01:00
7083838a54
Fix race condition causing shallow status with only a "favourited" attribute ( #9272 )
...
Fixes #9231
2018-11-13 14:58:14 +01:00
c735638483
Fix null error introduced in #9270 ( #9275 )
2018-11-12 22:07:31 +01:00
df154d2ffa
Perform deep comparison for card data when receiving new props ( #9270 )
...
Fixes #9226
2018-11-12 18:17:50 +01:00
4e067b1bd0
Only consider mouse move in scrolling on item insertion ( #9262 )
...
Fixes #9259
2018-11-11 23:20:20 +01:00
04f0b63c59
i18n: Add ja translations ( #9261 )
...
* Run yarn manage:translations
* Add Japanese translations.
2018-11-11 18:57:16 +01:00
b6e377a340
Fix emoji update date processing ( #9255 )
2018-11-10 23:59:51 +01:00
49889c0b8b
Check that twitter:player is valid before using it ( #9254 )
...
Fixes #9251
2018-11-10 20:42:04 +01:00
e5fd4939ff
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-10 17:57:19 +01:00
0562e258b3
Fix loading indicator inconsistency ( #9252 )
...
* Use global loading indicator when loading more items
* Use local loading indicator for notifications
And remove global loading indicator for initial custom emojis load
2018-11-10 15:04:13 +01:00
c81ac519ef
Merge pull request #806 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2018-11-09 22:29:52 +01:00
de57627588
[Glitch] Remove unused computation of reblog references from updateTimeline
2018-11-09 21:57:56 +01:00
d457964527
[Glitch] Don't remove originals of boosted toots from timeline
...
Port 019c39bf1d
2018-11-09 21:57:56 +01:00
59ecfbd28c
Identify manual scrolling to cancel scroll to top reset on mouse idle ( #9245 )
2018-11-09 18:06:43 +01:00
1dc409ffa6
Fix drawer waves being displayed in the list editor
2018-11-09 18:00:29 +01:00
3472950cea
Remove unused computation of reblog references from updateTimeline ( #9244 )
2018-11-09 17:43:25 +01:00
759005e4d0
[Glitch] Fix form validation flash message color and input borders
...
Port 718e4752a9
2018-11-09 15:10:09 +01:00
bf26c23205
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-09 14:56:31 +01:00
e48b428ef3
[Glitch] Implement adding a user to a list from their profile
...
Port bb5558de62
2018-11-09 14:50:08 +01:00
d78aed7a37
Reduce connect timeout limit and limit signature failures by source IP ( #9236 )
...
* Reduce connect timeout from 10s to 1s
* Limit failing signature verifications per source IP
2018-11-08 21:35:58 +01:00
9a32abcbac
Use local instead of global loading indicator for timelines, account timelines ( #9224 )
...
So that opening a profile feels faster. Also, pinned toots are not
shown before other toots have loaded. Also, if no toots are loaded,
added empty message
2018-11-08 21:35:06 +01:00
142940f4c6
Add "Show thread" link to self-replies ( #9228 )
...
Fix #4716
2018-11-08 21:08:57 +01:00
718e4752a9
Fix form validation flash message color and input borders ( #9235 )
...
* Fix form validation flash message color and input borders
* Fix typo
2018-11-08 21:06:14 +01:00
32c2f5a07f
Fix follow limit validator reporting lower number past threshold ( #9230 )
...
* Fix follow limit validator reporting lower number past threshold
* Avoid floating point follow limit
2018-11-08 21:06:01 +01:00
5f613d55e6
Optimize the process of following someone ( #9220 )
...
* Eliminate extra accounts select query from FollowService
* Optimistically update follow state in web UI and hide loading bar
Fix #6205
* Asynchronize NotifyService in FollowService
And fix failing test
* Skip Webfinger resolve routine when called from FollowService if possible
If an account is ActivityPub, then webfinger re-resolving is not necessary
when called from FollowService. Improve options of ResolveAccountService
2018-11-08 21:05:42 +01:00
54bc905a57
Cancel list scroll reset after mouse move on wheel scroll ( #9233 )
...
- Use object properties rather than component state for
mouseMovedRecently and scrollToTopOnMouseIdle flags
- Remove redundant scrollToTop prop call, also fixing an attempt to call
an undefined prop.
Fixes #9217
2018-11-08 18:45:20 +01:00
3e6a35d3ee
Increase default column width from 330px to 350px ( #9227 )
2018-11-08 07:42:17 +01:00
c29da32add
[Glitch] Update reset.scss from upstream
2018-11-06 16:03:53 +01:00
e18018e930
Merge branch 'master' into glitch-soc/merge-upstream
2018-11-06 15:22:44 +01:00
6e72dda7ef
Temporarily hold timeline if mouse moved recently ( fixes #8630 ) ( #9200 )
...
- On recent mouse movement, hold timeline position so statuses remain in
place for interactions in progress.
- If the timeline had been scrolled to the top before mouse movement,
restore scroll on mouse idle.
2018-11-05 18:59:41 +01:00
1093295902
Update resolve_url_service.rb ( #9188 )
2018-11-05 18:54:07 +01:00
d2a9ea58da
Allow joining several hashtags in a single column ( #8904 )
...
* Nascent tag menu on frontend
* Hook up frontend to search
* Tag intersection backend first pass
* Update yarnlock
* WIP
* Fix for tags not searching correctly
* Make radio buttons function
* Simplify radio buttons with modeOption
* Better naming
* Rearrange options
* Add all/any/none functionality on backend
* Small PR cleanup
* Move to service from scope
* Small cleanup, add proper service tests
* Don't use send with user input :D
* Set appropriate column header
* Handle auto updating timeline
* Fix up toggle function
* Use tag value correctly
* A bit more correct to use 'self' rather than 'all' in status scope
* Fix some style issues
* Fix more code style issues
* Style select dropdown more better
* Only use to_id'ed value to ensure no SQL injection
* Revamp frontend to allow for multiple selects
* Update backend / col header to account for more flexible tagging
* Update brakeman ignore
* Codeclimate suggestions
* Fix presenter tag_url
* Implement initial PR feedback
* Handle additional tag streaming
* CodeClimate tweak
2018-11-05 18:53:25 +01:00
43bfd0a7d0
Implement adding a user to a list from their profile ( #9062 )
...
* Add add user to list from thier profile
* Fix listAdderCss
2018-11-05 18:52:38 +01:00
6cd08a266a
Check for empty "last_status" before sorting DM column ( #9207 )
...
* Check for empty "last_status" before sorting
* Small touchups for codeclimate
2018-11-05 18:51:43 +01:00
bd31e76dcf
fix(reset): Property name for styled scrollbars ( #9210 )
...
https://webplatform.news/issues/2018-10-26
2018-11-05 18:51:26 +01:00
235e9b13ff
Fix timestamp position in public pages with RTL languages
2018-10-31 11:37:47 +01:00
080a6cb6f3
Fix styling of display names in public pages
2018-10-31 11:37:47 +01:00
33ad16faa7
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-31 10:08:36 +01:00
13567f13af
[Glitch] Port some of upstream's getting started footer links
2018-10-31 10:07:41 +01:00
083f015f9f
Fix reducer error when conversation has no last status in web UI ( #9173 )
...
Fix #9170
2018-10-31 00:55:20 +01:00
3981da6f90
Revert "Fix FetchAtomService content type handling ( #9132 )" ( #9171 )
...
This reverts commit c20d55f7dd
2018-10-31 00:43:34 +01:00
407cab9844
[i18n] Update for Occitan ( #9169 )
...
* Update oc.json
* Update oc.yml
* Update simple_form.oc.yml
* Update simple_form.oc.yml
* Update oc.json
2018-10-30 22:06:31 +01:00
5ad4bcbece
[Glitch] Fix empty display name precedence over username in web UI
...
Port 4084814d8a
2018-10-30 17:54:50 +01:00
fd18ed4cea
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/auth/sessions_controller.rb
Upstream reverted something we partially reverted already.
Reverted the rest to match upstream.
2018-10-30 17:52:08 +01:00
8bef422043
Add a local setting for inline preview cards
2018-10-30 17:51:06 +01:00
4fe81a99c6
Add a “link” status icon for toots with a preview card
2018-10-30 17:51:06 +01:00
7f023b3b98
[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning
...
Port 766a808de4
2018-10-30 17:51:06 +01:00
18870c45f1
[Glitch] Include preview cards in status entity in REST API
...
Port cf2ab9c394
2018-10-30 17:51:06 +01:00
4084814d8a
Fix empty display name precedence over username in web UI ( #9163 )
...
Fix #9131
2018-10-30 17:06:12 +01:00
e242688a74
Fix td instead of th in sessions table header ( #9162 )
...
Fix #9130
2018-10-30 17:00:34 +01:00
ca87d98d16
Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" ( #9161 )
...
This reverts commit 0c756cfd54
2018-10-30 16:25:54 +01:00
c20d55f7dd
Fix FetchAtomService content type handling ( #9132 )
...
* Add profile to json+ld in Accept
It's required by the ActivityPub spec
* Use headers['Content-type'] instead of mime_type
mime_type strips the profile from the content type, but it's still available raw in the headers hash
* Add test for ld+json with profile
2018-10-30 15:07:57 +01:00
a43fdd72ba
[i18n] Update for Occitan ( #9157 )
...
* Update oc.json
* Update devise.oc.yml
* Update oc.yml
* Update oc.json
2018-10-30 15:05:01 +01:00
d84886f35e
Accept the same payload in multiple inboxes and deliver ( #9150 )
2018-10-30 15:03:55 +01:00
c15b8ee75b
Always let through notifications from staff ( #9152 )
...
* Always let through notifications from staff
Follow-up to #8993
* Let messages from staff through, but no other notifications
2018-10-30 15:02:55 +01:00
cfe92b50bb
Fix Pleroma mentions being fetched as preview cards ( #9158 )
2018-10-30 15:02:24 +01:00
bdcdc35df7
[Glitch] RTL: fix toot privacy preferences radio buttonss
...
Port 27b5a57f6d
2018-10-30 11:24:40 +01:00
cecd8b25c4
[Glitch] RTL: fix preferences page checkbox margins
...
Port 4e034437e3
2018-10-30 11:24:19 +01:00
7406141a71
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-30 11:22:25 +01:00
fcd79aba0b
Make detailed-status__wrapper actually wrap detailed status ( #8547 )
...
* Remove class from scrollable div
.detailed-status__wrapper does not actually wrap the detailed status here
* Re-add class to focusable div
.detailed-status__wrapper now wraps the detailed status instead of the entire scrollable area
2018-10-30 06:33:02 +01:00
Thibaut Girka