30 Commits (cc70ca9b7694d631aa845a4ff70e7dd2c2f58e7c)

Author SHA1 Message Date
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
Ondřej Hruška 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
Daigo 3 Dango 7e6322863c Compact status_ids in StatusRelationshipsPresenter (#5073)
7 years ago
nullkal e5a634f940 Use OrderedCollectionPage to return followers/following list (#4949)
7 years ago
Akihiko Odaki f4e3449e61 Use Account.local.sum(statuses_count) instead of Status.local.count (#4996)
7 years ago
Eugen Rochko 9ff429aa6d Uploads for admin site settings (#4913)
7 years ago
David Yip 67d9178007 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
Eugen Rochko 181cbbcaf8 Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Daigo 3 Dango fd9d66dfd4 Add Mastodon::Source.url (#4643)
7 years ago
Eugen Rochko 0e5c8372e7 Add protocol handler. Handle follow intents (#4511)
7 years ago
Ondřej Hruška 2129485669 Fix JS errors and add back commit hash
7 years ago
Ondřej Hruška 713938f266 Updated from tootsuite
7 years ago
Eugen Rochko f3ed02e492 Minor ActivityPub JSON fixes (#4214)
7 years ago
kibigo! f48f42598f Merge upstream (#81)
7 years ago
Eugen Rochko c99f41dc3c Improve ActivityPub representations (#3844)
7 years ago
unarist df81145b7c Fix response of unreblog/unfavourite APIs (#4204)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
kibigo! bcc30c8697 Merge upstream!! #64 <3 <3
7 years ago
DJ Sundog be8eed1bd9 First lame pass at adding optional git commit hash display on /about/… (#67)
7 years ago
Eugen Rochko 49026e27e8 Redesign the landing page, mount public timeline on it (#4122)
7 years ago
Eugen Rochko 0d54e620d9 Replace OEmbed and initial state Rabl templates with serializers (#4110)
7 years ago
Eugen Rochko 20e15ecfb3 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
7 years ago
Yamagishi Kazutoshi 68abc90aec Customizable privacy policy from admin interface (#4062)
7 years ago
Eugen Rochko e21b9c875e Bump version, improve how version is stored for better commit history (#2526)
8 years ago
Ash Furrow c229532144 Adds version to about/more and API (#2181)
8 years ago
alpaca-tc c413926027 Replace User.count -> User.confirmed.count (#2127)
8 years ago
Matt Jankowski f382a4f746 About page contact email (#1839)
8 years ago
Matt Jankowski 41b79ae693 Clean up about page (#1282)
8 years ago