eloy/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
4365 commits 3 branches 72 tags 292 MiB
Commit graph

4365 commits

This branch
This branch
All branches
Author SHA1 Message Date
rinpatch
958227d556 MediaProxy: parse filename from content-disposition for non-whitelisted types 2019-03-15 01:36:29 +03:00
eugenijm
100413bf2c Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests 2019-03-15 01:35:48 +03:00
kaniini
7ecc201029 Merge branch 'fix/filename-mangling' into 'develop' 
Stop mangling filenames and enable dedupe by default

Closes #715

See merge request pleroma/pleroma!927
 2019-03-14 21:47:02 +00:00
William Pitcock
423fd07928 activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable 2019-03-14 19:52:08 +00:00
William Pitcock
5c7b774f09 reports: unify sending e-mail for both remote and local reports 2019-03-14 19:44:08 +00:00
William Pitcock
64b0120d67 activitypub: add support for forwarding reports 2019-03-14 19:36:17 +00:00
rinpatch
cbdd11c381 Merge develop to bump elixir version in the CI so I don't get failing formatting 2019-03-14 22:33:20 +03:00
William Pitcock
3b48d5f0c2 common api: add support for forwarding reports 2019-03-14 19:29:33 +00:00
William Pitcock
379442ad17 activitypub: utils: also match Activity objects 2019-03-14 19:29:04 +00:00
rinpatch
355f285a86 Fix uploaded media plug test 2019-03-14 22:26:54 +03:00
William Pitcock
0f3ecb2bfb activitypub: transmogrifier: accept remote Flag activities 2019-03-14 19:06:02 +00:00
William Pitcock
f86f7dbb8f activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs 2019-03-14 19:05:42 +00:00
William Pitcock
414d4b8088 test: add a test for accepting inbound Flag activities 2019-03-14 19:04:33 +00:00
rinpatch
e2fe796c63 Add some tests 2019-03-14 22:02:48 +03:00
rinpatch
34fc0dca2e Merge branch 'hotfix/delete-activities' into 'develop' 
Fix delete activities not federating

See merge request pleroma/pleroma!933
 2019-03-14 17:49:00 +00:00
rinpatch
e630e5e135 Fix delete activities not federating 2019-03-14 20:43:14 +03:00
link0ff
54e7087ab4 Merge remote-tracking branch 'upstream/develop' into feature/openldap-support 2019-03-14 17:43:30 +02:00
kaniini
59333f2d56 Merge branch 'admin-api-account-view-namespace' into 'develop' 
MastodonAPI.Admin.AccountView → AdminAPI.AccountView

See merge request pleroma/pleroma!930
 2019-03-14 02:01:10 +00:00
kaniini
86871c8a04 Merge branch 'feature/add-local-to-users-admin-api' into 'develop' 
Add "local" & "tags" to users admin API

See merge request pleroma/pleroma!932
 2019-03-14 02:00:47 +00:00
Maxim Filippov
f3964f4024 Ensure empty array is returned for tags 2019-03-14 03:17:09 +03:00
Maxim Filippov
257d8e78e5 Add tags 2019-03-14 01:52:24 +03:00
kaniini
4e72762322 Merge branch 'mastofe-content-types' into 'develop' 
Set content types settings on mastofe endpoint.

See merge request pleroma/pleroma!894
 2019-03-13 22:04:23 +00:00
kaniini
2029de5041 Merge branch 'unify-accept-reject-unfollow' into 'develop' 
Unify unfollow, accept and reject follow requests using CommonAPI

See merge request pleroma/pleroma!931
 2019-03-13 22:01:56 +00:00
eugenijm
e416c344dd Unify unfollow, accept and reject follow requests using CommonAPI 2019-03-13 20:28:36 +03:00
Maxim Filippov
4872914d32 Add test when local is false 2019-03-13 17:56:15 +03:00
Maxim Filippov
d5edff6ce6 Fix test 2019-03-13 16:14:31 +03:00
Maxim Filippov
490d9cf7b1 Add "local" to users admin API 2019-03-13 16:04:44 +03:00
Haelwenn (lanodan) Monnier
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView 2019-03-13 12:17:57 +01:00
lambda
92a0210fb0 Merge branch 'features/add-credo-to-ci' into 'develop' 
Add credo to CI

See merge request pleroma/pleroma!902
 2019-03-13 09:09:44 +00:00
Haelwenn (lanodan) Monnier
d43b1c0b5d
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
f62867dde6
.gitlab-ci.yml: Use --strict instead of list 
This makes the output to be more compact while not loosing readability
--format=flycheck // --format=json could also be used but they are
not very human readable
 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
4b73ca638e
[Credo][CI] Add readability as it’s fixed 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
8cd3eada7d
[Credo] write large numbers with underscore separation 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
c3d41b2b6e
[Credo] make all variables use snake_case 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder 2019-03-13 04:26:54 +01:00
Haelwenn (lanodan) Monnier
4c440f12c3
[Credo] Fix the consistency 2019-03-13 04:17:30 +01:00
Haelwenn (lanodan) Monnier
1d373d91f3
.credo.exs: Clear removed tests 2019-03-13 04:17:30 +01:00
Haelwenn (lanodan) Monnier
ddcd0910d3
[Credo][CI] Do not make TODO/FIXME fail 2019-03-13 04:17:30 +01:00
Haelwenn (lanodan) Monnier
6c8743d0c0
[Credo] Fix the warnings 2019-03-13 04:17:30 +01:00
Haelwenn (lanodan) Monnier
d93ab4817b
.gitlab-ci.yml: Adds credo to the chain 
Not really sure about the order in which this is but it feels right
because credo is more about checking if a ~working code could need
some improvements.<M-1>
 2019-03-13 04:17:30 +01:00
kaniini
d0e94d5f1b Merge branch 'feature/add-roles-to-users-admin-api' into 'develop' 
Add "roles" to users admin API

See merge request pleroma/pleroma!928
 2019-03-12 19:50:51 +00:00
Maxim Filippov
25eb6cf1cb Add "roles" to users admin API 2019-03-12 22:15:28 +03:00
kaniini
c231ed610a Merge branch 'masto-api-followers-following' into 'develop' 
MastoAPI followers/following endpoints

See merge request pleroma/pleroma!924
 2019-03-12 16:27:47 +00:00
link0ff
9338f061a3 Support LDAP method start_tls 2019-03-12 18:20:02 +02:00
eugenijm
984b5f8adf MastoAPI followers/following endpoints 2019-03-12 16:01:24 +03:00
rinpatch
faf238c1b0 Fix upload tests 2019-03-12 15:33:15 +03:00
rinpatch
92a69bddce escape quotation marks in Content-Disposition header 2019-03-12 09:21:13 +03:00