854 Commits (b8205550ddb333e1a205ba1223be860907314fa1)

Author SHA1 Message Date
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira 6528c0c101 Add option to show only local toots in timeline preview (#6292)
7 years ago
Eugen Rochko 5322013f25 CAS + SAML authentication feature (#6425)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Charlotte Fields 9c94c1e66f moved save button (#3792)
7 years ago
Akihiko Odaki f35fadcb9a Unify links container implementation in about pages (#6382)
7 years ago
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
David Yip 87517e2dd8 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 6278ffdba3 Add direction tags to HTML e-mails for RTL languages (#6373)
7 years ago
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 42457924eb Display deleted users' role as “Suspended” (#6339)
7 years ago
Akihiko Odaki a87bb3f4f6 Resolve URL for local account in follow authorization success view (#6324)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko d9421e01df Fix invalid value passed to full_asset_url in mailers (#6312)
7 years ago
David Yip d000f5dd80 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Iijima Yasushi c8d971a5c1 Change mailer avatar url (#6309)
7 years ago
David Yip 03f157f6da Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 896cadceed Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
Eugen Rochko 5f9c017c01 Make text e-mails consistent with HTML ones in UserMailer (#6291)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko b0f2bff481 Replace tutorial modal with welcome e-mail (#6273)
7 years ago
Jenkins 8c41fb4acc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh ef20e5d3fd Change mailer image url (#6279)
7 years ago
Eugen Rochko 000b0baac2 HTML e-mails for NotificationMailer (#6263)
7 years ago
Yamagishi Kazutoshi d60d5fbd26 Change image URL in mailer to full path (#6264)
7 years ago
kibi! be525dd4db Fix mailer to use webpack core
7 years ago
David Yip de7283a318 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 9613c3238c HTML e-mails for UserMailer (#6256)
7 years ago
Jenkins e6049e6fd0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm 73b6f2ebe9 Handle sessions that can't be translated (#6245)
7 years ago
David Yip 1a7f8eb723 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 6d9f2924ad Fix #6204: Use content warning for page title when present (#6231)
7 years ago
kibigo! 134e6590c6 Don't show skins selector when there's only one (#256)
7 years ago
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko c8f0be1d6d Revert #5772 (#6221)
7 years ago
Jenkins 8704a190c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 154bd8db56 Update Simplified Chinese translations (#6215)
7 years ago
Jenkins 86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 cf9323449e l10n Occitan language: mailer update (#6193)
7 years ago
Jenkins a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Marcin Mikołajczak b83fb8b107 i18n: Update Polish translation (#6168)
7 years ago
Yamagishi Kazutoshi d50d61a90c Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
Otakan 1cd5812c6b delete X-UA-Compatible (#6068)
7 years ago
Branko Kokanovic 1c4142da5b Adding Serbian latin translations (#6146)
7 years ago
David Yip ed572490c1 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 616b6867a0 Show mastodon on modal (#6129)
7 years ago
Jenkins 5975446002 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic 34a90dc266 Adding Serbian translation (#6133)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
beatrix d9c2806048 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
Jenkins 503e7fb4d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Nolan Lawson 59a50e6489 Reduce motion for boost animation (#5871)
7 years ago
Jenkins 9ccad78647 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 87ee458079 Display deleted users' role as “Suspended” (#6080)
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko d6088c5308 Add filters to admin UI for custom emojis (#6003)
7 years ago
Eugen Rochko aea3d0814b Clean up admin UI for accounts (#6004)
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko d5f4baf720 Improve public status page title (#5985)
7 years ago
kibigo! d9e1496990 Added styling
7 years ago
kibigo! a1c79ef544 Screenshot support for themes
7 years ago
kibigo! 901c08a999 Moved flavour UI into own prefs tab
7 years ago
cwm 34630e00cb pulled master, moved locale entry to new location
7 years ago
kibigo! 853082e760 Only localize js when there's a theme
7 years ago
kibigo! 99e8710095 Javascript intl8n flavour support
7 years ago
kibigo! f4c233f59f Ruby intl8n for themes
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
Yamagishi Kazutoshi 03d28b6ec8 Back to Web UI from tag page when signed in (#5943)
7 years ago
Eugen Rochko b95863ec48 Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)
7 years ago
beatrix f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko b037fbf9f4 Remove rabl dependency (#5894)
7 years ago
kibigo! fd7be49523 Various fixes
7 years ago
David Yip 0002d12c24 current_theme -> current_flavour (#229)
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 935946020f Fixed a name + localizations
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
Jenkins 822dea26c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1447ef1d44 Add invite filter (#5862)
7 years ago
Yamagishi Kazutoshi 7f0a01a20c Fix invites form path (#5861)
7 years ago
Yamagishi Kazutoshi 53145abfbf Allow admin to deactivate invite created by users (#5860)
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi d6846dce20 Show "expired" in invite index (#5838)
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 55d9abcceb Add UI for setting up account migration (#5832)
7 years ago
David Yip c9dd67a733 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi d5e4cb2ca1 Use account.username when display_name is empty (#5828)
7 years ago
Eugen Rochko bc8c951083 Add consumable invites (#5814)
7 years ago
Jenkins f504ac4ff6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alda Marteau-Hardi 191993c811 Use account.display_name for og:title single toot pages (#5821)
7 years ago
Jenkins 359ba16721 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko efc97d404c Add logging of admin actions (#5757)
7 years ago
kibigo! eadf1c38a5 Minor fixes
7 years ago
kibigo! 8aeda4f064 Finalized theme loading and stuff
7 years ago
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Yamagishi Kazutoshi bffc1b880b Add “staff” badge to admin user pages (#5735)
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
Jenkins 065e2388ba Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
unarist 5982d570de Move "Permissions" row into main table in /admin/accounts/:id (#5734)
7 years ago
kibigo! 5845057adb Themed prefetching
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 08cb63c360 Remove empty strings (#5732)
7 years ago
Eugen Rochko 21d01d5809 Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
7 years ago
Anna e só c4c9003f84 l10n: PT-BR translation updated (#5681)
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Quenty31 a7db7bdd96 i10n OC: Memorial (#5615) + #5467 (#5623)
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
nullkal 19f82492ab Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
MitarashiDango 3068add21d add account search condition (instance domain) (#5577)
7 years ago
Nolan Lawson ba22580c06 Add ServiceWorker caching for static assets (#5524)
7 years ago
SerCom_KC 282f0d7479 Updating Chinese (Simplified) translations (#5508)
7 years ago
Nolan Lawson 2085c1fa33 Refactor initial state: reduce_motion and auto_play_gif (#5501)
7 years ago
David Yip 2aec3c073b Merge branch 'master' into gs-master
7 years ago
nullkal 0a9cc96cdc Feature: Unlisted custom emojis (#5485)
7 years ago
beatrix ce738197b9 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
David Yip 7caca589c1 Override Action View name inference in settings/keyword_mutes.
7 years ago
Matthew Walsh 897931099c Changes to match other timelines in 2.0
7 years ago
David Yip 4ab1534f6c Address unused translation errors.
7 years ago
David Yip e3f5ec2652 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 018657a0e0 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip ebfec40698 Set up /settings/keyword_mutes. #164.
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
Håkan Eriksson c06052b7cf Swedish translation (#5406)
7 years ago
beatrix cda8575ae3 Merge pull request #184 from tootsuite/master
7 years ago
Nolan Lawson d7b8208a37 Fix reduced motion breaking public galleries (#5423)
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
KY e1357265ed Fix #5082 - disable retweet link for followers only toot (#5397)
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Lynx Kotoura 9aacf21af7 Adjust public hashtag pages (#5357)
7 years ago
KY d4b9f821ca Fix #5351 - Redirection with page params after copy emoji (#5387)
7 years ago
Ondřej Hruška 0f542d56b8 add duck beaks in haml
7 years ago
Ondřej Hruška 132a22ace5 Merge remote-tracking branch 'upstream/master'
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
takayamaki 4ee024e296 fix presented og:url is incorrect (#5320)
7 years ago
Nolan Lawson 3b6e5360c3 Only preload JS in /web pages (#5325)
7 years ago
takayamaki cfab4a7ce4 sign_in and sign_up views present og meta infos (#5308)
7 years ago
Eugen Rochko 5a0e862664 Fix dependency of error page generation on database (#5280)
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237)
7 years ago
kibigo! fb05013855 Basic static metadata styling
7 years ago
Eugen Rochko b4af50c521 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago