Commit graph

  • ed3403ad8b Merge branch 'formatting-fixes' into 'develop' lambda 2017-11-18 15:58:44 +0000
  • 146ec80285 Merge branch 'fix/mastofe-login-redirect' into 'develop' eal 2017-11-18 14:38:05 +0000
  • 7b397ed125 Merge branch 'sensitive-content-bit' into 'develop' eal 2017-11-18 14:34:37 +0000
  • f53cdabcdf Add #nsfw tag if sensitive content bit is set eal 2017-11-18 16:30:18 +0200
  • 31e4277ba5 Don't add summary if empty. eal 2017-11-18 15:25:22 +0200
  • fb118b2978 Don't insert newlines to generated HTML. eal 2017-11-18 14:46:54 +0200
  • 66e78c3ec4 Escape HTML instead of discarding it. eal 2017-11-18 14:43:41 +0200
  • 4647bcd6e6 Don't start streamer during tests. Roger Braun 2017-11-18 12:22:07 +0100
  • 9c60cc88df Redirect to Getting Started on login. eal 2017-11-16 20:47:44 +0200
  • a743940463 MastoAPI: Implement all streaming functions. Roger Braun 2017-11-16 16:49:51 +0100
  • 5719f69ae3 MastodonAPI: Stream fixes. Roger Braun 2017-11-16 13:48:58 +0100
  • a2d7e0f4d4 Merge branch 'feature/masto-styled-login-page' into 'develop' lambda 2017-11-16 12:01:07 +0000
  • 43499848d0 Small css fix. Roger Braun 2017-11-16 12:58:33 +0100
  • 189513e4ff Add styles to make login page resemble mastodon's Shpuld Shpuldson 2017-11-16 13:26:56 +0200
  • 8de890a0d9 Add custom emoji to Mastodon UI initial state. Roger Braun 2017-11-16 09:40:06 +0100
  • 3d1360c4d6 Add mastodon emoji folder. Roger Braun 2017-11-16 09:35:14 +0100
  • ced0d64d75 MastoAPI: Make attachment ids strings. Roger Braun 2017-11-15 18:58:13 +0100
  • 1cca544e20 Merge branch 'twitterapi-bitlbee' into 'develop' lambda 2017-11-14 16:47:54 +0000
  • 1eb7a862d2 Merge branch 'twitterapi-show-user' into 'develop' lambda 2017-11-14 16:44:25 +0000
  • f9828e578c TwitterAPI: Add /users/show. eal 2017-11-14 17:34:48 +0200
  • 0a69611884 Merge branch 'api-links' into 'develop' lambda 2017-11-14 14:19:39 +0000
  • 312d389f56 Add links to API documentation. eal 2017-11-14 16:15:03 +0200
  • 163c658202 TwitterAPI: Add unimplemented /mutes/users/ids. eal 2017-11-14 16:12:52 +0200
  • 22bbe27115 TwitterAPI: Add unimplemented /friendships/no_retweets/ids. eal 2017-11-14 16:10:13 +0200
  • dd76036cbb Merge branch 'mastoapi-media-timeline' into 'develop' lambda 2017-11-14 14:09:36 +0000
  • 3533bf7eac TwitterAPI: Add /friends/ids. eal 2017-11-14 16:04:58 +0200
  • 06c3ee3bac Accept 1 as true. eal 2017-11-14 15:50:23 +0200
  • c84723b679 MastoAPI: Add media timelines. eal 2017-11-14 15:41:16 +0200
  • 773eba4f0b Update frontend. Roger Braun 2017-11-14 09:34:28 +0100
  • 083cd169d2 MastoAPI: Fix repeat api bug. Roger Braun 2017-11-13 09:48:56 +0100
  • 5fc6e9d467 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2017-11-12 14:23:39 +0100
  • d293ceb1b5 Add Mastodon frontend. Roger Braun 2017-11-12 14:23:05 +0100
  • 08bc316742 Merge branch 'mastodon-notification-endpoints' into 'develop' lambda 2017-11-12 11:08:06 +0000
  • 87dee3902a Merge branch 'filetype-recognition' into 'develop' lambda 2017-11-12 09:27:59 +0000
  • efcf54dc02 Merge branch 'mastoapi-update-credentials' into 'develop' lambda 2017-11-12 09:24:32 +0000
  • 18a95cd375 Add common video and audio types. eal 2017-11-12 01:16:46 +0200
  • fc7483cb3c MastoAPI: Add update credentials endpoint. eal 2017-11-12 00:27:09 +0200
  • 260b148b92 Use headers for file content type recognition. eal 2017-11-11 23:09:33 +0200
  • 414c52509b MastoAPI: Websocket streaming for federated timeline. Roger Braun 2017-11-11 20:00:11 +0100
  • bd5bdc4c24 MastoAPI: Basic streaming. Roger Braun 2017-11-11 14:59:25 +0100
  • a1923d20e8 MastoAPI: Fix reblog emojis. Roger Braun 2017-11-11 11:18:05 +0100
  • fd12e585c9 Handle existing redirect params. Roger Braun 2017-11-10 18:24:50 +0100
  • 1d3d66a841 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2017-11-10 17:37:54 +0100
  • 6e9c22c0af MastoAPI: Use string ids everywhere. Roger Braun 2017-11-10 17:18:19 +0100
  • e6a78c6ed0 MastoAPI: Add notification get, clear and dismiss. eal 2017-11-10 15:24:39 +0200
  • 1b8ad9f731 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2017-11-09 16:49:32 +0100
  • 266d9c008d MastoAPI: Fetch statuses in search. Roger Braun 2017-11-09 16:48:45 +0100
  • 2247d7580e Merge branch 'fix-tootdon-image-uploads' into 'develop' lambda 2017-11-09 14:41:44 +0000
  • ccde03285d add sort index for activities Roger Braun 2017-11-09 15:16:10 +0100
  • e942e1e552 Correct mimetype on bad uploads. eal 2017-11-09 14:11:37 +0200
  • 9e60de695d Fix migration for empty db. Roger Braun 2017-11-09 13:45:17 +0100
  • 6bf261589f Update activities in own migration. Roger Braun 2017-11-09 13:32:53 +0100
  • 20b8b87743 Update in chunks. Roger Braun 2017-11-09 12:33:38 +0100
  • f1d27a5fbb Add actor column to activities. Roger Braun 2017-11-09 10:41:19 +0100
  • 41b8a76e96 Re-fetch user data on salmon decode error. Roger Braun 2017-11-09 08:32:54 +0100
  • 77e272df2d Merge branch 'following-you-in-user-view' into 'develop' lambda 2017-11-08 17:57:13 +0000
  • f7fc048aeb TwitterAPI user view: add follows_you. eal 2017-11-08 19:13:03 +0200
  • d2430d5007 Look through whole db for user timelines. Roger Braun 2017-11-08 17:25:18 +0100
  • 36557155af Update frontend. Roger Braun 2017-11-08 16:16:29 +0100
  • 8bbbfd72aa Merge branch 'blocks-in-user-view' into 'develop' lambda 2017-11-08 13:39:02 +0000
  • 4656cb9b99 TwitterAPI user view: add blocks. eal 2017-11-08 13:02:00 +0200
  • 3bbefd0a1e Merge branch 'twitter-api-blocks' into 'develop' lambda 2017-11-08 10:35:23 +0000
  • 6c0758e041 TwitterAPI: Add blocks. eal 2017-11-08 00:04:53 +0200
  • be67db5547 Merge branch 'mastodon-emoji-endpoint' into 'develop' lambda 2017-11-07 20:01:15 +0000
  • c6210183e1 Add mastodon API endpoint for custom emoji. eal 2017-11-07 21:28:31 +0200
  • d761b1543a Merge branch 'authenticated-profile-fetching' into 'develop' lambda 2017-11-07 18:58:22 +0000
  • f801b695d7 Update frontend. Roger Braun 2017-11-07 18:33:06 +0100
  • abfcf93dfc Update fronted. Roger Braun 2017-11-07 18:27:08 +0100
  • 722c4614ad Allow self-rt. Roger Braun 2017-11-07 16:45:27 +0100
  • 7da978f3f5 Linkify fixes. Roger Braun 2017-11-07 12:06:37 +0100
  • 6dfa62800a Revert "Longer timeouts for user fetching." Roger Braun 2017-11-07 09:41:35 +0100
  • 7de3a65214 Longer timeouts for user fetching. Roger Braun 2017-11-07 09:11:19 +0100
  • f85566324e Allow profile fetching for authenticated users only. eal 2017-11-07 00:33:44 +0200
  • ed1eb5deea Merge branch 'fix-tootdon-oauth' into 'develop' lambda 2017-11-06 20:27:31 +0000
  • d1c126ac98 Update README. eal 2017-11-06 22:22:36 +0200
  • b0e27b21dd Fix tootdon logins. eal 2017-11-06 21:51:31 +0200
  • 7252f6b054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2017-11-05 12:12:19 +0100
  • 046bee34d3 Fix bug when no posts are in the db. Roger Braun 2017-11-05 12:05:25 +0100
  • fa1f11e8e9 Merge branch 'feature/blocks' into 'develop' lambda 2017-11-03 08:56:44 +0000
  • c6b9b777da MastoAPI: Add list of blocked users. Roger Braun 2017-11-03 08:51:17 +0100
  • 5bf92e50be MastoAPI: Add blocking. Roger Braun 2017-11-03 08:38:05 +0100
  • 33beb51da4 MastoAPI: Add blocking to AccountView. Roger Braun 2017-11-03 08:23:31 +0100
  • 8a1a7191fd MastoAPI: Fix mentions always being for an anonymous user. Roger Braun 2017-11-03 08:13:39 +0100
  • 9b63647aff MastoApi: Add blocking to fetches. Roger Braun 2017-11-02 22:53:34 +0100
  • d89a7a0b34 TwitterAPI: Add blocking to fetches. Roger Braun 2017-11-02 22:50:42 +0100
  • 867ac1e4f5 Handle nil cases. Roger Braun 2017-11-02 22:47:11 +0100
  • 8ef58a266b Don't return blocked users' activities in contexts. Roger Braun 2017-11-02 22:44:36 +0100
  • a47727adde Don't return activities from blocked users. Roger Braun 2017-11-02 22:37:26 +0100
  • 632da6c927 Don't create notifications if the user is blocked. Roger Braun 2017-11-02 22:08:22 +0100
  • 6a5f087174 Add blocks to User. Roger Braun 2017-11-02 21:57:37 +0100
  • 345ad870f7 Clean up user_test.exs. Roger Braun 2017-11-02 21:57:21 +0100
  • 9554436d61 update gitlab ci Roger Braun 2017-11-02 17:52:53 +0100
  • 5794558077 Read variable for testing db. Roger Braun 2017-11-02 17:45:33 +0100
  • 32e1e52bd8 Update .gitlab-ci.yml lambda 2017-11-02 16:33:05 +0000
  • 520cc0c80f Update .gitlab-ci.yml lambda 2017-11-02 16:31:03 +0000
  • 41425fd64a Update .gitlab-ci.yml lambda 2017-11-02 16:28:38 +0000
  • 201fbd972e Add gitlab-ci.yml lambda 2017-11-02 16:26:13 +0000
  • 9be286a900 Handle empty terms / tags. Roger Braun 2017-11-01 09:33:29 +0100
  • 6f05367325 Federate out content warnings. Roger Braun 2017-10-31 19:51:58 +0100
  • e014cc6ed8 Allow using cws in mastodon api. Roger Braun 2017-10-31 19:44:36 +0100