Commit graph

  • 4dc64438e9 aaaaggghh Henry Jameson 2019-03-30 12:41:42 +0200
  • 995daf70b7 fix lint Henry Jameson 2019-03-30 12:34:13 +0200
  • 9f4a9bff46 Merge remote-tracking branch 'upstream/develop' into minimal-scopes-mode Henry Jameson 2019-03-30 12:31:50 +0200
  • e89a622005 fix formatting Henry Jameson 2019-03-30 12:29:28 +0200
  • beaf4fcf8a fix formatting Henry Jameson 2019-03-30 12:26:53 +0200
  • bf927122df Review Henry Jameson 2019-03-30 12:25:23 +0200
  • 2ee8d21366 #101 - update emoji with fontello icon jared 2019-03-29 16:34:59 -0400
  • 3172b4e7c1 #101 - insert emoji from emoji selector jared 2019-03-29 15:56:50 -0400
  • f9071dac25 #101 - show emojis in groups, clean up jared 2019-03-29 12:48:52 -0400
  • 2c4e80aab3 #101 - add emoji selector basic mockup jared 2019-03-29 11:49:32 -0400
  • 0117f6af9f Merge branch 'issues/#465' into 'develop' Shpuld Shpludson 2019-03-29 15:33:16 +0000
  • e329a362e0 Merge branch 'fix/warnings-in-user-profile' into 'develop' Shpuld Shpludson 2019-03-29 15:32:40 +0000
  • 783cc00dd0 merge develop & resolve conflict dave 2019-03-29 10:11:28 -0400
  • e6f9b1517b Fix: Change condition jasper 2019-03-28 18:43:03 -0700
  • 25370083b6 Merge branch '255-emoji-input' into 'develop' Shpuld Shpludson 2019-03-28 21:09:48 +0000
  • c06bcf3303 add gesture to close notifications drawer shpuld 2019-03-28 22:54:45 +0200
  • 31010779f6 Merge branch 'develop' into feature/mobile-improvements-3 shpuld 2019-03-28 22:25:40 +0200
  • c829b1a5f4 Merge branch 'feat/gesture-service' into 'develop' Shpuld Shpludson 2019-03-28 20:20:16 +0000
  • 1e2c304f76 fix typo shpuld 2019-03-28 22:11:05 +0200
  • ee9aa40001 Merge branch 'issues/#466' into 'develop' Shpuld Shpludson 2019-03-28 20:09:59 +0000
  • 7e8c2acc98 Merge branch 'issue-433-status-reply-form' into 'develop' Shpuld Shpludson 2019-03-28 20:08:40 +0000
  • 8e4ddcb843 update store according to retweeted status Brenden Bice 2019-03-28 13:20:09 -0400
  • a39fc49e84 #433 - update sort by for conversation dave 2019-03-28 10:02:33 -0400
  • e24145e233 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form dave 2019-03-28 09:54:55 -0400
  • 6b5a84e2b3 display replies_count right after reply icon Brenden Bice 2019-03-28 03:47:00 -0400
  • 95639fbd63 expose replies_count from mastodon api Brenden Bice 2019-03-28 03:46:41 -0400
  • e2e3a65c44 Merge branch 'fix/convos-masto' into 'develop' HJ 2019-03-27 20:55:24 +0000
  • 31a71ee3ee Apparently, MastoAPI gives status in ancestors if you try opening a repeat... Henry Jameson 2019-03-27 22:50:19 +0200
  • 86696167b7 Merge branch 'issue-457-mastodon-tag-timeline' into 'develop' HJ 2019-03-27 20:44:58 +0000
  • 0eff4bd0ac make side drawer use gesture service and fix its animations shpuld 2019-03-27 22:44:25 +0200
  • 30084a1204 merge develop and resolve conflict dave 2019-03-27 16:41:05 -0400
  • aed0943678 Merge branch 'mastoapi/actions' into 'develop' HJ 2019-03-27 20:28:55 +0000
  • 66ab131bd4 Merge remote-tracking branch 'upstream/develop' into mastoapi/actions Henry Jameson 2019-03-27 22:24:38 +0200
  • 4d66b9cf45 Merge branch 'mastoapi/followers' into 'develop' HJ 2019-03-27 20:18:44 +0000
  • c2c7e12aad review/remove error hiding Henry Jameson 2019-03-27 22:18:43 +0200
  • a5e71d1dd1 Merge remote-tracking branch 'upstream/develop' into mastoapi/followers Henry Jameson 2019-03-27 22:14:26 +0200
  • ff18e339cf Merge remote-tracking branch 'upstream/develop' into mastoapi/followers Henry Jameson 2019-03-27 22:12:51 +0200
  • 0a031aae20 errata Henry Jameson 2019-03-27 22:04:59 +0200
  • fb2aca06de review Henry Jameson 2019-03-27 22:02:46 +0200
  • 43e97e590c #433 - sort conversation for retweets and clean up dave 2019-03-27 16:00:54 -0400
  • f6e779a084 Merge branch 'masto-api/direct' into 'develop' HJ 2019-03-27 19:53:56 +0000
  • ea50f55148 Merge branch 'develop' into 'masto-api/direct' HJ 2019-03-27 19:48:41 +0000
  • 3870adf51f Merge branch 'mastoapi/friends-tl' into 'develop' HJ 2019-03-27 19:40:51 +0000
  • e1e0b8b254 Update oc.json for !611 and !691 Exilat 2019-03-27 18:46:40 +0000
  • 0e2931e7de Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form dave 2019-03-27 13:50:51 -0400
  • 85e9e52090 Merge branch 'fix/add-await-to-login-request' into 'develop' Shpuld Shpludson 2019-03-27 16:22:31 +0000
  • 37b33fc615 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input jared 2019-03-27 11:13:06 -0400
  • 578b412177 #457 - merge develop and resolve conflict dave 2019-03-27 11:09:30 -0400
  • b3a6bec17b Revert "Merge branch 'revert-987b5162' into 'develop'" Henry Jameson 2019-03-27 11:15:57 +0200
  • e750b2f197 Merge branch 'mastoapi/public-tl' into 'develop' HJ 2019-03-27 08:54:57 +0000
  • 96753e6a5f Merge branch 'revert-987b5162' into 'develop' HJ 2019-03-27 08:51:35 +0000
  • 95459ff0bc Revert "Merge branch 'mastoapi/friends-tl' into 'develop'" HJ 2019-03-27 08:47:54 +0000
  • 2d05aef24b Add await to login action' jasper 2019-03-26 14:26:26 -0700
  • 26955af60b Remove console log jasper 2019-03-26 13:36:33 -0700
  • ab99d5ef95 Fix warnings in user profile routing jasper 2019-03-26 13:35:08 -0700
  • c50e64f8ee Add tests for gesture service, fix bug with perpendicular directions shpuld 2019-03-26 22:11:45 +0200
  • 8fe9101f0b #255 - clean up autocomplete form jared 2019-03-26 14:53:27 -0400
  • 6dc2cedab0 #255 - clean up user settings page with self-closing html tags jared 2019-03-26 13:42:27 -0400
  • 2927454233 #255 - support textarea and update user settings page jared 2019-03-26 13:40:37 -0400
  • 987b5162a7 Merge branch 'mastoapi/friends-tl' into 'develop' Shpuld Shpludson 2019-03-26 17:24:37 +0000
  • 982be05873 #457 - update tag timeline endpoint to MastoAPI dave 2019-03-26 11:40:34 -0400
  • 5fd589d5e7 merge develop & resolve conflict dave 2019-03-26 10:52:46 -0400
  • 441deb405d Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into 255-emoji-input jared 2019-03-26 09:38:45 -0400
  • b97a033839 #255 - add emoji input component jared 2019-03-25 22:38:15 -0400
  • 2f1e690478 Merge branch 'issue-442-placeholder-fix' into 'develop' HJ 2019-03-25 22:29:17 +0000
  • e23c19468a somewhat functioning gesture service shpuld 2019-03-25 22:44:58 +0200
  • 467647d5d7 #433 - fix retweet abnormal behavior dave 2019-03-25 16:09:40 -0400
  • 04217fc660 Merge branch 'develop' into 'mastoapi/friends-tl' HJ 2019-03-25 19:21:48 +0000
  • d766059dee correctly update relationship on follow/unfollow Henry Jameson 2019-03-25 21:19:24 +0200
  • 82f077feb9 fixup! Merge remote-tracking branch 'upstream/develop' into mastoapi/actions Henry Jameson 2019-03-25 21:12:54 +0200
  • 0ffd43954e Merge remote-tracking branch 'upstream/develop' into mastoapi/actions Henry Jameson 2019-03-25 21:12:15 +0200
  • c5ec4829a7 #433 - consider page on focused dave 2019-03-25 15:10:45 -0400
  • 3025532ecf Merge branch 'develop' into 'mastoapi/public-tl' HJ 2019-03-25 19:09:22 +0000
  • 72749834f3 Merge remote-tracking branch 'upstream/develop' into masto-api/direct Henry Jameson 2019-03-25 21:06:58 +0200
  • 968e6c7fe8 correctly paginate on MastoAPI Henry Jameson 2019-03-25 21:04:52 +0200
  • 73dfb00be2 #433 - remove needless nesting/bloating dave 2019-03-25 14:59:47 -0400
  • 1a68a9db36 #433 - Fix conversation page highlight, fetch conversation on converation page dave 2019-03-25 14:55:58 -0400
  • 6143b1ce0f Resolve merge conflict, Fix few issues (conversation page highlight, fetch conversation, ...) dave 2019-03-25 14:47:54 -0400
  • 50960c7cfc Merge remote-tracking branch 'upstream/develop' into mastoapi/followers Henry Jameson 2019-03-25 20:32:12 +0200
  • b13a751926 start creating gesture service shpuld 2019-03-25 20:27:44 +0200
  • 854d0e8051 Merge branch 'mastoapi/convos' into 'develop' HJ 2019-03-25 18:17:53 +0000
  • cb122e3a99 review Henry Jameson 2019-03-25 20:11:06 +0200
  • 3b5fc88989 Merge remote-tracking branch 'upstream/develop' into mastoapi/convos Henry Jameson 2019-03-25 19:54:15 +0200
  • b02085f2ef Merge branch 'issue-450-user-data-populate' into 'develop' Shpuld Shpludson 2019-03-25 16:57:05 +0000
  • 57b82e9236 Merge branch 'file-paste' into 'develop' Shpuld Shpludson 2019-03-25 16:52:25 +0000
  • 182eab051d Merge branch 'develop' into 'develop' Shpuld Shpludson 2019-03-25 16:52:01 +0000
  • 153ad57007 Merge branch '435-mastoapi-composing-new-post' into 'develop' HJ 2019-03-25 16:42:20 +0000
  • 932652e335 Update attachment normalizer taehoon 2019-03-25 12:19:33 -0400
  • 6a9159b255 #433 - fix broken conversation page dave 2019-03-25 10:50:09 -0400
  • 4cec0d589d Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-433-status-reply-form dave 2019-03-25 10:22:16 -0400
  • 6fdbc182ca Add fallback for attachments uploaded via the other platforms taehoon 2019-03-17 23:42:07 -0400
  • 909c315a44 Get correct mimetype through entity_normalizer taehoon 2019-03-17 23:23:59 -0400
  • 966add1b29 Set default parameter taehoon 2019-03-17 23:22:54 -0400
  • 9802344603 Switch to mastoapi for posting status and uploading media taehoon 2019-03-15 15:02:00 -0400
  • 01d0531699 Merge branch '227-manage-blocks-mutes' into 'develop' HJ 2019-03-24 17:15:21 +0000
  • f03747e841 Revert changes taehoon 2019-03-24 13:04:47 -0400
  • b241539d4d prevent text pasting if image is pasted nik 2019-03-23 22:45:24 -0500
  • 05634d222d remove border radius of suggested emojis nik 2019-03-23 22:26:31 -0500
  • fd12263cac merge develop in shpuld 2019-03-23 22:21:57 +0200
  • 85584021fb make notifications close on navigation shpuld 2019-03-23 22:03:38 +0200