tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • d966878e87 Update goldfinger, ostatus2 and http.rb versions (#6337) Eugen Rochko 2018-01-23 14:30:42 +01:00
  • 2fc2725076 Fix e-mail icon for reblog being stretched (#6336) Eugen Rochko 2018-01-23 14:30:28 +01:00
  • 2107891edb Remove some leftover code, I guess Thibaut Girka 2018-01-18 17:18:01 +01:00
  • 0ddeed9377 add 'this.props' to fetchLists cwm 2018-01-23 01:23:56 -06:00
  • 16d5f9e162 Fix travis.yml ncls7615 2018-01-23 15:50:59 +09:00
  • 69f13e7bca Fix regression from #6199: Make entire column header clickable (#6334) Eugen Rochko 2018-01-23 05:06:29 +01:00
  • 939075899e remove unused openOnboardingModal from getting_started cwm 2018-01-22 19:38:34 -06:00
  • 00be9eb3fe merge tootsuite pr #6313 into glitch cwm 2018-01-22 19:05:13 -06:00
  • 613e7c7521 Rename ResolveRemoteAccountService to ResolveAccountService (#6327) Akihiko Odaki 2018-01-22 22:25:09 +09:00
  • 17cecd75ca Rename FetchRemoteResourceService to ResolveURLService (#6328) Akihiko Odaki 2018-01-22 22:24:22 +09:00
  • 8cc65cde27 Resolve URL for local account in follow authorization success view (#6324) Akihiko Odaki 2018-01-22 22:22:14 +09:00
  • b7f6ddeaf1 Weblate translations (#6323) Renato "Lond" Cerqueira 2018-01-22 14:20:58 +01:00
  • a90d0419d9 Merge pull request #343 from glitch-soc/merge-upstream-20180121 David Yip 2018-01-21 18:00:08 -06:00
  • 143fb54ab9 Korean translation (#6322) Jeong Arm 2018-01-22 08:49:57 +09:00
  • 48d79007f6 Merge remote-tracking branch 'origin/master' into merge-upstream-20180121 David Yip 2018-01-21 16:26:50 -06:00
  • 81b78fac54 Update Vagrantfile to ubuntu/xenial64. David Yip 2018-01-21 16:09:40 -06:00
  • 48cd6dc6ca armenian translations initial commit (#6320) Norayr Chilingarian 2018-01-22 00:02:23 +04:00
  • 1253279feb Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-21 13:36:10 -06:00
  • cfd2b06821 fix filter search index being too strict when looking for line breaks (#6318) codl 2018-01-21 13:23:17 +01:00
  • d613dda91d Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319) ThibG 2018-01-21 13:22:31 +01:00
  • 112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314) Aboobacker MK 2018-01-21 17:51:28 +05:30
  • 31d1485887 Display number of follow requests in getting started menu, and (#6313) Eugen Rochko 2018-01-21 13:20:20 +01:00
  • 1287de1b83 Fix invalid value passed to full_asset_url in mailers (#6312) Eugen Rochko 2018-01-21 13:20:00 +01:00
  • 2c578a01d8 Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-20 16:42:57 -06:00
  • e7a0840f8c Merge pull request #336 from ThibG/glitch-soc/features/tag-warning David Yip 2018-01-20 16:37:52 -06:00
  • 24b6e4121f Merge pull request #342 from glitch-soc/merge-upstream David Yip 2018-01-20 16:37:35 -06:00
  • 72f9eab3d6 Change mailer avatar url (#6309) Iijima Yasushi 2018-01-21 03:27:13 +09:00
  • 3cae362214 Merge new onboarding styles; delete refs to PNGs. David Yip 2018-01-20 11:23:06 -06:00
  • 38f6d8130d Eliminate stray conflict markers. David Yip 2018-01-20 10:46:43 -06:00
  • 071c2c9c85 Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-20 10:45:43 -06:00
  • 0b7a0d15c7 Bump version to 2.2.0rc1 Eugen Rochko 2018-01-20 16:27:19 +01:00
  • 80b3ca0f6f Update Simplified Chinese translations (#6306) SerCom_KC 2018-01-20 23:11:21 +08:00
  • 45afdf1781 Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305) Eugen Rochko 2018-01-20 03:49:06 +01:00
  • 79b34a0fa2 Restore onboarding modal (#6303) Eugen Rochko 2018-01-20 01:32:37 +01:00
  • 872a0d5bd8 Improve HTML e-mails based on Litmus tests (#6301) Eugen Rochko 2018-01-20 01:32:21 +01:00
  • 01421999ae Make text e-mails consistent with HTML ones in UserMailer (#6291) Eugen Rochko 2018-01-20 01:32:05 +01:00
  • 2ca965c704 Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-19 15:22:10 -06:00
  • b8c6656ce9 Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks David Yip 2018-01-19 15:17:20 -06:00
  • 1619efd735 Do not discard statuses obtained via websocket when API request finishes Thibaut Girka 2018-01-19 21:59:12 +01:00
  • 0b888acfd4 Do not throw away statuses obtained via websocket when API request finishes (#6302) ThibG 2018-01-19 21:48:00 +01:00
  • 238de58e65 Change belongs_to_required_by_default to true (#5888) Yamagishi Kazutoshi 2018-01-20 04:56:47 +09:00
  • 7233ac07d2 Add support Ruby v2.5.0 (#6097) Yamagishi Kazutoshi 2018-01-20 04:53:30 +09:00
  • b1e03197fa Process mentions and reblogs even from resolved threads (#6299) ThibG 2018-01-19 19:11:35 +01:00
  • 7be53a10b0 Fix "tzinfo-data is not present" docker error (#6300) Pierre Ozoux 2018-01-19 19:11:19 +01:00
  • a0de3222dd Retry delivering toots over ActivityPub for about 2 days (#6298) ThibG 2018-01-19 15:49:48 +01:00
  • 540b3f37ae Replace drawer elephant graphic with a vector image (#6286) Eugen Rochko 2018-01-19 15:25:27 +01:00
  • 852b48295f i18n: Update Polish translation (#6297) Marcin Mikołajczak 2018-01-19 13:49:25 +01:00
  • 1287b2782b Display a warning when composing unlisted toots with something looking like a hashtag Thibaut Girka 2018-01-19 11:34:48 +01:00
  • 2b2de41bc7 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-01-18 23:40:37 -06:00
  • 26ecee79bf Merge pull request #332 from glitch-soc/merge-upstream David Yip 2018-01-18 22:00:11 -06:00
  • ae369bceb3 Merge pull request #333 from glitch-soc/win95-update David Yip 2018-01-18 13:35:24 -06:00
  • 9b3b40df66 Fix regeneration marker not expiring (#6290) Eugen Rochko 2018-01-18 20:29:56 +01:00
  • d799921c75 Replace tutorial modal with welcome e-mail (#6273) Eugen Rochko 2018-01-18 19:17:25 +01:00
  • 766d6aac44 Strip trailing whitespace on win95.scss David Yip 2018-01-18 10:54:50 -06:00
  • d3f64812a6 Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update David Yip 2018-01-18 10:54:12 -06:00
  • 3896cd5d79 Use absolute paths for new working/not-found SVGs David Yip 2018-01-18 10:25:54 -06:00
  • bcd86404da Port 7badad7797 to glitch frontend David Yip 2018-01-18 10:25:37 -06:00
  • 1964a0f941 Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-18 09:17:58 -06:00
  • e27eedbd08 Merge branch 'gs-master' into merge-upstream David Yip 2018-01-18 09:14:28 -06:00
  • 708ec07e27 Style fixes to make eslint happier, hopefully David Yip 2018-01-18 09:13:07 -06:00
  • e56404be41 When must_be_following_dm is on, only notify if recipient dm'ed user (#6283) Renato "Lond" Cerqueira 2018-01-18 16:12:10 +01:00
  • 201e82686f Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-17 18:37:09 -06:00
  • 7badad7797 Fix home regeneration (#6251) Eugen Rochko 2018-01-17 23:56:03 +01:00
  • fe5c1f0803 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-17 22:17:14 +00:00
  • 59797ee233 Weblate translations (#6284) Renato "Lond" Cerqueira 2018-01-17 23:00:23 +01:00
  • aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-17 16:17:10 +00:00
  • fbe7756da6 implement web share target (#6278) りんすき 2018-01-18 01:08:10 +09:00
  • 0a103c7749 Upgrade ESLint to version 4.x (#6276) Yamagishi Kazutoshi 2018-01-18 00:57:15 +09:00
  • fb16c37d2a Update Simplified Chinese translations (#6280) SerCom_KC 2018-01-17 23:47:25 +08:00
  • 6f244ba82c Use better reblog icon and improve contrast in HTML e-mails (#6272) Eugen Rochko 2018-01-17 14:12:59 +01:00
  • ea75ae2d1f Use be_within instead of eq for a to_f test match (#6275) Mike Burns 2018-01-17 06:45:09 -05:00
  • acb982fc66 Korean translate (#6277) Jeong Arm 2018-01-17 20:42:11 +09:00
  • eed7484cd6 Change mailer image url (#6279) mayaeh 2018-01-17 20:41:24 +09:00
  • 02194838dd HTML e-mails for NotificationMailer (#6263) Eugen Rochko 2018-01-16 20:20:15 +01:00
  • 3323b4173e Change disclaimer in email according to #5817 (#6266) SerCom_KC 2018-01-16 13:44:57 +08:00
  • 9a28052e92 Change image URL in mailer to full path (#6264) Yamagishi Kazutoshi 2018-01-16 14:26:46 +09:00
  • 60ff086960 Fixed improper mailer import kibi! 2018-01-15 21:23:26 -08:00
  • cda845ae0e Fix mailer to use webpack core kibi! 2018-01-15 21:17:03 -08:00
  • e6fd4bea35 Stop duplicate CI with Pull Request (#6265) Yamagishi Kazutoshi 2018-01-16 14:15:28 +09:00
  • 89a9d629f7 Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-15 22:17:48 -06:00
  • 5276c0a090 HTML e-mails for UserMailer (#6256) Eugen Rochko 2018-01-16 03:29:11 +01:00
  • 7861c5f108 Surround mid-text display names with bdi tags (#6257) Eugen Rochko 2018-01-15 18:55:10 +01:00
  • 3987bd18a4 Fix #6128 - Display unfollow button even if account moved (#6258) Eugen Rochko 2018-01-15 18:42:15 +01:00
  • 0c7dc6c781 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-15 06:17:15 +00:00
  • 74c1c9ec01 Allow attributedTo in a status to be an embedded object (#6238) puckipedia 2018-01-15 06:51:46 +01:00
  • 537d2939b1 Suppress CSRF token warnings (#6240) Patrick Figel 2018-01-15 06:51:23 +01:00
  • 2091ae92be Make columns-area unscrollable when modal opened (#6241) neetshin 2018-01-15 05:51:00 +00:00
  • dcc614f869 Add some browsers (#6246) Jeong Arm 2018-01-15 14:50:29 +09:00
  • ed867eca9d Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252) Eugen Rochko 2018-01-15 04:34:28 +01:00
  • 08e4c78e78 Fix column headers accessibility (#6199) Gô Shoemake 2018-01-14 19:33:06 -08:00
  • 8ee6ed358f Increase priority of favstar gold kibi! 2018-01-14 16:05:44 -08:00
  • 1ee0e91fb6 Fixes to notification styling kibi! 2018-01-14 15:48:54 -08:00
  • b9f4896830 Fixes to drawer and CWs kibi! 2018-01-14 15:31:00 -08:00
  • cd6674606f Merge pull request #329 from KnzkDev/scss-refactor beatrix 2018-01-14 17:48:02 -05:00
  • 39f231f3da Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend beatrix 2018-01-14 17:40:27 -05:00
  • 0fb3bd09e9 Oops this should have been a part of last commit kibi! 2018-01-14 14:21:41 -08:00
  • 1fa03e026a Fixes onboarding modal (#318) kibi! 2018-01-14 14:13:24 -08:00
  • a5931e1f48 Fixed autocollapse detection kibi! 2018-01-14 13:29:51 -08:00
  • c2669f93d0 Fix eslint errors. #294. David Yip 2018-01-14 05:56:43 -06:00
  • 756a9cd139 Run slightly less afoul of accessibility checks. #294. David Yip 2018-01-14 05:07:08 -06:00