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
c99f41dc3c
Improve ActivityPub representations ( #3844 )
...
* Improve webfinger templates and make tests more flexible
* Clean up AS2 representation of actor
* Refactor outbox
* Create activities representation
* Add representations of followers/following collections, do not redirect /users/:username route if format is empty
* Remove unused translations
* ActivityPub endpoint for single statuses, add ActivityPub::TagManager for better
URL/URI generation
* Add ActivityPub::TagManager#to
* Represent all attachments as Document instead of Image/Video specifically
(Because for remote ones we may not know for sure)
Add mentions and hashtags representation to AP notes
* Add AP-resolvable hashtag URIs
* Use ActiveModelSerializers for ActivityPub
* Clean up unused translations
* Separate route for object and activity
* Adjust cc/to matrices
* Add to/cc to activities, ensure announce activity embeds target status and
not the wrapper status, add "id" to all collections
7 years ago
df81145b7c
Fix response of unreblog/unfavourite APIs ( #4204 )
...
Both APIs process asynchronously, so reblogged/favourited fields in the response should be set to `false` manually.
7 years ago
ecab38fd66
Web Push Notifications ( #3243 )
...
* feat: Register push subscription
* feat: Notify when mentioned
* feat: Boost, favourite, reply, follow, follow request
* feat: Notification interaction
* feat: Handle change of public key
* feat: Unsubscribe if things go wrong
* feat: Do not send normal notifications if push is enabled
* feat: Focus client if open
* refactor: Move push logic to WebPushSubscription
* feat: Better title and body
* feat: Localize messages
* chore: Fix lint errors
* feat: Settings
* refactor: Lazy load
* fix: Check if push settings exist
* feat: Device-based preferences
* refactor: Simplify logic
* refactor: Pull request feedback
* refactor: Pull request feedback
* refactor: Create /api/web/push_subscriptions endpoint
* feat: Spec PushSubscriptionController
* refactor: WebPushSubscription => Web::PushSubscription
* feat: Spec Web::PushSubscription
* feat: Display first media attachment
* feat: Support direction
* fix: Stuff broken while rebasing
* refactor: Integration with session activations
* refactor: Cleanup
* refactor: Simplify implementation
* feat: Set VAPID keys via environment
* chore: Comments
* fix: Crash when no alerts
* fix: Set VAPID keys in testing environment
* fix: Follow link
* feat: Notification actions
* fix: Delete previous subscription
* chore: Temporary logs
* refactor: Move migration to a later date
* fix: Fetch the correct session activation and misc bugs
* refactor: Move migration to a later date
* fix: Remove follow request (no notifications)
* feat: Send administrator contact to push service
* feat: Set time-to-live
* fix: Do not show sensitive images
* fix: Reducer crash in error handling
* feat: Add badge
* chore: Fix lint error
* fix: Checkbox label overlap
* fix: Check for payload support
* fix: Rename action "type" (crash in latest Chrome)
* feat: Action to expand notification
* fix: Lint errors
* fix: Unescape notification body
* fix: Do not allow boosting if the status is hidden
* feat: Add VAPID keys to the production sample environment
* fix: Strip HTML tags from status
* refactor: Better error messages
* refactor: Handle browser not implementing the VAPID protocol (Samsung Internet)
* fix: Error when target_status is nil
* fix: Handle lack of image
* fix: Delete reference to invalid subscriptions
* feat: Better error handling
* fix: Unescape HTML characters after tags are striped
* refactor: Simpify code
* fix: Modify to work with #4091
* Sort strings alphabetically
* i18n: Updated Polish translation
it annoys me that it's not fully localized :P
* refactor: Use current_session in PushSubscriptionController
* fix: Rebase mistake
* fix: Set cacheName to mastodon
* refactor: Pull request feedback
* refactor: Remove logging statements
* chore(yarn): Fix conflicts with master
* chore(yarn): Copy latest from master
* chore(yarn): Readd offline-plugin
* refactor: Use save! and update!
* refactor: Send notifications async
* fix: Allow retry when push fails
* fix: Save track for failed pushes
* fix: Minify sw.js
* fix: Remove account_id from fabricator
7 years ago
bcc30c8697
Merge upstream!! #64 <3 <3
7 years ago
be8eed1bd9
First lame pass at adding optional git commit hash display on /about/… ( #67 )
...
* First lame pass at adding optional git commit hash display on /about/more page.
Currently, this is implemented by checking for the existence of a file called CURRENT_RELEASE in the home directory of the user running Mastodon. If the file exists, its contents are added.
I've modified my update process to include the following before precompiling assets:
git log -1 | head -n 1 | cut -d " " -f2 > ~/CURRENT_RELEASE
That puts the current commit hash into the file ~/CURRENT_RELEASE, but you figured that out because you're a smart cookie.
As I am quite sure this is a horrible methodology for implementing this, I look forward to any improvements you have to offer!
* Updated to handle instances that share a user - the CURRENT_RELEASE file now lives in the instance's base directory.
This also requires modifying the update hook to `git log -1 | head -n 1 | cut -d " " -f2 > CURRENT_RELEASE`
7 years ago
49026e27e8
Redesign the landing page, mount public timeline on it ( #4122 )
...
* Redesign the landing page, mount public timeline on it
* Adjust the standalone mounted component to the lacking of router
* Adjust auth layout pages to new design
* Fix tests
* Standalone public timeline polling every 5 seconds
* Remove now obsolete translations
* Add responsive design for new landing page
* Address reviews
* Add floating clouds behind frontpage form
* Use access token from public page when available
* Fix mentions and hashtags links, cursor on status content in standalone mode
* Add footer link to source code
* Fix errors on pages that don't embed the component, use classnames
* Fix tests
* Change anonymous autoPlayGif default to false
* When gif autoplay is disabled, hover to play
* Add option to hide the timeline preview
* Slightly improve alt layout
* Add elephant friend to new frontpage
* Display "back to mastodon" in place of "login" when logged in on frontpage
* Change polling time to 3s
7 years ago
0d54e620d9
Replace OEmbed and initial state Rabl templates with serializers ( #4110 )
...
* Replace OEmbed Rabl template with serializer
* Replace initial state rabl with serializer
7 years ago
20e15ecfb3
Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl ( #4090 )
7 years ago
68abc90aec
Customizable privacy policy from admin interface ( #4062 )
7 years ago
e21b9c875e
Bump version, improve how version is stored for better commit history ( #2526 )
8 years ago
c229532144
Adds version to about/more and API ( #2181 )
...
* Adds version.
* Cleans up code.
* Removes standalone endpoint and adds version to instance endpoint.
* Addresses feedback from #2181 .
8 years ago
Thibaut Girka
Eugen Rochko
ashleyhull-versent
Jenkins
imncls
Yamagishi Kazutoshi
Ondřej Hruška
Daigo 3 Dango
nullkal
Akihiko Odaki
David Yip
kibigo!
unarist
Sorin Davidoi
DJ Sundog
Ash Furrow