4211 Commits (299cfa4bc7f3751e9129979bb6e8f49c5aa6d5a4)

Author SHA1 Message Date
Jenkins 2bd6532e63 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Chris 1f0ae8d173 Add mute, block, conversation mute actions to detailed status dropdown menu (#6099)
7 years ago
MitarashiDango b4047027d4 Additional prop name change. (#6098)
7 years ago
Jenkins 503e7fb4d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Neetshin fad20b7830 Add validation for onMuteNotifications (#6092)
7 years ago
Nolan Lawson 59a50e6489 Reduce motion for boost animation (#5871)
7 years ago
Akihiko Odaki 3f52d12a4c Refactor web_push_subscription (#6047)
7 years ago
Chris 65cabbe8ef removed references to hideOnMobile in column_link and getting_started (#6082)
7 years ago
cpsdqs 7f1828166d Move dropdown transform origin to top edge (#6091)
7 years ago
Jenkins 9ccad78647 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ncls7615 33f2976c84 Update and add some translate
7 years ago
ncls7615 0d900416f7 Add more en and ja
7 years ago
ncls7615 43b9a78f1d Add en and ja
7 years ago
ThibG 7eb2f42976 Reduce the number of synchronous resolves when posting toots (#6075)
7 years ago
ThibG 87ee458079 Display deleted users' role as “Suspended” (#6080)
7 years ago
beatrix 9ba54d457a Merge pull request #266 from chriswmartin/getting-started-improvements
7 years ago
ncls7615 4c682228ce Fix account header avatar
7 years ago
David Yip d93f6b4720 Add data-status-by back to DetailedStatus component. Fixes #273.
7 years ago
cwm f923aeec08 <kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049)
7 years ago
beatrix f42aa942b4 Merge pull request #276 from glitch-soc/245-click-avatar-to-open-profile-in-new-tab
7 years ago
David Yip c94a497ef6 Wrap <Avatar> in account header in a link to that account's page. Fixes #245.
7 years ago
cwm ca77c18c24 add keyboard shortcuts to getting started (fixes #275)
7 years ago
David Yip ea1c58f6d8 Set packs on 2FA-related pages. Fixes #271.
7 years ago
Jenkins 034617cac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 73b5392cb2 Rename settingKey in setting_toggle to settingPath (#6046)
7 years ago
Neetshin 163da9770c Replace <code> to <kbd> in KeyboardShortcuts component (#6049)
7 years ago
Jeong Arm 7df9864429 Update Korean translation (#6050)
7 years ago
ncls7615 58e3bd4d71 Add en and ja
7 years ago
cwm 5b185a0a0f missed a semicolon
7 years ago
cwm 1dd4e3791f use makeMapStateToProps
7 years ago
cwm d6ca0e29a7 use list-ul icon in list header and web/lists
7 years ago
Jenkins 9dd76b5b41 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Peter c9c63c2232 Add Slovak translation (#6052)
7 years ago
beatrix 978e5e5606 Merge pull request #253 from glitch-soc/prevent-local-only-federation
7 years ago
ncls7615 82bff179f4 fix admin/action_logs page
7 years ago
kibigo! e59d124be5 Fixes #244 to make search results scrollable
7 years ago
David Yip d53f727653 Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
NCLS cbc2f1ea5d Update ja.js
7 years ago
NCLS b9d1543f7e Update ja.js
7 years ago
Jenkins 601f0fe4a3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 99a208cd8f Do not hide statuses from silenced accounts from other silenced accounts (#6030)
7 years ago
Naoki Kosaka 7da34ff0a3 Fix oEmbed image_modal src. (#6027)
7 years ago
Eugen Rochko ef8fc3542b Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)
7 years ago
SerCom_KC 19a2ed9a04 Improve Chinese (Simplified) Translations (#6024)
7 years ago
Jeroen 0cadfd35a5 Last minute Dutch string updates (#6025)
7 years ago
David Yip b8e6074c53 Examples for Status#set_locality and .as_tag_timeline.
7 years ago
Jenkins e3d8c010b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Lynx Kotoura d0a8463db0 Fix focused background color of notifications of direct toots (#6021)
7 years ago
Lynx Kotoura 891b03536f Fix overflowing emojis on some devices (#6016)
7 years ago
Olivier Humbert 4621fd6461 1 fix + 1 translation (#6019)
7 years ago
Jenkins ac183e024b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 1010831783 Fix regression from #6014 (#6018)
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 10c0745c8f l10n OC and FR updates (#6017)
7 years ago
Eugen Rochko 772456072e Fix layout for RTL (#6014)
7 years ago
Lynx Kotoura cbf6bd4e0c Excahnge the order of spoiler-input and unlocked warning (#6015)
7 years ago
Lynx Kotoura d7bd1906d4 Redesign tootbox (#5919)
7 years ago
Eugen Rochko d4d0befb4b Weblate translations (#6011)
7 years ago
SerCom_KC 9bef4eb4c0 Update Chinese (Simplified) translations (#6005)
7 years ago
Eugen Rochko d6088c5308 Add filters to admin UI for custom emojis (#6003)
7 years ago
Yamagishi Kazutoshi 7a5e2ffebe Set direction style to reply indicator (#6006)
7 years ago
Eugen Rochko 8c04f9417f Fix redundant HTTP request in FetchLinkCardService (#6002)
7 years ago
Eugen Rochko aea3d0814b Clean up admin UI for accounts (#6004)
7 years ago
Eugen Rochko 88aef653ee Fix GIF avatars not autoplaying when GIF autoplay is enabled (#6000)
7 years ago
cwm f464eefc45 code style fixes
7 years ago
cwm 430733477c move list items into an array, don't unnecessarily concat misc nav item
7 years ago
Eugen Rochko 5b2ab607db Fix #5952 - NameError (regression from #5762) (#5999)
7 years ago
Eugen Rochko 992e8a11fe Adjust empty list timeline message (#5997)
7 years ago
Eugen Rochko 895e3c2e6c Use streaming API for standalone timelines on /about and /tag pages (#5998)
7 years ago
Neetshin 9a7fb53a7f Make detect empty string before assign image description (#5994)
7 years ago
Akihiko Odaki d67575edea Store preview image for embedded photo in preview cards (#5986)
7 years ago
cwm 2fa762ef0a travis fixes
7 years ago
Renato "Lond" Cerqueira 15bc3398f7 Return false if object does not respond to url (#5988)
7 years ago
Renato "Lond" Cerqueira ab3d248f48 Change conditional to avoid nil into string error in sidekiq (#5987)
7 years ago
beatrix 82ec368680 Merge pull request #264 from KnzkDev/add-ja
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
cwm 6cbf55ce7b readded connect for onboarding modal
7 years ago
cwm c746388452 remove unneeded imports from getting_started_misc
7 years ago
cwm 975d888f5c add components to getting started column
7 years ago
ncls7615 6bfbeb1fe1 add ja
7 years ago
Akihiko Odaki a90fa13235 Change account_id non-nullable in lists (#5979)
7 years ago
Eugen Rochko d5f4baf720 Improve public status page title (#5985)
7 years ago
Eugen Rochko 7f286d1af0 Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
Eugen Rochko 3b69e9b99c Exclude moved accounts from search results (#5984)
7 years ago
cwm 690cd248b1 change pack to 'auth'
7 years ago
cwm 7e8c87e443 load pack
7 years ago
Erin bdf25f5a60 reblog_service.rb: Status#local_only -> local_only?
7 years ago
Erin eb0660f6ef move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
Erin 080149acaf post_status_service: stylistic change (local_only -> local_only?)
7 years ago
beatrix af0031fe1b Merge pull request #254 from glitch-soc/new-theme-ux
7 years ago
Eugen Rochko 31fe0d067b Apply a 25x rate limit by IP even to authenticated requests (#5948)
7 years ago
beatrix cb05ff359f Merge pull request #255 from KnzkDev/remove-picture
7 years ago
David Yip b1f803d360 Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.
7 years ago
ncls7615 58a133978b remove picture
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
beatrix 252de634bb Merge pull request #250 from chriswmartin/fav-confirm-modal
7 years ago
Erin 6f3321fe4f set local_only in a before_create callback instead of status service
7 years ago
Erin 7fc6f40a88 remove vestigial Status#local_only? definition
7 years ago
Erin c3e84d208c post_status_service.rb: save the status after setting local_only
7 years ago
Erin 278d34a0ec Status#not_local_only scope should match nils too
7 years ago
Erin 3d1bef760d filter local-only toots from AP outboxes
7 years ago
ncls7615 b07111ceba add comma
7 years ago
ncls7615 3e6949b554 " => '
7 years ago
ncls7615 5cd4e577c2 Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles
7 years ago
Erin b463321c6f filter local-only statuses from public pages
7 years ago
Erin a80c329328 replace reblog service check for an 👁️ with #local_only
7 years ago
Erin d431bb8930 set local_only flag on statuses in post_status_service
7 years ago
Erin 993449ee59 status: stub local_only?, add scope, add marked_local_only?
7 years ago
Erin 5eadff9883 add a local_only column to the statuses table
7 years ago
cwm 2f56e7e00d use single quotes in locale entry
7 years ago
cwm 34630e00cb pulled master, moved locale entry to new location
7 years ago
cwm 06c490be96 removed unneeded actions_modal div
7 years ago
kibigo! bb65adc0c0 Move ja localization to new locaiton
7 years ago
kibigo! b27126f1d6 Linting fixes
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
Andrea Scarpino e8198cd298 Fix account and tag searches with leading/trailing spaces (#5965)
7 years ago
Lynx Kotoura 188f230f1e Refix extraspace for emojis (#5964)
7 years ago
abcang a55211ee5b Save media outside transaction (#5959)
7 years ago
cwm 4b9fa497c6 removed one last app settings addition
7 years ago
cwm 0d6a515145 removed app settings additions
7 years ago
Quenty31 7f56924d71 l10n i18n OC: corrections (#5962)
7 years ago
ncls7615 2a69b778c1 add and fix
7 years ago
beatrix f836468a7e Merge pull request #248 from chriswmartin/glitch-theme-lists
7 years ago
beatrix ce2528c50b Merge pull request #237 from dexamphetamine/jpn-localization
7 years ago
amphetamine 5c58c4cbb3 i18n: add ja glitch strings
7 years ago
Yamagishi Kazutoshi 07030db7ad Add Galician language support (#5955)
7 years ago
Olivier Humbert 74cdbdcc51 French translation update (#5954)
7 years ago
abcang cef07895a9 Remove unused function (#5950)
7 years ago
cwm 7a066e814b moved locales to glitch, created add settings entry
7 years ago
cwm c47e5232bd remove trailing spaces
7 years ago
cwm 98815c76ce fixed fav setting change
7 years ago
cwm ac42b2b95d fixes, functioning now
7 years ago
cwm 7ff586054c added a few more things
7 years ago
cwm 09c82d4343 remove keyboard shortcuts from getting started because thats a different thing
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
Yamagishi Kazutoshi f54ca825c5 Ignore HEAD method if does not support (#5949)
7 years ago
Eugen Rochko 2a8ab39a06 Weblate translations (#5946)
7 years ago
Eugen Rochko 87af0bf6cf Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
Yamagishi Kazutoshi 03d28b6ec8 Back to Web UI from tag page when signed in (#5943)
7 years ago
Yamagishi Kazutoshi f6780ee507 Move push notifications settings (regression from #5879) (#5941)
7 years ago
Quenty31 5c12b555b4 l10n i18n OC update (#5939)
7 years ago
cwm f42a622bf9 fix a missing semicolon and mixed tabs/spaces that travis was complaining about
7 years ago
cwm 591a3769f4 merge tootsuite prs #5895 and #5889 into glitch flavour
7 years ago
cwm a762aa7933 merge tootsuite pr #5904 into glitch flavour
7 years ago
cwm 2668d56334 add keyboard shortcut to getting started, add missing list style
7 years ago
cwm 0fbf7f2838 merged tootsuite pr #5811 into glitch flavour
7 years ago
cwm f6634f4fdc merged tootsuite pr #5750 into glitch flavour
7 years ago
abcang 7fc5cf7a12 Keep WebPush settings (#5879)
7 years ago
Eugen Rochko d83d1326cd Fix #5630 - Prevent duplicate load of favourites (#5931)
7 years ago
Eugen Rochko f16141ebac Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
Yamagishi Kazutoshi dfeb3ba74f Audio.prototype.seek is undefined (#5935)
7 years ago
Eugen Rochko 856e8465ea Fix #5926 - Do not downgrade to OStatus once ActivityPub is known (#5929)
7 years ago
Eugen Rochko 46cce9ee4b Ensure link thumbnails are not stretched to super low quality (#5932)
7 years ago
Eugen Rochko b95863ec48 Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)
7 years ago
Jenkins c6572ed6c8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 3d0fbe8c16 Remove unused messages (#5924)
7 years ago
Eugen Rochko bcba7bba2d Weblate translations (#5922)
7 years ago
Yamagishi Kazutoshi dc01c2f951 Disable status content outline (#5921)
7 years ago
kibigo! 5758a12491 Skins shouldn't apply to fallback flavours
7 years ago
kibigo! f9387aabaa Glitch doesn't have a home stylesheet anymore
7 years ago
kibigo! 31674d5083 Packaged local_settings styles in common
7 years ago
Lynx Kotoura 7cd63f0aae ReFix font-weight of <strong> element for CJK fonts (#5920)
7 years ago
SerCom_KC a77bf28ec1 Fix font-weight of <strong> element for CJK fonts (#5914)
7 years ago
Yamagishi Kazutoshi 87f1b249c1 Hide moved account's follow button in search result (#5913)
7 years ago
Quenty31 57e0d88c19 OC language update (#5905)
7 years ago
David Yip 82cd4a0a3c Fix hide reblogs in glitch frontend (#5909)
7 years ago
David Yip 9075094715 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip 04b03999c2 Merge pull request #241 from glitch-soc/no-dm-option
7 years ago
Jenkins 099159741b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi a7f20ed185 Remove duplicate annotate (#5910)
7 years ago
Akihiko Odaki ce3989fc6a Add embed_url to preview cards (#5775)
7 years ago
Yamagishi Kazutoshi 6bb4fb008a Fix hide reblogs (regression from #5887) (#5909)
7 years ago
kibigo! 8dc8ea2c0a Add option to remove DMs from home (#126)
7 years ago
David Yip 08290b0b02 Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)
7 years ago
kibigo! 41f9a4d4e4 Fix common packs when other pack also there
7 years ago
David Yip 6a5ba9d129 Use settings pack for InvitesController (#229)
7 years ago
beatrix f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
David Yip 63c41247ff Prepend check_enabled_deletion to Settings::DeletesController (#229)
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak e3422e363b i18n: 🇵🇱 (#5903)
7 years ago
Lynx Kotoura d3d52615ab Fix list editor modal on narrow devices (#5904)
7 years ago
Lynx Kotoura 1696fe1c84 Fix extra space between status text and username (#5902)
7 years ago
aschmitz cbaddc6447 Break out nested relationship API keys (#5887)
7 years ago
Yamagishi Kazutoshi eeb17ff02d Fix emoji picker scrollbar (regression from #5046) (#5901)
7 years ago
Yamagishi Kazutoshi f6b7869a2c Handle submit event of new list form (#5895)
7 years ago
Yamagishi Kazutoshi 9c1cbddf70 Search only from followees (#5897)
7 years ago
Yamagishi Kazutoshi fba46b6072 Using double splat operator (#5859)
7 years ago
Eugen Rochko b037fbf9f4 Remove rabl dependency (#5894)
7 years ago
mayaeh e1cabf86d5 Update Japanese translations. (#5893)
7 years ago
Eugen Rochko ff4c28a305 Lists redis clean-up (#5886)
7 years ago
Eugen Rochko 1e7f022fa2 Add list of lists component to web UI (#5811)
7 years ago
SerCom_KC 125ad3e931 Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849)
7 years ago
Neetshin 52f1c89aef Add aria-autocomplete='list' in Textaria (#5889)
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
Jenkins da7ccfeca2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Neetshin 2a3097b4cf Update mutes.js (#5882)
7 years ago
kibigo! 935946020f Fixed a name + localizations
7 years ago
kibigo! 3760da1321 Fixed image require
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
kibigo! cc70ca9b76 Fixed typos
7 years ago
Jenkins 92b6ca9028 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Lynx Kotoura 16ff931a56 Add keyboard shortcuts link to getting-started navigation (#5874)
7 years ago
Lynx Kotoura 2d6f2dac11 Add back button to keyboard shortcuts legend column (#5872)
7 years ago
Jenkins 822dea26c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
cormo 0bd728a690 Remove redundant import statement in SCSS (#5864)
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
mayaeh 9cb7c90412 Update Japanese translations for KeyboardShortcuts. (#5858)
7 years ago
Jenkins a7a59f927d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko cfe67ba832 Add semi-support for Video/Image objects in ActivityPub (#5848)
7 years ago
Eugen Rochko 2421fd745a Fix too many forwards (#5854)
7 years ago
Jenkins e8446e3724 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Mayu Laierlence a9413c2bb9 Fix Korean translation (#5853)
7 years ago
Marcin Mikołajczak b95f1b130a i18n: 🇵🇱 (#5851)
7 years ago
David Yip 4a4c6304c1 Merge pull request #232 from glitch-soc/hotkeys-glitch
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
aschmitz ce341c7cf6 Allow hiding of reblogs from followed users (#5762)
7 years ago
ThibG f33fd11c87 Fix handling of temporary failures in ProcessMentionsService (#5842)
7 years ago
Yamagishi Kazutoshi a132f4576d Refactor KeyboardShortcuts component (#5835)
7 years ago
nullkal 35e3791ba4 Fix account migration feature (#5837)
7 years ago
Marcin Mikołajczak 5f51992e16 i18n: 🇵🇱 (#5841)
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
kibigo! 4497b83982 Adds spoiler hotkey support to detailed statuses
7 years ago
Eugen Rochko 55d9abcceb Add UI for setting up account migration (#5832)
7 years ago
kibigo! fac7e31101 Implement status hotkeys + spoiler expanding
7 years ago
Joshua Wood 0b045ba7ab Add Keyboard Shortcuts Legend (#5823)
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
Akihiko Odaki ce0d30feb7 Do not filter the status collection after muting and blocking (#5815)
7 years ago
SerCom_KC 7cdf02f2d4 i18n: (zh-CN) Add translations for #5746 & #5750 (#5816)
7 years ago
Akihiko Odaki 16a49799cf Allow to open a modal for embedded photo (#5777)
7 years ago
Akihiko Odaki 7df80c9e83 Rename ariaLabel property of Dropdown to title (#5813)
7 years ago
spla eddbf2e485 Updated Catalan strings (#5801)
7 years ago
Jenkins 7fcbe5faee Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 8fde0aed51 Add Japanese translations (#5810)
7 years ago
William Pitcock a4bb95d8b3 status: preserve visibility attribute when reblogging (infoleak fix) (#5789)
7 years ago
Eugen Rochko bf8eab12ba Display list column (#5750)
7 years ago
abcang 3db3ca1258 Fix unnecessary order (#5807)
7 years ago
sdukhovni 019c39bf1d Don't remove originals of boosted toots from timeline (#5479)
7 years ago
Akihiko Odaki 0319b92979 Do not require onClose property in NavigationBar (#5802)
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! 3860750d5d Styling fixes
7 years ago
kibigo! ea77b60648 Update statuses on hidden toggle (Fixes #227)
7 years ago
kibigo! eadf1c38a5 Minor fixes
7 years ago
Jenkins a2e4d79b1c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak c75bc101ba i18n: Update Polish translation - front-end added (#231)
7 years ago
Joan Montané daec402a58 Update and fix Catalan translation (#5773)
7 years ago
kibigo! 8aeda4f064 Finalized theme loading and stuff
7 years ago
Jenkins 1c33bd3d3a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 4e409e629d Fixed duplicating URL of photo type of oEmbed (#5763)
7 years ago
Jenkins 9c9b105d43 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang ef14321fff Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)
7 years ago
abcang defb2fd0b0 Fix N+1 at notification (#5752)
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
beatrix 34ba45e47c Merge pull request #226 from glitch-soc/glitch-theme
7 years ago
kibigo! 2b05c3aaa1 Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
7 years ago
kibigo! e56a32a46b WIP static themeing
7 years ago
kibigo! 25361848e3 Enabled vanilla thmee
7 years ago
kibigo! f0aedba604 Public pack fix
7 years ago
kibigo! a8c0c7a2c1 Media styling
7 years ago
kibigo! 0c90d1ab38 Font styles are now packagified
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
beatrix 27ca589183 Merge pull request #208 from yipdw/keyword-mute
7 years ago
Jenkins cea7dec340 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC e618b6c136 Updating Chinese (Simplified) translations (#5725)
7 years ago
kibigo! 5466150ea4 Removed glitch tests
7 years ago
kibigo! 7c5614c667 Restore vanilla components
7 years ago
kibigo! 68304a6ce5 Forking glitch theme
7 years ago
beatrix 61585f2c42 Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
7 years ago
David Yip 08751360a0 Update annotations on Follow, FollowRequest, and Mute.
7 years ago
David Yip f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e149067561 Lists (#5703)
7 years ago
David Yip ce27681a76 Merge pull request #222 from yipdw/merge/tootsuite/master
7 years ago
David Yip e5a2158e2a Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
7 years ago
beatrix 57e301c5be Merge pull request #221 from glitch-soc/local-only-policy
7 years ago
Jenkins 065e2388ba Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip 87c1f91505 Merge pull request #218 from glitch-soc/themed-prefetching
7 years ago
Lynx Kotoura 731c859097 Increase contrast of Admin badges (#5740)
7 years ago
Clworld 6547ebee48 Fix regression #5467: fixes emoji copy (#5739)
7 years ago
David Yip bcdd0f8b9d Update StatusPolicy to check current_account for local_only? toots.
7 years ago
unarist 5982d570de Move "Permissions" row into main table in /admin/accounts/:id (#5734)
7 years ago
David Yip ff4e474bcd Add trailing comma in mapStateToProps
7 years ago
David Yip c687853d80 Merge pull request #219 from glitch-soc/no-spin
7 years ago
David Yip 801ecbfa5a Throw layout, isWide, navbarUnder back into mapStateToProps.
7 years ago
kibigo! bbef750b04 Removes spin theme
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 3df46ce5a8 Fix some rubocop style issues (#5730)
7 years ago
Eugen Rochko 21d01d5809 Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Renato "Lond" Cerqueira f366a83c6c Improve language filter (#5724)
7 years ago
ysksn bf1d4a2cb9 Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
David Yip b4725cad17 Replace =~ with #matches?. #208.
7 years ago
David Yip 21e138379d Prefix cache keys with the matcher type. #208.
7 years ago
David Yip 2c6a2d588c Match keyword mute filter on hashtags. #208.
7 years ago
David Yip dd29a41b61 Also run the keyword matcher on a status' tags. #208.
7 years ago
beatrix ed1cf698a2 Merge pull request #212 from aschmitz/feat/mute-reblogs
7 years ago
ysksn 475b7cecb5 Delegate some methods of User to @settings (#5706)
7 years ago
masarakki 7d3b67e1c8 reusable-streaming (#5709)
7 years ago
Surinna Curtis 582dd1b7c7 Optional notification muting (#5087)
7 years ago
ThibG 74de5566d4 Filter searched toots to be consistent with blocking behaviors (#5383)
7 years ago
ThibG 4531b67c3e Use already-known remote user data if resolving temporarily fails in mentions (#5702)
7 years ago
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
7 years ago
SerCom_KC 66a0141691 Updating Chinese (Simplified) translations (#5643)
7 years ago
Yamagishi Kazutoshi 3a51544e9a Add uniqueness to block email domains (#5692)
7 years ago
Marcin Mikołajczak fa89e5d911 i18n: Update Polish translation (#5699)
7 years ago
Lain Iwakura a77e03ede4 Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.
7 years ago
Lain Iwakura f517cbae22 Code style fixes.
7 years ago
Lain Iwakura 3de2814a5a Handle character limit in initial state in frontend.
7 years ago
Lain Iwakura a45f3cdc69 Return character limit in API and initial state.
7 years ago
Lain Iwakura 666540f4a8 Make character limit configurable.
7 years ago
Andrew 1d0a72c00b Updates and fixes to win95 theme
7 years ago
Anna e só c4c9003f84 l10n: PT-BR translation updated (#5681)
7 years ago
David Yip 13ec4a9a20 Maintain case-insensitivity when merging multiple matchers (#213)
7 years ago
Daniel Hunsaker 96504fd1ec Update model annotations to use BIGINT for IDs (#5461)
7 years ago
aschmitz 3fe59e7d97 Actually filter blocked reblogs from feed
7 years ago
Eugen Rochko 9caf162432 Fix #5632 - Reset column loading status after fetch fail (#5659)
7 years ago
aschmitz 869cfdfda6 Don't update follower counts on reblog toggle
7 years ago
aschmitz 76008c3e8c Updates per code review
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
ThibG df882d5a59 Retry thread resolving (#5599)
7 years ago
aschmitz 2f1fdd37d3 Per-user reblog hiding implementation/fixes/tests
7 years ago
Lynx Kotoura 37992a1012 Fix focused background color of direct toots (#5642)
7 years ago
aschmitz 2aedd8eaad "Show reblogs" per-follower UI/database changes
7 years ago
ysksn 26f52a2551 Add and Remove tests for FollowRequest (#5622)
7 years ago
unarist 1cb6606055 Show confirmation dialog on leaving WebUI while composing (#5616)
7 years ago
Quenty31 a7db7bdd96 i10n OC: Memorial (#5615) + #5467 (#5623)
7 years ago
ThibG 5abd97e5ba Fix process mentions for local users, as local users are considered to use OStatus (#5618)
7 years ago
nullkal 863958ce09 Eliminate space around emoji (#5474)
7 years ago
ThibG 4912f539c3 Twidere mention workaround (#5552)
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
voidSatisfaction dc63306620 fix: slang to adequate word (#5453)
7 years ago
nullkal 19f82492ab Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
MIYAGI Hikaru 3506668438 Avoid emojifying on invisible text (#5558)
7 years ago
ThibG 02608c2292 Do not process undeliverable mentions (#5598)
7 years ago
ThibG a8249d2486 Resolve remote accounts when mentioned even if they are already known (#5539)
7 years ago
nullkal 64fbf1d6e5 Make fullscreen video in detailed status plays in fullscreen (Partly Fix #5160) (#5611)
7 years ago
kedama 82e9df5e3c Hide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613)
7 years ago
kibigo! f9e8e1357e Mastodon GO! -> v0.1.1
7 years ago
kibigo! b0f88fbdc1 Autocollapse boosts option
7 years ago
MIYAGI Hikaru 70726e0f72 don't display any descendants of .invisible (#5567)
7 years ago
beatrix 0f6d6186b6 Merge pull request #204 from glitch-soc/with-mastodon-go
7 years ago
kibigo! 23a15bd315 Introducing: Mastodon GO!
7 years ago
Quenty31 b6f057365d l10n Occitan (#5586)
7 years ago
MitarashiDango 3068add21d add account search condition (instance domain) (#5577)
7 years ago
Sorin Davidoi 2c6bb251c5 refactor(features/ui): Avoid useless renders in WrappedSwitch (#5580)
7 years ago
Yamagishi Kazutoshi c858c1a2b8 Replace react-router-scroll to react-router-scroll-4 (#5568)
7 years ago
Nolan Lawson 4a7046e607 Refactor initial state: auto_play_gif (#5576)
7 years ago
Nolan Lawson ba22580c06 Add ServiceWorker caching for static assets (#5524)
7 years ago
Nolan Lawson b89628424d Refactor initial state: "me" (#5563)
7 years ago
SerCom_KC 282f0d7479 Updating Chinese (Simplified) translations (#5508)
7 years ago
ThibG fec32921d5 Update remote ActivityPub users when fetching their toots (#5545)
7 years ago
Nolan Lawson aa85f4cf73 Avoid modifying emoji data inline (#5548)
7 years ago
Nolan Lawson 6c6c67b52b Add margin to account for Edge disappearing scrollbar (#5522)
7 years ago
Nolan Lawson fc075b16d9 Reactor unfollow_modal, boost_modal, delete_modal (#5505)
7 years ago
Herbert Kagumba c652eefd3c Separate Follow/Unfollow and back buttons (#5496)
7 years ago
ThibG b41ed24f74 Instantiate service classes for each call (fixes #5540) (#5543)
7 years ago
Nolan Lawson 6a7deb8fc8 Avoid unnecessary Motion components in icon_button.js (#5544)
7 years ago
Nolan Lawson 7286e6dcf0 Directly use <Motion/> if not reducing motion (#5546)
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
puckipedia 2c06b21883 Allow ActivityPub Note's tag and attachment to be single objects (#5534)
7 years ago
Andrew 120fc4ef61 Theme: Windows 95
7 years ago
Jenkins c388f66ecc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
erin fe11a72c0b Fix copying emojos: redirect to the page you were on (#5509)
7 years ago
David Yip d3db08b69f Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
りんすき e6f7ccb786 Fix column design broken with very long title (#5493)
7 years ago
Nolan Lawson afe5176ee8 Remove translateZ(0) on modal overlay (#5478)
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
Jenkins cfc46d7334 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Ratmir Karabut 51d4add08d Update Russian translation (#5517)
7 years ago
Olivier Nicole fe8646f078 Complete Esperanto translation (#5520)
7 years ago
David Yip b8c462c42b Remove nil check in Glitch::KeywordMute#=~.
7 years ago
David Yip 53c2ea1a86 Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.
7 years ago
David Yip 2da4eca986 Use edit template for displaying errors in update.
7 years ago
David Yip 22f9b4f2c0 Also filter notifications containing muted keywords.
7 years ago
David Yip 7caca589c1 Override Action View name inference in settings/keyword_mutes.
7 years ago
David Yip 05fecda52d Switch to Regexp.union for building the mute expression.
7 years ago
Ondřej Hruška 77cad0daf0 option to add title to <Button>, use for toot buttons (#197)
7 years ago
David Yip 763fd4b275 Only cache the regex text, not the regex itself.
7 years ago
David Yip 2b753ac54f Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Matthew Walsh 897931099c Changes to match other timelines in 2.0
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip e8314ee2a6 KeywordMute matcher: more closely mimic Regexp#=~ behavior.
7 years ago
David Yip 4ab1534f6c Address unused translation errors.
7 years ago
David Yip 156ebf53f6 Use current_account from ApplicationController.
7 years ago
David Yip 3b2bf30644 Don't add \b to whole-word keywords that don't start with word characters.
7 years ago
David Yip 8d69329b8e keyword mutes: also check spoiler (CW) text and reblogged statuses.
7 years ago
Marcin Mikołajczak 67992e1b7e i18n: Update Polish Translation (#5494)
7 years ago
David Yip b2ad79547c Apply keyword mutes to reblogs.
7 years ago
David Yip 74141adca1 Move KeywordMute into Glitch namespace.
7 years ago
David Yip e3f5ec2652 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 05ee0aeb8b Allow keywords to match either substrings or whole words.
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 be472f276d Invalidate cached matcher objects on KeywordMute commit. #164.
7 years ago
David Yip aa57929688 Use more idiomatic string concatentation. #164.
7 years ago
David Yip f3a57932c0 Make use of the regex attr_reader. #164.
7 years ago
David Yip a3ee8592a8 Rework KeywordMute interface to use a matcher object; spec out matcher. #164.
7 years ago
David Yip ddcb129101 Spec out KeywordMute interface. #164.
7 years ago
David Yip c123b710ad Add KeywordMute model.
7 years ago
Ondřej Hruška 067e4e2404 Compose buttons bar redesign + generalize dropdown (#194)
7 years ago
beatrix eed9808f5f hide mentions of muted accounts (in home col) (#190)
7 years ago
kibigo! 9e2b6657c0 Updates to bio metadata script
7 years ago
Nolan Lawson 1a8b2157d0 Remove unnecessary translateZ(0) when doing scale() (#5473)
7 years ago
David Yip 8b8eeb0fbf Make the compose area optionally scrollable.
7 years ago
David Yip 2325bf7423 Merge pull request #185 from glitch-soc/fix-null-status
7 years ago
Ondřej Hruška 0a9b3b1415 formatting fix for eslint
7 years ago
David Yip 722fe5fda8 Remove unused filesAttached property.
7 years ago
David Yip c17395266c Update stylesheet imports in glitch components.
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
Sho Kusano 85e47a4423 Suppress type error(not a function) on calling fastSeek (#5452)
7 years ago
Renato "Lond" Cerqueira a761e02bd1 Fix pt-BR translation strings related to advanced search. (#5449)
7 years ago
Technowix 8eea3bd6d8 Revert #5438 for FR (#5450)
7 years ago
Håkan Eriksson ecef91e5ca Some typos and supplementation in sentence structures (#5441)
7 years ago
JohnD28 8e386ca547 fr.json typo (realtive time) (#5447)
7 years ago
YaQ cd59b66680 Make theme directory and Rename application.scss (#5336)
7 years ago
Eugen Rochko 8eee4b3d35 When unreblog arrives over streaming API, just delete in UI (#5439)
7 years ago
JeanGauthier a18201f690 i18n better wording (OC/CA/FR) + string added in FR (#5438)
7 years ago
Nolan Lawson 845b2f4ad9 Fix scrolling of dropdown when offscreen (#5434)
7 years ago
Eugen Rochko 24155c5890 Fix unwanted content warning gap in CSS (#5436)
7 years ago
Eugen Rochko fef7c55bce When status is fetched instead of delivered, do not stream it (#5437)
7 years ago
unarist 8b2ee20dfa Don't capture scheme-less URLs in the status (#5435)
7 years ago
JeanGauthier e1efabf979 i18n update (#5427) in OC/CA/FR/ES (#5431)
7 years ago
unarist 90fb04f1bb Fix React warning about tabIndex on status with CW (#5432)
7 years ago
Jakob Kramer 15ae7fe6b2 Update German translation (#5425)
7 years ago
Yamagishi Kazutoshi d7063885bc Add Japanese translations (#5427)
7 years ago
aschmitz 4dbdda6b89 Clean up reblog tracking keys, related improvements (#5428)
7 years ago
Håkan Eriksson c06052b7cf Swedish translation (#5406)
7 years ago
Jeroen 289723dd1c Small update Dutch (nl) strings (#5424)
7 years ago
Ondřej Hruška 26b5013865 Fix dual toot button wrong behavior after compose re-design
7 years ago
Ondřej Hruška 57555bf432 workaround for null status
7 years ago
beatrix cda8575ae3 Merge pull request #184 from tootsuite/master
7 years ago
David Yip 02887e0953 Merge pull request #182 from glitch-soc/wide-tootbox-panel
7 years ago
Ondřej Hruška adec2b6716 satisfy eslint and jest
7 years ago
Ondřej Hruška c3ded60ec9 rem a comment
7 years ago
Ondřej Hruška f1d386a3ad double-decker tootbox
7 years ago
Ondřej Hruška e2b44d03ee Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
Ondřej Hruška 26e7e5f0ef fix some lint errors
7 years ago
Nolan Lawson d7b8208a37 Fix reduced motion breaking public galleries (#5423)
7 years ago
Eugen Rochko 7571d79c8d Keep references to all reblogs of a status on home feed (#5419)
7 years ago
David Yip c5888ff3a8 Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Eugen Rochko 8a276b4d43 Ensure that feed renegeration restores non-zero items (#5409)
7 years ago
Eugen Rochko 55642feb4b Filter out duplicate IDs in timelines reducer (#5417)
7 years ago
unarist 1fa6d20981 Fix un-reblogged status being at wrong position in the home timeline (#5418)
7 years ago
voidSatisfaction 7ae6d55b8a Add up-to-date korean translation on client (#5402)
7 years ago
KY e1357265ed Fix #5082 - disable retweet link for followers only toot (#5397)
7 years ago
Marcin Mikołajczak 8953c2a918 i18n: Update Polish translation (#5416)
7 years ago
JeanGauthier c102025e2c i18n ultim hour «More» dropdown title + reduce motion (#5415)
7 years ago
Yamagishi Kazutoshi dd505c5d8c Enable ESLint rules import/* (#5414)
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
Nolan Lawson a5d60195fc Fix offline-plugin warning in dev mode (#5411)
7 years ago
Yamagishi Kazutoshi fb5040885c Replace JavaScript Testing Framework from Mocha to Jest (#5412)
7 years ago
Nolan Lawson cb0c479fd4 i18n "More" dropdown title (#5410)
7 years ago
Nolan Lawson 0e9e72f228 Refactor and simplify icon_button.js (#5413)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip d199a8c612 Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification
7 years ago
Matthew Walsh 078319992b 1.6 changed files for unified avatar styling -- updated to restore unity
7 years ago
David Yip b015ab4e94 Merge pull request #173 from glitch-soc/zerowidthmoji
7 years ago
Eugen Rochko 4a0367d04a Clear timer when unmounting RelativeTimestamp components (#5408)
7 years ago
JeanGauthier 2b099f9f2e l10n Occitan: finishing touches (#5404)
7 years ago
Yannick A c03e2d7c51 Update French translation (#5401)
7 years ago
Lynx Kotoura 9aacf21af7 Adjust public hashtag pages (#5357)
7 years ago
unarist 69b74d26cd Use atomUri in Undo activity of Announce (#5376)
7 years ago
Ondřej Hruška b88cae6c6b replace newlines in desktop notif with spaces instead of removing them (#5361)
7 years ago
spla 9fc9d3554d Updated Catalan strings (#5323)
7 years ago
KY d4b9f821ca Fix #5351 - Redirection with page params after copy emoji (#5387)
7 years ago
abcang 7c1f3173bb Close connection when succeeded posting (#5390)
7 years ago
Yannick A 7b717319f6 Update French translation (#5384)
7 years ago
Masoud Abkenar 5c26c3062d l10n: update Persian translation for 2.0 (#5391)
7 years ago
Ondřej Hruška f92d0bbda4 Doodle improvements 2 (#176)
7 years ago
Jakob Kramer 2425ba45ae Update German translation (#5389)
7 years ago
Ondřej Hruška a438c1dc83 Doodle palette, options, fill tool (#172)
7 years ago
Ondřej Hruška 4eb270dd19 use zerowidth spaces for emojis
7 years ago
Ondřej Hruška 0cca5ac567 Fixed a bug where the canvas would get transparent bg upon erase
7 years ago
Ondřej Hruška f1f6d8220a Initial doodle support
7 years ago
Jeroen c07034708c Dutch strings: small change (#5375)
7 years ago
unarist 490f3146f2 Optimize Status#permitted_for 500x (account timeline) (#5373)
7 years ago
Eugen Rochko ab9c76d786 Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371)
7 years ago
Eugen Rochko 7ccc1c5748 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago
Eugen Rochko 284b078741 Do not try to guess why home timeline is empty in web UI (#5370)
7 years ago
Eugen Rochko bfc6479a96 When unfollowing, remove from home in web UI immediately (#5369)
7 years ago
ThibG 10c5fafbe1 Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372)
7 years ago
Yamagishi Kazutoshi c12c5270fa Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)
7 years ago
Lex Alexander 526b66e871 Retoot count increases without reason (#5363)
7 years ago
ThibG 2e88988fce Reduce discrepancies between server and client-side character count (#5360)
7 years ago
Anna e só 02d14fd373 l10n: PT-BR translation updated (#5362)
7 years ago
Ondřej Hruška e960e2c1d2 Fix the notification bug with newlines
7 years ago
David Yip 227824429b Another tabs-vs-spaces fix, but with ~feeling~
7 years ago
Alda Marteau-Hardi dfde574160 Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)
7 years ago
David Yip 3cc091d374 Fix tabs-vs-spaces issue pointed out by eslint.
7 years ago
JeanGauthier 7c06e0af86 Update oc.json (#5343)
7 years ago
unarist dead33f113 Fix some failure cases on FetchLinkCardService (#5347)
7 years ago
David Yip df6311e002 Restore variable assignment in MuteService#call.
7 years ago
David Yip 7d0cf5a6a1 Merge tag 'v2.0.0rc2' into gs-master
7 years ago
Sylvhem ad4d5aaf96 Fixes and updates for the French translation (#5340)
7 years ago
Ondřej Hruška d08756cfc3 Fix our media gallery not having alt text and tooltips
7 years ago
Ondřej Hruška f8749b268c workaround for scrollIntoView bug ???
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
Jeroen e3717ffadc Updating Dutch strings for 2.0 (#5334)
7 years ago
Alda Marteau-Hardi ae4345e6d4 Use gender neutral language as in the rest of the french translation (#5331)
7 years ago
Lynx Kotoura 75e036b493 Fix styles of error pages (#5335)
7 years ago
kibigo! 037d7478af Removed length check which now happens in reducer
7 years ago
kibigo! 215da1a03c Fixed header emojification
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
Eugen Rochko 794e015ea2 In thread view, only scroll first update, scroll to replied-to post (#5322)
7 years ago
Nolan Lawson 3b6e5360c3 Only preload JS in /web pages (#5325)
7 years ago
Eugen Rochko 6e729f42c3 Fully disable hotkeys when input element is focused (#5324)
7 years ago
JohnD28 eacf9b9039 Update french translation : mastodon/locales/fr.json (#5318)
7 years ago
ButterflyOfFire ffe158fc96 Update ar.json (#5316)
7 years ago
unarist 2b29f5b5f1 Fix an error when ancestors get loaded before the status itself (#5312)
7 years ago
Eugen Rochko 6fc71ff7f2 Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309)
7 years ago
takayamaki cfab4a7ce4 sign_in and sign_up views present og meta infos (#5308)
7 years ago
Eugen Rochko af93f234ab Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)
7 years ago
Eugen Rochko 9d5075740a Fix custom emoji copy not copying file (#5298)
7 years ago
Eugen Rochko 4c6adaf4f4 Fix #5295 - Order custom emoji lexicographically (#5297)
7 years ago
unarist 9c448a0280 Fix an error when video playback buffer is empty (#5300)
7 years ago
nullkal 4a45cc7566 foreign_key, non-nullable, dependent: destroy in account_moderation_notes (#5294)
7 years ago
Eugen Rochko 4a09a62f98 Center error layout (#5289)
7 years ago
Akihiko Odaki 783422f8f5 Fix pagination in Api::V1::BlocksController (#5285)
7 years ago
beatrix 6f578c25c6 try to tighten up local only toot stuff, like... properly (#163)
7 years ago
Eugen Rochko 5a0e862664 Fix dependency of error page generation on database (#5280)
7 years ago
Eugen Rochko a431000b97 Fix #5272 - Order of checks in ActivityPub handler (#5276)
7 years ago
Eugen Rochko 40328ea6a3 Fix #5271 - Fix missing attribute in remove_from_feed (#5277)
7 years ago
Eugen Rochko f8ec132261 Track frequently used emojis in web UI (#5275)
7 years ago
Eugen Rochko 007fce8c10 Set snowflake IDs for backdated statuses (#5260)
7 years ago
Eugen Rochko 3d8b3bf9a0 Fix #5178 - Use object URI only in Announce, instead of embedding (#5266)
7 years ago
Ondřej Hruška 2f8dc023a5 improve static page metadata look
7 years ago
JeanGauthier 5bff1ad44e i18n update Occitan (#5263)
7 years ago
Nolan Lawson 7a66400670 Video preload should be a string (#5267)
7 years ago
Nolan Lawson 7bde8dcc08 Use ES module build of react-router-dom (#5264)
7 years ago
Eugen Rochko 8279ea2f54 Dynamically calculate card height for embeds instead of padding (#5265)
7 years ago
Eugen Rochko 1e7e6413fc Show buffering in video player (#5261)
7 years ago
beatrix d41c9f90ab Merge pull request #161 from DJSundog/audio-uploads-feature
7 years ago
DJ Sundog e50cd23407 update indentation
7 years ago
DJ Sundog c7cae1bf0f add faststart to audio transcoding
7 years ago
DJ Sundog c3e5510289 adding support for audio uploads, transcoded to mp4 videos
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237)
7 years ago
Eugen Rochko 519c4c446a Fix custom emoji in emoji picker, persist skin tone (#5258)
7 years ago
Eugen Rochko e589e17b61 In REST API, when URL can be missing, cast it to nil (#5259)
7 years ago
MitarashiDango b5aeaa395a Japanese translation (relative time) (#5251)
7 years ago
Eugen Rochko 60925ce0ae Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Nolan Lawson 14db4829dc Update emoji-mart to v2.1.1 (#5256)
7 years ago
Eugen Rochko b68aa42383 Fix regression from #5206 - deduplicate descendants (#5253)
7 years ago
kibigo! fb05013855 Basic static metadata styling
7 years ago
Eugen Rochko 11ceec2756 Make auto-play GIFs preference affect custom emojis in web UI (#5254)
7 years ago
Lynx Kotoura d33bc0c04f Fix overflowing in web UI (#5246)
7 years ago
unarist 4acb1c73dd Improve error handling on LinkCrawlWorker (#5250)
7 years ago
unarist 617bc216b8 Fix remote profile being displayed in HTML on remote_follow (#5249)
7 years ago
K.SHIRAKASHI 31501f47c5 Fix error on reloading status detail column (#5248)
7 years ago
MIYAGI Hikaru a22adce069 Fix error at emoji_compressed in Firefox ESR (#5241)
7 years ago
Lynx Kotoura 94fb47ee12 Fix theme settings (#5242)
7 years ago
Nolan Lawson 651aba0e12 Fix thinking_face emoji autocomplete (#5238)
7 years ago
Ondřej Hruška 4bc0a9d1e9 comment out unused stuff with Video
7 years ago
Nolan Lawson 749a6d2511 Import only Spring/Motion from react-motion (#5236)
7 years ago
Nolan Lawson 2b34471d9d Compress and combine emoji data (#5229)
7 years ago
Nolan Lawson ac55d742c2 import only Overlay from react-overlays (#5235)
7 years ago
Eugen Rochko 32998720eb Implement hotkeys for web UI (#5164)
7 years ago
Eugen Rochko b4af50c521 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
Eugen Rochko f37350c08f When processing custom emoji, ensure a non-animated version exists (#5230)
7 years ago
Ondřej Hruška 37f69bb4db workaround for notif clearing
7 years ago
ThibG a89d69a269 Fix regression in FetchRemoteResourceService (#5217)
7 years ago
Lynx Kotoura 4e822d41b9 adjust public profile pages 2 (#5223)
7 years ago
Eugen Rochko 06aff382bc Fix #5050 - Use summary_large_image only with media attachments (#5219)
7 years ago
Lynx Kotoura f0aa03095d Fix style of email domain block table (#5218)
7 years ago
MitarashiDango dd3f9ec261 fix error (When part of conversation has already been deleted.) (#5216)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
Ryo Kajiwara 8041638da2 Supply @instance variable in password reset instructions / password change mailer (#5215)
7 years ago
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447)
7 years ago
ThibG dee5c22790 Check Webfinger-returned author URI even when not redirected (#5213)
7 years ago
aschmitz 5b2d855d86 Non-Serial ("Snowflake") IDs (#4801)
7 years ago
Yamagishi Kazutoshi e671d77e8f Fix undefined local variable (regression from #5114) (#5210)
7 years ago
Eugen Rochko 2a9819b8ec Use own, shorter relative timestamps (#5171)
7 years ago
Eugen Rochko 23dd2eb614 Follow up to #5172, clean up notifications after mute like after block (#5198)
7 years ago
Akihiko Odaki 2e6db37776 Validate id of ActivityPub representations (#5114)
7 years ago
Eugen Rochko e702a64f41 When a streaming API status arrives, sort it into conversations (#5206)
7 years ago
Eugen Rochko 1bf2afddcf Use separate workers to process imports, retry failures (#5207)
7 years ago
Eugen Rochko 7983da13cd Fix possible acct: uri usurpation in ActivityPub account discovery (#5208)
7 years ago
ThibG 707cd936e8 Fix HTTP responses for salmon and ActivityPub inbox processing (#5200)
7 years ago