5801 Commits (7bff3243ae5882ea9e9a708240a37dc10cffc246)
 

Author SHA1 Message Date
David Yip 48d79007f6
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121 7 years ago
David Yip 81b78fac54
Update Vagrantfile to ubuntu/xenial64. 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
ThibG d613dda91d Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319) 7 years ago
Aboobacker MK 112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314) 7 years ago
Eugen Rochko 31d1485887
Display number of follow requests in getting started menu, and (#6313) 7 years ago
Eugen Rochko 1287de1b83
Fix invalid value passed to full_asset_url in mailers (#6312) 7 years ago
David Yip 2c578a01d8
Merge remote-tracking branch 'origin/master' into gs-master 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
Iijima Yasushi 72f9eab3d6 Change mailer avatar url (#6309) 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
Eugen Rochko 0b7a0d15c7
Bump version to 2.2.0rc1 7 years ago
SerCom_KC 80b3ca0f6f Update Simplified Chinese translations (#6306) 7 years ago
Eugen Rochko 45afdf1781
Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305) 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
Eugen Rochko 01421999ae
Make text e-mails consistent with HTML ones in UserMailer (#6291) 7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream 7 years ago
David Yip b8c6656ce9
Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks 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
Yamagishi Kazutoshi 238de58e65 Change belongs_to_required_by_default to true (#5888) 7 years ago
Yamagishi Kazutoshi 7233ac07d2 Add support Ruby v2.5.0 (#6097) 7 years ago
ThibG b1e03197fa Process mentions and reblogs even from resolved threads (#6299) 7 years ago
Pierre Ozoux 7be53a10b0 Fix "tzinfo-data is not present" docker error (#6300) 7 years ago
ThibG a0de3222dd Retry delivering toots over ActivityPub for about 2 days (#6298) 7 years ago
Eugen Rochko 540b3f37ae
Replace drawer elephant graphic with a vector image (#6286) 7 years ago
Marcin Mikołajczak 852b48295f i18n: Update Polish translation (#6297) 7 years ago
Thibaut Girka 1287b2782b Display a warning when composing unlisted toots with something looking like a hashtag 7 years ago
David Yip 2b2de41bc7
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master 7 years ago
David Yip 26ecee79bf
Merge pull request #332 from glitch-soc/merge-upstream 7 years ago
David Yip ae369bceb3
Merge pull request #333 from glitch-soc/win95-update 7 years ago
Eugen Rochko 9b3b40df66
Fix regeneration marker not expiring (#6290) 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 1964a0f941
Merge remote-tracking branch 'origin/master' into merge-upstream 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
Renato "Lond" Cerqueira e56404be41 When must_be_following_dm is on, only notify if recipient dm'ed user (#6283) 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
Jenkins fe5c1f0803 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago