vivlim
/
pleroma-fe
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Commit Graph

  • ab7a418d80 maintain conversationsObject storage taehoon 2019-04-11 12:46:06 -0400
  • fa16d66c52 remove unused importing taehoon 2019-04-09 11:29:29 -0400
  • 724602bdc1 get statuses in a conversation from the global repository instead of local state taehoon 2019-04-09 11:08:39 -0400
  • 8c2efc5a5c Merge branch 'restore-yarnlock' into 'develop' HJ 2019-04-10 18:13:17 +0000
  • ab58b735cd restore yarnlock Henry Jameson 2019-04-10 21:09:26 +0300
  • 84505e01f5 Merge branch 'issue-436-mastoapi-notifications' into 'develop' HJ 2019-04-10 17:28:42 +0000
  • 76cd01e99b #436 - remove yarn.lock dave 2019-04-10 13:22:54 -0400
  • 40e9eebf91 #436 - merge develop dave 2019-04-10 12:54:33 -0400
  • d94a7b6318 Merge branch 'fix-local' into 'develop' HJ 2019-04-10 12:06:35 +0000
  • 18cb97a2bd Fix wrong local Henry Jameson 2019-04-10 15:02:14 +0300
  • ed3aceff5c Merge branch 'mastoapi/update-extension-support' into 'develop' Shpuld Shpludson 2019-04-10 03:14:58 +0000
  • 25601c6873 Merge branch 'fix-emoji-picker' into 'develop' Shpuld Shpludson 2019-04-10 03:14:51 +0000
  • a25aabfa10 support new custom emoji format Henry Jameson 2019-04-09 22:54:14 +0300
  • d498a26af5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications dave 2019-04-09 15:42:05 -0400
  • dfd89b0bbc revert, it's still missing Henry Jameson 2019-04-09 22:28:36 +0300
  • d95fc02810 add support for pleroma-specific fields Henry Jameson 2019-04-09 22:25:44 +0300
  • d7cf841dfe Merge branch '486-expand-button' into 'develop' Shpuld Shpludson 2019-04-09 18:52:18 +0000
  • 5df049ca31 #486 - remove expand button on conversation page jared 2019-04-09 14:10:51 -0400
  • b3ace226fb Merge branch 'fix/prevent-repeated-fetching' into 'develop' Shpuld Shpludson 2019-04-09 18:05:46 +0000
  • 011f04c196 fix small bug jasper 2019-04-09 09:19:48 -0700
  • b7d7c21617 Add await to login befor redirect to friends timeline jasper 2019-04-09 08:57:41 -0700
  • 1570e779b1 Prevent repeated fetching jasper 2019-04-09 08:38:13 -0700
  • 1e9ddcb0da Merge branch 'fix/notification-bugs' into 'develop' Shpuld Shpludson 2019-04-09 15:24:33 +0000
  • d3218807b4 #436 - merge develop dave 2019-04-08 21:04:59 -0400
  • 546ced43d9 Merge branch 'moderation-menu' into 'develop' Shpuld Shpludson 2019-04-08 19:01:40 +0000
  • b0da32fea2 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications dave 2019-04-08 14:29:12 -0400
  • 2f725c570b Merge branch 'debug_message' into 'develop' Shpuld Shpludson 2019-04-08 16:49:52 +0000
  • 7259e02a10 remove debug message Maksim 2019-04-08 16:49:51 +0000
  • 8c7f765dff Merge branch 'issue-469-safe-dm-from-BE' into 'develop' Shpuld Shpludson 2019-04-04 19:38:03 +0000
  • 1c04cd2036 Add space jasper 2019-04-04 09:06:53 -0700
  • a1275be4c0 Separate timeline and notification jasper 2019-04-04 09:03:56 -0700
  • 7c2b65e9a3 Remove useless codes jasper 2019-04-03 09:08:23 -0700
  • ea27483f27 Fix notification bugs jasper 2019-04-03 09:04:46 -0700
  • fe756fe30d #436 - revert stripe html for notification dave 2019-04-03 11:17:23 -0400
  • 6ed26ce65d #436 - notification html to text content dave 2019-04-03 10:58:39 -0400
  • 6fa014505c #436 - revert notification silience config dave 2019-04-03 10:53:11 -0400
  • 70071b870f #469 - update text copy dave 2019-04-02 12:46:22 -0400
  • 67258571c5 #469 - update behavior of safe_dm dave 2019-04-02 11:19:45 -0400
  • 9d5ed04147 #469 - clean up dave 2019-04-02 10:28:38 -0400
  • c9a9b3122d #469 - DM warning text should vary based on BE setting dave 2019-04-02 10:26:14 -0400
  • 8b3f037f87 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications dave 2019-04-02 10:07:36 -0400
  • 6b6878bde0 Added moderation menu eugenijm 2019-02-18 17:49:32 +0300
  • ac28e8c2f9 Merge branch 'feature/mobile-improvements-3' into 'develop' Shpuld Shpludson 2019-04-01 19:57:31 +0000
  • a595febcb8 Merge branch 'develop' into 'develop' Shpuld Shpludson 2019-04-01 19:49:16 +0000
  • 89c9448532 fix conflict shpuld 2019-04-01 22:47:37 +0300
  • ae3b92ce85 Merge branch 'fix/sending-requests-when-loading' into 'develop' Shpuld Shpludson 2019-04-01 19:45:08 +0000
  • 3b38e1b8a7 Merge branch 'patch-2' into 'develop' Shpuld Shpludson 2019-04-01 19:44:11 +0000
  • 46de457f50 Merge branch 'develop' into feature/mobile-improvements-3 shpuld 2019-04-01 22:42:06 +0300
  • 2879495b8a remove window width copypasta shpuld 2019-04-01 22:41:34 +0300
  • df366a586d Merge branch '471-timeline-since-id' into 'develop' Shpuld Shpludson 2019-04-01 19:33:45 +0000
  • 3c2931529e Merge branch 'minimal-scopes-mode' into 'develop' HJ 2019-04-01 19:32:37 +0000
  • 90939f198b Fix login handling jasper 2019-04-01 12:32:13 -0700
  • c17de4b638 Merge branch '470-toggle-subject-content' into 'develop' HJ 2019-04-01 18:45:24 +0000
  • 8fc10dc177 Add Promise.all to send requests when loading jasper 2019-04-01 10:46:30 -0700
  • d856c2745c #471 - fix timeline fetch with since_id jared 2019-04-01 13:25:48 -0400
  • dee9ab7bda #470 - update button text capitalization jared 2019-04-01 13:04:40 -0400
  • 487a194f6d #470 - handle cases without subject jared 2019-04-01 13:01:28 -0400
  • 6847e70a49 #470 - update i18n jared 2019-04-01 12:58:23 -0400
  • 748b1ed167 #470 - fix subject and content toggle issue jared 2019-04-01 12:54:34 -0400
  • 6482201dc9 #436 - sync notification & timeline users dave 2019-04-01 12:22:49 -0400
  • 0af2f8e4fd #436 - merge develop & resolve conflict dave 2019-04-01 12:13:11 -0400
  • 6c24ae9b0b Merge branch 'fix/user-card-buttons' into 'develop' Shpuld Shpludson 2019-04-01 15:38:14 +0000
  • 80277e5571 Remove useless comma jasper 2019-04-01 07:27:12 -0700
  • 4a2f676f2e Fix user card in notification jasper 2019-04-01 07:26:13 -0700
  • 21ea5adc8b #436 - apply patch and clean up dave 2019-03-31 21:59:18 -0400
  • b909796683 #436 - update notification dave 2019-03-31 15:15:16 -0400
  • 06fd3a9c5f #436 - apply patch dave 2019-03-31 14:50:34 -0400
  • ecacc933e7 #436 - keep original naming dave 2019-03-31 13:47:23 -0400
  • 0db66e2905 #436 - keep original naming dave 2019-03-31 13:41:22 -0400
  • 8efcfc69e8 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications dave 2019-03-31 11:03:43 -0400
  • 6828c7d74c Update Polish translation Marcin Mikołajczak 2019-03-31 13:50:51 +0000
  • 0792732822 final touches Henry Jameson 2019-03-30 12:42:42 +0200
  • 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
  • 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