af504e62ff
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 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
7 years ago
4055ce490c
Enable custom emojis in profiles (notes, field values, display names) ( #7374 )
...
Follow-up to #6124
7 years ago
2ee5d518f1
Fallback to old on-the-fly URI for follows/blocks if no stored URI ( #7371 )
...
Fix #7367
7 years ago
087c79669a
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
app/controllers/follower_accounts_controller.rb
app/controllers/following_accounts_controller.rb
db/schema.rb
7 years ago
154076e8e7
Store URIs of follows, follow requests and blocks for ActivityPub ( #7160 )
...
Same URI passed between follow request and follow, since they are
the same thing in ActivityPub. Local URIs are generated during
creation using UUIDs and are passed to serializers.
7 years ago
3fc6e7dabb
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
93b8db8f08
Better pagination for ActivityPub outbox ( #7356 )
7 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
7 years ago
4258e304c5
Allow updating bio fields via PUT /api/v1/accounts/update_credentials ( #7288 )
...
Add raw bio fields to the source attribute on GET /api/v1/accounts/verify_credentials
7 years ago
24330e4fa7
Add RSS feeds for end-users ( #7259 )
...
* Add RSS feed for accounts
* Add RSS feeds for hashtags
* Fix code style issues
* Fix code style issues
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
12f8473561
Add backend support for bookmarks
...
Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.
7 years ago
f3db0d6ecc
retrieve custom emoji list via API instead of before page load ( #7047 )
7 years ago
21394c5462
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
44274257de
[WIP] Enable custom emoji on account pages and in the sidebar ( #6124 )
...
Federate custom emojis with accounts
7 years ago
60eafb173f
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
6383580e6f
Do not re-query mentions from serializers ( #6858 )
...
Fix performance regression from #6836
7 years ago
eba1b109db
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
99790407e2
Serialize mentions in the order they are added ( #6836 )
...
Up until now, the order seemed to be in the *opposite* order,
which caused the WebUI to populate mentions in reversed order
when replying to toots local to one's instance.
7 years ago
54608d0486
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
8e25857cb9
Fix wrong target URIs in ActivityPub Add/Remove ( #6668 )
7 years ago
29f412da2c
Fix #6657 - Use target instead of origin in Remove activity ( #6664 )
7 years ago
0016fd40e7
Do not fetch environment variables to determine default locale ( #6618 )
...
The default locale is now set by config.
7 years ago
b1f8dfd3cf
Federate pinned statuses over ActivityPub ( #6610 )
...
* Federate pinned statuses over ActivityPub
* Display pinned toots in web UI
Fix #6117
* Fix migration
* Fix tests
* Update outbox_serializer.rb
* Update remove_serializer.rb
* Update add_serializer.rb
* Update fetch_featured_collection_service.rb
7 years ago
359e441fb2
Fix missing focalPoint in ActivityPub JSON ( #6609 )
7 years ago
c08c971dd3
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
a91ef56e80
When search enabled, display hint in search popout ( #6593 )
...
* When advanced search is enabled, show different hint in search popout
* Change "getting started" icon in tabs bar from asterisk to hamburger
7 years ago
c421ad685d
Add contact_account and languages to instance API ( #6574 )
7 years ago
0ebd2a1718
Federated reports ( #6570 )
...
* Fix #2176 : Federated reports
* UI for federated reports
* Add spec for ActivityPub Flag handler
* Add spec for ReportService
7 years ago
c0aabbec0f
Merge branch 'master' of https://github.com/tootsuite/mastodon
...
# Conflicts:
# app/controllers/settings/exports_controller.rb
# app/models/media_attachment.rb
# app/models/status.rb
# app/views/about/show.html.haml
# docker_entrypoint.sh
# spec/views/about/show.html.haml_spec.rb
7 years ago
692dfd9a93
Fix nil error in focal_point? ( #6537 )
7 years ago
9184d588c1
fix typo in image serializer ( #6530 )
...
respond to!
7 years ago
865c7e7178
Focal points ( #6520 )
...
* Add focus param to media API, center thumbnails on focus point
* Add UI for setting a focal point
* Improve focal point icon on upload item
* Use focal point in upload preview
* Add focalPoint property to ActivityPub
* Don't show focal point button for non-image attachments
7 years ago
f6884555d7
Account archive download ( #6460 )
...
* Fix #201 : Account archive download
* Export actor and private key in the archive
* Optimize BackupService
- Add conversation to cached associations of status, because
somehow it was forgotten and is source of N+1 queries
- Explicitly call GC between batches of records being fetched
(Model class allocations are the worst offender)
- Stream media files into the tar in 1MB chunks
(Do not allocate media file (up to 8MB) as string into memory)
- Use #bytesize instead of #size to calculate file size for JSON
(Fix FileOverflow error)
- Segment media into subfolders by status ID because apparently
GIF-to-MP4 media are all named "media.mp4" for some reason
* Keep uniquely generated filename in Paperclip::GifTranscoder
* Ensure dumped files do not overwrite each other by maintaing directory partitions
* Give tar archives a good name
* Add scheduler to remove week-old backups
* Fix code style issue
7 years ago
799b205766
Merge remote-tracking branch 'origin/master' into merge-upstream
...
Conflicts:
.travis.yml
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_detailed_status.html.haml
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
7 years ago
219b28e172
Add preference to always display sensitive media ( #6448 )
7 years ago
8c41fb4acc
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
1827d142ee
implement web share target ( #6278 )
...
* web share target
* fix
* fix
7 years ago
1f469edac1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
c8f0be1d6d
Revert #5772 ( #6221 )
7 years ago
796a39a283
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
f92399cfe7
Fallback default thumbnail in instance status API ( #6177 )
7 years ago
c647ce902b
Send one Delete of Actor in ActivityPub when account is suspended ( #6172 )
7 years ago
a7b8cb9493
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
7a0479c830
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
601f0fe4a3
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ef8fc3542b
Fix #6022 - Prevent nested migrated accounts, or migrations to self ( #6026 )
7 years ago
7ff586054c
added a few more things
7 years ago
Thibaut Girka
Eugen Rochko
David Yip
Jenkins
Isatis
David Underwood
Akihiko Odaki
imncls
beatrix
りんすき
Yamagishi Kazutoshi
cwm