pleroma

Commit Graph

Author	SHA1	Message	Date
Alex S	7410aee886	Merge develop to 770-add-emoji-tags Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs	5 years ago
Haelwenn	3c5daa0235	Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop' Redirect to the referer url after mastofe authorization Closes #717 See merge request pleroma/pleroma!1025	5 years ago
Sergey Suprunenko	325a268017	Redirect to the referer url after mastofe authorization	5 years ago
rinpatch	e3ca9f708f	Merge branch 'revert-8607ae68' into 'develop' Revert "Merge branch 'test-coverage' into 'develop'" See merge request pleroma/pleroma!1028	5 years ago
rinpatch	e5df8cadea	Revert "Merge branch 'test-coverage' into 'develop'" This reverts merge request !1027	5 years ago
rinpatch	8607ae6841	Merge branch 'test-coverage' into 'develop' Use --cover option when running CI tests See merge request pleroma/pleroma!1027	5 years ago
optikfluffel	fb1be1d798	Use --cover option when running CI tests	5 years ago
feld	3fb3f42e77	Merge branch 'feature/admin-api-follow' into 'develop' Feature/admin api follow See merge request pleroma/pleroma!1026	5 years ago
Mark Felder	fac76bfa35	We actually want the user id not nickname in the test...	5 years ago
Mark Felder	c746087f57	Also remove Repo functions in the tests	5 years ago
Mark Felder	b5a2d384f7	Redundant Repo.get_by usage was recently removed from the codebase	5 years ago
Mark Felder	da64a5aece	Document the admin API endpoints for controlling follow/unfollow	5 years ago
Roger Braun	7895ee37fa	Add user following / unfollowing to the admin api.	5 years ago
lambda	5499750054	Merge branch 'hotfix/html-sanitization' into 'develop' Refactor html caching functions to use a key instead of a module, use more correct terminology and fix summaries in mastoapi See merge request pleroma/pleroma!1022	5 years ago
rinpatch	f0f30019e1	Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi	5 years ago
feld	9c9eec62c2	Merge branch 'feature/quack' into 'develop' Add ability to ship logs to a Slack channel See merge request pleroma/pleroma!1014	5 years ago
feld	3b12eeda19	Add ability to ship logs to a Slack channel	5 years ago
lambda	3c7f5bb1dc	Merge branch 'fix/add-oauth-token-indexes' into 'develop' adding indexes to oauth_tokens table See merge request pleroma/pleroma!1016	5 years ago
lambda	c900ff39af	Merge branch 'features/pleroma-tan-mastofe' into 'develop' mastodon_api_controller.ex: Add pleroma-tan to initial_state See merge request pleroma/pleroma!1018	5 years ago
Haelwenn (lanodan) Monnier	af0065a71f	mastodon_api_controller.ex: Add pleroma-tan to initial_state	5 years ago
lambda	3f8be270c6	Merge branch 'feature/robotstxt' into 'develop' Generate permissive or restrictive robots.txt in the config generator See merge request pleroma/pleroma!1012	5 years ago
Sachin Joshi	cd41584ac4	Generate permissive or restrictive robots.txt in the config generator	5 years ago
lambda	9bb122d5a7	Merge branch 'update-autolinker' into 'develop' Update `auto_linker` dependency See merge request pleroma/pleroma!1015	5 years ago
Alex S	86f90c0a54	adding indexes to oauth_tokens table	5 years ago
Egor Kislitsyn	d313a0c49c	Update `auto_linker` dependency	5 years ago
lambda	7c003991d6	Merge branch 'fix/preview-not-working-with-form-data' into 'develop' Fix preview not being usable in form data See merge request pleroma/pleroma!1013	5 years ago
rinpatch	79cb34a4b0	Fix preview not being usable in form data	5 years ago
Haelwenn	0cb94cfa94	Merge branch 'fix-slow-relationships' into 'develop' ActivityPub Utils: Greatly speed up the follow / block activity fetching. See merge request pleroma/pleroma!1011	5 years ago
lambda	256b492a58	Merge branch 'bugfix/wrong-date-format' into 'develop' Support activities with dates in the Unix timestamp format Closes #763 See merge request pleroma/pleroma!1004	5 years ago
lambda	a79ce94dd4	Merge branch 'feature/fake-statuses' into 'develop' Add fake status submit See merge request pleroma/pleroma!995	5 years ago
lain	39bcf93007	Merge remote-tracking branch 'origin/develop' into fix-slow-relationships	5 years ago
lain	fd07745d1b	ActivityPub Utils: Greatly speed up the follow / block activity fetching.	5 years ago
Alex S	fa8483cb80	Merging develop into feature/770-add-emoji-tags Conflict test/web/twitter_api/util_controller_test.exs	5 years ago
Alex S	d140738edf	second level of headertext change in doc	5 years ago
Alex S	3465b7ba9a	syntax highlighting	5 years ago
lambda	180b87257c	Merge branch 'bugfix/share-mastodon' into 'develop' [OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002	5 years ago
lambda	ce9284b36f	Merge branch 'remove-user-activities' into 'develop' [#757] Add mix task to delete user's activities See merge request pleroma/pleroma!1008	5 years ago
lambda	b95cf3d490	Merge branch 'get_by_id' into 'develop' Replace `Repo.get_by` with existing functions See merge request pleroma/pleroma!1010	5 years ago
Alex S	9e0567ec52	Merge develop into feature/770-add-emoji-tags	5 years ago
lambda	bd961a3bad	Merge branch 'features/pleroma-tan' into 'develop' priv/static/images: Add pleroma-tan See merge request pleroma/pleroma!913	5 years ago
rinpatch	fdb4357e9b	Rename fake param to preview and make the tests check that the object was not inserted to the db	5 years ago
Egor Kislitsyn	20c619f85f	replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests	5 years ago
lambda	091baf9316	Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop' MastoAPI 2.6.0 `force_login` option Closes #734 See merge request pleroma/pleroma!999	5 years ago
lambda	26d509cc86	Merge branch 'get_by_id' into 'develop' Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible See merge request pleroma/pleroma!1009	5 years ago
lambda	b5d486d9ac	Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop' Fix account lookup for nicknames beginning with numbers See merge request pleroma/pleroma!1003	5 years ago
cascode	95c92c49c9	Fix account lookup for nicknames beginning with numbers	5 years ago
Egor Kislitsyn	9a59c26619	replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`	5 years ago
Egor Kislitsyn	88d3cb44c3	replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`	5 years ago
Ivan Tashkinov	15ce710460	Added "GET /oauth/authorize" tests.	5 years ago
Egor Kislitsyn	11c2d6bdc4	change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests	5 years ago

1 2 3 4 5 ...

4492 Commits (7410aee886fbb38615bb595b8b7be0722761a0a4) All Branches Search

4492 Commits (7410aee886fbb38615bb595b8b7be0722761a0a4)

All Branches