an
7126d53baf
Merge branch 'master' of https://github.com/noiob/awoospace
...
# Conflicts:
# app/controllers/settings/preferences_controller.rb
# app/helpers/settings_helper.rb
# app/javascript/flavours/glitch/features/compose/components/compose_form.js
# app/javascript/flavours/glitch/features/compose/components/publisher.js
# app/javascript/flavours/glitch/styles/about.scss
# app/javascript/flavours/glitch/styles/variables.scss
# app/javascript/mastodon/features/ui/components/modal_root.js
# app/javascript/styles/mastodon/variables.scss
# app/lib/ostatus/activity/creation.rb
# app/models/status.rb
# app/services/pubsubhubbub/subscribe_service.rb
# app/services/resolve_account_service.rb
# app/services/send_interaction_service.rb
# app/services/update_remote_profile_service.rb
# app/validators/status_length_validator.rb
# app/views/about/more.html.haml
# app/views/about/show.html.haml
# app/workers/pubsubhubbub/delivery_worker.rb
# config/application.rb
# config/locales/simple_form.en.yml
2019-12-21 22:29:34 -05:00
de5305a3a5
Fix redirecting non-functional accounts on public pages ( #11978 )
...
Fix #11969
2019-09-28 01:33:27 +02:00
16cdaa1110
Fix uncaught errors in media proxy controller ( #11811 )
2019-09-12 01:51:12 +02:00
a8b0bb355d
Fix uncaught 422 and 500 errors ( #11590 )
2019-08-18 18:04:18 +02:00
24552b5160
Add whitelist mode ( #11291 )
2019-07-30 11:10:46 +02:00
bd942ac2a5
Merge remote-tracking branch 'glitchsoc/master'
2019-07-18 05:34:20 +02:00
707ddf7808
Change domain blocks to automatically support subdomains ( #11138 )
...
* Change domain blocks to automatically support subdomains
If a more authoritative domain is blocked (example.com), then the
same block will be applied to a subdomain (foo.example.com)
* Match subdomains of existing accounts when blocking/unblocking domains
* Improve code style
2019-06-22 00:13:10 +02:00
8514ef723c
Fix login sometimes redirecting to paths that are not pages ( #11019 )
...
Fix #11016
2019-06-10 12:28:13 +02:00
a27ccc5d4c
update whitelist usage in media_proxy_controller
2018-08-15 00:12:53 +02:00
55fd55714a
Raise Mastodon::RaceConditionError if Redis lock failed ( #7511 )
...
An explicit error allows user agents to know the error and Sidekiq to
retry.
2018-05-16 12:29:45 +02:00
41e6c8b151
Fix incomplete account records being read ( #4998 )
...
* Fix incomplete account records being read
- Put account processing into redis lock
- Do not save until record is complete
* Fix spaces
2017-09-19 06:53:16 +02:00
54edb4b853
When accessing uncached media attachment, redownload it ( #4955 )
...
* When accessing uncached media attachment, redownload it
* Prevent re-download of rejected media
2017-09-16 03:01:45 +02:00
an
Eugen Rochko
noiob
Crom
Akihiko Odaki