10488 Commits (4c9295adccdc4b89baec55860ffe2c31091491c9)

 

All Branches   

Search

Author	SHA1	Message	Date
lain	4c9295adcc	Update frontend	4 years ago
lain	65fd28e0c4	Config: Remove Statusnet preloader.	4 years ago
lain	28feba8af4	Preloaders: Remove status_net preloader	4 years ago
lain	f787eb1acf	Update frontend	4 years ago
lain	30d0df8e2f	Update frontend	4 years ago
lain	1963e143c5	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api	4 years ago
rinpatch	69f0b286f7	Merge branch '1915-dont-filter-announce-notifications' into 'develop' ... Streamer: Don't filter out announce notifications. Closes #1915 See merge request pleroma/pleroma!2719	4 years ago
lain	a2cabb99ca	Merge branch 'filter-tesla-config' into 'develop' ... Filter tesla config See merge request pleroma/pleroma!2722	4 years ago
Alexander Strizhakov	465ddcfd20	migration to delete migrated tesla setting	4 years ago
Alexander Strizhakov	480dfafa83	don't save tesla settings into db	4 years ago
lain	cf56655614	Streamer: Don't filter out announce notifications.	4 years ago
lain	c2a052a346	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	4 years ago
lain	9a27ef47f1	Merge branch '1912-leading-trailing-space-search' into 'develop' ... SearchController: Trim query. Closes #1912 See merge request pleroma/pleroma!2717	4 years ago
lain	cbf2fe9649	Update changelog	4 years ago
lain	d3efb50262	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/mastoapi-2.9.0-status_text	4 years ago
lain	19fbfbb767	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	4 years ago
lain	945e75c8e8	SearchController: Trim query.	4 years ago
rinpatch	86151b23a6	Merge branch '1910-migration-fix' into 'develop' ... Notification Backfill: Explicitly select the needed fields. Closes #1910 See merge request pleroma/pleroma!2715	4 years ago
lain	59b426ebef	Notification Backfill: Explicitly select the needed fields. ... Prevents a crashing migration when we change user fields.	4 years ago
Ivan Tashkinov	90764670dc	[#1892] Excluded internal users (applications) from user search results, reinstated service actors in search results.	4 years ago
feld	fd5ad99ace	Merge branch 'feature/1885-MRF-metadata' into 'develop' ... Feature/1885 mrf metadata Closes #1885 See merge request pleroma/pleroma!2693	4 years ago
feld	4f8e0170e9	Merge branch 'activation-meta' into 'develop' ... Add more FE-required fields to /api/v1/instance See merge request pleroma/pleroma!2613	4 years ago
Mark Felder	8121e46f25	Merge branch 'develop' into activation-meta	4 years ago
Mark Felder	02d855b2b9	Document the new API extension of /api/v1/instance	4 years ago
Mark Felder	d44ec2bf4c	Remove camelCase from the keys	4 years ago
Mark Felder	80076f1974	Lint, long lines	4 years ago
Mark Felder	d169e51b7e	Improve descriptions, move primary MRF settings to top for AdminFE ordering	4 years ago
Mark Felder	a5d611abc2	Update AdminFE build to utilize new MRF metadata	4 years ago
Mark Felder	6b5563ed2c	Merge branch 'develop' into feature/1885-MRF-metadata	4 years ago
rinpatch	4c044f6225	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	4 years ago
rinpatch	b0439df1b5	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	4 years ago
lain	d884b6f704	Merge branch 'feature/update-description' into 'develop' ... Update settings descriptions and labels See merge request pleroma/pleroma!2709	4 years ago
lain	bad08f34ca	Credo fixes.	4 years ago
lain	ce9b7c0e0f	Changelog: Update with stream changes.	4 years ago
lain	311b7c19d0	Streamer: Align announce streaming with polling.	4 years ago
lain	61fe94d698	SideEffects: Refactor.	4 years ago
rinpatch	fa7a0be225	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	4 years ago
lain	fedfe8f7d6	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.	4 years ago
lain	ce92e6e5ce	Fetcher: Work when we can't get the OP.	4 years ago
lain	8ae572d5ae	Fixtures: Pretty print.	4 years ago
lain	d889c9ca70	Merge branch 'revert-651f2695' into 'develop' ... Revert "Merge branch 'avatar-removing' into 'develop'" See merge request pleroma/pleroma!2710	4 years ago
lain	691742e62d	Revert "Merge branch 'avatar-removing' into 'develop'" ... This reverts merge request !2701	4 years ago
Angelina Filippova	df2d6564d5	Add labels, update descriptions and labels	4 years ago
Haelwenn	9cf4bfcd81	Merge branch 'chore/rename-user-settings-column' into 'develop' ... Rename user.settings column See merge request pleroma/pleroma!2707	4 years ago
Mark Felder	5a8e0208b1	Add fields limits to instance metadata, add tests	4 years ago
Mark Felder	0883a706dc	Merge branch 'develop' into activation-meta	4 years ago
Ivan Tashkinov	3d2989278c	[#1892] Excluded bot actors (applications, services) from search results.	4 years ago
Mark Felder	d69af7f742	Rename user.settings column ... This is used exclusively by MastoFE/GlitchFE now	4 years ago
lain	b9e6ad571a	Merge branch 'preloadfixups' into 'develop' ... Some fixups for the preload. See merge request pleroma/pleroma!2692	4 years ago
lain	8b7055e25e	Credo fixes	4 years ago