Commit Graph

  • 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
  • f86a5dc804 Merge branch 'issue-448-status-text-null' into 'develop' Shpuld Shpludson 2019-03-23 14:17:47 +0000
  • e9b58f1af7 Merge branch 'issue-452-unfollow-button' into 'develop' Shpuld Shpludson 2019-03-23 07:45:42 +0000
  • f3f006c8e3 Merge branch 'issue-451-long-user-name' into 'develop' Shpuld Shpludson 2019-03-23 07:45:04 +0000
  • 31d09931c8 #450 - dispatch login after saved state is loaded dave 2019-03-22 14:04:22 -0400
  • d70928792d #448 - fix timeline fetch error when status text is null dave 2019-03-22 13:15:11 -0400
  • ed4540530b #451 - add class to username span dave 2019-03-22 10:42:21 -0400
  • 277790e462 Merge branch '438-mastoapi-user-search' into 'develop' lambda 2019-03-22 11:16:25 +0000
  • 9fa1bc63b0 No need to fetch mutes on load anymore 🙌 taehoon 2019-03-21 21:58:02 -0400
  • a64e744c1b switch to mastoapi taehoon 2019-03-21 21:53:24 -0400
  • 8702d23a13 switch to mastoapi taehoon 2019-03-21 21:44:59 -0400
  • 379e33f6a5 masto api sends muted property now taehoon 2019-03-21 21:31:16 -0400
  • 883a84b313 No need to fetch user data using old api anymore 🎉 taehoon 2019-03-21 21:30:30 -0400
  • af85a3f244 Switch to mastoapi taehoon 2019-03-21 21:27:10 -0400
  • e617ed285e reactivity fixes Henry Jameson 2019-03-22 00:05:20 +0200
  • 67719e9a23 less hackery, more direct usage of mastoapi Henry Jameson 2019-03-21 23:45:18 +0200
  • d6c62fa50f minor UI improvements - keep current behavior of showing originating post initially Henry Jameson 2019-03-21 23:27:14 +0200
  • ee94a6732a why did i do that Henry Jameson 2019-03-21 22:49:26 +0200
  • 307b4ba698 Merge remote-tracking branch 'upstream/develop' into mastoapi/convos Henry Jameson 2019-03-21 22:40:20 +0200
  • a0bccbce94 Add comment taehoon 2019-03-02 08:21:15 -0500
  • d7919109ec Reset statusnet_blocking of all fetched users first while refreshing block list taehoon 2019-03-02 08:20:56 -0500
  • 9857002bf5 Add hideMutedPosts setting and wire up to post-returning endpoints taehoon 2019-03-02 08:07:14 -0500
  • fe13b1b75a Merge remote-tracking branch 'upstream/develop' into mastoapi/friends-tl Henry Jameson 2019-03-21 22:28:29 +0200
  • 300259fd97 Add todo comment taehoon 2019-03-02 06:47:05 -0500
  • 333afd2138 Minor code refactoring taehoon 2019-03-01 22:50:06 -0500
  • d65422a6a5 Improve fetch error handling using a util taehoon 2019-03-01 22:47:07 -0500
  • 9b690209d0 Reset old mutes state after fetching new mutes data taehoon 2019-03-01 13:30:01 -0500
  • 302310a653 Remove old muting logic taehoon 2019-03-01 11:37:34 -0500
  • a6ce191cbc Update MuteCard ui taehoon 2019-02-28 22:59:26 -0500
  • 859ed4f34f Fetct full data of muted users after fetchMutes api call taehoon 2019-02-24 03:21:21 -0500
  • f04cbc8875 Add mute/unmute mutations taehoon 2019-02-24 03:20:11 -0500
  • 3255950b0e Add mute/unmute featrue and mutes management tab taehoon 2019-02-24 03:02:04 -0500
  • faef769b40 Merge remote-tracking branch 'upstream/develop' into masto-api/direct Henry Jameson 2019-03-21 22:11:02 +0200
  • 23bae67146 #452 - update button class name dave 2019-03-21 15:03:54 -0400
  • 8932c53706 #451 - update styling dave 2019-03-21 14:58:28 -0400
  • dfcdf4f32c #452 - unfollow button issue dave 2019-03-21 13:19:10 -0400
  • 1c6e5d3688 #451 - long username on follow/follower tabs dave 2019-03-21 13:06:37 -0400
  • 66e60572bc Merge branch 'issue-449-auto-token-fetch' into 'develop' Shpuld Shpludson 2019-03-21 16:12:33 +0000
  • db3b48d444 #449 - fix auth token fetch issue dave 2019-03-21 12:04:57 -0400
  • c2b7aff325 Merge branch 'issue-444-remote-follow' into 'develop' Shpuld Shpludson 2019-03-21 15:46:05 +0000
  • 9890e41440 Merge branch 'feature/bypass-avatar-cropper' into 'develop' Shpuld Shpludson 2019-03-21 15:44:26 +0000
  • 9e17853b2c Merge branch 'patch-2' into 'develop' Shpuld Shpludson 2019-03-21 15:38:19 +0000
  • a284a267ce Merge branch 'develop' into 'develop' Shpuld Shpludson 2019-03-21 15:37:05 +0000
  • 57cd6f8018 Merge branch 'feature/version-info' into 'develop' Shpuld Shpludson 2019-03-21 15:25:59 +0000
  • f389128e53 make mobile notifs drawer more like an actual drawer, make mobile nav buttons bigger to press, fix alert dot shpuld 2019-03-20 22:09:29 +0200
  • 0659d2fd3a Merge branch 'patch-1' into 'develop' HJ 2019-03-20 13:12:51 +0000
  • 4ace0866da Make select tag use --inputText as text color Marcin Mikołajczak 2019-03-20 11:52:58 +0000
  • 96c88b334c #444 - remote follow clean up dave 2019-03-19 14:41:50 -0400
  • 07b8115a37 #444 - show remote follow button when logged out dave 2019-03-19 14:36:27 -0400
  • 3108722eda Add button to save without cropping jasper 2019-03-18 18:19:42 -0700
  • 13e727b5ee #436: sync notification with timeline dave 2019-03-18 14:42:09 -0400
  • 060d3b0713 #436: implement is_seen logic dave 2019-03-18 12:30:34 -0400
  • 55d7bd6d4e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications dave 2019-03-18 10:37:26 -0400
  • 5717d97182 #442 - update placeholder linebreak dave 2019-03-18 10:35:13 -0400
  • 543cc0d285 #442 - clean up Bio placeholder text dave 2019-03-17 16:59:08 -0400
  • 241503346f #436: clean up based on comment dave 2019-03-17 10:08:01 -0400
  • 96f9eab700 Merge branch 'mastoapi/emojis' into 'develop' HJ 2019-03-17 14:08:01 +0000
  • 4cdfd5fb86 post-merge fixes Henry Jameson 2019-03-17 14:41:05 +0200
  • 30c0cafff1 Merge remote-tracking branch 'upstream/develop' into mastoapi/emojis Henry Jameson 2019-03-17 13:32:56 +0200
  • 7babbce522 [i18n] Update oc.json Exilat 2019-03-15 17:23:30 +0000