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

Commit Graph

  • effcc52ffd
         Don't expose remote accounts to search engines fix/dont-expose-remote-accounts-to-search-engines Egor Kislitsyn 2020-03-12 20:32:00 +04:00
  • 3ad2aac00b Merge remote-tracking branch 'upstream/feature/funkwhale-audio' into neckbeard Your New SJW Waifu 2020-03-12 11:44:13 -05:00
  • 8b4e01660f Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-12 11:36:13 -05:00
  • 39ed608b13
         Merge branch 'develop' into gun Alexander Strizhakov 2020-03-12 18:31:10 +03:00
  • 1306b92997
         clean up Alexander Strizhakov 2020-03-12 18:28:54 +03:00
  • d1c7f8e576
         Merge remote-tracking branch 'origin/develop' into global-status-expiration Egor Kislitsyn 2020-03-12 16:02:24 +04:00
  • 19ad944056
         frontends dir frontend-dl-task Alexander Strizhakov 2020-03-12 14:31:04 +03:00
  • bd40880fa0 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions Ivan Tashkinov 2020-03-12 12:07:07 +03:00
  • bf95bf3492
         Merge branch 'develop' into frontend-dl-task Alexander Strizhakov 2020-03-12 08:56:31 +03:00
  • 00d1752031 Merge branch 'docs/new_user' into 'develop' rinpatch 2020-03-11 20:26:50 +00:00
  • 2019f3b3ff Merge branch 'fix/signup-without-email' into 'develop' feld 2020-03-11 16:53:05 +00:00
  • 7cdabdc0df Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' rinpatch 2020-03-11 15:16:18 +00:00
  • f92c447bbc Merge branch 'relay-list-change' into 'develop' feld 2020-03-11 15:10:09 +00:00
  • c3b9fbd3a7 Revert "Set better Cache-Control header for static content" rinpatch 2020-03-11 17:58:25 +03:00
  • fce090c1de
         using Pleroma.Config instead of ets Alexander Strizhakov 2020-03-11 17:22:50 +03:00
  • 193d67cde5
         compile fix Alexander Strizhakov 2020-03-11 16:43:58 +03:00
  • 282a93554f
         merging release default config on app start Alexander Strizhakov 2020-03-11 16:25:53 +03:00
  • 863ec33ba2
         Add support for funkwhale Audio activity Haelwenn (lanodan) Monnier 2020-03-11 12:21:44 +01:00
  • 5b696a8ac1 [#1560] Enforced authentication for non-federating instances in StaticFEController. Ivan Tashkinov 2020-03-11 14:05:56 +03:00
  • 9dbf493b65 Merge branch 'docs/debian-install' into 'develop' rinpatch 2020-03-11 10:39:06 +00:00
  • 6316726a5f
         CLI_tasks: Use manpage formatting conventions Haelwenn (lanodan) Monnier 2020-03-11 08:46:57 +01:00
  • a06104b9d5
         CLI_tasks/user.md: Fix pleroma.user new documentation Haelwenn (lanodan) Monnier 2020-03-11 08:35:46 +01:00
  • 8ad73445cd Merge branch 'bugfix/bad-pleromafe-bundle' into 'develop' Haelwenn 2020-03-11 07:25:35 +00:00
  • 3d3f1509f9
         installation: Add ERL_EPMD_ADDRESS=127.0.0.1,::1 to services fix/epmd-loopback Haelwenn (lanodan) Monnier 2020-03-11 07:51:46 +01:00
  • 972889550d Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions Ivan Tashkinov 2020-03-11 09:15:55 +03:00
  • a747eb6df9
         static-fe.css: Restore from before a65ee8ea Haelwenn (lanodan) Monnier 2020-03-11 06:35:18 +01:00
  • 28dba91279 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-10 21:37:35 -05:00
  • 953aece848 Merge branch 'fix/post-length-validation' into 'develop' lain 2020-03-10 18:16:10 +00:00
  • 5af798f246 Fix enforcement of character limits Mark Felder 2020-03-10 13:08:00 -05:00
  • f39e1b9eff
         add verify tls_opts only when we open connection Alexander Strizhakov 2020-03-10 15:54:11 +03:00
  • 426f5ee48a
         tesla adapter can't be changed in adminFE Alexander Strizhakov 2020-03-10 15:31:44 +03:00
  • d9134d4430
         installation/otp_en.md: Fix pleroma.nginx target [deb] Haelwenn (lanodan) Monnier 2020-03-10 11:49:02 +01:00
  • c9bf8ec752 Merge branch 'develop' into contextes-boundaries rustra 2020-03-09 21:46:57 +01:00
  • 5fc92deef3 [#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring. Ivan Tashkinov 2020-03-09 20:51:44 +03:00
  • 841e4e4d83 Merge branch 'patch-1' into 'develop' lain 2020-03-09 13:36:21 +00:00
  • d9f8941dac
         Merge branch 'develop' into gun Alexander Strizhakov 2020-03-09 10:56:33 +03:00
  • 9fcfe55005 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-08 18:02:26 -05:00
  • 5b74976c8d Merge branch 'chore/mix-version-bump' into 'develop' rinpatch 2020-03-08 20:31:54 +00:00
  • 86e7709a4d mix.exs: bump version to development one rinpatch 2020-03-08 23:24:30 +03:00
  • a68fe6c172 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-08 10:35:32 -05:00
  • 663e466067 Merge branch 'stable' into 'develop' rinpatch 2020-03-08 13:42:15 +00:00
  • a85194e94d Merge branch 'develop' into issue/1469 issue/1469 Maksim Pechnikov 2020-03-08 14:23:41 +03:00
  • edb659dc57 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-03-08 14:10:45 +03:00
  • e8493431bf Merge branch 'release/2.0.0' into 'stable' v2.0.0 rinpatch 2020-03-08 10:38:35 +00:00
  • bb71117816 neckbeard v2.0 Your New SJW Waifu 2020-03-07 11:56:25 -06:00
  • e7c49d51d7 pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af rinpatch 2020-03-07 18:18:43 +03:00
  • 80ca06227a Merge branch 'fix/moderation-log-crashes' into 'release/2.0.0' rinpatch 2020-03-07 14:45:00 +00:00
  • 6cf1958b02 moderation log: fix improperly migrated data rinpatch 2020-03-07 13:51:28 +03:00
  • 474ef512df wait in mix task while pleroma is rebooted Alexander Strizhakov 2020-02-18 18:10:39 +03:00
  • b2eb1124d1
         Merge branch 'develop' into gun Alexander Strizhakov 2020-03-07 12:41:37 +03:00
  • 6d797b9928 Merge branch 'restart-fix-for-mix-tasks' into 'develop' rinpatch 2020-03-07 09:32:29 +00:00
  • 5f42ecc4c7
         start gun upload pool, if proxy_remote is enabled Alexander Strizhakov 2020-03-07 12:24:39 +03:00
  • 9f884a2639
         tests changes Alexander Strizhakov 2020-03-07 11:01:37 +03:00
  • 14678a7708
         using stub instead expect Alexander Strizhakov 2020-03-07 10:12:34 +03:00
  • 4eca0a752e Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-06 15:34:45 -06:00
  • f259b1adab Merge branch 'update/adminfe-2.0.0-release' into 'release/2.0.0' rinpatch 2020-03-06 20:23:39 +00:00
  • 78282dc983
         little polishing Alexander Strizhakov 2020-03-06 21:24:19 +03:00
  • c93c3096d5
         little refactor Alexander Strizhakov 2020-03-06 21:04:18 +03:00
  • 56ff02f2ef
         removing GunMock to use Mox Alexander Strizhakov 2020-03-06 20:23:58 +03:00
  • 46f118d7e1 Merge branch 'revert-67cc4dce' into 'develop' feld 2020-03-06 16:03:24 +00:00
  • 15d36b7f5f Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'" feld 2020-03-06 15:56:41 +00:00
  • e25bacabb1 Remove EmojiPacks from AdminFE build Mark Felder 2020-03-06 09:54:38 -06:00
  • 67cc4dceb5 Merge branch 'update/admin-fe-without-emojipack' into 'develop' lain 2020-03-06 15:14:10 +00:00
  • d283c9abc1 Remove emoji support from AdminFE Mark Felder 2020-03-06 07:53:33 -06:00
  • 027714b519 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions Ivan Tashkinov 2020-03-06 11:48:30 +03:00
  • 424756eec6 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-05 17:14:13 -06:00
  • 8ee3424401 Merge branch 'develop' into contextes-boundaries rustra 2020-03-05 22:01:28 +01:00
  • a65ee8ead6 pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd rinpatch 2020-03-05 23:41:47 +03:00
  • 4271cfb81a Merge branch 'stable' into release/2.0.0 rinpatch 2020-03-05 22:38:38 +03:00
  • 7605fe5065 Merge branch 'stable' into release/2.0.0 rinpatch 2020-03-05 22:36:35 +03:00
  • 3508ae7039 version bump changelog and mix version rinpatch 2020-03-05 22:35:23 +03:00
  • 69a85e9c82 changelog: sync with stable rinpatch 2020-03-05 22:28:37 +03:00
  • 40765875d4 [#1560] Misc. improvements in ActivityPubController federation state restrictions. Ivan Tashkinov 2020-03-05 21:19:21 +03:00
  • 931111fd55
         removing integration tests Alexander Strizhakov 2020-03-05 18:57:45 +03:00
  • 058c9b01ac
         returning, not needed Alexander Strizhakov 2020-03-05 18:28:04 +03:00
  • f0753eed0f
         removing try block in tesla request Alexander Strizhakov 2020-03-05 17:31:06 +03:00
  • ad22e94f33 Exclude private and direct statuses visible to the admin when using godmode eugenijm 2020-03-05 15:01:45 +03:00
  • 47604907c9 Merge branch 'proper_error_messages' into 'develop' lain 2020-03-05 11:49:51 +00:00
  • f1750b4658 Admin API tests: Fix wrong test. lain 2020-03-05 12:42:02 +01:00
  • 927079e2ff Merge branch 'fix/stats-on-startup' into 'develop' Haelwenn 2020-03-05 07:25:23 +00:00
  • eb324467d9
         removing try block in getting gun info Alexander Strizhakov 2020-03-05 09:51:52 +03:00
  • ec3dc462ff Document the instance stats fix Mark Felder 2020-03-04 13:41:04 -06:00
  • cdb05633a6 Generate instance stats on startup Mark Felder 2020-03-04 13:33:26 -06:00
  • 9b740cfb23 Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop' feld 2020-03-04 18:22:37 +00:00
  • b34bc669b9
         adding descriptions Alexander Strizhakov 2020-03-04 20:09:18 +03:00
  • 4bce13fa2f MastodonController: Return 404 errors correctly. lain 2020-03-04 18:09:06 +01:00
  • fe47bcde8c
         updating tesla ref Alexander Strizhakov 2020-03-04 19:44:03 +03:00
  • d6bebd4f9c
         moving some logic to tesla adapter Alexander Strizhakov 2020-03-04 18:13:24 +03:00
  • 6f7a8c43a2 Merge branch 'fix/no-email-no-fail' into 'develop' lain 2020-03-04 12:43:06 +00:00
  • 22d52f5691
         same copyright date format Alexander Strizhakov 2020-03-04 09:41:23 +03:00
  • 6b2fb9160c
         otp version Alexander Strizhakov 2020-03-04 09:23:42 +03:00
  • 8d9dee1ba9
         retry_timeout description change Alexander Strizhakov 2020-03-04 08:56:36 +03:00
  • d9c5ae7c09 Update Copyrights for gun related files Mark Felder 2020-03-03 17:16:24 -06:00
  • 4427161ca3 Merge branch 'develop' into gun Mark Felder 2020-03-03 17:15:49 -06:00
  • 5992c256ad Merge branch 'chore/update-copyrights' into 'develop' Haelwenn 2020-03-03 23:15:12 +00:00
  • 5592db4757 Older copyright updates Mark Felder 2020-03-03 16:46:45 -06:00
  • 05da5f5cca Update Copyrights Mark Felder 2020-03-03 16:44:49 -06:00
  • b6fc98d9cd [#1560] ActivityPubController federation state restrictions adjustments. Adjusted tests. Ivan Tashkinov 2020-03-03 22:22:02 +03:00
  • 884d9710b2
         refactoring for gun api modules Alexander Strizhakov 2020-03-03 19:24:14 +03:00
  • 23f407bf09
         don't test gun itself Alexander Strizhakov 2020-03-03 18:57:16 +03:00