aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-03-13Update comment to reflect what the code is actually doingMark Felder
2020-03-13Do not trust remote Cache-Control headers for mediaproxyMark Felder
2020-03-13Merge branch 'revert/cache-control' into 'develop'rinpatch
Revert "Set better Cache-Control header for static content" Closes #1613 See merge request pleroma/pleroma!2290
2020-03-13Fix hashtags WebSocket streamingEgor Kislitsyn
2020-03-13Formatting: Do not use \n and prefer <br> insteadHaelwenn (lanodan) Monnier
It moves bbcode to bbcode_pleroma as the former is owned by kaniini and transfering ownership wasn't done in a timely manner. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374 Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-13more clean upAlexander Strizhakov
2020-03-12Merge branch 'exclude-posts-visible-to-admin' into 'develop'feld
Exclude private and direct statuses visible to the admin when using godmode Closes #1599 See merge request pleroma/pleroma!2272
2020-03-12Merge branch 'develop' into gunAlexander Strizhakov
2020-03-12clean upAlexander Strizhakov
2020-03-12Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions # Conflicts: # test/web/activity_pub/activity_pub_controller_test.exs
2020-03-11Merge branch 'fix/signup-without-email' into 'develop'feld
Allow account registration without an email See merge request pleroma/pleroma!2246
2020-03-11Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'rinpatch
Merging default release config on app start Closes #1610 See merge request pleroma/pleroma!2288
2020-03-11Merge branch 'relay-list-change' into 'develop'feld
Relay list shows hosts without accepted follow See merge request pleroma/pleroma!2240
2020-03-11Revert "Set better Cache-Control header for static content"rinpatch
On furher investigation it seems like all that did was cause unintuitive behavior. The emoji request flood that was the reason for introducing it isn't really that big of a deal either, since Plug.Static only needs to read file modification time and size to determine the ETag. Closes #1613
2020-03-11using Pleroma.Config instead of etsAlexander Strizhakov
2020-03-11compile fixAlexander Strizhakov
2020-03-11merging release default config on app startAlexander Strizhakov
2020-03-11Add support for funkwhale Audio activityHaelwenn (lanodan) Monnier
reel2bits fixture not included as it lacks the Actor fixture for it. Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624 Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-11[#1560] Enforced authentication for non-federating instances in ↵Ivan Tashkinov
StaticFEController.
2020-03-11Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions
2020-03-10Fix enforcement of character limitsMark Felder
2020-03-10add verify tls_opts only when we open connectionAlexander Strizhakov
for other requests tesla will add tls_opts
2020-03-10tesla adapter can't be changed in adminFEAlexander Strizhakov
2020-03-09[#1560] Ensured authentication or enabled federation for federation-related ↵Ivan Tashkinov
routes. New tests + tests refactoring.
2020-03-09Merge branch 'develop' into gunAlexander Strizhakov
2020-03-08Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-03-07moderation log: fix improperly migrated datarinpatch
Some of the actions used to have a user map as a subject, which was then changed to an array of user maps. However instead of migrating old data there was just a hack to transform it every time, moreover this hack didn't include all possible actions, which resulted in crashes. This commit fixes the crashes by introducing a proper database migration for old data. Closes #1606
2020-03-07wait in mix task while pleroma is rebootedAlexander Strizhakov
2020-03-07Merge branch 'develop' into gunAlexander Strizhakov
2020-03-07Merge branch 'restart-fix-for-mix-tasks' into 'develop'rinpatch
Wait in mix task while pleroma is rebooted See merge request pleroma/pleroma!2225
2020-03-07start gun upload pool, if proxy_remote is enabledAlexander Strizhakov
2020-03-06little polishingAlexander Strizhakov
2020-03-06little refactorAlexander Strizhakov
2020-03-06Merge remote-tracking branch 'remotes/origin/develop' into ↵Ivan Tashkinov
1560-non-federating-instances-routes-restrictions
2020-03-05[#1560] Misc. improvements in ActivityPubController federation state ↵Ivan Tashkinov
restrictions.
2020-03-05returning, not neededAlexander Strizhakov
2020-03-05removing try block in tesla requestAlexander Strizhakov
added mocks for tests which fail with Tesla.Mock.Error
2020-03-05Exclude private and direct statuses visible to the admin when using godmodeeugenijm
2020-03-05Merge branch 'proper_error_messages' into 'develop'lain
MastodonController: Return 404 errors correctly. See merge request pleroma/pleroma!2270
2020-03-05Merge branch 'fix/stats-on-startup' into 'develop'Haelwenn
Generate instance stats on startup Closes #1598 See merge request pleroma/pleroma!2271
2020-03-05removing try block in getting gun infoAlexander Strizhakov
2020-03-04Generate instance stats on startupMark Felder
2020-03-04Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'feld
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default Closes #1596 See merge request pleroma/pleroma!2267
2020-03-04MastodonController: Return 404 errors correctly.lain
2020-03-04moving some logic to tesla adapterAlexander Strizhakov
- checking original inside gun adapter - flushing streams on max_body error
2020-03-04Merge branch 'fix/no-email-no-fail' into 'develop'lain
Do not fail when user has no email See merge request pleroma/pleroma!2249
2020-03-04same copyright date formatAlexander Strizhakov
2020-03-04otp versionAlexander Strizhakov
2020-03-03Update Copyrights for gun related filesMark Felder
2020-03-03Merge branch 'develop' into gunMark Felder
generated by cgit v1.2.3 (git 2.26.2) at 2025-05-09 10:10:37 +0000