squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,044 Commits 154 Branches 42 Tags 503 MiB
c93479c6f5
Commit Graph

4044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kaniini
c93479c6f5 Merge branch 'count-only-public-statuses' into 'develop' 
Increment user note count only on public activities #703

See merge request pleroma/pleroma!884
 2019-03-03 15:49:19 +00:00
kaniini
dfdbb6f125 Merge branch 'remove-follow-request-count' into 'develop' 
Remove follow_request_count as it's not needed for FE anymore.

See merge request pleroma/pleroma!886
 2019-03-03 15:48:00 +00:00
eugenijm
d5418e9ff7 Remove follow_request_count as it's not needed for FE anymore. 
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
 2019-03-03 18:42:27 +03:00
eugenijm
8a1e0c9bee Added migration to update existing user note counters 2019-03-03 15:35:32 +03:00
lambda
9b63fda9c7 Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop' 
[#675] Do not show DMs in mentions timeline

See merge request pleroma/pleroma!877
 2019-03-03 11:13:59 +00:00
eugenijm
c46950d3b1 Increment user note count only on public activities 2019-03-03 14:08:43 +03:00
rinpatch
f38c316e6e Merge branch 'bugfix/oauth-scopes-join' into 'develop' 
Bugfix: OAuth scopes formatting

Closes #702

See merge request pleroma/pleroma!881
 2019-03-02 06:39:07 +00:00
Haelwenn (lanodan) Monnier
bb9e40968a
Web.OAuth.OAuthControllerTest: Add test against token formatting 2019-03-02 04:10:57 +01:00
Haelwenn (lanodan) Monnier
b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response 2019-03-02 04:04:16 +01:00
rinpatch
9c6abec4d8 use commonapi.post instead of activitybulder 2019-03-01 15:48:04 +03:00
kaniini
b91a6dd85e Merge branch 'hotfix/http-date-header' into 'develop' 
activitypub: fix date header format

See merge request pleroma/pleroma!879
 2019-03-01 12:28:08 +00:00
William Pitcock
689b0730f8 activitypub: fix date header format 
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
 2019-03-01 12:22:45 +00:00
kaniini
1fc1b0d935 Merge branch 'default-tags-for-existing-users' into 'develop' 
Migration for adding tags to the existing users records

See merge request pleroma/pleroma!878
 2019-03-01 11:09:36 +00:00
eugenijm
85734c0d49 Added migration for setting default tags in existing users records 2019-03-01 14:02:25 +03:00
lambda
2f00814475 Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop' 
Bugfix #236 Prefer user look-up by nickname

See merge request pleroma/pleroma!860
 2019-03-01 09:48:24 +00:00
lambda
b37b26ab87 Merge branch 'feature/cowboy2' into 'develop' 
upgrade to cowboy 2.6

See merge request pleroma/pleroma!876
 2019-03-01 09:42:34 +00:00
rinpatch
1341ee650e [#675] Do not show DMs in mentions timeline 2019-03-01 09:37:29 +03:00
William Pitcock
6b2a1ad1c8 config: fix chat endpoint path 2019-02-28 17:00:54 +00:00
William Pitcock
28b4093233 mastodon websocket: return errors using ok, not stop 2019-02-28 16:23:55 +00:00
William Pitcock
388a3f4ca2 mastodon websocket: bring back infinity timeout 2019-02-28 16:23:24 +00:00
William Pitcock
f1d37a5e23 mastodon websocket: use pattern match to get query data, robustly handle errors 2019-02-28 16:02:48 +00:00
William Pitcock
9aec00d711 config: update config for cowboy 2 endpoints 2019-02-28 15:44:12 +00:00
William Pitcock
bc53dff5b6 mastodon api: websocket: update code for cowboy 2.x 2019-02-28 15:44:12 +00:00
William Pitcock
e10ca35b3d mix: update dependencies for cowboy 2.0 2019-02-28 15:44:07 +00:00
href
a47cc5a2cf Merge branch 'customizable_auth' into 'develop' 
Authenticator tweaks

See merge request pleroma/pleroma!875
 2019-02-28 11:18:01 +00:00
Ivan Tashkinov
3281a3f074 Renamed *DatabaseAuthenticator to *Authenticator. 2019-02-28 14:12:41 +03:00
Ivan Tashkinov
4e77f68414 Added auth_template/0 to DatabaseAuthenticator. 2019-02-28 13:58:58 +03:00
kaniini
cf426a719d Merge branch 'with-mutes' into 'develop' 
Add `with_muted` param.

Closes #683

See merge request pleroma/pleroma!872
 2019-02-28 10:22:19 +00:00
href
90a24fbf95 Merge branch 'customizable_auth' into 'develop' 
Auth customization support

See merge request pleroma/pleroma!852
 2019-02-28 10:12:26 +00:00
kaniini
089e2588a3 Merge branch 'speedup-follow-requests' into 'develop' 
Speedup follow requests

Closes #677

See merge request pleroma/pleroma!871
 2019-02-28 10:10:03 +00:00
kaniini
3c849d0438 Merge branch 'deactivated-in-user-view' into 'develop' 
Add activation status to the regular user view

See merge request pleroma/pleroma!874
 2019-02-28 10:08:31 +00:00
Ivan Tashkinov
b6f915313f Made auth customization be runtime-configurable. 2019-02-28 13:00:54 +03:00
lambda
9cc98b496e Merge branch 'feature/mastoapi-embedded-relationships' into 'develop' 
mastodon api: embed relationship card under account card for Pleroma FE convenience

See merge request pleroma/pleroma!870
 2019-02-28 07:35:26 +00:00
eugenijm
6b11011039 Added deactivated to the user view 2019-02-28 09:08:34 +03:00
lain
bbbdbec4fd Remove parts of the old activity view. 
Not used anymore.
 2019-02-27 17:24:51 +01:00
lain
9ade1242c2 Add user muted status info to twitterapi. 2019-02-27 16:52:03 +01:00
lain
c1ae495878 Add user muted status info to MastodonAPI. 2019-02-27 16:46:47 +01:00
lain
c4235f96bd Add with_muted param. 2019-02-27 16:37:42 +01:00
lain
b24cc44e8d Follower requests: Utilize object index. 
Closes #677
 2019-02-27 15:01:54 +01:00
lain
8d8cb08f94 Add follow request test. 2019-02-27 14:51:07 +01:00
William Pitcock
1536640962 mastodon api: embed relationship card under account card for Pleroma FE convenience 2019-02-27 13:01:10 +00:00
kaniini
14bc6bd40f Merge branch 'fix/formatter' into 'develop' 
Bugfix: markdown in formatter

Closes #688

See merge request pleroma/pleroma!869
 2019-02-27 08:45:43 +00:00
Egor Kislitsyn
5d961d536c fix formatter 2019-02-27 15:40:30 +07:00
kaniini
a50a47a011 Merge branch 'chore/add-missing-tests-docs-to-admin-api' into 'develop' 
Add missing docs and tests to Admin API

See merge request pleroma/pleroma!868
 2019-02-27 07:28:10 +00:00
Maxim Filippov
ed7fd6b47e Add missing docs and tests 2019-02-27 03:08:03 +03:00
kaniini
1c265b3b19 Merge branch 'auto_linker' into 'develop' 
AutoLinker

Closes #609

See merge request pleroma/pleroma!839
 2019-02-26 23:32:26 +00:00
Egor
c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
kaniini
e9703a5326 Merge branch 'feature/more-actions-to-admin-api' into 'develop' 
Add list/toggle activation endpoints to AdminController

See merge request pleroma/pleroma!867
 2019-02-26 23:31:53 +00:00
Maxim Filippov
90d0d055fc Add more admin actions 2019-02-27 00:13:38 +03:00
kaniini
b985c91431 Merge branch 'fix-nginx-listen-missing-ipv4' into 'develop' 
need to put back ipv4 listen instruct

See merge request pleroma/pleroma!866
 2019-02-26 16:47:18 +00:00