Dym Sohin [Thu, 9 Jul 2020 03:15:51 +0000 (03:15 +0000)]
added link to changelog, removed repetition
lain [Wed, 8 Jul 2020 10:55:03 +0000 (10:55 +0000)]
Merge branch '1895-hashtag-timeline-restrict-unauthenticated-fix' into 'develop'
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting
Closes #1895
See merge request pleroma/pleroma!2731
Ivan Tashkinov [Wed, 8 Jul 2020 09:54:23 +0000 (12:54 +0300)]
[#1895] credo fix.
Ivan Tashkinov [Wed, 8 Jul 2020 09:36:44 +0000 (12:36 +0300)]
[#1895] Applied code review suggestion.
Haelwenn [Wed, 8 Jul 2020 03:25:30 +0000 (03:25 +0000)]
Merge branch '1918-avatar-background-header-reset-2' into 'develop'
Resolve "Better support for resetting avatar/header/background"
Closes #1918
See merge request pleroma/pleroma!2729
Haelwenn [Wed, 8 Jul 2020 03:05:20 +0000 (03:05 +0000)]
Merge branch 'fix/twitter-rich-media-preview' into 'develop'
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
Closes #1923
See merge request pleroma/pleroma!2730
lain [Tue, 7 Jul 2020 18:26:07 +0000 (18:26 +0000)]
Merge branch 'remove-twitter-api' into 'develop'
Remove some TwitterAPI endpoints
See merge request pleroma/pleroma!2327
Ivan Tashkinov [Tue, 7 Jul 2020 17:44:16 +0000 (20:44 +0300)]
[#1895] Documentation hints on private instances and instance/restrict_unauthenticated setting.
Ivan Tashkinov [Tue, 7 Jul 2020 17:37:11 +0000 (20:37 +0300)]
[#1895] Made hashtag timeline respect `:restrict_unauthenticated` instance setting.
Mark Felder [Tue, 7 Jul 2020 16:21:05 +0000 (11:21 -0500)]
Add "Bot" to User Agent to coerce Twitter into serving OGP <meta> tags.
lain [Tue, 7 Jul 2020 15:13:23 +0000 (17:13 +0200)]
Update frontend
lain [Tue, 7 Jul 2020 14:51:44 +0000 (16:51 +0200)]
Changelog: Add info about avatar removal
lain [Tue, 7 Jul 2020 14:48:47 +0000 (16:48 +0200)]
AccountController: Remove unused `update_?` routes.
These were not documented and are also not used anymore.
lain [Tue, 7 Jul 2020 14:26:57 +0000 (16:26 +0200)]
Docs: Document resetting of images
lain [Tue, 7 Jul 2020 14:20:50 +0000 (16:20 +0200)]
AccountController: Allow removal / reset of user images.
lain [Tue, 7 Jul 2020 11:41:56 +0000 (11:41 +0000)]
Merge branch 'develop' into 'develop'
added hyper:// to default protocols
See merge request pleroma/pleroma!2727
lain [Tue, 7 Jul 2020 09:14:50 +0000 (09:14 +0000)]
Merge branch 'bugfix/peertube-videos' into 'develop'
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
Haelwenn [Tue, 7 Jul 2020 08:23:49 +0000 (08:23 +0000)]
Merge branch 'feature/1392-support-irreversible-filters' into 'develop'
Updates for Feature/1392 support irreversible filters
Closes #1392
See merge request pleroma/pleroma!2186
Haelwenn (lanodan) Monnier [Mon, 25 May 2020 11:13:42 +0000 (13:13 +0200)]
Fix getting videos from peertube
DYM [Tue, 7 Jul 2020 07:05:54 +0000 (09:05 +0200)]
added hyper:// to default protocols
Haelwenn [Tue, 7 Jul 2020 03:00:52 +0000 (03:00 +0000)]
Merge branch 'description-limits' into 'develop'
Add limits to image descriptions
See merge request pleroma/pleroma!2724
Haelwenn [Tue, 7 Jul 2020 00:04:24 +0000 (00:04 +0000)]
Merge branch '1507-static-fe-prioritize-json' into 'develop'
StaticFE: Prioritize json in requests.
Closes #1507
See merge request pleroma/pleroma!2695
lain [Mon, 6 Jul 2020 10:25:25 +0000 (12:25 +0200)]
Config: Remove Statusnet preloader.
lain [Mon, 6 Jul 2020 10:24:45 +0000 (12:24 +0200)]
Preloaders: Remove status_net preloader
lain [Mon, 6 Jul 2020 10:20:20 +0000 (12:20 +0200)]
Update frontend
lain [Mon, 6 Jul 2020 10:17:08 +0000 (12:17 +0200)]
Update frontend
lain [Mon, 6 Jul 2020 10:15:59 +0000 (12:15 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
lain [Mon, 6 Jul 2020 10:11:10 +0000 (12:11 +0200)]
StaticFE Plug: Use phoenix helper to get the requested format.
lain [Mon, 6 Jul 2020 10:07:56 +0000 (12:07 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1507-static-fe-prioritize-json
rinpatch [Mon, 6 Jul 2020 09:21:03 +0000 (09:21 +0000)]
Merge branch '1915-dont-filter-announce-notifications' into 'develop'
Streamer: Don't filter out announce notifications.
Closes #1915
See merge request pleroma/pleroma!2719
lain [Mon, 6 Jul 2020 09:20:10 +0000 (09:20 +0000)]
Merge branch 'filter-tesla-config' into 'develop'
Filter tesla config
See merge request pleroma/pleroma!2722
lain [Mon, 6 Jul 2020 09:18:01 +0000 (11:18 +0200)]
Changelog: Document description limits.
lain [Mon, 6 Jul 2020 09:16:58 +0000 (11:16 +0200)]
Docs: document instance differences
lain [Mon, 6 Jul 2020 09:12:37 +0000 (11:12 +0200)]
InstanceView: Add chat limit, description limit
lain [Mon, 6 Jul 2020 09:08:53 +0000 (11:08 +0200)]
Docs: Add description limits to cheat sheet
lain [Mon, 6 Jul 2020 09:08:13 +0000 (11:08 +0200)]
Upload: Restrict description length
Alexander Strizhakov [Wed, 17 Jun 2020 09:34:27 +0000 (12:34 +0300)]
test fixes
Alexander Strizhakov [Fri, 1 May 2020 06:20:54 +0000 (09:20 +0300)]
tests fixes
Alexander Strizhakov [Tue, 31 Mar 2020 13:53:11 +0000 (16:53 +0300)]
adding benchmarks in new format
Alexander Strizhakov [Wed, 26 Feb 2020 14:50:56 +0000 (17:50 +0300)]
renaming back and reject nil on create
Alexander Strizhakov [Wed, 26 Feb 2020 14:00:38 +0000 (14:00 +0000)]
Apply suggestion to test/notification_test.exs
Alexander Strizhakov [Wed, 26 Feb 2020 14:00:28 +0000 (14:00 +0000)]
Apply suggestion to test/notification_test.exs
Alexander Strizhakov [Wed, 26 Feb 2020 13:59:07 +0000 (13:59 +0000)]
Apply suggestion to lib/pleroma/filter.ex
Alexander Strizhakov [Fri, 7 Feb 2020 15:16:39 +0000 (18:16 +0300)]
don't filter notifications for follow and move types
Sergey Suprunenko [Mon, 25 Nov 2019 15:59:55 +0000 (16:59 +0100)]
Restrict thread statuses that contain user's irreversible filters
Sergey Suprunenko [Fri, 22 Nov 2019 18:52:50 +0000 (19:52 +0100)]
Skip notifications for statuses that contain an irreversible filtered word
Sergey Suprunenko [Sat, 16 Nov 2019 21:54:13 +0000 (22:54 +0100)]
Restrict statuses that contain user's irreversible filters
Alexander Strizhakov [Mon, 6 Jul 2020 06:12:29 +0000 (09:12 +0300)]
migration to delete migrated tesla setting
Alexander Strizhakov [Mon, 6 Jul 2020 05:48:20 +0000 (08:48 +0300)]
don't save tesla settings into db
lain [Sat, 4 Jul 2020 15:11:37 +0000 (17:11 +0200)]
Streamer: Don't filter out announce notifications.
lain [Fri, 3 Jul 2020 15:06:33 +0000 (15:06 +0000)]
Merge branch 'features/mastoapi-2.9.0-status_text' into 'develop'
MastoAPI 2.9.0: status text on deletion
See merge request pleroma/pleroma!2690
lain [Fri, 3 Jul 2020 14:59:12 +0000 (14:59 +0000)]
Merge branch '1912-leading-trailing-space-search' into 'develop'
SearchController: Trim query.
Closes #1912
See merge request pleroma/pleroma!2717
lain [Fri, 3 Jul 2020 14:46:11 +0000 (16:46 +0200)]
Update changelog
lain [Fri, 3 Jul 2020 14:44:31 +0000 (16:44 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text
lain [Fri, 3 Jul 2020 14:38:22 +0000 (14:38 +0000)]
Merge branch '1892-exclude-bots-from-search-results' into 'develop'
[#1892] Exclusion of service actors from user search results
Closes #1892
See merge request pleroma/pleroma!2708
lain [Fri, 3 Jul 2020 14:36:55 +0000 (16:36 +0200)]
SearchController: Trim query.
rinpatch [Fri, 3 Jul 2020 10:44:19 +0000 (10:44 +0000)]
Merge branch '1910-migration-fix' into 'develop'
Notification Backfill: Explicitly select the needed fields.
Closes #1910
See merge request pleroma/pleroma!2715
lain [Fri, 3 Jul 2020 09:25:12 +0000 (11:25 +0200)]
Notification Backfill: Explicitly select the needed fields.
Prevents a crashing migration when we change user fields.
Ivan Tashkinov [Fri, 3 Jul 2020 08:02:15 +0000 (11:02 +0300)]
[#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results.
feld [Thu, 2 Jul 2020 19:44:05 +0000 (19:44 +0000)]
Merge branch 'feature/1885-MRF-metadata' into 'develop'
Feature/1885 mrf metadata
Closes #1885
See merge request pleroma/pleroma!2693
feld [Thu, 2 Jul 2020 18:12:03 +0000 (18:12 +0000)]
Merge branch 'activation-meta' into 'develop'
Add more FE-required fields to /api/v1/instance
See merge request pleroma/pleroma!2613
Mark Felder [Thu, 2 Jul 2020 18:01:22 +0000 (13:01 -0500)]
Merge branch 'develop' into activation-meta
Mark Felder [Thu, 2 Jul 2020 17:59:45 +0000 (12:59 -0500)]
Document the new API extension of /api/v1/instance
Mark Felder [Thu, 2 Jul 2020 17:55:08 +0000 (12:55 -0500)]
Remove camelCase from the keys
Mark Felder [Thu, 2 Jul 2020 15:33:27 +0000 (10:33 -0500)]
Lint, long lines
Mark Felder [Thu, 2 Jul 2020 15:27:15 +0000 (10:27 -0500)]
Improve descriptions, move primary MRF settings to top for AdminFE ordering
Mark Felder [Thu, 2 Jul 2020 15:16:19 +0000 (10:16 -0500)]
Update AdminFE build to utilize new MRF metadata
Mark Felder [Thu, 2 Jul 2020 14:57:57 +0000 (09:57 -0500)]
Merge branch 'develop' into feature/1885-MRF-metadata
rinpatch [Thu, 2 Jul 2020 10:17:51 +0000 (10:17 +0000)]
Merge branch 'fetcher-fixes' into 'develop'
Don't fail fetching when the user in a replied-to message can't be fetched.
See merge request pleroma/pleroma!2711
rinpatch [Thu, 2 Jul 2020 10:08:42 +0000 (10:08 +0000)]
Merge branch '1907-fix-announce-streaming' into 'develop'
Resolve "Streaming API: Repeats of your posts from random people are pushed to the timeline"
Closes #1907
See merge request pleroma/pleroma!2714
lain [Thu, 2 Jul 2020 08:43:32 +0000 (08:43 +0000)]
Merge branch 'feature/update-description' into 'develop'
Update settings descriptions and labels
See merge request pleroma/pleroma!2709
lain [Thu, 2 Jul 2020 07:57:31 +0000 (09:57 +0200)]
Credo fixes.
lain [Thu, 2 Jul 2020 07:54:48 +0000 (09:54 +0200)]
Changelog: Update with stream changes.
lain [Thu, 2 Jul 2020 07:50:26 +0000 (09:50 +0200)]
Streamer: Align announce streaming with polling.
lain [Thu, 2 Jul 2020 07:33:50 +0000 (09:33 +0200)]
SideEffects: Refactor.
rinpatch [Wed, 1 Jul 2020 13:51:23 +0000 (13:51 +0000)]
Merge branch '1716-handle-nickname-clashes' into 'develop'
ActivityPub: Handle clashing nicknames for the same ap id
Closes #1716
See merge request pleroma/pleroma!2712
lain [Wed, 1 Jul 2020 10:26:07 +0000 (12:26 +0200)]
ActivityPub: Handle clashing nicknames for the same ap id
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.
This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
lain [Wed, 1 Jul 2020 09:48:51 +0000 (11:48 +0200)]
Fetcher: Work when we can't get the OP.
lain [Wed, 1 Jul 2020 09:47:45 +0000 (11:47 +0200)]
Fixtures: Pretty print.
lain [Wed, 1 Jul 2020 09:18:02 +0000 (09:18 +0000)]
Merge branch 'revert-
651f2695' into 'develop'
Revert "Merge branch 'avatar-removing' into 'develop'"
See merge request pleroma/pleroma!2710
lain [Wed, 1 Jul 2020 08:51:56 +0000 (08:51 +0000)]
Revert "Merge branch 'avatar-removing' into 'develop'"
This reverts merge request !2701
Angelina Filippova [Wed, 1 Jul 2020 00:01:15 +0000 (03:01 +0300)]
Add labels, update descriptions and labels
Haelwenn [Tue, 30 Jun 2020 20:51:10 +0000 (20:51 +0000)]
Merge branch 'chore/rename-user-settings-column' into 'develop'
Rename user.settings column
See merge request pleroma/pleroma!2707
Mark Felder [Tue, 30 Jun 2020 20:25:10 +0000 (15:25 -0500)]
Add fields limits to instance metadata, add tests
Mark Felder [Tue, 30 Jun 2020 20:09:03 +0000 (15:09 -0500)]
Merge branch 'develop' into activation-meta
Ivan Tashkinov [Tue, 30 Jun 2020 18:26:39 +0000 (21:26 +0300)]
[#1892] Excluded bot actors (applications, services) from search results.
Mark Felder [Tue, 30 Jun 2020 16:50:53 +0000 (11:50 -0500)]
Rename user.settings column
This is used exclusively by MastoFE/GlitchFE now
lain [Tue, 30 Jun 2020 10:52:55 +0000 (10:52 +0000)]
Merge branch 'preloadfixups' into 'develop'
Some fixups for the preload.
See merge request pleroma/pleroma!2692
lain [Tue, 30 Jun 2020 09:55:58 +0000 (11:55 +0200)]
Credo fixes
lain [Tue, 30 Jun 2020 09:40:34 +0000 (11:40 +0200)]
Merge branch 'preload-fixups-2' into preloadfixups
lain [Tue, 30 Jun 2020 09:35:54 +0000 (11:35 +0200)]
Preload: Load the correct instance panel
lain [Tue, 30 Jun 2020 08:42:45 +0000 (08:42 +0000)]
Merge branch 'patch-1' into 'develop'
Use correct PostgreSQL version command in bug template
See merge request pleroma/pleroma!2706
normandy [Tue, 30 Jun 2020 03:12:30 +0000 (03:12 +0000)]
Use correct PostgreSQL version command in bug template
rinpatch [Mon, 29 Jun 2020 18:06:25 +0000 (18:06 +0000)]
Merge branch 'fix-notification-filtering' into 'develop'
Notifications: Never return `nil` in the notification list.
See merge request pleroma/pleroma!2705
lain [Mon, 29 Jun 2020 16:04:14 +0000 (16:04 +0000)]
Apply suggestion to lib/pleroma/notification.ex
lain [Mon, 29 Jun 2020 15:59:40 +0000 (15:59 +0000)]
Merge branch 'fix/cast-and-validate' into 'develop'
Fix CastAndValidate plug
Closes #1889
See merge request pleroma/pleroma!2704
lain [Mon, 29 Jun 2020 15:52:56 +0000 (17:52 +0200)]
Notification: Remove TODO.
lain [Mon, 29 Jun 2020 15:48:18 +0000 (17:48 +0200)]
Notifications: Never return `nil` in the notification list.
Egor Kislitsyn [Mon, 29 Jun 2020 15:47:04 +0000 (19:47 +0400)]
Test default "content-type" for CastAndValidate
feld [Mon, 29 Jun 2020 15:24:39 +0000 (15:24 +0000)]
Merge branch 'fix/swoosh-sendmail' into 'develop'
updated swoosh
See merge request pleroma/pleroma!2703
projects / akkoma / log