Commit Graph

  • 2ca965c704
    Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-19 15:22:10 -0600
  • b8c6656ce9
    Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks David Yip 2018-01-19 15:17:20 -0600
  • 1619efd735 Do not discard statuses obtained via websocket when API request finishes Thibaut Girka 2018-01-19 21:59:12 +0100
  • 0b888acfd4 Do not throw away statuses obtained via websocket when API request finishes (#6302) ThibG 2018-01-19 21:48:00 +0100
  • 238de58e65 Change belongs_to_required_by_default to true (#5888) Yamagishi Kazutoshi 2018-01-20 04:56:47 +0900
  • 7233ac07d2 Add support Ruby v2.5.0 (#6097) Yamagishi Kazutoshi 2018-01-20 04:53:30 +0900
  • b1e03197fa Process mentions and reblogs even from resolved threads (#6299) ThibG 2018-01-19 19:11:35 +0100
  • 7be53a10b0 Fix "tzinfo-data is not present" docker error (#6300) Pierre Ozoux 2018-01-19 19:11:19 +0100
  • a0de3222dd Retry delivering toots over ActivityPub for about 2 days (#6298) ThibG 2018-01-19 15:49:48 +0100
  • 540b3f37ae
    Replace drawer elephant graphic with a vector image (#6286) Eugen Rochko 2018-01-19 15:25:27 +0100
  • 852b48295f i18n: Update Polish translation (#6297) Marcin Mikołajczak 2018-01-19 13:49:25 +0100
  • 1287b2782b Display a warning when composing unlisted toots with something looking like a hashtag Thibaut Girka 2018-01-19 11:34:48 +0100
  • 2b2de41bc7
    Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-01-18 23:40:37 -0600
  • 26ecee79bf
    Merge pull request #332 from glitch-soc/merge-upstream David Yip 2018-01-18 22:00:11 -0600
  • ae369bceb3
    Merge pull request #333 from glitch-soc/win95-update David Yip 2018-01-18 13:35:24 -0600
  • 9b3b40df66
    Fix regeneration marker not expiring (#6290) Eugen Rochko 2018-01-18 20:29:56 +0100
  • d799921c75
    Replace tutorial modal with welcome e-mail (#6273) Eugen Rochko 2018-01-18 19:17:25 +0100
  • 766d6aac44
    Strip trailing whitespace on win95.scss David Yip 2018-01-18 10:54:50 -0600
  • d3f64812a6
    Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update David Yip 2018-01-18 10:54:12 -0600
  • 3896cd5d79
    Use absolute paths for new working/not-found SVGs David Yip 2018-01-18 10:25:54 -0600
  • bcd86404da
    Port 7badad7797 to glitch frontend David Yip 2018-01-18 10:25:37 -0600
  • 1964a0f941
    Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-18 09:17:58 -0600
  • e27eedbd08
    Merge branch 'gs-master' into merge-upstream David Yip 2018-01-18 09:14:28 -0600
  • 708ec07e27
    Style fixes to make eslint happier, hopefully David Yip 2018-01-18 09:13:07 -0600
  • 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 +0100
  • 201e82686f
    Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-17 18:37:09 -0600
  • 7badad7797
    Fix home regeneration (#6251) Eugen Rochko 2018-01-17 23:56:03 +0100
  • fe5c1f0803 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-17 22:17:14 +0000
  • 59797ee233 Weblate translations (#6284) Renato "Lond" Cerqueira 2018-01-17 23:00:23 +0100
  • aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-17 16:17:10 +0000
  • fbe7756da6 implement web share target (#6278) りんすき 2018-01-18 01:08:10 +0900
  • 0a103c7749 Upgrade ESLint to version 4.x (#6276) Yamagishi Kazutoshi 2018-01-18 00:57:15 +0900
  • fb16c37d2a Update Simplified Chinese translations (#6280) SerCom_KC 2018-01-17 23:47:25 +0800
  • 6f244ba82c
    Use better reblog icon and improve contrast in HTML e-mails (#6272) Eugen Rochko 2018-01-17 14:12:59 +0100
  • ea75ae2d1f Use be_within instead of eq for a to_f test match (#6275) Mike Burns 2018-01-17 06:45:09 -0500
  • acb982fc66 Korean translate (#6277) Jeong Arm 2018-01-17 20:42:11 +0900
  • eed7484cd6 Change mailer image url (#6279) mayaeh 2018-01-17 20:41:24 +0900
  • 02194838dd
    HTML e-mails for NotificationMailer (#6263) Eugen Rochko 2018-01-16 20:20:15 +0100
  • 3323b4173e Change disclaimer in email according to #5817 (#6266) SerCom_KC 2018-01-16 13:44:57 +0800
  • 9a28052e92 Change image URL in mailer to full path (#6264) Yamagishi Kazutoshi 2018-01-16 14:26:46 +0900
  • 60ff086960 Fixed improper mailer import kibi! 2018-01-15 21:23:26 -0800
  • cda845ae0e Fix mailer to use webpack core kibi! 2018-01-15 21:17:03 -0800
  • e6fd4bea35 Stop duplicate CI with Pull Request (#6265) Yamagishi Kazutoshi 2018-01-16 14:15:28 +0900
  • 89a9d629f7
    Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-15 22:17:48 -0600
  • 5276c0a090
    HTML e-mails for UserMailer (#6256) Eugen Rochko 2018-01-16 03:29:11 +0100
  • 7861c5f108
    Surround mid-text display names with bdi tags (#6257) Eugen Rochko 2018-01-15 18:55:10 +0100
  • 3987bd18a4
    Fix #6128 - Display unfollow button even if account moved (#6258) Eugen Rochko 2018-01-15 18:42:15 +0100
  • 0c7dc6c781 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-15 06:17:15 +0000
  • 74c1c9ec01 Allow attributedTo in a status to be an embedded object (#6238) puckipedia 2018-01-15 06:51:46 +0100
  • 537d2939b1 Suppress CSRF token warnings (#6240) Patrick Figel 2018-01-15 06:51:23 +0100
  • 2091ae92be Make columns-area unscrollable when modal opened (#6241) neetshin 2018-01-15 05:51:00 +0000
  • dcc614f869 Add some browsers (#6246) Jeong Arm 2018-01-15 14:50:29 +0900
  • ed867eca9d
    Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252) Eugen Rochko 2018-01-15 04:34:28 +0100
  • 08e4c78e78 Fix column headers accessibility (#6199) Gô Shoemake 2018-01-14 19:33:06 -0800
  • 8ee6ed358f Increase priority of favstar gold kibi! 2018-01-14 16:05:44 -0800
  • 1ee0e91fb6 Fixes to notification styling kibi! 2018-01-14 15:48:54 -0800
  • b9f4896830 Fixes to drawer and CWs kibi! 2018-01-14 15:31:00 -0800
  • cd6674606f
    Merge pull request #329 from KnzkDev/scss-refactor beatrix 2018-01-14 17:48:02 -0500
  • 39f231f3da
    Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend beatrix 2018-01-14 17:40:27 -0500
  • 0fb3bd09e9 Oops this should have been a part of last commit kibi! 2018-01-14 14:21:41 -0800
  • 1fa03e026a Fixes onboarding modal (#318) kibi! 2018-01-14 14:13:24 -0800
  • a5931e1f48 Fixed autocollapse detection kibi! 2018-01-14 13:29:51 -0800
  • c2669f93d0
    Fix eslint errors. #294. David Yip 2018-01-14 05:56:43 -0600
  • 756a9cd139
    Run slightly less afoul of accessibility checks. #294. David Yip 2018-01-14 05:07:08 -0600
  • e64cc311dd
    Introduce a bit of luck into the elefriend selection. #294. David Yip 2018-01-14 04:19:29 -0600
  • 53cbc9933e
    Add wave background; blend elefriend in a bit more. #294. David Yip 2018-01-14 04:00:21 -0600
  • cd1377de7f
    Bind click event to elefriend cycling. #294. David Yip 2018-01-14 03:35:25 -0600
  • 1dbb6b5e08
    Set glitchy elephant friend variant in initial state. #294. David Yip 2018-01-13 21:22:37 -0600
  • 1e0b707018
    Add the shrinking glitchy elefriend. #294. David Yip 2018-01-13 11:41:06 -0600
  • 835eec8a4c
    Prototype out glitchy elephant friend. #294. David Yip 2018-01-08 10:40:34 -0600
  • f9b08e2142
    Fix collapsed toot style ncls7615 2018-01-14 11:13:55 +0900
  • 1ebe66b78c
    Fix un-fullwidth media style ncls7615 2018-01-14 11:07:32 +0900
  • be2bac05aa
    Fix media detailed style ncls7615 2018-01-14 10:38:51 +0900
  • b5476f6c75
    Fix confirmation modal bug ncls7615 2018-01-14 09:51:01 +0900
  • bc0524834e
    Fix letterbox bug ncls7615 2018-01-14 09:25:35 +0900
  • 6ecf81cacf
    Improve scss refactor 5 ncls7615 2018-01-14 09:17:38 +0900
  • 64425dbb77
    Improve scss refactor 4 ncls7615 2018-01-14 09:12:10 +0900
  • a16d885ac9
    Improve scss refactor 3 ncls7615 2018-01-14 08:47:59 +0900
  • 5f35b39f6f
    Improve scss refactor 2 ncls7615 2018-01-14 07:48:18 +0900
  • bb2ca23839
    Improve scss refactor 1 ncls7615 2018-01-14 07:18:50 +0900
  • a9be680807
    Fix padded-blocks error ncls7615 2018-01-14 04:12:41 +0900
  • 6a73c8c8a2
    Initial scss refactor ncls7615 2018-01-14 03:41:20 +0900
  • 9526aababc
    Merge pull request #324 from glitch-soc/load-public-on-admin beatrix 2018-01-12 23:52:41 -0500
  • 3a0b47982d
    load public.js on vanilla#admin Gô Shoemake 2018-01-12 18:52:53 -0800
  • 9b9b7fa005
    Load packs/public.js for glitch#admin Gô Shoemake 2018-01-12 18:51:52 -0800
  • 0210e59759
    Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility' David Yip 2018-01-12 20:10:58 -0600
  • 4773481a90
    Merge pull request #322 from m4sk1n/glitch-soc-pl beatrix 2018-01-12 18:16:31 -0500
  • ee7217bc94 i18n: Update Polish translation Marcin Mikołajczak 2018-01-12 23:07:06 +0100
  • e2ce628724
    Merge pull request #321 from KnzkDev/fix/dropdown-text David Yip 2018-01-12 09:09:10 -0600
  • cf5789146b
    Fix dropdown text ncls7615 2018-01-12 23:18:25 +0900
  • 9fa79bc317 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-12 02:17:15 +0000
  • 704053d221 Handle sessions that can't be translated (#6245) Jeong Arm 2018-01-12 10:44:28 +0900
  • 8c08c852bc
    Merge pull request #320 from glitch-soc/dockerfile-stack-space David Yip 2018-01-11 04:25:26 -0600
  • f13ebd02c9
    dockerfile: Give more stack space to /sbin/tini. David Yip 2017-12-22 00:07:02 +0000
  • 26f054253c
    Merge pull request #319 from glitch-soc/317-attempt-to-switch-flavors-raises-actioncontroller-parametermissing David Yip 2018-01-10 12:49:43 -0600
  • 395e64e858
    Thank you, Officer Murphy David Yip 2018-01-09 20:16:31 -0600
  • 514db316f7
    The flavour parameter is unused, so omit it (#317) David Yip 2018-01-09 20:12:28 -0600
  • 6fcb870d96
    Allow for user object to be empty. Fixes #317. David Yip 2018-01-09 20:09:00 -0600
  • 3ce1385b25
    Add examples based on errors seen in #317 David Yip 2018-01-10 12:08:57 -0600
  • 095a00ef3d
    Merge pull request #316 from glitch-soc/fix-async David Yip 2018-01-09 18:30:45 -0600