1f70b51fff
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
6 years ago
e97d76632d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/admin/settings_controller.rb
- app/models/form/admin_settings.rb
Conflicts caused by upstream refactoring, while we have
flavours and skins, with the flavour_and_skin pseudo-setting.
6 years ago
a8bb10633d
Add `blocked_by` relationship to the REST API ( #10373 )
6 years ago
b4c64dcccc
Add custom closed registrations message to landing page when set ( #10347 )
6 years ago
741766a01d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/views/admin/settings/edit.html.haml:
Conflict due to how the theming settings change.
6 years ago
73fb7bfa0f
Admission-based registrations mode ( #10250 )
...
Fix #6856
Fix #6951
6 years ago
d86033c352
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
6 years ago
9d214f30ae
Fix to limit to discoverable accounts. ( #10253 )
6 years ago
56822606f4
Redesign landing page ( #10232 )
6 years ago
91934eeb74
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
9f3f47e91f
Improved remote thread fetching ( #10106 )
...
* Fetch up to 5 replies when discovering a new remote status
This is used for resolving threads downwards. The originating
server must add a “replies” attributes with such replies for it to
be useful.
* Add some tests for ActivityPub::FetchRepliesWorker
* Add specs for ActivityPub::FetchRepliesService
* Serialize up to 5 public self-replies for ActivityPub notes
* Add specs for ActivityPub::NoteSerializer
* Move exponential backoff logic to a worker concern
* Fetch first page of paginated collections when fetching thread replies
* Add specs for paginated collections in replies
* Move Note replies serialization to a first CollectionPage
The collection isn't actually paginable yet as it has no id nor
a `next` field. This may come in another PR.
* Use pluck(:uri) instead of map(&:uri) to improve performances
* Fix fetching replies when they are in a CollectionPage
6 years ago
77b9249250
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
81536e07ab
Don't count suspended users in user count ( #9380 )
...
Fix #7637
6 years ago
478abe3a58
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/status.rb
Resolved by taking both changes (not a real conflict, just changes too close
to each other).
6 years ago
a217abb71c
Cast status_count to integer ( #9314 )
...
It is returned as a double because the sum is now over bigint columns
Fix #9312
6 years ago
62c0e112ea
Extract counters from accounts table to account_stats table ( #9295 )
6 years ago
74e411f4e8
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ea57aca5e1
Replace SVG asset with Custom mascot ( #8766 )
6 years ago
69212ed0ad
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/application_controller.rb
Changed instance theme selection by instance flavour selection.
6 years ago
94b7dddeac
Add admin custom CSS setting ( #8399 )
...
Fix #3894
6 years ago
5ed6f6db1d
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/controllers/accounts_controller.rb
app/javascript/mastodon/locales/pl.json
app/views/about/more.html.haml
Conflicts in `accounts_controller.rb` resolved by taking upstream's
version + our `use_pack`.
Conflicts in `pl.json` resolved by taking upstream's changes.
Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.
6 years ago
6e3cb11f3c
Public profile endorsements (accounts picked by profile owner) ( #8146 )
6 years ago
30c9fef4d4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
config/settings.yml
6 years ago
934d50daf0
Add separate setting for sidebar text (site_short_description) ( #8107 )
...
* Add separate setting for sidebar text (site_short_description)
* Fix tests
6 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
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
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
ad1f541bd7
Redesign landing page (again) ( #6486 )
...
* Redesign landing page (again)
* Move login form in small version to the right column
* Display closed registrations message
* Add site setting for the hero image
* Fix test
* Increase spacing, maximum width, change call to action section
7 years ago
cdb12bd39b
Fix bug in relationships API introduced by #6482 ( #6527 )
...
It was merge when it needed to be deep_merge. And added some tests
7 years ago
e768ef35b1
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
750f3e64c9
Cache relationships in API ( #6482 )
...
* Cache relationships in API
* Fetch relationships for search results in UI
* Only save one account's maps in each cache item
7 years ago
a3a7b6a848
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
fba46b6072
Using double splat operator ( #5859 )
7 years ago
0cc795db6b
Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
7e6322863c
Compact status_ids in StatusRelationshipsPresenter ( #5073 )
7 years ago
e5a634f940
Use OrderedCollectionPage to return followers/following list ( #4949 )
7 years ago
f4e3449e61
Use Account.local.sum(statuses_count) instead of Status.local.count ( #4996 )
...
It is faster.
7 years ago
9ff429aa6d
Uploads for admin site settings ( #4913 )
...
* Improve OpenGraph tags for about pages
* Add thumbnail admin setting
* Fix error
* Fix up
7 years ago
67d9178007
Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
da3f22ee7d
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
181cbbcaf8
Fix #4794 - Fake instant follow in API response when account is believed unlocked ( #4799 )
7 years ago
3e20cb7025
Pinned statuses ( #4675 )
...
* Pinned statuses
* yarn manage:translations
7 years ago
fd9d66dfd4
Add Mastodon::Source.url ( #4643 )
...
* Add Mastodon::Source.url
* Update spec
* Refactor
Move things frmo Mastodon::Source to Mastodon::Version
7 years ago
0e5c8372e7
Add protocol handler. Handle follow intents ( #4511 )
...
* Add protocol handler. Handle follow intents
* Add share intent
* Improve code in intents controller
* Adjust share form CSS
7 years ago
2129485669
Fix JS errors and add back commit hash
7 years ago
713938f266
Updated from tootsuite
7 years ago
f3ed02e492
Minor ActivityPub JSON fixes ( #4214 )
...
- Objects must have attributedTo instead of actor
- The current attribute belongs to CollectionPage, not Collection
7 years ago
f48f42598f
Merge upstream ( #81 )
7 years ago
Thibaut Girka
Eugen Rochko
mayaeh
ashleyhull-versent
Jenkins
imncls
Yamagishi Kazutoshi
Ondřej Hruška
Daigo 3 Dango
nullkal
Akihiko Odaki
David Yip
kibigo!