Commit Graph

  • 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
  • 3b78c9c755 #101 - update hard-coded server url jared 2019-04-02 13:38:07 -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
  • 79efe0646c merge develop jared 2019-04-02 10:53:33 -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
  • 6c7cf7d9b5 some initial documentation about configuration Henry Jameson 2019-03-31 15:32:11 +0300
  • 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
  • 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