Commit Graph

  • 6ab0aba50a Transmogrify outgoing hashtags. lain 2018-02-18 13:51:03 +0100
  • 6046f10431 Actually fix incoming attachments. lain 2018-02-18 13:03:40 +0100
  • 6352dffd13 Drop unhandle activities. lain 2018-02-18 12:51:35 +0100
  • b99eeb2bdf Try to fetch AP user data first. lain 2018-02-18 12:27:05 +0100
  • 68752b2047 Switch protocols to AP when post come in through AP. lain 2018-02-18 12:04:59 +0100
  • 77c6c424a6 ActivityPub: Make fake Create activities for objects without one. lain 2018-02-18 11:24:54 +0100
  • fc9d361d17 Add mock. lain 2018-02-18 10:21:19 +0100
  • 81ea359a7c ActivityPub: Handle incoming announces. lain 2018-02-17 21:57:31 +0100
  • e3732ea3bc Add test fixtures. lain 2018-02-17 21:56:52 +0100
  • 5e36b750c1 ActivityPub: Fetch an object from an id. lain 2018-02-17 21:56:33 +0100
  • 0f2ad25a7b AcitvityPub: Outgoing Announces. lain 2018-02-17 20:47:45 +0100
  • 32b995fbb6 ActivityPub: Implement outgoing likes. lain 2018-02-17 20:22:14 +0100
  • e1b12a7782 ActivityPub: Handle incoming likes. lain 2018-02-17 20:13:12 +0100
  • 1f98de2079 ActivityPub: Use shared inbox. lain 2018-02-17 18:39:12 +0100
  • ab27c90c9f ActivityPub: Handle attachments. lain 2018-02-17 18:38:58 +0100
  • fb7b926be3 Handle black name fields on incoming users. lain 2018-02-17 18:15:48 +0100
  • c2d0cb1a29 ActivtyPub Delivery: Use shared inbox if possible. lain 2018-02-17 16:18:10 +0100
  • 7b26443a76 ActivityPub: Send out Accept after Follow. lain 2018-02-17 16:08:55 +0100
  • e7b73359e3 ActivityPub: Partly handle incoming follows. lain 2018-02-17 14:55:44 +0100
  • 5682e48a25 ActivityPub: tags -> tag. lain 2018-02-17 14:20:53 +0100
  • 05ba6ca1b8 Do some transmogrifying for the output. lain 2018-02-17 14:11:20 +0100
  • 5a371892a0 Fix specs. lain 2018-02-17 10:26:44 +0100
  • dea29d707c Add post activity fixture. lain 2018-02-17 09:48:42 +0100
  • 7851b9ba81 ActivityPub: Use recipients fields. lain 2018-02-15 20:32:07 +0100
  • 5454ec6a6c ActivityPubController: Handle inbox data. lain 2018-02-15 20:00:43 +0100
  • ef0300889d Transmogrifier: Handle basic notice creation. lain 2018-02-15 20:00:06 +0100
  • a15f572800 OstatusTest: Remove insert_or_update test (moved to User). lain 2018-02-15 19:59:40 +0100
  • ae26604378 ActivityPub: Refactor create function. lain 2018-02-15 19:59:03 +0100
  • 38b61fddfe HttpSignature Plug: Skip if already valid. lain 2018-02-15 19:58:26 +0100
  • 0aa56a853b UserTest: Move insert_or_update test. lain 2018-02-15 19:58:12 +0100
  • b331cb449a Merge branch 'develop' into feature/activitypub lain 2018-02-12 10:24:15 +0100
  • 1bc34de4df Add missing support file. lain 2018-02-12 10:23:21 +0100
  • 26ccb768d3 Make test output easier to read. lain 2018-02-12 10:13:54 +0100
  • 33a5d0a238 Fix some test warnings. lain 2018-02-12 09:33:01 +0100
  • 91928b06ab Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into develop lain 2018-02-12 08:15:37 +0100
  • 3c80d9b277 Fix spec. lain 2018-02-12 08:15:03 +0100
  • e946f300ae update frontend lain 2018-02-11 20:58:08 +0100
  • dfc23e717f update frontend lain 2018-02-11 20:55:02 +0100
  • 8cf97ee8e1 ActivityPub: Basic note federation with Mastodon. lain 2018-02-11 20:43:33 +0100
  • ce31f3a922 Twitter Representers: Handle Mastodon attachments. lain 2018-02-11 17:21:06 +0100
  • ae1ec858f4 Basic AP user building. Roger Braun 2018-02-11 17:20:02 +0100
  • c1d26751e6 Mocks: Add mastodon user json example. Roger Braun 2018-02-11 17:19:06 +0100
  • 1d52afe83e Merge branch 'feature/instance-specific-panel' into 'develop' lambda 2018-02-11 09:32:48 +0000
  • 9cf293c84b Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into feature/instance-specific-panel Hakaba Hitoyo 2018-02-11 18:08:27 +0900
  • 52200998c9 Merge branch 'develop' into feature/activitypub Roger Braun 2018-02-11 09:50:55 +0100
  • 0e2ca77eec update frontend Roger Braun 2018-02-09 17:14:11 +0100
  • a61f21ff4f print <link rel="next"> element in atom.feed hakabahitoyo 2018-02-09 23:03:28 +0900
  • 7124f12a94 introduce max_id parameter in feed.atom (debug) Hakaba Hitoyo 2018-02-09 21:46:05 +0900
  • 08f458e6df UtilController: Fix statusnet config api compatibility. Roger Braun 2018-02-09 13:43:12 +0100
  • 9c61f60558 introduce max_id parameter in feed.atom Hakaba Hitoyo 2018-02-09 21:41:30 +0900
  • af854f7e01 Merge branch 'develop' into 'develop' lambda 2018-02-09 08:57:54 +0000
  • f0cde24f71 Merge branch 'fix/config-disable-chat' into 'develop' lambda 2018-02-08 18:18:28 +0000
  • 73249fa5ff Changed fallback controller to handle all cases from OAuthController Calv Collins 2018-02-08 18:15:59 +0000
  • 314f4775c5 Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop Calv Collins 2018-02-08 16:58:31 +0000
  • bdb5dd2194 Create action_fallback for username/password incorrect input Calv Collins 2018-02-08 16:57:30 +0000
  • 2f291576e4 Fix compile errors on 1.4.5 Roger Braun 2018-02-08 16:03:30 +0100
  • 103eca482c update frontend Roger Braun 2018-02-07 13:44:52 +0100
  • b1edfba3b9 Update required Elixir version in README eal 2018-02-06 00:06:29 +0200
  • 8df0aee889 Merge branch 'fix/no-image-upload-filetype' into 'develop' eal 2018-02-05 21:57:17 +0000
  • 286f6698ee Detect file type if none given. eal 2018-02-04 15:14:08 +0200
  • a2fac9b0e8 adjust panel.html Hakaba Hitoyo 2018-02-04 00:31:46 +0900
  • bffc78f2a8 add backend default for instance specific panel Hakaba Hitoyo 2018-02-03 23:09:26 +0900
  • 61c16193de Merge branch 'move-backend-images' into 'develop' lambda 2018-02-03 13:05:20 +0000
  • c8a2931549 add backend endpoint /images Hakaba Hitoyo 2018-02-03 20:52:01 +0900
  • ea6d1b2b17 move avi.png & banner.png from /priv/static/static to /priv/static/images Hakaba Hitoyo 2018-02-03 20:43:14 +0900
  • f0745148a3 Add config option for enabling/disabling chat. eal 2018-02-01 19:23:26 +0200
  • 9a9766d648 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2018-02-02 17:14:58 +0100
  • 2203fa2fdb Update frontend. Roger Braun 2018-02-02 17:14:23 +0100
  • 3163311098 Merge branch 'feature/remote-follow' into 'develop' lambda 2018-02-02 07:33:09 +0000
  • 29be70c008 Add remote following of local profiles. eal 2018-02-02 00:00:48 +0200
  • ab83e0de6d TwitterAPI: Add is_local to user view. eal 2018-02-01 21:41:19 +0200
  • 15cb3f2b01 Revert renaming emoji.txt eal 2018-01-31 23:47:42 +0200
  • 0f194dc56b Merge branch 'feature/instance-thumbnail-api' into 'develop' eal 2018-01-31 18:34:52 +0000
  • 3fa6f3ae42 Merge branch 'fix/split-custom-emoji' into 'develop' lambda 2018-01-31 15:24:36 +0000
  • ab8b9ababa Split emoji to default and custom. eal 2018-01-31 16:23:31 +0200
  • 03c15a54f5 provide instance thumbnail at /api/v1/instance (debug) Hakaba Hitoyo 2018-01-31 23:09:47 +0900
  • e47f60c053 provide instance thumbnail at /api/v1/instance (debug) Hakaba Hitoyo 2018-01-31 23:04:34 +0900
  • 10753178ea provide instance thumbnail at /api/v1/instance (debug) Hakaba Hitoyo 2018-01-31 22:57:43 +0900
  • a4335e391f provide instance thumbnail at /api/v1/instance Hakaba Hitoyo 2018-01-31 22:51:25 +0900
  • 5e37adedfb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2018-01-30 12:21:05 +0100
  • ad0ab3a57b Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop Roger Braun 2018-01-30 12:20:39 +0100
  • 4501094606 Make specs less breaky. Roger Braun 2018-01-30 12:20:14 +0100
  • 1bb3ba02f3 Fix specs. Roger Braun 2018-01-30 12:17:01 +0100
  • cefb6cfea1 provide logo at feed.atom (debug) Hakaba Hitoyo 2018-01-30 19:37:04 +0900
  • b713b28dfd provide logo at feed.atom Hakaba Hitoyo 2018-01-30 19:26:07 +0900
  • 2f23ae5b68 Merge branch 'pr-upstream-http-proxy' into 'develop' lambda 2018-01-30 08:16:31 +0000
  • 189e9d63bc Merge branch 'feature/caddyfile' into 'develop' lambda 2018-01-30 08:14:07 +0000
  • ede4883ac9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Roger Braun 2018-01-29 17:45:44 +0100
  • 64e51c2cfa Fix incoming Pleroma CWs. Closes #96. Roger Braun 2018-01-29 17:44:35 +0100
  • 066fe1a697
    use nil instead of empty string Jeff Becker 2018-01-29 10:06:16 -0500
  • 8db83c3dc0 Merge branch 'feature/longfox' into 'develop' lambda 2018-01-27 11:57:34 +0000
  • 7e1d4819ca add longfox emojis Hakaba Hitoyo 2018-01-27 08:38:48 +0900
  • 46c8f79cd7 Merge branch 'feature/cross-origin' into 'develop' lambda 2018-01-26 23:30:11 +0000
  • 9c0c40cf1e Access-Control-Allow-Origin Hakaba Hitoyo 2018-01-26 22:58:58 +0000
  • e97864bfcb Update frontend. Roger Braun 2018-01-26 15:12:34 +0100
  • 5957c6517d Fix config. Roger Braun 2018-01-26 14:31:52 +0100
  • cd3210c9b8 Update frontend. Roger Braun 2018-01-26 14:28:27 +0100
  • dffde6631d
    Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy Jeff Becker 2018-01-24 13:15:54 -0500
  • 0f722a8c22 Stats: Make less crashy and improve query. Roger Braun 2018-01-20 18:38:30 +0100
  • 2ed17541b7 Merge branch 'feature/remote-follow' into 'develop' lambda 2018-01-20 15:02:04 +0000