cc8d81519e
Fix glitch-style bio fields incorrect HTML escaping in public profiles
7 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
61a9018607
Enable custom emojis in profiles (notes, field values, display names) ( #7374 )
...
Follow-up to #6124
7 years ago
2ef9d65052
Improve rendering of bio fields ( #7353 )
...
Fix #7335
7 years ago
356d0214c9
Implement tootsuite-style account fields
...
glitch-soc-style still in backup, both sharing the same SCSS style
7 years ago
16d5217502
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
1c379b7ef4
Remove extra spaces from search API queries and public account headers ( fixes #7129 ) ( #7152 )
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
eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/views/accounts/_header.html.haml
7 years ago
123a343d11
[WIP] Enable custom emoji on account pages and in the sidebar ( #6124 )
...
Federate custom emojis with accounts
7 years ago
1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
README.md
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
app/serializers/rest/instance_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.ja.yml
7 years ago
18513a978a
Improve public account cards ( #6559 )
...
- Add follow/unfollow/remote follow buttons
- Format the bio properly
- Always show username@domain, even for local accounts
7 years ago
f839ac694c
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
dbda87c31f
Revert #5772 ( #6221 )
7 years ago
fc884d015a
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
161c72d66d
Allow to dereference Follow object for ActivityPub ( #5772 )
...
* Allow to dereference Follow object for ActivityPub
* Accept IRI as object representation for Accept activity
7 years ago
d083f7741a
Merge remote-tracking branch 'tootsuite/master'
7 years ago
bfdcf76a64
Add “staff” badge to admin user pages ( #5735 )
...
* Allow staff badge to change from setting to hidden
* i18n: Update Polish translation
7 years ago
58cede4808
Profile redirect notes ( #5746 )
...
* Serialize moved accounts into REST and ActivityPub APIs
* Parse federated moved accounts from ActivityPub
* Add note about moved accounts to public profiles
* Add moved account message to web UI
* Fix code style issues
7 years ago
b28b405b97
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
2151fd3150
Display moderator badge (green), admin badge changed to red ( #5728 )
7 years ago
35fbdc36f9
Merge tootsuite/master at 3023725936
7 years ago
1032f3994f
Add ability to disable login and mark accounts as memorial ( #5615 )
...
Fix #5597
7 years ago
6610d57f91
Basic static metadata styling
7 years ago
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
9e0985d9e4
Add `strip_insignificant_zeros: true` option to `number_to_human` ( #4993 )
7 years ago
b9f7bc149b
Merge branch 'origin/master' into sync/upstream
...
Conflicts:
app/javascript/mastodon/components/status_list.js
app/javascript/mastodon/features/notifications/index.js
app/javascript/mastodon/features/ui/components/modal_root.js
app/javascript/mastodon/features/ui/components/onboarding_modal.js
app/javascript/mastodon/features/ui/index.js
app/javascript/styles/about.scss
app/javascript/styles/accounts.scss
app/javascript/styles/components.scss
app/presenters/instance_presenter.rb
app/services/post_status_service.rb
app/services/reblog_service.rb
app/views/about/more.html.haml
app/views/about/show.html.haml
app/views/accounts/_header.html.haml
config/webpack/loaders/babel.js
spec/controllers/api/v1/accounts/credentials_controller_spec.rb
7 years ago
15093f9113
Shorten display of large numbers on public profiles ( #4711 )
7 years ago
ca7ea1aba9
Redesign public profiles ( #4608 )
...
* Redesign public profiles
* Responsive design
* Change public profile status filtering defaults and add options
- No longer displays private/direct toots even if you are permitted access
- By default omits replies
- "With replies" option
- "Media only" option
* Redesign account grid cards
* Fix style issues
7 years ago
03f9648377
Improvements to static metadata styling, especially for mobile
7 years ago
6107e95404
Backend YAML Processing + Profile Metadata on Static Pages
7 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
8bac0350d1
Restful refactor of accounts/ routes ( #2133 )
...
* Add routing specs for accounts followers and following actions
* Use more restful route naming for public account follow pages
Moves two actions:
- accounts#followers to accounts/follower_accounts#index
- accounts#following to accounts/following_accounts#index
Adds routing spec to ensure prior URLs are preserved.
8 years ago
7efde22c3a
Use local vars in partials ( #1935 )
...
* Use local vars in accounts/header partial
* Use local variable in 2fa recovery codes partial
8 years ago
0254ee9795
significant improvement in microformats markup ( #1063 )
...
* significant improvement in microformats markup
This is a huge improvement and I believe will close #965 .
Had these microformats reviewed by others in the community to help
ensure they are at least correct, if not complete.
I did not want to change the structure of the page, and so there it does
not fully mark up the entire ancestry chain, or reply chain, only the
direct decendants and direct ancestors are correctly associated, but
this is likely fine as the most important bit is to have access to the
urls for those toots which are now correctly fetchable.
* improve code climate
* trying to pass code climate tests
* code climate
* fix p-summary for content warning posts
* fix error introduced when merging via github
8 years ago
bde5c0eaf9
Fix some views still not using counter caches
8 years ago
d6ed2eb512
Prettier account and stream entry URLs
8 years ago
917cf0bf5d
simplify emojification on public pages with .emojify class
8 years ago
72c3a41bef
Fix h-card classes and remote follow button appearing when it shouldn't
8 years ago
18deeb9db5
Add Microformats2 markup
...
h-feed, h-card and h-entry
8 years ago
8f47f6a7ec
Adding remote follow button
8 years ago
3282448878
Fix #86 - resolve layout breaking on zoom-out on accounts grid
8 years ago
b302b9202b
Add page for authorizing/rejecting follow requests
8 years ago
9d42bff285
Hide follow/unfollow button from public page if follow already requested
8 years ago
f763e844e8
Do not use expiring links after all
8 years ago
24e692b0cf
Set a specific S3 expiration time so that files can be cached
8 years ago
80c44ed9c1
Do not autoplay videos, display play button instead. Use expiring links when using S3. Do not keep originals
...
for avatars/headers, resize avatars down to 120x120 instead of 300x300. Set cache headers on S3 stuff, also
make it private (aka only accessible via expiring links to prevent hotlinking)
8 years ago
546c4718e7
Localizations for most server-side strings
8 years ago
Thibaut Girka
Eugen Rochko
David Yip
David Underwood
Jenkins
Akihiko Odaki
Yamagishi Kazutoshi
Surinna Curtis
kibigo!
Ondřej Hruška
yhirano
Matt Jankowski
Ben Roberts
blackle
Greg V