f9c8642a11
Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
...
Conflicts:
app/models/glitch/keyword_mute.rb
6 years ago
34ac79cb68
Merge pull request #506 from ThibG/glitch-soc/fixes/static-500
...
Hardcode default skin/theme in error layout (fixes #373 )
6 years ago
c2f7676dfc
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
...
Conflicts:
app/models/status.rb
The conflict in the Status model was due to
3114ac9655
6 years ago
f4a6f6fb89
Remove unnecessary underline on accounts table ( #7728 )
6 years ago
a38c4c45da
Add apply-to-mentions option to keyword mute UI. #454 .
6 years ago
574e74bbdd
Hardcode default skin/theme in error layout ( fixes #373 )
...
This is a bit hackish. The best way would simply to somehow
use Mastodon's ApplicationController with `use_pack 'error'` from
the Rake task, but I'm not sure how to do that.
6 years ago
8f74ec1286
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
6 years ago
f548332935
Display only domain of report account if remote under comment ( #7574 )
6 years ago
c384e0f3de
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/locales/simple_form.ja.yml
6 years ago
3646b280d9
Disables autocorrect/autocapitalize on remote username field. ( #7549 )
6 years ago
95385ebe3e
In footer, replace text "Mastodon" with logo ( #7545 )
6 years ago
3c3e6d0e9b
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/controllers/settings/preferences_controller.rb
app/lib/user_settings_decorator.rb
app/models/user.rb
config/locales/simple_form.en.yml
6 years ago
aeceb63275
Add preference to hide following/followers lists ( #7532 )
...
* Add preference to hide following/followers lists
- Public pages
- ActivityPub collections (does not return pages but does give total)
- REST API (unless it's your own) (does not federate)
Fix #6901
* Add preference
* Add delegation
* Fix issue
* Fix issue
6 years ago
efd2441d1f
Merge branch 'master' into glitch-soc/merge
6 years ago
6e5b5d557c
Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape
...
Fix glitch-style bio fields incorrect HTML escaping in public profiles
6 years ago
c39d227996
Fix glitch-style bio fields incorrect HTML escaping in public profiles
6 years ago
4072475241
Improvements to toots display in admin view ( #7452 )
...
* Distinguish boosts from original statuses in the admin panel (fixes #7449 )
* Show the “show more” button in admin view to make CWs clearer (fixes #7451 )
* Make content warnings swag
6 years ago
d0b753db6b
Merge branch 'master' into glitch-soc/merge
...
Conflicts:
app/controllers/invites_controller.rb
app/serializers/initial_state_serializer.rb
config/locales/ko.yml
6 years ago
b91c131afa
Strip tags from og:description on public tag page ( #7437 )
6 years ago
f286c23900
Add alternate for RSS ( #7436 )
6 years ago
af504e62ff
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
6 years ago
c1427f90f6
Show media modal on public timeline ( #7413 )
6 years ago
7ff3c849d1
Bot nameplates ( #7391 )
...
* Store actor type in database
* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365
* Fix code style issues
6 years ago
3f7348c436
Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items
...
Support upstream bio items / custom account fields
6 years ago
4055ce490c
Enable custom emojis in profiles (notes, field values, display names) ( #7374 )
...
Follow-up to #6124
6 years ago
8c8a850f8a
Add resend confirmation for admin ( #7378 )
...
* Add confirmations_controller#resend
* Add tests for confirmations_controller#resend
* Add translations
6 years ago
a1398887ae
Add hint about 7 day cooldown for archive takeout ( #7375 )
6 years ago
14393f29ef
Add contact e-mail hint to 2FA login form ( #7376 )
6 years ago
0dcca6b6e8
Improve admin UI for accounts ( #7360 )
...
* Improve design of account statuses admin UI (consistent with reports)
* Make account moderation notes look consistent with report notes
* i18n-tasks remove-unused
* Fix code style issues
* Fix tests
6 years ago
9a84024b1e
Improve rendering of bio fields ( #7353 )
...
Fix #7335
6 years ago
ea46024add
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
Gemfile.lock
6 years ago
d9eda62221
Show remote reports in admin UI as coming from domain rather than user ( #7347 )
...
Fix #6994
6 years ago
c87f1d99e4
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
.travis.yml
Gemfile.lock
README.md
app/controllers/settings/follower_domains_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/ja.json
app/lib/feed_manager.rb
app/models/media_attachment.rb
app/models/mute.rb
app/models/status.rb
app/services/mute_service.rb
app/views/home/index.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/ca.yml
config/locales/en.yml
config/locales/es.yml
config/locales/fr.yml
config/locales/nl.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/themes.yml
6 years ago
68ba4f23e0
Serialize webfinger XML with Ox instead of Nokogiri ( #7319 )
...
25ms -> 0.5ms
6 years ago
ba1f40c806
Fix "Show more" URL on paginated threads for remote statuses ( #7285 )
...
* Fix URL of "Show more" link in paginated threads (ancestors side)
Increase item limits in threads
Fix #7268
* Fix "Show more" link in paginated threads (descendants side)
6 years ago
2df57af401
Implement tootsuite-style account fields
...
glitch-soc-style still in backup, both sharing the same SCSS style
6 years ago
e22f682df0
Paginate descendant statuses in public page ( #7148 )
7 years ago
354a6e4026
Improve report layout ( #7188 )
...
* Use table for statuses in report
* Display reported account and reporter in the same table
* Split accounts and general report info into two tables again
* Redesign report statuses table, notes, merge notes and action log
* Remove unused translations
* Fix code style issue
* Fix code style issue
* Fix code style issue
7 years ago
7a8c526709
Replace preload link tag to Rails helper ( #7192 )
7 years ago
c9265e97cc
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
185407d3a2
Reports: Merge contents and comment columns ( #7189 )
7 years ago
bae5435010
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/home_controller.rb
app/controllers/stream_entries_controller.rb
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
7 years ago
0f9c6407e9
Feature: add count of account notes to reports ( #7130 )
...
* Reports: Colocate account details with reports
* Reports: Add count of account moderation notes
Sometimes an account will be left with a note instead of the report, this adds a way to quickly see from a given report if this is the case.
7 years ago
7f6823b149
Able to deactivate invites if they aren't expired ( #7163 )
7 years ago
0cdf4567c7
Fix missing "Administered by" when timeline preview disabled ( #7161 )
7 years ago
60d86501b5
Remove extra spaces from search API queries and public account headers ( fixes #7129 ) ( #7152 )
7 years ago
9697c6d9f0
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
db/schema.rb
7 years ago
466442b764
Add bio fields ( #6645 )
...
* Add bio fields
- Fix #3211
- Fix #232
- Fix #121
* Display bio fields in web UI
* Fix output of links and missing fields
* Federate bio fields over ActivityPub as PropertyValue
* Improve how the fields are stored, add to Edit profile form
* Add rel=me to links in fields
Fix #121
7 years ago
ac1ac20ee9
Merge remote-tracking branch 'tootsuite/master'
...
Conflicts:
app/controllers/statuses_controller.rb
7 years ago
6c2344d4dd
Paginate ancestor statuses in public page ( #7102 )
...
This also limits the statuses returned by API, but pagination is not
implemented in Web API yet. I still expect it brings user experience
better than making a user wait to fetch all ancestor statuses and flooding
the column with them.
7 years ago
David Yip
Yamagishi Kazutoshi
Thibaut Girka
Jenkins
Eugen Rochko
Ash Furrow
beatrix
Shuhei Kitagawa
Akihiko Odaki
Emelia Smith
Jennifer Kruse