sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,301 Commits 1 Branch 0 Tags 184 MiB
fee360e581
Commit Graph

4301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rinpatch
5a73cae2be WIP: Stop mangling filenames 2019-03-12 09:10:19 +03:00
kaniini
4aa285e6ce Merge branch 'add-screenname-extension-to-masto-api' into 'develop' 
MastoAPI Accounts: Add fetching by nickname.

See merge request pleroma/pleroma!922
 2019-03-11 21:43:46 +00:00
kaniini
f9a9639015 Merge branch 'add-activity-id-to-push-messages' into 'develop' 
WebPush: Add activity id to the push messages.

See merge request pleroma/pleroma!925
 2019-03-11 21:43:06 +00:00
rinpatch
9ce97d454c Merge branch 'ci-switch-to-elixir-1-8-1' into 'develop' 
Switch the CI to Elixir 1.8.1

See merge request pleroma/pleroma!926
 2019-03-11 19:40:45 +00:00
rinpatch
7b227d935d Switch the CI to Elixir 1.8.1 2019-03-11 22:36:02 +03:00
lain
07277879e5 Linting. 2019-03-11 19:32:21 +01:00
lain
600f428db4 WebPush: Add activity id to the push messages. 
Makes it easier to relate the push to a given status.
 2019-03-11 19:23:21 +01:00
lain
3474066f6d MastoAPI Accounts: Add fetching by nickname. 
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
 2019-03-11 15:18:32 +01:00
lambda
2c8deecdd2 Merge branch 'add-local-field-to-status' into 'develop' 
MastoAPI StatusView: Add locality indicator.

See merge request pleroma/pleroma!920
 2019-03-11 13:26:12 +00:00
lambda
66774b5567 Update Differences-in-MastodonAPI-Responses.md 2019-03-11 13:21:03 +00:00
lambda
d9ae2d00a1 Merge branch 'feat/style-oauth-login-page' into 'develop' 
Style again the OAuth login page to fit pleroma more

See merge request pleroma/pleroma!921
 2019-03-11 13:19:24 +00:00
lambda
9df4fa22dd Merge branch 'broadcast-activity-id-on-deletion' into 'develop' 
Broadcast proper deleted activity id to conform to MastoAPI streaming spec

See merge request pleroma/pleroma!917
 2019-03-11 13:19:09 +00:00
lambda
0afab16442 Merge branch 'fix/roma-links-clients-md' into 'develop' 
Update homepages and provide source code links for Roma apps in Clients.md

See merge request pleroma/pleroma!919
 2019-03-11 13:15:45 +00:00
Shpuld Shpuldson
50edead11c Remove chromium input hilight that clashes with our own 2019-03-11 15:10:42 +02:00