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

Commit Graph

  • 1881680e28 Merge branch 'scarlett/pleroma-summary-html-api' into 'develop' lambda 2019-01-09 16:26:38 +00:00
  • 8df348a3da Add test for summary_html lain 2019-01-09 17:18:37 +01:00
  • 04735db193 Build the index concurrently. lain 2019-01-09 16:55:05 +01:00
  • 5027f82cde Add activity visibility index. lain 2019-01-09 16:45:09 +01:00
  • 6cbe63726d improve tests Egor Kislitsyn 2019-01-09 19:54:37 +07:00
  • 44a1e69484 Add Twitter API for the pinned statuses Egor Kislitsyn 2019-01-09 19:54:19 +07:00
  • 9854978b8b Remove recent activity restriction. lain 2019-01-09 12:38:23 +01:00
  • 1b06e6fdf3 only non-reblogs, self-authored, public statuses can be pinned Egor Kislitsyn 2019-01-09 17:40:15 +07:00
  • 65fc2df7cc Use follow_all in autofollow. lain 2019-01-09 11:38:45 +01:00
  • 26938d65fd Add User mass following function. lain 2019-01-09 11:35:23 +01:00
  • 28afcb7c31 move defaults from sample_config.exs to config.exs Egor Kislitsyn 2019-01-09 17:02:30 +07:00
  • 48591aab98 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts Egor Kislitsyn 2019-01-09 16:56:31 +07:00
  • 20c0dd1e24 Support activity+json request for activity sxsdv1 2019-01-08 23:22:15 +01:00
  • 5c5c8508c2 Merge branch 'hotfix/media-proxy-uri' into 'develop' kaniini 2019-01-09 07:09:39 +00:00
  • 567651fb3f test: user: add tests for visible_for?/2 William Pitcock 2019-01-09 07:03:32 +00:00
  • f2a4f89abe tests: user: add tests for superuser?/1 William Pitcock 2019-01-09 06:50:31 +00:00
  • f15183178c user: fix auth_active?/1 for remote users William Pitcock 2019-01-09 06:45:17 +00:00
  • 0015d43e13 user: factor out illogical User.Info.superuser?/1. William Pitcock 2019-01-09 06:41:25 +00:00
  • 74f48beec3 user: remove entirely redundant remote_or_auth_active?/1. William Pitcock 2019-01-09 06:36:50 +00:00
  • 2af67353c5 user: harden auth_active?/1, superuser?/1, visible_for?/1 William Pitcock 2019-01-09 06:21:21 +00:00
  • 4124c9aa4a tests: user: add regression test for remote_or_auth_active?/1 William Pitcock 2019-01-09 05:02:00 +00:00
  • 595a970493 user: use pattern matching to determine if user is local or remote instead of the previous hairy logic William Pitcock 2019-01-09 04:46:03 +00:00
  • 3aee8bb67b Merge branch 'autofollow' into 'develop' rinpatch 2019-01-08 22:58:19 +00:00
  • 0c750bc432 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts Egor Kislitsyn 2019-01-08 16:32:07 +07:00
  • 6428ef77ad add default configuration for the pinned statuses and some doc Egor Kislitsyn 2019-01-08 16:11:03 +07:00
  • 7b6c5f0a9d improve test readability Egor Kislitsyn 2019-01-08 16:01:35 +07:00
  • 0fae04c4e3 Add a setting for users to autofollow on sign up. lain 2019-01-08 09:55:33 +01:00
  • db6f4496eb fix test Egor Kislitsyn 2019-01-08 15:32:06 +07:00
  • e679da4c34 add pinned property to StatusView Egor Kislitsyn 2019-01-08 15:27:02 +07:00
  • 63dbd87568 rename post to status Egor Kislitsyn 2019-01-08 15:25:50 +07:00
  • 4e5b156047 Merge branch 'features/syslog_logger' into 'develop' kaniini 2019-01-07 22:25:02 +00:00
  • 3065fa4dfd Merge branch 'spc-fix-2' into 'develop' kaniini 2019-01-07 20:39:46 +00:00
  • a16b17cc61 Actually put some onformation in the error user, make it actually properly parse in conversations. lain 2019-01-07 20:59:30 +01:00
  • 74e1093732 Merge branch 'resilient-user-view' into 'develop' kaniini 2019-01-07 17:09:52 +00:00
  • f24087f96e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts Egor Kislitsyn 2019-01-07 20:55:32 +07:00
  • 380e9fba21 add pinned posts Egor Kislitsyn 2019-01-07 20:45:33 +07:00
  • b640cf0ce0 Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop' lambda 2019-01-07 12:20:15 +00:00
  • 7dcafb4894 MastoAPI: Add test. lain 2019-01-07 13:13:37 +01:00
  • 7382adf407 Make TwAPI UserView more resilient to issues. lain 2019-01-07 12:41:31 +01:00
  • 36fa5e8802 Check visible_for_user when performing a search using a direct link. scarlett 2019-01-07 10:30:30 +00:00
  • 52493467ac Twitter API: Add a summary_html field. scarlett 2019-01-06 10:16:40 +00:00
  • c9b99d4486
         config/config.exs: Add syslog backends Haelwenn (lanodan) Monnier 2019-01-02 23:07:48 +01:00
  • 5bcea0deca
         Install ex_syslogger Haelwenn (lanodan) Monnier 2019-01-02 22:57:37 +01:00
  • b0e8e521fb Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop' kaniini 2019-01-05 22:54:25 +00:00
  • 042852ecf3 Add check to prevent multiple follow notifications from the same user Sadposter 2019-01-05 22:54:25 +00:00
  • 8d047c7a72 Merge branch 'fix/user-search-null-name' into 'develop' kaniini 2019-01-05 22:34:47 +00:00
  • 0b54c3d643 Merge branch 'fix_486' into 'develop' kaniini 2019-01-05 22:33:38 +00:00
  • 576368237c Merge branch 'activitypub-tombstone-fix' into 'develop' kaniini 2019-01-05 22:29:08 +00:00
  • 145d6fe6e9 Merge branch 'emoji-in-summary' into 'develop' scarlett 2019-01-05 21:52:02 +00:00
  • 57df7d6e1d Add tests for emoji and lack of HTML in summaries. scarlett 2019-01-05 21:46:42 +00:00
  • 096e121879 Remove redundant comma. scarlett 2019-01-05 18:25:36 +00:00
  • 6556be344d Resolve some test failures. scarlett 2019-01-05 18:20:42 +00:00
  • 3c86d907d4 add some brakets to the emoji list. scarlett 2019-01-05 17:35:39 +00:00
  • 0787f0dfbe Strip HTML in and allow emoji in summaries. scarlett 2019-01-05 17:28:47 +00:00
  • 2d7da5f437 Don't crash on AP request for tombstone sxsdv1 2019-01-05 10:38:38 +01:00
  • a81307251c Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name cascode 2019-01-04 20:32:55 -08:00
  • ba17518a0a Merge branch 'feature/rich-media-cachex' into 'develop' rinpatch 2019-01-04 23:56:42 +00:00
  • 487c00d36d rich media: disable cachex in test mode William Pitcock 2019-01-04 23:50:54 +00:00
  • bf5aaefbb5 Merge branch 'fix/html-cache-content-collision' into 'develop' kaniini 2019-01-04 23:35:56 +00:00
  • 0964c207eb rich media: use cachex to avoid flooding remote servers William Pitcock 2019-01-04 23:23:47 +00:00
  • 1e2d58982e oopsies Rin Toshaka 2019-01-05 00:25:31 +01:00
  • 846082e54f Different caches based on the module. Remove scrubber version since it is not relevant anymore Rin Toshaka 2019-01-05 00:19:46 +01:00
  • 4aa977d3b3 fix 486: Add option --assume-yes to allow it to work non-interactive spctrl 2019-01-04 22:11:46 +01:00
  • 4258dd8633 Merge branch 'feature/rich-media' into 'develop' kaniini 2019-01-04 20:50:18 +00:00
  • ffea81b84f Merge branch 'activitypub-c2s-delete-activity' into 'develop' kaniini 2019-01-04 20:32:10 +00:00
  • 4c5ee4c62b formatted cascode 2019-01-04 10:18:43 -08:00
  • ab6ebbae67 added test for #499 cascode 2019-01-04 10:14:13 -08:00
  • ba93396649 Patch to support image descriptions in Pleroma FE Wim Vanderbauwhede 2019-01-04 16:27:46 +00:00
  • 4c95545d19 Patch to support image descriptions in Pleroma FE Wim Vanderbauwhede 2019-01-04 15:35:41 +00:00
  • fe2dceb66d Patch to support image descriptions in Pleroma FE Wim Vanderbauwhede 2019-01-04 15:22:02 +00:00
  • 5b23dfa1c5 handle null cascode 2019-01-04 01:35:26 -08:00
  • d9d62a110c Merge branch 'mr/retry-queue-remove-fold' into 'develop' kaniini 2019-01-03 22:30:02 +00:00
  • ccdc916f95 Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop' kaniini 2019-01-03 22:29:36 +00:00
  • 53f56039e5
         Remove media proxy examples in config/config.exs href 2019-01-03 20:20:11 +01:00
  • eaaf701319 Merge branch 'fix/follow-requests-deleted-accounts' into 'develop' kaniini 2019-01-03 18:53:30 +00:00
  • b73a1a33de Merge branch 'captcha' into 'develop' rinpatch 2019-01-03 17:04:27 +00:00
  • 9ef664ffce Merge branch 'fix-chat' into 'develop' rinpatch 2019-01-03 08:59:05 +00:00
  • eb1a18d22f user: check that the follow request actually has an active account associated with it William Pitcock 2019-01-02 22:47:12 +00:00
  • 943211b035 rewrites List.foldl to Enum.each Michael Loftis 2019-01-01 15:40:57 +00:00
  • d1983ed028 Merge branch 'fix/reserve-media-username' into 'develop' rinpatch 2019-01-02 16:23:46 +00:00
  • 5142b50f39 reserve /media Rin Toshaka 2019-01-02 17:16:26 +01:00
  • 48e81d3d40 Add RichMediaController and tests Maxim Filippov 2019-01-02 17:02:50 +03:00
  • 8910e103ce Add handler for Phoenix-style socket. lain 2019-01-02 11:39:11 +01:00
  • 4e1cc2bab6 Implement delete activity sxsdv1 2019-01-01 23:19:40 +01:00
  • 551c3d9391 Split create activity specifics from update_outbox sxsdv1 2019-01-01 22:16:46 +01:00
  • 917d48d09b Better variable name Maxim Filippov 2019-01-01 23:29:47 +03:00
  • 2aab4e03c3 Add OGP parser Maxim Filippov 2019-01-01 23:26:40 +03:00
  • 32bed66471 Merge branch 'pool-usage' into 'develop' kaniini 2019-01-01 20:12:34 +00:00
  • 34fa709015 Merge branch 'configurable-federator' into 'develop' rinpatch 2019-01-01 18:55:59 +00:00
  • b9ac7067eb Merge branch '2019-1-1-update-frontend' into 'develop' lambda 2019-01-01 16:55:37 +00:00
  • 1dd0e0ed4c update frontend lain 2019-01-01 17:45:03 +01:00
  • 1a0391c8a4 Add documentation. lain 2019-01-01 17:40:42 +01:00
  • 32541172cd Merge branch 'cleanup/admin-api-useless-if' into 'develop' lambda 2019-01-01 13:48:59 +00:00
  • 400337b0a7 Make Federator options configurable. lain 2019-01-01 14:46:55 +01:00
  • 096a927805 Merge remote-tracking branch 'origin/develop' into pool-usage lain 2019-01-01 14:19:55 +01:00
  • 91afbbe4ea Update Tesla and Hackney. lain 2019-01-01 13:49:48 +01:00
  • d4799e0dc2 Remove default pool, it's used automatically anyway. lain 2019-01-01 13:49:24 +01:00
  • 1e6c102bfc
         Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete Haelwenn (lanodan) Monnier 2018-12-31 12:18:59 +01:00
  • 90e157ef80 Merge branch 'features/admin-api-user-views' into 'develop' kaniini 2018-12-31 15:49:34 +00:00
  • 1b1e928667 Merge branch 'docs/admin-api' into 'develop' kaniini 2018-12-31 15:49:01 +00:00