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

Commit Graph

  • ede3fd7459 Merge branch 'maintenance/copyright-2019' into 'develop' kaniini 2018-12-31 15:43:07 +00:00
  • 980b5288ed update copyright years to 2019 William Pitcock 2018-12-31 15:41:47 +00:00
  • 286632dfa2
         Add docs/Admin-API.md Haelwenn (lanodan) Monnier 2018-12-31 12:13:17 +01:00
  • 33e3a7ba7d Merge branch 'fix/scrubber-cache' into 'develop' lambda 2018-12-31 09:56:26 +00:00
  • 9f5881cbb1 Fix a typo in user_test.ex Rin Toshaka 2018-12-31 08:34:14 +01:00
  • 6ed9b31a5f Eh? Rin Toshaka 2018-12-31 08:25:48 +01:00
  • 7e09c2bd7d Move scrubber cache-related functions to Pleroma.HTML Rin Toshaka 2018-12-31 08:19:48 +01:00
  • 8e7da98b18 Merge branch 'mr/retry-queue' into 'develop' kaniini 2018-12-30 21:47:50 +00:00
  • 05743e2000 Get default scrubbers from config instead of hardcoded rinpatch 2018-12-31 00:12:14 +03:00
  • 91d5a7e81c Fix test failure rinpatch 2018-12-31 00:03:03 +03:00
  • dec23500d8 Resolve merge conflict Rin Toshaka 2018-12-30 21:00:40 +01:00
  • ab3089d6a7 Fix comment in object.ex Rin Toshaka 2018-12-30 20:51:31 +01:00
  • dfde2622d0 Merge branch 'activitypub-c2s' into 'develop' kaniini 2018-12-30 19:50:15 +00:00
  • c50353e6ae shame on me for not testing after revert Rin Toshaka 2018-12-30 20:44:17 +01:00
  • 3f9da55adc Fix formating. Aparently my pre-commit hook broke. Rin Toshaka 2018-12-30 20:16:42 +01:00
  • 62af23bd26 Revert some changes in html.ex Rin Toshaka 2018-12-30 20:12:12 +01:00
  • c119ea3a57 Friendship ended with Postgresql now Cachex is my best friend Rin Toshaka 2018-12-30 20:00:01 +01:00
  • 535fddd286 Friendship ended with Postgresql now Cachex is my best friend Rin Toshaka 2018-12-30 19:33:36 +01:00
  • d9f40b05b3 Added get_stripped_html_for_object. Renamed a few things Rin Toshaka 2018-12-30 16:51:16 +01:00
  • cb286fdeba Improves RetryQueue behavior Michael Loftis 2018-12-30 15:16:26 +00:00
  • bce152aba0 Tidy up the code. Rename key to signature Rin Toshaka 2018-12-30 15:58:19 +01:00
  • 66d1c31461 Fix some stupid typos Rin Toshaka 2018-12-30 13:51:01 +01:00
  • f40562b4e1 Respond with full activity to outbox post sxsdv1 2018-12-30 11:19:53 +01:00
  • 1e781715c8 Limit activity types accepted to outbox to only 'Create' sxsdv1 2018-12-29 18:22:40 +01:00
  • 569bad8210 Create activity when client posts to outbox sxsdv1 2018-12-29 18:21:45 +01:00
  • 26dc2dddab Implement ActivityPub inbox view sxsdv1 2018-12-29 18:15:28 +01:00
  • a32e23905a Use Object.change instead of Ecto.Changeset.change Rin Toshaka 2018-12-30 11:08:19 +01:00
  • aa082ca7b6 Wire up stub routes for client calls of activitypub inbox/outbox sxsdv1 2018-12-29 18:01:15 +01:00
  • 9a0163db53 use Kernel.put_in instead of Map.merge Rin Toshaka 2018-12-29 21:50:34 +01:00
  • 816db3f494 Remove the debugging IO.inspect vaartis 2018-12-29 17:44:26 +00:00
  • f5d7b0003e Merge branch 'fix_485' into 'develop' Haelwenn 2018-12-29 17:30:31 +00:00
  • 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 +01:00
  • e8ba390fe9 Merge branch '2018-12-29-update-frontend' into 'develop' lambda 2018-12-29 13:47:45 +00:00
  • e1227d812c update frontend lain 2018-12-29 14:30:44 +01:00
  • 3dc5f04976 Merge branch 'carrot-bullying' into 'develop' kaniini 2018-12-29 11:46:06 +00:00
  • ab9cda315f Change 'name' to 'instance_name' so option is used when running non-interactive spctrl 2018-12-29 12:43:54 +01:00
  • dd8f2196f6 Merge branch '483_blocks_import_export' into 'develop' kaniini 2018-12-29 11:34:51 +00:00
  • 7117ab43af Merge branch 'support/issue_480' into 'develop' kaniini 2018-12-29 11:32:24 +00:00
  • 523848d1fd Salmon# fixed publish an activity to remote accounts Maksim Pechnikov 2018-12-29 12:48:54 +03:00
  • 242cc9a658 [#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests. Ivan Tashkinov 2018-12-29 12:26:23 +03:00
  • 7bd49a3222 [#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests. Ivan Tashkinov 2018-12-29 12:26:23 +03:00
  • b3574dccbb [#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname (<nick>@<our_instance_host>). Ivan Tashkinov 2018-12-29 12:15:46 +03:00
  • 67b4297f4d [#483] Refactored blocks and follows import, added tests. Ivan Tashkinov 2018-12-29 12:02:37 +03:00
  • 49cf5f9ce0 Merge branch '471_invalid_accounts_rendering' into 'develop' kaniini 2018-12-29 03:03:18 +00:00
  • 89fbed8821 Merge branch 'systemd-drop-sysadmin-privilege' into 'develop' kaniini 2018-12-28 20:14:29 +00:00
  • 64035201b5
         Security/Drops the sysadmin privilege from the daemon shibayashi 2018-12-28 21:09:48 +01:00
  • 700661b761 [#483] Blocked users list import (TwitterAPI). Ivan Tashkinov 2018-12-28 23:01:03 +03:00
  • 0a41786624 [#467] Refactored valid / invalid user rendering. Ivan Tashkinov 2018-12-28 22:47:42 +03:00
  • 9c782e59dd Raise remote limit lambda 2018-12-28 18:57:50 +00:00
  • 68f483ef4c Merge branch 'fix/no-attachment-links' into 'develop' kaniini 2018-12-28 18:33:14 +00:00
  • 1cd825519c Merge branch 'fix/public-timeline-auth' into 'develop' kaniini 2018-12-28 18:30:36 +00:00
  • 6e9a15b181 [#483] Blocked users export for TwitterAPI. Ivan Tashkinov 2018-12-28 21:08:07 +03:00
  • b43d630f30
         Web.TwitterAPI.UserView: Add rights.admin Haelwenn (lanodan) Monnier 2018-12-23 18:31:37 +01:00
  • 0d1788ce44 [#471] Factored out User.visible_for?/2. Ivan Tashkinov 2018-12-28 14:35:25 +03:00
  • d8cc96cb1f Fix Twitter timelines for private instances Vyr Cossont 2018-12-27 22:43:40 -08:00
  • e1de866f95 Merge branch '396_elixir_1.7' into 'develop' Haelwenn 2018-12-27 22:10:39 +00:00
  • bee6acd51d Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop' kaniini 2018-12-27 19:37:55 +00:00
  • cff0292d4b Merge branch 'reserve-user-names' into 'develop' kaniini 2018-12-27 19:35:06 +00:00
  • 02866a42af Merge branch 'feature/exclude_reblogs' into 'develop' kaniini 2018-12-27 19:22:31 +00:00
  • d8fd6a1055 [#396] Updated ex_doc version spec. Updated README to reflect Elixir version. Ivan Tashkinov 2018-12-27 16:32:47 +03:00
  • 58b12c09db [Fixes #396] Required Elixir ~> 1.7. Ivan Tashkinov 2018-12-27 16:12:33 +03:00
  • e6aeb1d4a5 [#471] Prevented rendering of inactive local accounts. Ivan Tashkinov 2018-12-27 15:46:18 +03:00
  • be70272ab0 Treat only true and "true" as true Maxim Filippov 2018-12-27 13:21:04 +03:00
  • 708a228919 Set ttl_interval to the seconds_valid time vaartis 2018-12-27 07:42:03 +00:00
  • e4562105e7 Implement exclude_reblogs and include_rts Vyr Cossont 2018-12-26 21:30:01 -08:00
  • 838c024231 Treat any present value in "no_attachment_links" as true Maxim Filippov 2018-12-27 02:39:41 +03:00
  • 448af3601a Up captcha timer to 60 secs again, save used captchas in cachex Ekaterina Vaartis 2018-12-27 00:12:20 +03:00
  • 92b114499f Merge branch 'fix/ci-set-mix-env-globally' into 'develop' Haelwenn 2018-12-26 20:11:07 +00:00
  • e31b4d05a8 [CI] Set MIX_ENV to test in variables section instead of specifying it before the command. Fix mix compile compiling in the dev env. Rin Toshaka 2018-12-26 18:50:52 +01:00
  • 1dd71026a1 Add 'about' to restricted list. lain 2018-12-26 14:51:51 +01:00
  • 8da2c45c27 Add ~ to the list of restricted names. lain 2018-12-26 14:16:41 +01:00
  • 551d80cc01 Expose restricted names in nodeinfo. lain 2018-12-26 12:46:16 +01:00
  • 5811e65e67 Add some hard limits on inserted activities. lain 2018-12-26 12:39:35 +01:00
  • 012b7ab5e6 Add test to check /object/:id does not leak the tombstone itself Maxim Filippov 2018-12-25 23:40:57 +03:00
  • 91724d160a Reserve a few user names lain 2018-12-25 20:09:27 +01:00
  • 922abcda61 Merge branch 'legal-boilerplate' into 'develop' lambda 2018-12-25 17:53:48 +00:00
  • 340dd7a75e Format Maxim Filippov 2018-12-25 03:47:20 +03:00
  • ca2e9ce9cc Revert unneeded changes Maxim Filippov 2018-12-25 03:44:48 +03:00
  • ab2ee43634 Fix Activity test Maxim Filippov 2018-12-25 03:41:14 +03:00
  • aeb89bece6 Remove unused test Maxim Filippov 2018-12-25 03:38:02 +03:00
  • f75f707f6c Revert Activity tombstones, add ObjectTombstone struct Maxim Filippov 2018-12-25 03:00:06 +03:00
  • 2bbec33c71 Fix failing tests Maxim Filippov 2018-12-25 00:29:13 +03:00
  • 18a4cbb244 Capitalize "tombstone" Maxim Filippov 2018-12-24 20:09:18 +03:00
  • 0f412cf6e6 Create tombstone instead of object deletion Maxim Filippov 2018-12-24 02:25:36 +03:00
  • 3c08d229db tests: add legal boilerplate William Pitcock 2018-12-23 20:11:29 +00:00
  • 69ad1039ba mix tasks: add legal boilerplate William Pitcock 2018-12-23 20:05:55 +00:00
  • 2791ce9a1f add license boilerplate to pleroma core William Pitcock 2018-12-23 20:04:54 +00:00
  • 005b4194ff Merge branch 'bugfix/trans_fix_url_videos' into 'develop' lambda 2018-12-23 14:46:58 +00:00
  • a2bceaf688 tests: twitter api: add test proving that peertube videos are correctly handled William Pitcock 2018-12-23 13:59:06 +00:00
  • 34a4ed22c4 twitter api: add "Video" to supported activity types list William Pitcock 2018-12-23 13:58:45 +00:00
  • 873938d223 tests: twitter api: activity view test: enable tesla mock William Pitcock 2018-12-23 13:55:08 +00:00
  • 79b51a97fe twitter api: activity representer: remove peertube hack William Pitcock 2018-12-23 13:53:25 +00:00
  • 9f48485f64 tests: mastodon api: add test verifying that peertube videos are correctly rendered William Pitcock 2018-12-23 13:42:42 +00:00
  • 32dfc1d12a mastodon api: status view: remove obsolete peertube hack William Pitcock 2018-12-23 13:40:33 +00:00
  • 71f6d9f418 transmogrifier: significantly rework handling of peertube videos, add test William Pitcock 2018-12-23 13:28:17 +00:00
  • a3e33fa177 Merge branch 'hotfix/activity-without-content' into 'develop' lambda 2018-12-23 13:17:25 +00:00
  • 3aff8067e4 transmogrifier: When it’s a Video move "url" to "attachment" Haelwenn (lanodan) Monnier 2018-11-17 18:34:45 +01:00
  • 093d39b634 Merge branch 'feature/hellthread-mitigation' into 'develop' kaniini 2018-12-23 11:28:43 +00:00
  • a7f07bb6e5 Implement kaniini's tweaks Karen Konou 2018-12-23 12:24:53 +01:00
  • c76179419d Renamed the things Karen Konou 2018-12-23 11:14:29 +01:00