Commit graph

  • b640cf0ce0 Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop' lambda 2019-01-07 12:20:15 +0000
  • 7dcafb4894 MastoAPI: Add test. lain 2019-01-07 13:13:37 +0100
  • 7382adf407 Make TwAPI UserView more resilient to issues. lain 2019-01-07 12:41:31 +0100
  • 36fa5e8802 Check visible_for_user when performing a search using a direct link. scarlett 2019-01-07 10:30:30 +0000
  • 52493467ac Twitter API: Add a summary_html field. scarlett 2019-01-06 10:16:40 +0000
  • c9b99d4486
    config/config.exs: Add syslog backends Haelwenn (lanodan) Monnier 2019-01-02 23:07:48 +0100
  • 5bcea0deca
    Install ex_syslogger Haelwenn (lanodan) Monnier 2019-01-02 22:57:37 +0100
  • b0e8e521fb Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop' kaniini 2019-01-05 22:54:25 +0000
  • 042852ecf3 Add check to prevent multiple follow notifications from the same user Sadposter 2019-01-05 22:54:25 +0000
  • 8d047c7a72 Merge branch 'fix/user-search-null-name' into 'develop' kaniini 2019-01-05 22:34:47 +0000
  • 0b54c3d643 Merge branch 'fix_486' into 'develop' kaniini 2019-01-05 22:33:38 +0000
  • 576368237c Merge branch 'activitypub-tombstone-fix' into 'develop' kaniini 2019-01-05 22:29:08 +0000
  • 145d6fe6e9 Merge branch 'emoji-in-summary' into 'develop' scarlett 2019-01-05 21:52:02 +0000
  • 57df7d6e1d Add tests for emoji and lack of HTML in summaries. scarlett 2019-01-05 21:46:42 +0000
  • 096e121879 Remove redundant comma. scarlett 2019-01-05 18:25:36 +0000
  • 6556be344d Resolve some test failures. scarlett 2019-01-05 18:20:42 +0000
  • 3c86d907d4 add some brakets to the emoji list. scarlett 2019-01-05 17:35:39 +0000
  • 0787f0dfbe Strip HTML in and allow emoji in summaries. scarlett 2019-01-05 17:28:47 +0000
  • 2d7da5f437 Don't crash on AP request for tombstone sxsdv1 2019-01-05 10:38:38 +0100
  • a81307251c Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name cascode 2019-01-04 20:32:55 -0800
  • ba17518a0a Merge branch 'feature/rich-media-cachex' into 'develop' rinpatch 2019-01-04 23:56:42 +0000
  • 487c00d36d rich media: disable cachex in test mode William Pitcock 2019-01-04 23:50:54 +0000
  • bf5aaefbb5 Merge branch 'fix/html-cache-content-collision' into 'develop' kaniini 2019-01-04 23:35:56 +0000
  • 0964c207eb rich media: use cachex to avoid flooding remote servers William Pitcock 2019-01-04 23:23:47 +0000
  • 1e2d58982e oopsies Rin Toshaka 2019-01-05 00:25:31 +0100
  • 846082e54f Different caches based on the module. Remove scrubber version since it is not relevant anymore Rin Toshaka 2019-01-05 00:19:46 +0100
  • 4aa977d3b3 fix 486: Add option --assume-yes to allow it to work non-interactive spctrl 2019-01-04 22:11:46 +0100
  • 4258dd8633 Merge branch 'feature/rich-media' into 'develop' kaniini 2019-01-04 20:50:18 +0000
  • ffea81b84f Merge branch 'activitypub-c2s-delete-activity' into 'develop' kaniini 2019-01-04 20:32:10 +0000
  • 4c5ee4c62b formatted cascode 2019-01-04 10:18:43 -0800
  • ab6ebbae67 added test for #499 cascode 2019-01-04 10:14:13 -0800
  • ba93396649 Patch to support image descriptions in Pleroma FE Wim Vanderbauwhede 2019-01-04 16:27:46 +0000
  • 4c95545d19 Patch to support image descriptions in Pleroma FE Wim Vanderbauwhede 2019-01-04 15:35:41 +0000
  • fe2dceb66d Patch to support image descriptions in Pleroma FE Wim Vanderbauwhede 2019-01-04 15:22:02 +0000
  • 5b23dfa1c5 handle null cascode 2019-01-04 01:35:26 -0800
  • d9d62a110c Merge branch 'mr/retry-queue-remove-fold' into 'develop' kaniini 2019-01-03 22:30:02 +0000
  • ccdc916f95 Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop' kaniini 2019-01-03 22:29:36 +0000
  • 53f56039e5
    Remove media proxy examples in config/config.exs href 2019-01-03 20:20:11 +0100
  • eaaf701319 Merge branch 'fix/follow-requests-deleted-accounts' into 'develop' kaniini 2019-01-03 18:53:30 +0000
  • b73a1a33de Merge branch 'captcha' into 'develop' rinpatch 2019-01-03 17:04:27 +0000
  • 9ef664ffce Merge branch 'fix-chat' into 'develop' rinpatch 2019-01-03 08:59:05 +0000
  • eb1a18d22f user: check that the follow request actually has an active account associated with it William Pitcock 2019-01-02 22:47:12 +0000
  • 943211b035 rewrites List.foldl to Enum.each Michael Loftis 2019-01-01 15:40:57 +0000
  • d1983ed028 Merge branch 'fix/reserve-media-username' into 'develop' rinpatch 2019-01-02 16:23:46 +0000
  • 5142b50f39 reserve /media Rin Toshaka 2019-01-02 17:16:26 +0100
  • 48e81d3d40 Add RichMediaController and tests Maxim Filippov 2019-01-02 17:02:50 +0300
  • 8910e103ce Add handler for Phoenix-style socket. lain 2019-01-02 11:39:11 +0100
  • 4e1cc2bab6 Implement delete activity sxsdv1 2019-01-01 23:19:40 +0100
  • 551c3d9391 Split create activity specifics from update_outbox sxsdv1 2019-01-01 22:16:46 +0100
  • 917d48d09b Better variable name Maxim Filippov 2019-01-01 23:29:47 +0300
  • 2aab4e03c3 Add OGP parser Maxim Filippov 2019-01-01 23:26:40 +0300
  • 32bed66471 Merge branch 'pool-usage' into 'develop' kaniini 2019-01-01 20:12:34 +0000
  • 34fa709015 Merge branch 'configurable-federator' into 'develop' rinpatch 2019-01-01 18:55:59 +0000
  • b9ac7067eb Merge branch '2019-1-1-update-frontend' into 'develop' lambda 2019-01-01 16:55:37 +0000
  • 1dd0e0ed4c update frontend lain 2019-01-01 17:45:03 +0100
  • 1a0391c8a4 Add documentation. lain 2019-01-01 17:40:42 +0100
  • 32541172cd Merge branch 'cleanup/admin-api-useless-if' into 'develop' lambda 2019-01-01 13:48:59 +0000
  • 400337b0a7 Make Federator options configurable. lain 2019-01-01 14:46:55 +0100
  • 096a927805 Merge remote-tracking branch 'origin/develop' into pool-usage lain 2019-01-01 14:19:55 +0100
  • 91afbbe4ea Update Tesla and Hackney. lain 2019-01-01 13:49:48 +0100
  • d4799e0dc2 Remove default pool, it's used automatically anyway. lain 2019-01-01 13:49:24 +0100
  • 1e6c102bfc
    Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete Haelwenn (lanodan) Monnier 2018-12-31 12:18:59 +0100
  • 90e157ef80 Merge branch 'features/admin-api-user-views' into 'develop' kaniini 2018-12-31 15:49:34 +0000
  • 1b1e928667 Merge branch 'docs/admin-api' into 'develop' kaniini 2018-12-31 15:49:01 +0000
  • ede3fd7459 Merge branch 'maintenance/copyright-2019' into 'develop' kaniini 2018-12-31 15:43:07 +0000
  • 980b5288ed update copyright years to 2019 William Pitcock 2018-12-31 15:41:47 +0000
  • 286632dfa2
    Add docs/Admin-API.md Haelwenn (lanodan) Monnier 2018-12-31 12:13:17 +0100
  • 33e3a7ba7d Merge branch 'fix/scrubber-cache' into 'develop' lambda 2018-12-31 09:56:26 +0000
  • 9f5881cbb1 Fix a typo in user_test.ex Rin Toshaka 2018-12-31 08:34:14 +0100
  • 6ed9b31a5f Eh? Rin Toshaka 2018-12-31 08:25:48 +0100
  • 7e09c2bd7d Move scrubber cache-related functions to Pleroma.HTML Rin Toshaka 2018-12-31 08:19:48 +0100
  • 8e7da98b18 Merge branch 'mr/retry-queue' into 'develop' kaniini 2018-12-30 21:47:50 +0000
  • 05743e2000 Get default scrubbers from config instead of hardcoded rinpatch 2018-12-31 00:12:14 +0300
  • 91d5a7e81c Fix test failure rinpatch 2018-12-31 00:03:03 +0300
  • dec23500d8 Resolve merge conflict Rin Toshaka 2018-12-30 21:00:40 +0100
  • ab3089d6a7 Fix comment in object.ex Rin Toshaka 2018-12-30 20:51:31 +0100
  • dfde2622d0 Merge branch 'activitypub-c2s' into 'develop' kaniini 2018-12-30 19:50:15 +0000
  • c50353e6ae shame on me for not testing after revert Rin Toshaka 2018-12-30 20:44:17 +0100
  • 3f9da55adc Fix formating. Aparently my pre-commit hook broke. Rin Toshaka 2018-12-30 20:16:42 +0100
  • 62af23bd26 Revert some changes in html.ex Rin Toshaka 2018-12-30 20:12:12 +0100
  • c119ea3a57 Friendship ended with Postgresql now Cachex is my best friend Rin Toshaka 2018-12-30 20:00:01 +0100
  • 535fddd286 Friendship ended with Postgresql now Cachex is my best friend Rin Toshaka 2018-12-30 19:33:36 +0100
  • d9f40b05b3 Added get_stripped_html_for_object. Renamed a few things Rin Toshaka 2018-12-30 16:51:16 +0100
  • cb286fdeba Improves RetryQueue behavior Michael Loftis 2018-12-30 15:16:26 +0000
  • bce152aba0 Tidy up the code. Rename key to signature Rin Toshaka 2018-12-30 15:58:19 +0100
  • 66d1c31461 Fix some stupid typos Rin Toshaka 2018-12-30 13:51:01 +0100
  • f40562b4e1 Respond with full activity to outbox post sxsdv1 2018-12-30 11:19:53 +0100
  • 1e781715c8 Limit activity types accepted to outbox to only 'Create' sxsdv1 2018-12-29 18:22:40 +0100
  • 569bad8210 Create activity when client posts to outbox sxsdv1 2018-12-29 18:21:45 +0100
  • 26dc2dddab Implement ActivityPub inbox view sxsdv1 2018-12-29 18:15:28 +0100
  • a32e23905a Use Object.change instead of Ecto.Changeset.change Rin Toshaka 2018-12-30 11:08:19 +0100
  • aa082ca7b6 Wire up stub routes for client calls of activitypub inbox/outbox sxsdv1 2018-12-29 18:01:15 +0100
  • 9a0163db53 use Kernel.put_in instead of Map.merge Rin Toshaka 2018-12-29 21:50:34 +0100
  • 816db3f494 Remove the debugging IO.inspect vaartis 2018-12-29 17:44:26 +0000
  • f5d7b0003e Merge branch 'fix_485' into 'develop' Haelwenn 2018-12-29 17:30:31 +0000
  • 19f9889fbe I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD Rin Toshaka 2018-12-29 17:45:50 +0100
  • e8ba390fe9 Merge branch '2018-12-29-update-frontend' into 'develop' lambda 2018-12-29 13:47:45 +0000
  • e1227d812c update frontend lain 2018-12-29 14:30:44 +0100
  • 3dc5f04976 Merge branch 'carrot-bullying' into 'develop' kaniini 2018-12-29 11:46:06 +0000
  • ab9cda315f Change 'name' to 'instance_name' so option is used when running non-interactive spctrl 2018-12-29 12:43:54 +0100