luna/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
4488 commits 4 branches 74 tags 294 MiB
Commit graph

4488 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex S
b810aac117 added docs to docs/api/admin_api.md 
code style and little renamings
 2019-04-07 19:48:52 +07:00
Alex S
ce8d457132 little channges 2019-04-06 22:38:35 +07:00
Alex S
76d8928cf1 fix for field name 2019-04-06 20:49:43 +07:00
Alex S
a53d591ac5 code style 2019-04-06 20:47:05 +07:00
Alex S
dcc54f8cfa admin api endpoints for invites 2019-04-06 20:25:19 +07:00
Alex S
47b07cec49 token -> invite renaming 2019-04-06 20:24:22 +07:00
Alex S
be54e40890 twitter api registration 
fix for twitter api tests
 2019-04-06 17:18:59 +07:00
Alex S
0484f3a8b1 generating tokens with mix 2019-04-06 16:58:22 +07:00
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
 2019-04-05 23:36:42 +00:00
Sergey Suprunenko
325a268017 Redirect to the referer url after mastofe authorization 2019-04-05 23:36:42 +00:00
rinpatch
e3ca9f708f Merge branch 'revert-8607ae68' into 'develop' 
Revert "Merge branch 'test-coverage' into 'develop'"

See merge request pleroma/pleroma!1028
 2019-04-05 20:04:16 +00:00
rinpatch
e5df8cadea Revert "Merge branch 'test-coverage' into 'develop'" 
This reverts merge request !1027
 2019-04-05 19:59:03 +00:00
rinpatch
8607ae6841 Merge branch 'test-coverage' into 'develop' 
Use --cover option when running CI tests

See merge request pleroma/pleroma!1027
 2019-04-05 19:49:20 +00:00
optikfluffel
fb1be1d798 Use --cover option when running CI tests 2019-04-05 20:12:44 +02:00
feld
3fb3f42e77 Merge branch 'feature/admin-api-follow' into 'develop' 
Feature/admin api follow

See merge request pleroma/pleroma!1026
 2019-04-05 17:15:55 +00:00
Mark Felder
fac76bfa35 We actually want the user id not nickname in the test... 2019-04-05 12:11:19 -05:00
Mark Felder
c746087f57 Also remove Repo functions in the tests 2019-04-05 11:59:56 -05:00
Mark Felder
b5a2d384f7 Redundant Repo.get_by usage was recently removed from the codebase 2019-04-05 11:41:41 -05:00
Mark Felder
da64a5aece Document the admin API endpoints for controlling follow/unfollow 2019-04-05 11:29:34 -05:00
Roger Braun
7895ee37fa Add user following / unfollowing to the admin api. 2019-04-05 11:27:07 -05:00
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
 2019-04-05 12:43:57 +00:00
rinpatch
f0f30019e1 Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi 2019-04-05 15:19:44 +03:00
feld
9c9eec62c2 Merge branch 'feature/quack' into 'develop' 
Add ability to ship logs to a Slack channel

See merge request pleroma/pleroma!1014
 2019-04-04 19:52:22 +00:00
feld
3b12eeda19 Add ability to ship logs to a Slack channel 2019-04-04 19:52:22 +00:00
lambda
3c7f5bb1dc Merge branch 'fix/add-oauth-token-indexes' into 'develop' 
adding indexes to oauth_tokens table

See merge request pleroma/pleroma!1016
 2019-04-04 08:01:12 +00:00
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
 2019-04-04 07:34:20 +00:00
Haelwenn (lanodan) Monnier
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state 2019-04-04 09:07:25 +02:00
lambda
3f8be270c6 Merge branch 'feature/robotstxt' into 'develop' 
Generate permissive or restrictive robots.txt in the config generator

See merge request pleroma/pleroma!1012
 2019-04-03 17:31:34 +00:00
Sachin Joshi
cd41584ac4 Generate permissive or restrictive robots.txt in the config generator 2019-04-03 22:12:58 +05:45
lambda
9bb122d5a7 Merge branch 'update-autolinker' into 'develop' 
Update `auto_linker` dependency

See merge request pleroma/pleroma!1015
 2019-04-03 14:42:59 +00:00
Alex S
86f90c0a54 adding indexes to oauth_tokens table 2019-04-03 20:51:09 +07:00
Egor Kislitsyn
d313a0c49c Update auto_linker dependency 2019-04-03 19:41:15 +07:00
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
 2019-04-03 06:51:44 +00:00
rinpatch
79cb34a4b0 Fix preview not being usable in form data 2019-04-02 23:07:16 +03:00
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
 2019-04-02 18:43:48 +00:00
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
 2019-04-02 14:18:23 +00:00
lambda
a79ce94dd4 Merge branch 'feature/fake-statuses' into 'develop' 
Add fake status submit

See merge request pleroma/pleroma!995
 2019-04-02 14:17:43 +00:00
lain
39bcf93007 Merge remote-tracking branch 'origin/develop' into fix-slow-relationships 2019-04-02 16:10:38 +02:00
lain
fd07745d1b ActivityPub Utils: Greatly speed up the follow / block activity fetching. 2019-04-02 16:08:55 +02:00
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
 2019-04-02 12:47:40 +00:00
lambda
ce9284b36f Merge branch 'remove-user-activities' into 'develop' 
[#757] Add mix task to delete user's activities

See merge request pleroma/pleroma!1008
 2019-04-02 12:45:29 +00:00
lambda
b95cf3d490 Merge branch 'get_by_id' into 'develop' 
Replace `Repo.get_by` with existing functions

See merge request pleroma/pleroma!1010
 2019-04-02 12:43:28 +00:00
lambda
bd961a3bad Merge branch 'features/pleroma-tan' into 'develop' 
priv/static/images: Add pleroma-tan

See merge request pleroma/pleroma!913
 2019-04-02 11:54:04 +00:00
rinpatch
fdb4357e9b Rename fake param to preview and make the tests check that the object was not inserted to the db 2019-04-02 14:31:18 +03:00
Egor Kislitsyn
20c619f85f replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests 2019-04-02 17:58:32 +07:00
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
 2019-04-02 10:57:38 +00:00
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
 2019-04-02 10:52:29 +00:00
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
 2019-04-02 10:51:33 +00:00
cascode
95c92c49c9 Fix account lookup for nicknames beginning with numbers 2019-04-02 10:51:33 +00:00
Egor Kislitsyn
9a59c26619 replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id) 2019-04-02 17:47:52 +07:00