Commit Graph

  • 60c65857c9 fix(persistent): Do not use display none Stephen Burgess 2017-05-14 00:47:18 -0500
  • 2b271ad8e3 fix(application): Use console error Stephen Burgess 2017-05-14 00:35:48 -0500
  • b94f0bd5db fix(compose): Show compose Stephen Burgess 2017-05-14 00:27:14 -0500
  • ef4fd22ade Merge branch 'master' into safari-run-fix Stephen Burgess 2017-05-14 00:20:33 -0500
  • 4fb16f4ccc feat(scroll): Adjust cross-browser scroll behavior Stephen Burgess 2017-05-13 23:42:14 -0500
  • 1941195d42 Merge branch 'master' into hotfix/2899-safari-column-height Stephen Burgess 2017-05-13 23:28:15 -0500
  • 465283aa94 Add heroku APT buildpack for scalingo. William Pitcock 2017-05-13 22:50:10 -0500
  • f8f530545b Create j_WwW.NET jlind0 2017-05-13 20:44:04 -0500
  • 657496b5a9 Do not cancel PuSH subscriptions after encountering "permanent" error… (#3046) Eugen Rochko 2017-05-14 03:22:48 +0200
  • 073dfc328c Update delivery_worker.rb Eugen Rochko 2017-05-14 00:53:48 +0200
  • e54d2c1b5f Do not cancel PuSH subscriptions after encountering "permanent" error response Eugen Rochko 2017-05-13 22:10:52 +0200
  • fd03a3d957 tiny js fix for 'show more' button in chrome (#3045) beatrix 2017-05-13 16:07:58 -0400
  • 6467156eaf Raise validation error when trying to mute/unmute status without conversation Eugen Rochko 2017-05-13 22:01:24 +0200
  • 87ded912a6 Merge branch 'master' into feature-conversations-muting Eugen Rochko 2017-05-13 21:59:58 +0200
  • 7a4ae3e09f Rename to "mute conversation" and "unmute conversation" Eugen Rochko 2017-05-13 21:58:44 +0200
  • b2ed532572 Add tests, clean up Eugen Rochko 2017-05-13 21:49:50 +0200
  • d878483807 tiny js fix for 'show more' button in chrome beatrix-bitrot 2017-05-13 17:37:25 +0000
  • 7b198204c9 fix(eslint): Disable eslint console rule Stephen Burgess 2017-05-13 14:14:04 -0500
  • 68d4926b4d Add reserved usernames Hikaru Suido 2017-05-14 03:45:31 +0900
  • 021e02172f fix(catch): Error Stephen Burgess 2017-05-13 13:42:34 -0500
  • cecbcc73bf Revert "fix(safari9): Allow app to run in Safari 9" Stephen Burgess 2017-05-13 11:55:07 -0500
  • 0d00bbbc70 fix(polyfil): Catch error from promise Stephen Burgess 2017-05-13 13:27:32 -0500
  • 9d2e26959e Create TARDIS.htmlx jlind0 2017-05-13 12:58:16 -0500
  • fb39063115 fix(safari): Fix cross browser column and scroll issues Stephen Burgess 2017-05-13 12:18:29 -0500
  • 5096156ad3 Add filter to AccountFilter alpaca-tc 2017-05-14 02:02:41 +0900
  • 94343f219d Add Catalan language salvadorpla 2017-05-13 18:56:45 +0200
  • f36564ad85 fix(safari9): Allow app to run in Safari 9 Stephen Burgess 2017-05-13 11:55:07 -0500
  • 3750b04af5 Add Catalan language salvadorpla 2017-05-13 18:52:02 +0200
  • 4bd0488a77 feat(count): Just yml count syntax to provide different rule for 1 (#2685) Stephen Burgess 2017-05-13 10:13:17 -0500
  • 1b17da6ed9 i18n: Hebrew string updates (#3037) Ira 2017-05-13 18:05:02 +0300
  • 54947abd6f Merge branch 'master' into hotfix/2899-safari-column-height Stephen Burgess 2017-05-13 09:41:40 -0500
  • 484c5d9a64 Add Catalan language salvadorpla 2017-05-13 16:40:47 +0200
  • 2cdb90015d feat(count): Just yml count syntax to provide different rule for 1 Stephen Burgess 2017-05-13 09:39:01 -0500
  • b42435db10 i18n: Hebrew string updates Ira Abramov 2017-05-08 12:15:20 +0300
  • dc5b746f42 Small FR localisation enhancements (#3033) Bastien 2017-05-13 15:56:49 +0200
  • 89210781cb Fix og:url. (#3031) Shunsuke Michii 2017-05-13 22:56:42 +0900
  • e9810cbad6 Fixes NoMethodError: undefined method 'first' for nil:NilClass (#3036) alpaca-tc 2017-05-13 22:56:12 +0900
  • 1027556614 Fix broken storybook (#3030) Yamagishi Kazutoshi 2017-05-13 22:55:56 +0900
  • b74a0b3765 Fixes NoMethodError: undefined method 'first' for nil:NilClass alpaca-tc 2017-05-13 22:32:11 +0900
  • ab073fd1b8 Merge remote-tracking branch 'refs/remotes/tootsuite/master' maa123 2017-05-13 19:46:35 +0900
  • 25733bd372 Localisation enhancements. Bastien 2017-05-13 08:08:12 +0200
  • 40b84c4203 Small localisation enhancement. Bastien 2017-05-13 08:06:22 +0200
  • eb9f83612b Fix og:url. Shunsuke Michii 2017-05-13 13:24:12 +0900
  • 8a14209618 Fix broken storybook Yamagishi Kazutoshi 2017-05-13 12:13:59 +0900
  • 3dcb5fa28f Revert HTML CW changes (#3020) beatrix 2017-05-12 22:03:43 -0400
  • a9f677fce7 Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)" beatrix-bitrot 2017-05-12 04:49:38 +0000
  • a68c885bd2 selectively Revert "Fix regressions from #2683 (#2970)" beatrix-bitrot 2017-05-12 04:47:07 +0000
  • 32f2f910bd Add plugin for test Yamagishi Kazutoshi 2017-05-11 10:25:07 +0900
  • d034d72e45 Remove Babel plugin for ES Modules Yamagishi Kazutoshi 2017-05-11 08:21:57 +0900
  • 1d5dcfcd46 Make direct statuses stand out more (#3025) Eugen Rochko 2017-05-13 01:38:51 +0200
  • 66ff9ed34e Finalizing Dutch strings (#3028) jeroenpraat 2017-05-13 00:13:08 +0200
  • b4e5e83596 Finalizing Dutch strings jeroenpraat 2017-05-12 23:55:08 +0200
  • 68bcd690d0 ja.yml malmel 2017-05-13 06:47:14 +0900
  • 060d55be77 Star malmel 2017-05-13 06:37:36 +0900
  • 00093477fe bug malmel 2017-05-13 06:29:29 +0900
  • c8cc9737c5 Bug malmel 2017-05-13 06:26:50 +0900
  • 54d133efc0 action_bar.jsx malmel 2017-05-13 06:23:30 +0900
  • b9d577b2f4 Ja.jsx 22 malmel 2017-05-13 06:17:29 +0900
  • bf9b0b5b40 ja.jsx malmel 2017-05-13 06:15:46 +0900
  • caee7bd5c8 <<<HEAD del and star >> cloud malmel 2017-05-13 06:10:41 +0900
  • f0870f0abf Merge commit '7406404fa3c3ff921bf4501eb365932b0553ebeb' into ucouco1.3.1 malmel 2017-05-13 05:16:17 +0900
  • aa65da55c5 Make direct statuses stand out more Eugen Rochko 2017-05-12 22:12:57 +0200
  • 66328adf83 Rebuild node-sass (#3002) Daigo 3 Dango 2017-05-12 10:04:41 -1000
  • b65950bb2e fix #3008 : props was not defined (#3022) Wonderfall 2017-05-12 20:58:41 +0200
  • f3ae6436f6 Remove pending test for conversation mute Eugen Rochko 2017-05-12 19:12:00 +0200
  • 68ee09a4fb Up max class length Eugen Rochko 2017-05-12 18:33:10 +0200
  • 9c557b6bd1 Add "muted" as a boolean attribute on statuses JSON Eugen Rochko 2017-05-10 01:19:52 +0200
  • a6ceb484ac Display "Dismiss notifications" on all statuses in notifications column, not just own Eugen Rochko 2017-05-10 00:20:30 +0200
  • cc5b4518e5 Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Eugen Rochko 2017-05-09 01:52:55 +0200
  • 9f8b335063 Add <ostatus:conversation /> tag to Atom input/output Eugen Rochko 2017-05-07 02:44:39 +0200
  • 0d70fe2659 Spec coverage and refactor for pubsub/delivery worker (#3021) Matt Jankowski 2017-05-12 14:35:36 -0400
  • aaa1b42538 fix #3008 : props was not defined Wonderfall 2017-05-12 20:20:56 +0200
  • a1fc2cfa09 Fix color contrast some more in privacy warning (#3018) Shel Raphen 2017-05-12 14:19:39 -0400
  • d22fb77a7f Refactor of pubsub delivery worker Matt Jankowski 2017-05-11 14:39:06 -0400
  • 9bb3f14d54 add missing ; Shel Raphen 2017-05-12 14:11:52 -0400
  • b3e38f8eb9 Framework for delivery worker spec Matt Jankowski 2017-05-11 14:09:21 -0400
  • 5b2acd34ac Make domain dark blue again Shel Raphen 2017-05-12 13:25:43 -0400
  • b535966ab5 Allow SCSS variables to be overridden (#2987) Koala Yeung 2017-05-13 01:22:50 +0800
  • 02412429ab Remove reference to non-existent table in schema rb (#3019) Matt Jankowski 2017-05-12 13:22:33 -0400
  • af557bd7e7 Remove reference to non-existent table in schema rb Matt Jankowski 2017-05-12 13:17:14 -0400
  • 80557fd14c Fix color contrast some more in privacy warning Shel Raphen 2017-05-12 13:11:25 -0400
  • 5abdc77c80 Add conversation model, <ostatus:conversation /> (#3016) Eugen Rochko 2017-05-12 19:09:21 +0200
  • 714838b625 Remove redundant local variable Eugen Rochko 2017-05-08 23:04:05 +0200
  • b79f70dd9c Improve code style Eugen Rochko 2017-05-12 17:52:52 +0200
  • c03bde77d6 Prevent n+1 query when generating Atom with the new conversations Eugen Rochko 2017-05-08 17:04:47 +0200
  • dd82823c38 More spec coverage for status before_create Eugen Rochko 2017-05-08 02:07:38 +0200
  • 1e58826a5d Fix conversation migration Eugen Rochko 2017-05-08 01:57:46 +0200
  • 86090c6810 Add <ostatus:conversation /> tag to Atom input/output Eugen Rochko 2017-05-07 02:44:39 +0200
  • f2e85c880b Merge e575927723 into b5a9c6b3d2 Akihiko Odaki 2017-05-12 15:47:07 +0000
  • b5a9c6b3d2 Prepend reblogs' wrapper content with "RT @original_author", (#3013) Eugen Rochko 2017-05-12 17:46:44 +0200
  • 60f3230a05 Increase color contrast on privacy warning (#3015) Shel Raphen 2017-05-12 11:46:36 -0400
  • 0cb4b9205c Fix sidekiq "port" being wrong (#3014) Eugen Rochko 2017-05-12 17:46:14 +0200
  • c4a28d10fa Increase color contrast on privacy warning Shel Raphen 2017-05-12 11:45:08 -0400
  • 3afe540a76 Fix sidekiq "port" being wrong Eugen Rochko 2017-05-12 17:23:23 +0200
  • 41327dc25e Prepend reblogs' wrapper content with "RT @original_author", so that when a reblog parse fails on another instance, it doesn't look like a misattributed/stolen text Eugen Rochko 2017-05-12 17:15:34 +0200
  • 43d754eb42 Fix not rejecting remote URIs when parsing out local IDs (#3012) Eugen Rochko 2017-05-12 16:47:55 +0200
  • 2cc0d56652 Add back stdout logging to development environment after rails_12factor was removed (#3011) Eugen Rochko 2017-05-12 16:47:49 +0200
  • ca34969e2d Fix not rejecting remote URIs when parsing out local IDs Eugen Rochko 2017-05-12 16:41:46 +0200
  • 374961dd53 Add back stdout logging to development environment after rails_12factor was removed Eugen Rochko 2017-05-12 16:39:04 +0200
  • b7ca6f80f7 dump.rdb del malmel 2017-05-12 22:50:06 +0900