2590 Commits (ac9780b8449527a6a7ab5e2031eeb37f7f2291e7)

Author SHA1 Message Date
Thibaut Girka e70fc059a9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 3c49daeb8d Add glitch-soc local setting to display reply counters
6 years ago
Thibaut Girka d62ea55d51 Move layout options to their own section
6 years ago
Thibaut Girka 87ad942d76 [Glitch] Display replies count in web UI
6 years ago
Thibaut Girka 801919fc9b Add hashtag trendline support to glitch-soc flavour
6 years ago
Thibaut Girka 360fbf1bd4 Add pinned accounts editor
6 years ago
Thibaut Girka 9fbaaefe59 Split list editor into components and containers
6 years ago
Thibaut Girka d69f045681 Fix ColumnLink keys in getting_started_misc
6 years ago
Eugen Rochko 2374a00c10
Add confirmation step to account suspensions (#8353)
6 years ago
Yamagishi Kazutoshi 513cb20b75 Weblate translations (2018-08-22) (#8346)
6 years ago
Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master
6 years ago
NecroTechno 6a0d4d36ad reorder simple form ul to list vertically (fixes #8236) (#8322)
6 years ago
Thibaut Girka c789181626 [Glitch] Add hotkey for follow requests
6 years ago
Thibaut Girka b230c04e00 Make the privacy dropdown button not look strange when using top placement
6 years ago
Thibaut Girka 24f39c0841 [Glitch] Skip pagination logic entirely for pinned toots
6 years ago
Thibaut Girka 0c091475df Make non-link ColumnLinks behave as links
6 years ago
ThibG 5fbf12bbb8 Skip pagination logic entirely for pinned toots (fixes #8302) (#8310)
6 years ago
Annika Backstrom 25f6f41052 Add hotkey for follow requests (#8307)
6 years ago
Thibaut Girka f4d28ccfa3 Don't filter own toots
6 years ago
ThibG 28163528e5 Don't filter own toots (fixes #8289) (#8298)
6 years ago
cpsdqs 8fe1f8d4ce Make dropdown animations respect their placement (#8292)
6 years ago
Thibaut Girka 432f6b88b0 Focus CW field when enabling it, focus compose textarea when disabling it
6 years ago
mayaeh 0d1d9b9a33 Fix report text color. (#8288)
6 years ago
Thibaut Girka 88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 19b07ba260
Make unfollow button light up red when hovered (#8286)
6 years ago
Eugen Rochko 025fbb8285
Show compose form on delete & redraft when in mobile layout (#8277)
6 years ago
Eugen Rochko 0fc0980de1
Link to mobile apps page (#8278)
6 years ago
Spanky 7a0f781aa9 Fix ctrl+enter not submitting toot when text cursor is composing image description (#8273)
6 years ago
Thibaut Girka bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 7423c0c130 Various minor upload description fixes
6 years ago
Thibaut Girka 534439e73b Add focal points support in the composer
6 years ago
Thibaut Girka 9782ac017b Refactor in preparation for focal points modal
6 years ago
M Somerville 298ee84488 Fix #8264 - Do not override ctrl/cmd+click. (#8265)
6 years ago
Eugen Rochko 85bb32c410
Add "sign in to participate" message to public toot page (#8200)
6 years ago
Eugen Rochko 78fa926ed5
Add remote interaction dialog for toots (#8202)
6 years ago
Thibaut Girka 69d4fa3bc5 Fix rails-ujs not being run on some settings pages (fixes #645)
6 years ago
Dachi Natsvlishvili bf1bde5d6a Add Georgian language translation (#8250)
6 years ago
Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 4a6bc2482a [Glitch] Defer scrollIntoView after DOM is drawn
6 years ago
ThibG 4601a58ac2 Defer scrollIntoView after DOM is drawn (fixes #8239) (#8242)
6 years ago
Thibaut Girka 50cd70b3e9 Fix incorrect prop type for ComposerReply.status
6 years ago
Thibaut Girka 7595ae4090 Fix one GettingStarted ColumnLink not having a key
6 years ago
ThibG be0b372a22 Fix admin.js starting rails-ujs twice (fixes #8168) (#8213)
6 years ago
ThibG 625b5a567b Get rid of the Content Warning rainbows (#8129)
6 years ago
Eugen Rochko 4df9cabb22
Display replies count in web UI (#8181)
6 years ago
Thibaut Girka 494eaab5b1 Slightly more aggressive video preloading
6 years ago
Thibaut Girka c4e8402ef9 Fix bug when clicking on video position slider before starting the video
6 years ago
Thibaut Girka f0fa6e3a7c Prevent default event handling when clicking on the video position slider
6 years ago
Eugen Rochko aaac14b8ad
Show exact number of followers/statuses on export page/in tooltip (#8199)
6 years ago
ThibG ec2c516ab8 Various fixes regarding the video position slider (#8201)
6 years ago
Evgeny Petrov 9e4ac1c12c Added endorse strings, fixed footer 'developers' string (#8183)
6 years ago
Yamagishi Kazutoshi 662a914f5e Weblate translations (2018-08-12) (#8171)
6 years ago
Evgeny Petrov b7091c6c0f Added endorse strings, fixed footer 'developers' string (#8183)
6 years ago
Yamagishi Kazutoshi 38e39c9366 Weblate translations (2018-08-12) (#8171)
6 years ago
Thibaut Girka 84a2587d44 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka acb3d5b7aa Don't prevent opening links in tabs with keyboard modifiers
6 years ago
Mélanie Chauvel (ariasuni) 7b5ea7270d Fix crash when clicking “Show more/less for all” when a toot is not visible (#8118)
6 years ago
Yamagishi Kazutoshi e8b7f3f3e2
Weblate translations (2018-08-11) (#8167)
6 years ago
Marcin Mikołajczak 3d7979c2ca i18n: Update Polish translation (#8155)
6 years ago
Evgeny Petrov d2e0818d5a [RU] Updated translation (#8164)
6 years ago
Thibaut Girka 7067b64de3 Implement public profile endorsements in glitch-soc
6 years ago
Thibaut Girka 4e66e0ac04 Merge upstream SCSS changes for /about, /about/more and /terms
6 years ago
Thibaut Girka 16a4a333a2 Merge upstream styling for public profile endorsements
6 years ago
Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 5b8603879f
Adjust responsive design for /about/more and /terms (#8158)
6 years ago
Eugen Rochko 0dcc1950d1
Update /terms and /about/more to use public layout (#8142)
6 years ago
Eugen Rochko f2404de871
Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Evgeny Petrov 80176a3814 [RU] Translation update: (#8147)
6 years ago
Eugen Rochko d974c94478
Remove protocol handler registration (#8127)
6 years ago
Thibaut Girka 7d1dd59496 Good bye, CW rainbows
6 years ago
Thibaut Girka c700778922 Scroll to linked status in public status view
6 years ago
ThibG 1ab8b4b8ea Scroll to linked status in public status view (fixes #7884) (#8130)
6 years ago
Thibaut Girka 617c3a8006 Restore glitch-soc's 500 characters limit for bios (fixes #625)
6 years ago
Thibaut Girka 5e6cec4a40 Import upstream's emojify function in settings.js
6 years ago
Marcin Mikołajczak 23b22d0dff i18n: Make Polish translation more gender neutral + update (#8119)
6 years ago
Thibaut Girka ed69117048 Fix styling of toot prepended text on public profiles
6 years ago
Thibaut Girka a0d0111979 Fix toot styling on public pages
6 years ago
Thibaut Girka 7ab46b73bd Reintroduce glitch-soc avatar styling in public pages
6 years ago
Thibaut Girka a3dd2deda3 [Glitch] Do not hide hashtag timeline in mobile view, make it full-window
6 years ago
Thibaut Girka 175c2155a9 [Glitch] Compensate for scrollbar disappearing when media modal
6 years ago
Thibaut Girka d2b3eebe00 [Glitch] Show media modal on public timeline
6 years ago
Thibaut Girka 5cd7fe21bf [Glitch] Add missing formatting to the text in hero widget
6 years ago
Thibaut Girka d894cdc93f Port profile redesign to glitch-soc
6 years ago
Thibaut Girka c1c514ca70 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 88b593a63f Drop glitch-style account bio fields
6 years ago
Eugen Rochko 13ac8ca66a
Do not hide hashtag timeline in mobile view, make it full-window (#8093)
6 years ago
Eugen Rochko 60df87f6f0
Compensate for scrollbar disappearing when media modal visible (#8100)
6 years ago
Thibaut Girka 1bae4c4f83 [Glitch] Resize images by area instead of fixed dimensions
6 years ago
Thibaut Girka 5f1bdca4c8 Merge commit 'e23b26178a71f90d64fe2a3e9e4468f265ecc71c' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka b02bfe86ce Don't reset scroll position when opening a modal
6 years ago
Thibaut Girka 5d060cb6e4 Allow modals to be closed by pressing “back”
6 years ago
Thibaut Girka 3eb3c21327 Treat the App Setting link as a proper link (fixes #375)
6 years ago
Thibaut Girka 88b7ccc2ca [Glitch] Improve WebUI account action bar
6 years ago
Thibaut Girka 4cf7cfd9e0 [Glitch] Fix accounts' display name/bio not being set from initial state
6 years ago
Yamagishi Kazutoshi 18831acc10 Weblate translations (2018-07-30) (#8096)
6 years ago
Yamagishi Kazutoshi 06c83527f5 Do not scroll up when modal is opened (#8095)
6 years ago
Eugen Rochko 1d773b3a46
Add missing formatting to the text in hero widget (#8089)
6 years ago
Thibaut Girka d8544e7003 Use same margin for navbar and column for consistency
6 years ago
Thibaut Girka 69ea4a01e1 Hide navigation bar text so it can fit on small screens
6 years ago
Thibaut Girka 37302c63c3 Fix glitch-soc columns padding on mobile (fixes #561)
6 years ago
Thibaut Girka 93d4e9a58d Preserve hashtags in threaded mode (fixes #584)
6 years ago
Thibaut Girka 28a59e4e80 Move CW field just above main textarea
6 years ago
Thibaut Girka 358e3a4c32 Get rid of Collapsable, use CSS instead
6 years ago
Thibaut Girka d3783b864c Refactor reply indicator and show compact list of attachments
6 years ago
Thibaut Girka e3bf8c8aa1 Show reply indicator for empty toots, not undefined toots (fixes #610)
6 years ago
Mélanie Chauvel (ariasuni) 2ccef52a4f Improve account bar css (#8087)
6 years ago
Eugen Rochko bb71538bb5
Redesign public profiles and toots (#8068)
6 years ago
Marcin Mikołajczak e23b26178a i18n: Update Polish translation (#8084)
6 years ago
Eugen Rochko 0fb0037ca7
Resize images by area instead of fixed dimensions (#8083)
6 years ago
Thibaut Girka c057aeb76b [Glitch] Add documentation for “p” hotkey
6 years ago
Thibaut Girka a8911616b6 Add hotkey variants to keyboard shortcuts description
6 years ago
Thibaut Girka 6141c2a035 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 82ab5aacb2 Prevent scrolling main frame when navigating in image gallery with arrow keys
6 years ago
ThibG 3c35b34b61 Improve keyboard shortcuts descriptions (#8066)
6 years ago
ThibG d199806969 Prevent scrolling main frame when navigating in image gallery with arrow keys (#8073)
6 years ago
Eai c9739ca86b Fix .column-back-button line-height (#8074)
6 years ago
Marcin Mikołajczak ba6a592b39 fix typo in 🇵🇱 (#8075)
6 years ago
Thibaut Girka 02326a4322 [Glitch] Use LoadingBar instead of blur to indicate that an image is loading
6 years ago
Thibaut Girka 1769a7e9aa Use the same description string as upstream for the “x” hotkey
6 years ago
Thibaut Girka b1ed2b1d03 Fix focusing search bar with hotkeys
6 years ago
Thibaut Girka c600bcfe1d Fix focusing composer textarea on “new toot” hotkey
6 years ago
Thibaut Girka 037228cf03 Fix routing issues, especially keyboards shortcuts changing location
6 years ago
Yamagishi Kazutoshi b62ec00d87 Weblate translations (2018-07-25) (#8065)
6 years ago
Thibaut Girka 1aa253c41d Display custom emoji in account notes in WebUI (fixes #595)
6 years ago
Thibaut Girka c99054ecb2 Add CSS for the newly-introduced dashboard (fixes #592)
6 years ago
Thibaut Girka 828f602b2f [Glitch] Ensure container of React components has full width
6 years ago
Thibaut Girka b9d5d8982d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 552b4d9a5f Disable threaded mode when canceling a reply (fixes #583)
6 years ago
Yamagishi Kazutoshi 7e638043b9
Weblate translations (2018-07-18) (#8047)
6 years ago
Thibaut Girka 7dbed4dab9 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 1fb78602c5 Do not cause an error if domain_lists.blocks.next is undefined (fixes #572)
6 years ago
Thibaut Girka 8501ad5c5c Process statuses on COMPOSE_SUBMIT_SUCCESS (fixes #579)
6 years ago
Eugen Rochko 6277a6db2a
Hide "A look inside" in mobile layout on frontpage (#8044)
6 years ago
Eugen Rochko f6910fba02
Ensure container of React components has full width (#8043)
6 years ago
Thibaut Girka bcf157a1a9 Avoid loading rails-ujs twice on vanilla flavour
6 years ago
Thibaut Girka f26f1145ac Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marcin Mikołajczak daacf15d72 i18n: Update Polish translation (#8032)
6 years ago
Eugen Rochko 2354b10eb5
Add admin dashboard (#8029)
6 years ago
ThibG 955d5d36e8 Use LoadingBar instead of blur to indicate that an image is loading (fixes #4060) (#7562)
6 years ago
ThibG d0d23b8f0a Do not cause an error if domain_lists.blocks.next is undefined (#8021)
6 years ago
Yamagishi Kazutoshi e9b322d0a6 Upgrade webpack to version v4.x (#6655)
6 years ago
Eugen Rochko e709107463
Display Mastodon version in footer of web UI (#8013)
6 years ago
Eugen Rochko 9b75dee316 Weblate translations (2018-07-14) (#8016)
6 years ago
Eugen Rochko e55dce3176
Add federation relay support (#7998)
6 years ago
Thibaut Girka 57f31b361f Add an option restricting secondary toot privacy to that of the toot being replied to
6 years ago
Thibaut Girka d8b13b46f7 Move privacyPreference to utils
6 years ago
Thibaut Girka cd05378b59 [Glitch] Refactor privacyPrefence() to use priority list
6 years ago
Thibaut Girka d67cb13d84 Use options rather than a boolean
6 years ago
Thibaut Girka 8c8707771d Do not store duplicate reply_privacy
6 years ago
Ash Levy 6f06d16b1e add option to enable auto visibility on secondary toot button
6 years ago
Thibaut Girka 7cb7ecaf7e [Glitch] Make whole-word filter regex consistent between Ruby and JS
6 years ago
Thibaut Girka debc6544d9 [Glitch] Add follow button to detailed status, add gradient to mask bio cut-off (fixes #566)
6 years ago
Thibaut Girka 6f0f583abe Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ffd444d221
Weblate translations (2018-07-11) (#7992)
6 years ago
Eugen Rochko bfce6a5485
Add link to filters in web UI dropdown (#7990)
6 years ago
Thibaut Girka 612b00d1bb Display reply indicator even when replying to contentless toot (fixes #564)
6 years ago
Thibaut Girka ef1d660596 make sure reblogged's filter is set correctly
6 years ago
Thibaut Girka faa4db7975 [Glitch] Add option to not consider word boundaries when processing keyword filtering
6 years ago
Thibaut Girka 6777dfc8d9 [Glitch] In keyword filter, account for reblogs, HTML and whole-words
6 years ago
Thibaut Girka 00c1386b9d [Glitch] Fix filters not affecting notifications in web UI
6 years ago
Thibaut Girka 0bb1720495 Add client-side custom filter support to glitch-soc
6 years ago
Thibaut Girka 33c1607c83 [Glitch] Fix Chrome issue with sizes="0px"
6 years ago
Ash Levy e96a4434c7 add keybind in composer textarea for secondary submit
6 years ago
Eugen Rochko 20fefdb714
Make whole-word filter regex consistent between Ruby and JS (#7987)
6 years ago
Thibaut Girka d392020da6 Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
ThibG 1ca4e51eb3 Add option to not consider word boundaries when processing keyword filtering (#7975)
6 years ago
Eugen Rochko 30e1da7668
Add follow button to detailed status, add gradient to mask bio cut-off (#7979)
6 years ago
Eugen Rochko cfeb3beb4e
Fix filters not affecting notifications in web UI (#7977)
6 years ago
Lynx Kotoura c930b61770 Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964)
6 years ago
Lynx Kotoura 617f40fc2b Fix gradient, regression from #7927 (#7963)
6 years ago
Eugen Rochko 404c7702ec
In keyword filter, account for reblogs, HTML and whole-words (#7960)
6 years ago
Eugen Rochko 1f6ed4f86a
Add more granular OAuth scopes (#7929)
6 years ago
Maciek Baron ca2cc556f1 Crush PNGs to reduce overall size (#7954)
6 years ago
Renato "Lond" Cerqueira b2051a6256 Weblate translations (2018-07-05) (#7950)
6 years ago
Maciek Baron 1e65cdf821 Add comment, test to unescapeHTML (#7949)
6 years ago
Maciek Baron cdfe51e325 Fix #6395 - overlapping profile name and domain (#7927)
6 years ago
Marek Lach 7da74e3157 Fix dark background error on user-mention autosuggest (#7937)
6 years ago
Maciek Baron f2d9a3c239 Refactor privacyPrefence() to use priority list (#7945)
6 years ago
Maciek Baron 0bfa0f2374 Add white outline to black emojis (fix #5083) (#7936)
6 years ago
Maciek Baron f3af1a96a8 Check if router is injected in media modal (#7941)
6 years ago
Eugen Rochko 8ff0d64d05 What is on your mind -> What's on your mind (#7938)
6 years ago
Eugen Rochko 5b6db8a62a
Disable service worker media cache and IndexedDB storage (#7932)
6 years ago
Maciek Baron bbbe3ed6ba Allow the media modal to be closed by pressing back (#7934)
6 years ago
Eugen Rochko 23e1f143de Fix M hotkey inserting @undefined when in detailed status (#7931)
6 years ago
Eugen Rochko 30b377cc15
Fix style of attachment list on /about (#7930)
6 years ago
Shaun Gillies ac82c9380f Display full username in tooltip on search and autosuggest #7478 (#7920)
6 years ago
Eugen Rochko 2092d5c0ad
Improve embeds (#7919)
6 years ago
Marcin Mikołajczak dfd9cd463d i18n: Update Polish translation (#7915)
6 years ago
Eugen Rochko cdb101340a
Keyword/phrase filtering (#7905)
6 years ago
Quentí fbee9b5ac8 Missing translations (#7896)
6 years ago
ふぁぼ原 20bb90ced6 On the mobile UI, move the search column to the right (#7877)
6 years ago
Yamagishi Kazutoshi 349d0196b2 Weblate translations (2018-06-25) (#7890)
6 years ago
Eugen Rochko 45b5e60909
Fix Chrome issue with sizes="0px" (#7886)
6 years ago
ThibG c18d55e8c2
Merge pull request #553 from ThibG/glitch-soc/merge-upstream
6 years ago
Thibaut Girka f364a27922 Increase padding of toots
6 years ago
Thibaut Girka ccbaf32bca Fix margins of toot text
6 years ago
Thibaut Girka 4b0f27ba78 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 03cfe366fd
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
6 years ago
Mélanie Chauvel (ariasuni) f0f8b242c4 Fix CW field still having animation in when reduce motion is enabled (#7872)
6 years ago
Thibaut Girka f0161702d8 [Glitch] Submit report using meta key
6 years ago
Thibaut Girka d0faac9027 Fix clicking on collapsed toots with a background (fixes #547)
6 years ago
Thibaut Girka ab5f450700 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Hinaloe c3b40a6950 Return collect response when fail put cache to storage (#7863)
6 years ago
kedama 926bfce465 Fix broken single column getting-started menu (Fix #7854) (#7862)
6 years ago
Eugen Rochko 2a1089839d
Weblate translations (2018-06-19) (#7847)
6 years ago
Yamagishi Kazutoshi 7e9e7c642d Weblate translations (2018-06-18) (#7839)
6 years ago
Lynx Kotoura 434ec913dd Change list icons different from the getting-started icons (#7838)
6 years ago
Eugen Rochko a58ec29631
Allow selecting default posting language instead of auto-detect (#7828)
6 years ago
Hinaloe b347d55432 DataTransfer.types may Array-like object (#7827)
6 years ago
Lynx Kotoura 31e5d7efd7 Fix the action with X button on compose form (#7826)
7 years ago
Thibaut Girka 26c20a4ec7 [Glitch] Preserve newlines in delete & redraft and desktop notifications
7 years ago
Thibaut Girka a01faecfcb [Glitch] Add redraft function
7 years ago
ThibG c08a249558
Merge pull request #544 from ThibG/glitch-soc/merge-upstream
7 years ago
Lynx Kotoura 9c08a368e7 Adjust account__action-bar contents (#7818)
7 years ago
Lynx Kotoura a9ef82febb Fix autosuggest-textarea backgrounds and some minor adjustments (#7817)
7 years ago
Yamagishi Kazutoshi ea23ef8cb6 Weblate translations (2018-06-16) (#7815)
7 years ago
Jeong Arm 0f6622f7d1 Add missing Korean translations (#7819)
7 years ago
SerCom_KC b469a8d688 Update Chinese (Simplified) Translations (#7816)
7 years ago
Masoud Abkenar 97b2ba4240 Update fa.json (#7814)
7 years ago
Thibaut Girka e8ccac468a [Glitch] Add vendor prefix for background-clip
7 years ago
David Yip 8cafeedc25 Port 85470ec872 to glitch emoji picker.
7 years ago
Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 09147186b7
Fix regression where CW is focused on reply (#7811)
7 years ago
Eugen Rochko ca85658975
Add autofollow option to invites (#7805)
7 years ago
Eugen Rochko 33dd9bf36d
Fix vertical alignment of navigation bar (#7807)
7 years ago
Eugen Rochko 1cc775200e
Add "find friends", "invite people", and more to getting started footer (#7803)
7 years ago
chr v1.x 4f42238c29 Put "Media Only" option in column settings instead of content area headline (#7801)
7 years ago
Jenkins afceef74c2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi f972815f1b Hide status content when spoiler text is not empty (#7797)
7 years ago
Yamagishi Kazutoshi 79a468016a Fix "Invalid DOM property `class`" (#7798)
7 years ago
Lain Iwakura 6bae583d2f
Handle character limit in initial state in frontend.
7 years ago
chr v1.x 0338da1699 Add profile options on compose form (#7789)
7 years ago
David Yip fac6e392e9
Port emojimart 2.6.1 changes to glitch flavour
7 years ago
Jenkins 4d8d1fa129 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Lynx Kotoura 7e27a3c225 Uniform media and video spoiler settings and fix them of the light theme (#7778)
7 years ago
Yamagishi Kazutoshi 01ee460ceb Weblate translations (2018-06-10) (#7779)
7 years ago
kedama a99179d31f Control the focus when clicking the "CW" button. (#7776)
7 years ago
Renato "Lond" Cerqueira 268d90e810 Rename emoji sheet to avoid caching issue (#7777)
7 years ago
Eugen Rochko 10f51c9886
Fix domain hiding logic (#7765)
7 years ago
Lynx Kotoura 91e5d9f8af Fix background color of emoji-mart-bar in light theme (#7768)
7 years ago
Lynx Kotoura 3df8c40508 Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772)
7 years ago
Thibaut Girka 7d3c0e4cb4 Delete references to removed constants (fixes #537)
7 years ago
SerCom_KC fc132915ec Update Chinese (Simplified) translations (#7769)
7 years ago
Renato "Lond" Cerqueira 85470ec872 Fix issues with updated emoji mart (#7761)
7 years ago
Yamagishi Kazutoshi 6671297e7a Weblate translations (2018-06-08) (#7759)
7 years ago
Eugen Rochko 9b9e96eae5
Add "Edit profile" link to public profile page, increase bottom padding (#7754)
7 years ago
Renato "Lond" Cerqueira 0c3ce41031 Update to emojimart 2.6.1 (#7746)
7 years ago
David Yip 8142bd2553
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
David Yip f8d50a4070
Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation
7 years ago
Marcin Mikołajczak 2304d52599 🌍🇵🇱 (#7753)
7 years ago
Eugen Rochko c75493755f
Preserve newlines in delete & redraft and desktop notifications (#7750)
7 years ago
Renato "Lond" Cerqueira d8b4f39007 Weblate translations 20180605 (#7743)
7 years ago
Renato "Lond" Cerqueira aa177bdca7 Add missing locale strings (#7742)
7 years ago
Eugen Rochko bd0791d800
Add redraft function (#7735)
7 years ago
Yamagishi Kazutoshi e0354aba7c Add vendor prefix for background-clip (#7727)
7 years ago
Lynx Kotoura bb0edbd988 Change border color of activity-stream (#7724)
7 years ago
Yamagishi Kazutoshi 64d7a63f18 Submit report using meta key (#7729)
7 years ago
Eugen Rochko 1bbe81030c
Display numbers in account header using shortNumberFormat for consistency (#7723)
7 years ago
Lynx Kotoura 73923ea6c4 Fix activity-stream-tabs colors and set text variables for text colors (#7722)
7 years ago
Eugen Rochko e18390cfe6
Fix bug in order of conversations in web UI (#7721)
7 years ago
David Yip c55263027a
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 0deb9fa6b9
Remove trending hashtags (#7711)
7 years ago
David Yip 5dd2a78034
Merge pull request #528 from glitch-soc/merge-upstream
7 years ago
David Yip 8343f56b2c
Whoops, forgot to clean up a conflict.
7 years ago
David Yip cfdbb36bdf
Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null
7 years ago
David Yip 3550470c18
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip a641d1b5b8
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
Yamagishi Kazutoshi 89c86ee521 Weblate translations (2018-06-02) (#7705)
7 years ago
Eugen Rochko 8d6e4e0485
Fix margin between compose warning, reply indicator and textarea (#7701)
7 years ago
Eugen Rochko 73c0c36e7b
Improve trends layout (#7700)
7 years ago
Yamagishi Kazutoshi 69b45350fe Add loading indicator for trending tags (#7693)
7 years ago
Yamagishi Kazutoshi bfa12239e8 Update ESLint for Code Climate (#7696)
7 years ago
Yamagishi Kazutoshi 15ce60f610 Fix duplicate key attributes (#7694)
7 years ago
David Yip 9ad5de8a3a
Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks
7 years ago
Spencer Alves e5f25a73f2 Adjust spacing between status icons
7 years ago
Spencer Alves 7d2e6429c2 Merge branch 'glitch' into thread-icon
7 years ago
Eugen Rochko 0ce5339a7b
Make the refresh trends button refresh trends (#7685)
7 years ago
Mélanie Chauvel (ariasuni) 691107263c Put the CW field between the toot we are replying to and the toot field (#7508)
7 years ago
Thibaut Girka b9fdeceb3c Make active bookmarks red (fixes #493)
7 years ago
Thibaut Girka cc396f085d Use history.state to decide whether we should goBack() or go to / (fixes #247)
7 years ago
Thibaut Girka f86d280fd6 Use props.router instead of context.router, as we are using withRouter
7 years ago
Thibaut Girka 893f2aff20 Prevent a rare crash when a status' root node is undefined
7 years ago
Thibaut Girka e396fbfe3b Fix direct timeline
7 years ago
Yamagishi Kazutoshi 648a22637c Weblate translations (2018-05-31) (#7681)
7 years ago
Marcin Mikołajczak 063d4d4ccc 🌍: 🇵🇱⬆️ (#7679)
7 years ago
Jenkins 165b5dc7f5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 3623aea6c9
Redirect / to home on mobile layout, to getting started on desktop (#7677)
7 years ago
Eugen Rochko 1a7a74ff76
Improve getting started column (#7676)
7 years ago
Thibaut Girka e7b3a4263e [Glitch] Fix low-contrasted cancel button of reply indicator
7 years ago
Thibaut Girka 08dbe29e29 [Glitch] Improve load gap styling in web UI
7 years ago
Thibaut Girka cc589d6ec0 [Glitch] Use randomized setTimeout when fallback-polling and re-add since_id
7 years ago
Thibaut Girka fbc25bdd2d [Glitch] Do not crash in getStatusIds when there is a gap in the timeline
7 years ago
Thibaut Girka 5cc4d34250 [Glitch] Fix gap insertion for timeline disconnection
7 years ago
Thibaut Girka 15bef77add [Glitch] Fix ID duplication in timelines
7 years ago
Thibaut Girka 4b38ac3bed [Glitch] Fix comparing id
7 years ago
Thibaut Girka 6020a21130 [Glitch] Fix LoadMore on account media gallery
7 years ago
Thibaut Girka 5d16fd3f28 [Glitch] Add missing null handling in notification reducer
7 years ago
Thibaut Girka 4eba8c50c3 [Glitch] Allow clients to fetch notifications made while they were offline
7 years ago
Thibaut Girka 0ad3eedd4c [Glitch] Allow clients to fetch statuses made while they were offline
7 years ago
unarist 7706ed038f Fix context building in the reducer (#7671)
7 years ago
Thibaut Girka 532fb8e215 Fix error when unmuting a domain without listing muted domains first
7 years ago
ThibG 0345cd5a0f Fix error when unmuting a domain without listing muted domains first (#7670)
7 years ago
Thibaut Girka c087738270 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 8bb74e50be
Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)
7 years ago
Eugen Rochko 90b64c0069
Always display tab navigation on local/federated timeline even when empty (#7663)
7 years ago
Akihiko Odaki d95642f6d9 Cache attachments on external host with service worker (#7493)
7 years ago
Lynx Kotoura c0355878ba Fix embed, error and onboarding modals in light theme (#7656)
7 years ago
Eugen Rochko 04a2cf8bcc
Fix incomplete flex style on trends items (#7655)
7 years ago
Eugen Rochko dfbadd6837
Replace recursion in status mapStateToProps (#7645)
7 years ago
Eugen Rochko 9bd23dc4e5
Track trending tags (#7638)
7 years ago
Thibaut Girka 8b98afa781 [Glitch] Replace onScrollToBottom with onLoadMore
7 years ago
Thibaut Girka a81ed7b205 Do not needlessly refresh pinned toots
7 years ago
Thibaut Girka 60addb14ce [Glitch] Change icon for domain blocks
7 years ago
Thibaut Girka b7508940b7 [Glitch] Add option to show only local toots in timeline preview
7 years ago
Thibaut Girka 1fa3586db5 [Glitch] Use streaming API for standalone timelines on /about and /tag pages
7 years ago
Thibaut Girka d959d04133 Change direct message warning to match upstream
7 years ago
Thibaut Girka 659b8a12ec Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Thibaut Girka c2e528916c Implement client-size image resizing from upstream
7 years ago
Thibaut Girka d253449ff0 Port upstream's result section headers (fixes #366)
7 years ago
Eugen Rochko 182bdbc5f4 Don't use Object.assign with Notification, only display actions for mentions (#7632)
7 years ago
bsky 422f92f3f8 Fix lock icon position in account card (#7630)
7 years ago
Thibaut Girka 18d9a7fd71 Fix caret position after inserting suggestions (fixes #281)
7 years ago
Thibaut Girka d8793e1bee Remove unneeded code now that attachment URL isn't appended to toots
7 years ago
Lynx Kotoura 07054ee6f7 Add right margin of notification message (#7628)
7 years ago
Lynx Kotoura a0b4754231 Fix color mistakes in mastodon-light theme (#7626)
7 years ago
Yamagishi Kazutoshi 62cb3b199f Weblate translations (2018-05-26) (#7624)
7 years ago
ThibG a5c25242af
Merge pull request #514 from ThibG/glitch-soc/fixes/fix-hardcoded-fav
7 years ago
Thibaut Girka 11cc2e099a Merge branch 'master' into glitch-soc/merge-master
7 years ago
Akihiko Odaki 023fe5181b Introduce flat layout to contexts reducer (#7150)
7 years ago
Yamagishi Kazutoshi 8182b61518 Enable media timeline (#7598)
7 years ago
Lynx Kotoura 7ea91dcbb3 More polished light theme (#7620)
7 years ago
Lynx Kotoura 6042403621 Fix color of /about/more link anchors (#7618)
7 years ago
Thibaut Girka 4c91215e1f [Glitch] Use .star-icon instead of hardcoding color in detailed statuses
7 years ago
ThibG 2587fcdd27 Use .star-icon instead of hardcoding color in detailed statuses (fixes #7610) (#7613)
7 years ago
ThibG 88ec5193cb
Merge pull request #510 from ThibG/glitch-soc/merge-upstream
7 years ago
ThibG 7719fe0df2
Merge pull request #505 from ThibG/glitch-soc/features/fetch-relationships-on-search
7 years ago
Thibaut Girka 0553496b76 Change notification cleaning checkbox color (fixes #511)
7 years ago
Thibaut Girka e0ef89c73f Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
ThibG d8864b9e9d Fix caret position after selected suggestion and media upload (#7595)
7 years ago
ThibG 39d70f375f Remove unneeded code now that attachment URL isn't appended to toots (#7593)
7 years ago
SerCom_KC 4c9d5a500d [WIP] i18n: Update Simplified Chinese translations (#7576)
7 years ago
Yamagishi Kazutoshi 4eeda67727 Hide section headline for timelines in production (#7590)
7 years ago
Yamagishi Kazutoshi 06252ec71e Change column params on pinned timeline (#7581)
7 years ago
bsky 92b09d90c8 Remove outline (#7582)
7 years ago
Thibaut Girka 247f55f673 [Glitch] Fetch relationships for search results in UI
7 years ago
David Yip 6dd676e006
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Marcin Mikołajczak 810f92e697 🌍: 🇵🇱⬆️ (#7580)
7 years ago
Jenkins f93806ea55 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Thibaut Girka d0b2f71501 Fix width only being set for standalone media
7 years ago
Thibaut Girka 3ad3cee44c [Glitch] Use real container width in MediaGallery srcSet
7 years ago