alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 9d1c0ec18d Merge branch 'salmon-native-keys' into 'develop' lambda 2017-11-28 16:46:01 +0000
  • 4524721fba
         Salmon: generate private key with native crypto if available. href 2017-11-28 16:50:12 +0100
  • c680ae581d Return xml notice at /notice path. Lain Iwakura 2017-11-27 17:24:52 +0100
  • 89a8dc7485 Merge branch 'patch-1' into 'develop' eal 2017-11-25 23:10:43 +0000
  • f86fca682a fix mix typo in README.md Partial name 2017-11-25 02:42:39 +0000
  • 44f7154fb9 Update frontend. Roger Braun 2017-11-24 08:37:41 +0100
  • 386c130769 More readme updates. Lain Iwakura 2017-11-23 16:41:09 +0100
  • ecf109a0fe Add mix deps.get back to readme. Lain Iwakura 2017-11-23 16:35:03 +0100
  • 44dc694882 Add configuration generation tool, update readme. Lain Iwakura 2017-11-23 16:22:20 +0100
  • d16b613929 MastodonUI login: Show error message on error. Roger Braun 2017-11-23 12:06:14 +0100
  • ad90da07f5 untoot. Roger Braun 2017-11-22 16:10:03 +0100
  • 698a75cb39 Merge branch 'develop' into 'develop' lambda 2017-11-22 14:19:27 +0000
  • d7b6fa79cb Fixed in-reply CSS, also included full column width (to have timelines take the whole screen size.) Hyper! (Stitch) 2017-11-22 14:12:04 +0000
  • bcc4e73e51 Update README.md lambda 2017-11-22 13:42:27 +0000
  • 0716f8e626 Update frontend. Roger Braun 2017-11-22 12:19:13 +0100
  • 1625021a9c Merge branch 'fix/self-follow' into 'develop' eal 2017-11-21 23:09:59 +0000
  • e9037ffc8d Do not include user in their own follower count. eal 2017-11-21 15:33:09 +0200
  • 9b35a4e850 Merge branch 'fix/mastoapi-attachment-count' into 'develop' eal 2017-11-20 20:55:27 +0000
  • fa19de97ba MastoAPI: no more than 4 attachments. eal 2017-11-20 22:49:20 +0200
  • dae2949bcc Fix a links... Retweet button still broken. Hyper! (Stitch) 2017-11-20 17:19:22 +0000
  • 3d29fc5462 Make /api/friends/ids test deterministic. eal 2017-11-20 19:16:43 +0200
  • 0c68e75b93 Update pl-dark-masto-fe.css Hyper! (Stitch) 2017-11-20 17:09:14 +0000
  • cb071745b5 Update pl-dark-masto-fe.css, fix notification_message and retweet Hyper! (Stitch) 2017-11-20 16:54:32 +0000
  • 747a68a075 Treat internal emoji like external. Roger Braun 2017-11-20 17:53:21 +0100
  • cf0bbf320d MastoAPI: Add max_toot_chars. Roger Braun 2017-11-20 08:54:47 +0100
  • 6900851581 Merge branch 'fix/self-follow' into 'develop' lambda 2017-11-20 07:27:10 +0000
  • 8d4e7b32c9 Ensure correct state in self-unfollow. eal 2017-11-20 09:26:31 +0200
  • bd921ca5d7 Fix posts being streamed to non-local websocket channels. eal 2017-11-20 07:58:43 +0200
  • edc3e5bc30 Make users in tests follow themselves by default. eal 2017-11-20 07:52:02 +0200
  • 4db5954786 Don't let the user unfollow their own account. eal 2017-11-20 01:21:53 +0200
  • aadf54e0df Don't show the user in their own following count. eal 2017-11-20 00:31:39 +0200
  • 36011fee4e Add Custom Pleroma-dark theme Hyper! (Stitch) 2017-11-19 19:07:19 +0000
  • f065689407 Update pl-dark-masto-fe.css Hyper! (Stitch) 2017-11-19 19:04:51 +0000
  • 97bb99edba Add new file Hyper! (Stitch) 2017-11-19 19:04:21 +0000
  • 52aa65fe6e Federator Queue: Add seperate in/out queues. Roger Braun 2017-11-19 15:10:51 +0100
  • 5ff5d583b6 MastodonAPI: Streaming fixes. Roger Braun 2017-11-19 13:47:50 +0100
  • f6495abf73 Update frontend. Roger Braun 2017-11-19 13:31:09 +0100
  • 0f099dac67 MastodonAPI: Add sign out. Roger Braun 2017-11-19 13:23:16 +0100
  • 40ca379357 Fix flakey test. Roger Braun 2017-11-19 13:07:29 +0100
  • c336a13d2c MastoAPI: Only return create activties in contexts. Roger Braun 2017-11-19 12:59:23 +0100
  • a6f65083ae Merge branch 'feature/fix-warnings' into 'develop' lambda 2017-11-19 11:50:02 +0000
  • 59770c3f5c
         Fix all compilation warnings Thog 2017-11-19 02:22:07 +0100
  • 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