1662 Commits (a896f601fa0744c4d28cdeab1a2d008a3276a46b)

Author SHA1 Message Date
Jenkins efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip b6159bcb0a
Merge remote-tracking branch 'origin/merge-upstream'
7 years ago
Thibaut Girka fb6f131fa1 Revert 245816ab27 (fixes #348)
7 years ago
Eugen Rochko 3ebc0ad4d3
Full-text search for authorized statuses (#6423)
7 years ago
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 2ef9d0e101
Change web UI "posts" to "toots" on profile for consistency (#6447)
7 years ago
Eugen Rochko 76f3d5d16b
Add preference to always display sensitive media (#6448)
7 years ago
Jenkins 3405ea6dd9 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel King 95c8232109 match hashtag regex in js client with server (#6431)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira 4e4f1b0dcb Add option to show only local toots in timeline preview (#6292)
7 years ago
Eugen Rochko 26f21fd5a0
CAS + SAML authentication feature (#6425)
7 years ago
Jenkins 530fcc1c14 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ncls7615 15a5b3372a
Fix detailed-status
7 years ago
takayamaki d75d2a9f99 fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417)
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
abcang 33f56811e3 Fix column header button (#6411)
7 years ago
Akihiko Odaki c1efe0aa1d Set minimum height for mastodon on drawer (#6142)
7 years ago
Akihiko Odaki 77dd9e7d27 Remove wave from list drawer (#6381)
7 years ago
abcang ffb2b8ef8c Fix button hiding when header title is too long (#6406)
7 years ago
Jenkins ad3a2dfb66 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Evgeny Petrov 3ed194b67d Russian language updated (#6397)
7 years ago
David Yip f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 47eda1e5fb
Fix padding bug in landing page column header (#6374)
7 years ago
Renato "Lond" Cerqueira 106efba800 Weblate translations (#6370)
7 years ago
Quenty31 bd8d8ad894 l10n Occitan update (#6367)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang a3c0a20373 Fix initial_state me in push_notification_register (#6349)
7 years ago
abcang 8cd2828e91 Fix hide and show media button on admin page (#6347)
7 years ago
Quenty31 7650506b39 l10n Occitan language update (#6346)
7 years ago
Eugen Rochko daefbd66a6
Fix style of legacy column headers (#6342)
7 years ago
Eugen Rochko 2fc2725076
Fix e-mail icon for reblog being stretched (#6336)
7 years ago
Thibaut Girka 2107891edb Remove some leftover code, I guess
7 years ago
cwm 0ddeed9377 add 'this.props' to fetchLists
7 years ago
Eugen Rochko 69f13e7bca
Fix regression from #6199: Make entire column header clickable (#6334)
7 years ago
cwm 939075899e remove unused openOnboardingModal from getting_started
7 years ago
cwm 00be9eb3fe merge tootsuite pr #6313 into glitch
7 years ago
Renato "Lond" Cerqueira b7f6ddeaf1 Weblate translations (#6323)
7 years ago
David Yip 48d79007f6
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
7 years ago
Norayr Chilingarian 48cd6dc6ca armenian translations initial commit (#6320)
7 years ago
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
codl cfd2b06821 fix filter search index being too strict when looking for line breaks (#6318)
7 years ago
Eugen Rochko 31d1485887
Display number of follow requests in getting started menu, and (#6313)
7 years ago
David Yip e7a0840f8c
Merge pull request #336 from ThibG/glitch-soc/features/tag-warning
7 years ago
David Yip 24b6e4121f
Merge pull request #342 from glitch-soc/merge-upstream
7 years ago
David Yip 3cae362214
Merge new onboarding styles; delete refs to PNGs.
7 years ago
David Yip 38f6d8130d
Eliminate stray conflict markers.
7 years ago
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
SerCom_KC 80b3ca0f6f Update Simplified Chinese translations (#6306)
7 years ago
Eugen Rochko 79b34a0fa2
Restore onboarding modal (#6303)
7 years ago
Eugen Rochko 872a0d5bd8
Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Thibaut Girka 1619efd735 Do not discard statuses obtained via websocket when API request finishes
7 years ago
ThibG 0b888acfd4 Do not throw away statuses obtained via websocket when API request finishes (#6302)
7 years ago
Eugen Rochko 540b3f37ae
Replace drawer elephant graphic with a vector image (#6286)
7 years ago
Thibaut Girka 1287b2782b Display a warning when composing unlisted toots with something looking like a hashtag
7 years ago
David Yip 26ecee79bf
Merge pull request #332 from glitch-soc/merge-upstream
7 years ago
Eugen Rochko d799921c75
Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip 766d6aac44
Strip trailing whitespace on win95.scss
7 years ago
David Yip d3f64812a6
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
7 years ago
David Yip 3896cd5d79
Use absolute paths for new working/not-found SVGs
7 years ago
David Yip bcd86404da
Port 7badad7797 to glitch frontend
7 years ago
David Yip e27eedbd08
Merge branch 'gs-master' into merge-upstream
7 years ago
David Yip 708ec07e27
Style fixes to make eslint happier, hopefully
7 years ago
David Yip 201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 7badad7797
Fix home regeneration (#6251)
7 years ago
Renato "Lond" Cerqueira 59797ee233 Weblate translations (#6284)
7 years ago
Jenkins aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 0a103c7749 Upgrade ESLint to version 4.x (#6276)
7 years ago
SerCom_KC fb16c37d2a Update Simplified Chinese translations (#6280)
7 years ago
Eugen Rochko 6f244ba82c
Use better reblog icon and improve contrast in HTML e-mails (#6272)
7 years ago
Eugen Rochko 02194838dd
HTML e-mails for NotificationMailer (#6263)
7 years ago
kibi! 60ff086960 Fixed improper mailer import
7 years ago
kibi! cda845ae0e Fix mailer to use webpack core
7 years ago
David Yip 89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 5276c0a090
HTML e-mails for UserMailer (#6256)
7 years ago
Eugen Rochko 7861c5f108
Surround mid-text display names with bdi tags (#6257)
7 years ago
Eugen Rochko 3987bd18a4
Fix #6128 - Display unfollow button even if account moved (#6258)
7 years ago
Jenkins 0c7dc6c781 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
neetshin 2091ae92be Make columns-area unscrollable when modal opened (#6241)
7 years ago
Gô Shoemake 08e4c78e78 Fix column headers accessibility (#6199)
7 years ago
kibi! 8ee6ed358f Increase priority of favstar gold
7 years ago
kibi! 1ee0e91fb6 Fixes to notification styling
7 years ago
kibi! b9f4896830 Fixes to drawer and CWs
7 years ago
beatrix cd6674606f
Merge pull request #329 from KnzkDev/scss-refactor
7 years ago
beatrix 39f231f3da
Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend
7 years ago
kibi! 0fb3bd09e9 Oops this should have been a part of last commit
7 years ago
kibi! 1fa03e026a Fixes onboarding modal (#318)
7 years ago
kibi! a5931e1f48 Fixed autocollapse detection
7 years ago
David Yip c2669f93d0
Fix eslint errors. #294.
7 years ago
David Yip 756a9cd139
Run slightly less afoul of accessibility checks. #294.
7 years ago
David Yip e64cc311dd
Introduce a bit of luck into the elefriend selection. #294.
7 years ago
David Yip 53cbc9933e
Add wave background; blend elefriend in a bit more. #294.
7 years ago
David Yip cd1377de7f
Bind click event to elefriend cycling. #294.
7 years ago
David Yip 1dbb6b5e08
Set glitchy elephant friend variant in initial state. #294.
7 years ago
David Yip 1e0b707018
Add the shrinking glitchy elefriend. #294.
7 years ago
David Yip 835eec8a4c
Prototype out glitchy elephant friend. #294.
7 years ago
ncls7615 f9b08e2142
Fix collapsed toot style
7 years ago
ncls7615 1ebe66b78c
Fix un-fullwidth media style
7 years ago
ncls7615 be2bac05aa
Fix media detailed style
7 years ago
ncls7615 b5476f6c75
Fix confirmation modal bug
7 years ago
ncls7615 bc0524834e
Fix letterbox bug
7 years ago
ncls7615 6ecf81cacf
Improve scss refactor 5
7 years ago
ncls7615 64425dbb77
Improve scss refactor 4
7 years ago
ncls7615 a16d885ac9
Improve scss refactor 3
7 years ago
ncls7615 5f35b39f6f
Improve scss refactor 2
7 years ago
ncls7615 bb2ca23839
Improve scss refactor 1
7 years ago
ncls7615 a9be680807
Fix padded-blocks error
7 years ago
ncls7615 6a73c8c8a2
Initial scss refactor
7 years ago
Gô Shoemake 3a0b47982d
load public.js on vanilla#admin
7 years ago
Gô Shoemake 9b9b7fa005
Load packs/public.js for glitch#admin
7 years ago
David Yip 0210e59759
Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility'
7 years ago
Marcin Mikołajczak ee7217bc94 i18n: Update Polish translation
7 years ago
ncls7615 cf5789146b
Fix dropdown text
7 years ago
David Yip 095a00ef3d
Merge pull request #316 from glitch-soc/fix-async
7 years ago
kibigo! 35be02f21d Renamed glitch async chunks
7 years ago
David Yip 622c8fdb75
Merge pull request #314 from chriswmartin/merge-vanilla-updates-2
7 years ago
cwm aef4b1af66 Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223)
7 years ago
cwm f43c2f12f3 Fix overflowing audit logs (tootsuite pr #6184)
7 years ago
cwm 9bdbe66316 Set background to the navigation of Getting Started column (tootsuite pr #6163)
7 years ago
cwm b535f24fe5 Use const instead of let for constant (tootsuite pr #6106)
7 years ago
cwm 0d4dcb5fb2 change key to path in timeline settings containers
7 years ago
cwm 6d1c325167 Rename key to path in actions and reducers for settings (tootsuite pr #6105)
7 years ago
cwm 7f4374d97d Fix newlines-to-spaces functionality (tootsuite pr #6158)
7 years ago
cwm 8a0e4bb9a4 Hide moved account's follow button in search result (tootsuite pr #5913)
7 years ago
cwm 5963630c63 Prevent duplicate load of favourites (tootsuite pr #5931)
7 years ago
Jenkins e780d5951b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 9f04b0d4b1 Weblate translations (#6228)
7 years ago
David Yip ce7f4aef16
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip ec0bdd6c1a
Merge pull request #312 from glitch-soc/tag-sensitive-imgs
7 years ago
Jenkins 7c719c567c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
kibigo! 60433d03f5 Add missing comma
7 years ago
kibigo! 5d2ef7a616 Show SENSITIVE tag on sensitive images (#267)
7 years ago
kibigo! 824a790e63 Threads now inherit privacy directly (#309)
7 years ago
Andrew fe6663ef50 Minor style fixes
7 years ago
nightpool c235711ffe Refactor /api/web APIs to use the centralized axios instance (#6223)
7 years ago
ncls7615 ef0b7d1e76
fix list editor scss
7 years ago
David Yip 2dc4fbbd1a
When pulling out max_toot_chars, handle nulls
7 years ago
Jenkins 722b3f567f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 93555182c3
Do not display elephant friend in single-column layout (#6222)
7 years ago
Jenkins c2e1bfd9ae Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC c4d36d024c Update Simplified Chinese translations (#6215)
7 years ago
Andrew 56312df73b Z indexes and colors
7 years ago
Andrew 7a93acd803 To 2.1.2
7 years ago
Jenkins bcbdd4f88d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm 9e97fbf0af Translate Korean (#6212)
7 years ago
kibigo! b5874c1428 Fixes to search dropdown
7 years ago
beatrix 61ef8d643e
fix typo in vanilla names.yml
7 years ago
Ondřej Hruška 9f29fd31ba
fixed ctrl enter
7 years ago
Ondřej Hruška 53caab0c0b
Fix the always-threaded bug
7 years ago
ncls7615 f5a4201ad8
Update ja.js
7 years ago
beatrix a251c42192
Merge pull request #296 from glitch-soc/thread-mode
7 years ago
beatrix 2ec9a75a1d
Merge pull request #302 from KnzkDev/fix/search-popout
7 years ago
beatrix fa92e88fb2
appease eslint
7 years ago
ncls7615 da98c33161
Fix search popout
7 years ago
David Yip 2eed4ace11
Read max_toot_chars from root object. Fixes #297.
7 years ago
kibigo! c71d848855 my global .gitignore excluded this file ;_;
7 years ago
kibigo! e4bc013d6f Threaded mode~
7 years ago
kibigo! 6932b464e6 Fixed improper dropdown func binding for #293 + toot button spacing
7 years ago
kibigo! ad10a80a99 Styling and autosuggest fixes for #293
7 years ago
kibigo! 8bf9d9362a Fixes composer mounting issue with #293
7 years ago
Andrew 077f2e600c Win95 to 2.1
7 years ago
Andrew 39c0b6ceb3 Updates and fixes to win95 theme
7 years ago
Andrew ed574fbc09 Theme: Windows 95
7 years ago
David Yip 03aeab857f
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
beatrix f441770e50
Merge pull request #290 from chriswmartin/web-push-updates
7 years ago
beatrix b4e667f86b
Merge pull request #295 from chriswmartin/getting-started-key-fix
7 years ago
beatrix faf20eeaa4
Merge pull request #293 from glitch-soc/compose-refactor
7 years ago
Jenkins f6adb409fd Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
kibigo! ac686d5a5d Fixed overflow issue
7 years ago
kibigo! ec620ae486 Styling fixes
7 years ago
beatrix f41b33eb01
Merge pull request #243 from m4sk1n/glitch-pl
7 years ago
cwm 9fc08e4861 add key to lists div
7 years ago
cwm 6236577734 change how list ColumnLink keys are determined
7 years ago
kibigo! d7ce339c2e WIP <Compose> Refactor; Fin~
7 years ago
Yamagishi Kazutoshi 9a61b0ef22 Fix RFC 5646 Regular Expression (#6190)
7 years ago
kibigo! 42f50049ff WIP <Compose> Refactor; 1000 tiny edits
7 years ago
kibigo! b4a3792201 WIP <Compose> Refactor; <ActionsModal>; dropdowns
7 years ago
kibigo! 083170bec7 WIP <Compose> Refactor; SCSS ed.
7 years ago
kibigo! 8713659dff WIP <Compose> Refactor; <OnboardingModal> ed.
7 years ago
kibigo! 3c29f57404 WIP <Compose> Refactor; <Drawer> ed.
7 years ago
kibigo! 924ffe81d4 WIPgit status <Compose> Refactor; <Composer> ed.
7 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic d872902997 Small translation fixes for Serbian (and sr@Latn too) (#6188)
7 years ago
Lynx Kotoura 49e296e1b0 Fix overflowing audit logs (#6184)
7 years ago
Nolan Darilek 3b016342c6 Fix accessibility of column headers
7 years ago
Marcin Mikołajczak 0f69a90588 i18n: Update Polish translation
7 years ago
muan 89daeb43a8 Improve Traditional Chinese translation (#6166)
7 years ago
Akihiko Odaki 256c2b1de0 Rearrange items in Getting Started navigation (#6126)
7 years ago
Jenkins fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 d907d4352e l10n OC language (#6169)
7 years ago
Marcin Mikołajczak 53d99ebf4f i18n: Update Polish translation (#6168)
7 years ago
Yamagishi Kazutoshi 1001922156
Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 2471796d75 Set background to the navigation of Getting Started column (#6163)
7 years ago
Noiob 94230fe565 Fix newlines-to-spaces functionality (#6158)
7 years ago
ThibG b6af88192f Display a warning when composing unlisted toots with something looking like a hashtag (#6132)
7 years ago
Akihiko Odaki 3ba7cde38d Rename key to path in actions and reducers for settings (#6105)
7 years ago
Branko Kokanovic 21b9da6418 Adding Serbian latin translations (#6146)
7 years ago
David Yip fa768abf5c
More ../ -> ~.
7 years ago
David Yip 54148b9a4a
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 764f876953 Use const instead of let for constant (#6106)
7 years ago
Akihiko Odaki 2c1ed5f872 Show mastodon on modal (#6129)
7 years ago
cwm 72b99f6ee4 bug fix (tootsuite pr #6120)
7 years ago
Jenkins fa9b7ece2e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic 7d376e41be Adding Serbian translation (#6133)
7 years ago
David Yip d817c0a958
Merge pull request #291 from glitch-soc/merge-upstream
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip e4944d065b
Switch to tootsuite's elephant friend for the drawer
7 years ago
David Yip 513d982f29
Use ~ notation in components for image references
7 years ago
cwm 4ce44ba470 remove unused 'saveSettings' from column_settings_container
7 years ago
cwm 0dce26b82b web push updates (tootsuite PRs #5879, #5941, #6047)
7 years ago
Jeong Arm f4b80e6511 Translate Korean (#6131)
7 years ago
MitarashiDango 511c6f9625 bug fix (WebPush does not work) (#6120)
7 years ago
cwm 832a93e67c Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000)
7 years ago
David Yip 7174d1c955
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Akihiko Odaki 65f30f65a2 Move the mastodon on Getting Started column to drawer column (#6109)
7 years ago
beatrix 7347bc7334
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
7 years ago
cwm 20ad071931 Set direction style to reply indicator (tootsuite pr #6006)
7 years ago
cwm 14243bf80a Reduce motion for boost animation (tootsuite pr #5871)
7 years ago
cwm 337c2e77ee Fix layout for RTL (tootsuite pr #6014, #6018)
7 years ago
cwm 46565ed746 Fix focused background color of favourited direct toot (tootsuite pr #6021)
7 years ago
cwm 815524412b Move dropdown transform origin (tootsuite pr #6091)
7 years ago
cwm 083571915f onMuteNotifications validation (tootsuite pr #6092)
7 years ago
cwm 2bbd22e91c Rename settingKey to settingPath (tootsuite pr #6046 & #6098)
7 years ago
cwm cc6a2ffd0a use 'flavours/glitch/' prefix in new imports
7 years ago
cwm 22818d2a16 Add mute, block, conversation mute actions to detailed status dropdown menu
7 years ago
Jenkins bed13f22e2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Chris 1e5d1fa5c8 Add mute, block, conversation mute actions to detailed status dropdown menu (#6099)
7 years ago
MitarashiDango a3b369337f Additional prop name change. (#6098)
7 years ago
Jenkins f77c47d01b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Neetshin 7e6214b869 Add validation for onMuteNotifications (#6092)
7 years ago
Nolan Lawson a8eb0bf44f Reduce motion for boost animation (#5871)
7 years ago
Akihiko Odaki 35fdf561be Refactor web_push_subscription (#6047)
7 years ago
Chris 081956742c removed references to hideOnMobile in column_link and getting_started (#6082)
7 years ago
cpsdqs 8528fd89d2 Move dropdown transform origin to top edge (#6091)
7 years ago
ncls7615 fb57ec41df
Update and add some translate
7 years ago
ncls7615 4694dcfe16
Add more en and ja
7 years ago
ncls7615 02db8aa3a0
Add en and ja
7 years ago
beatrix 60d415bc5e
Merge pull request #266 from chriswmartin/getting-started-improvements
7 years ago
ncls7615 191b625a27
Fix account header avatar
7 years ago
David Yip 7bb99ca3cf
Add data-status-by back to DetailedStatus component. Fixes #273.
7 years ago
cwm d736739e8f <kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049)
7 years ago
David Yip dbd5f8b9a5
Wrap <Avatar> in account header in a link to that account's page. Fixes #245.
7 years ago
cwm 9042f9a813 add keyboard shortcuts to getting started (fixes #275)
7 years ago
Jenkins 6f11aa8383 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 81d29e4126 Rename settingKey in setting_toggle to settingPath (#6046)
7 years ago
Neetshin c11a52d888 Replace <code> to <kbd> in KeyboardShortcuts component (#6049)
7 years ago
Jeong Arm e52293482e Update Korean translation (#6050)
7 years ago
ncls7615 d3b2677775
Add en and ja
7 years ago