c1c514ca70
Merge branch 'master' into glitch-soc/merge-upstream
...
Manually-resolved conflicts:
.circleci/config.yml
app/controllers/accounts_controller.rb
app/controllers/auth/passwords_controller.rb
app/controllers/statuses_controller.rb
app/javascript/packs/public.js
app/models/media_attachment.rb
app/views/stream_entries/_content_spoiler.html.haml
app/views/stream_entries/_media.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
lib/mastodon/version.rb
Some content from app/javascript/packs/public.js has been split to
app/javascript/core/settings.js.
Translation strings for glitch-soc's keyword mutes were dropped.
Everything else was mostly “take both”.
6 years ago
0a3cc246ac
Fix size/dimension values in avatar/header hint localizations ( #8088 )
6 years ago
bb71538bb5
Redesign public profiles and toots ( #8068 )
6 years ago
1c9c0167b7
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 years ago
42cd363542
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
7 years ago
813da6788e
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
db/schema.rb
7 years ago
78ed4ab75f
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
7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
7 years ago
706e534455
Add UI for setting up account migration ( #5832 )
7 years ago
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
47d48fed8d
Reset preview image if avatar/header image selection was cancelled ( #4893 )
7 years ago
984d2d4cb6
Merge that good fresh upstream shit
7 years ago
7bf7ed6123
Fix #3220 - Show avatar/header on edit profile page ( #4288 )
7 years ago
c0a665865e
update bio length to 500
7 years ago
76449df903
Fix character counter not updating for bio ( #3101 )
8 years ago
4bd0488a77
feat(count): Just yml count syntax to provide different rule for 1 ( #2685 )
...
Update all translation forms that use this "counter" element.
8 years ago
459bbfa4b2
Prevent selection of unacceptable Content-Type files ( #2910 )
...
* Prevent selection of unacceptable Content-Type files
* replace hard code
* media_attachments accept content-types in initial state
8 years ago
48594b18e6
Added haml-lint and fix warnings ( #2773 )
...
* add haml_lint to Gemfile
* add .haml-lint.yml
* fix warnings of haml_lint
8 years ago
74c474a652
Display remaining characters when editing display name and bio ( #2219 )
8 years ago
f4bc9620a9
Update settings to re-use admin layout, one big navigation tree, improve settings forms
8 years ago
b891a81008
Follow call on locked account creates follow request instead
...
Reflect "requested" relationship in API and UI
Reflect inability of private posts to be reblogged in the UI
Disable Webfinger for locked accounts
8 years ago
2d2154ba75
Add "locked" flag to accounts, prevent blocked users from following, force-unfollow blocked users
8 years ago
14bd46946d
Per-status control for unlisted mode, also federation for unlisted mode
...
Fix #233 , fix #268
8 years ago
1788164352
Local accounts can control "silenced" attribute which removes them from public timeline
8 years ago
3ce6ac0ce2
Adding some localizations
8 years ago
43df35213e
Improving all forms
8 years ago
7a6d95f70c
E-mail preferences page
8 years ago
Thibaut Girka
Eugen Rochko
David Yip
Ondřej Hruška
unarist
beatrix-bitrot
Stephen Burgess
Yamagishi Kazutoshi
yhirano
Sebastian Morr