1452 Commits (9105b0c95428e3bbecd6f8ad106508095eed5643)

Author SHA1 Message Date
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
Eugen Rochko 69f13e7bca
Fix regression from #6199: Make entire column header clickable (#6334)
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