23 Commits (5ebbaffaa308d4e0496f99321bbaeb1205bb8930)

Author SHA1 Message Date
Thibaut Girka d17844e6d1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ashleyhull-versent 2dba313100 Replace SVG asset with Custom mascot (#8766)
6 years ago
Thibaut Girka 246c313d45 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko a2cabf3f4a
Add admin custom CSS setting (#8399)
6 years ago
Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko cc56f2230a
Add separate setting for sidebar text (site_short_description) (#8107)
6 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Eugen Rochko c71aa468b5
Redesign landing page (again) (#6486)
7 years ago
Ondřej Hruška 9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
7 years ago
Akihiko Odaki 9619b7f727 Use Account.local.sum(statuses_count) instead of Status.local.count (#4996)
7 years ago
Eugen Rochko 9239e4ce4d Uploads for admin site settings (#4913)
7 years ago
David Yip b9f7bc149b Merge branch 'origin/master' into sync/upstream
7 years ago
Daigo 3 Dango 696c2c6f2f Add Mastodon::Source.url (#4643)
7 years ago
Ondřej Hruška b7cf758fbe Fix JS errors and add back commit hash
7 years ago
kibigo! 79d898ae0a Merge upstream!! #64 <3 <3
7 years ago
DJ Sundog 74eff5456c First lame pass at adding optional git commit hash display on /about/… (#67)
7 years ago
Eugen Rochko e19eefe219 Redesign the landing page, mount public timeline on it (#4122)
7 years ago
Yamagishi Kazutoshi 275c5b51ed Customizable privacy policy from admin interface (#4062)
7 years ago
Eugen Rochko b48c9013aa Bump version, improve how version is stored for better commit history (#2526)
8 years ago
Ash Furrow a0ed88a99b Adds version to about/more and API (#2181)
8 years ago
alpaca-tc 5ce8a1811a Replace User.count -> User.confirmed.count (#2127)
8 years ago
Matt Jankowski 3b8908c114 About page contact email (#1839)
8 years ago
Matt Jankowski e5282e4ec0 Clean up about page (#1282)
8 years ago