lambda
52bec238c3
Merge branch 'feature/deploy-docs' into 'develop'
...
Add automatic documentation build and deploy for master and develop branches
Closes #478
See merge request pleroma/pleroma!965
6 years ago
kaniini
ef3c23d40e
Merge branch 'bugfix/migration-less_replies_count' into 'develop'
...
Revert awfully long migration from 568e34858
See merge request pleroma/pleroma!991
6 years ago
Haelwenn (lanodan) Monnier
b2f3a40e53
Revert awfully long migration from 568e34858
6 years ago
rinpatch
634e09e1a8
Remove duplicated header from i2p.md
6 years ago
rinpatch
9bd80e6044
did it really take me 4 commits to fix this?
6 years ago
rinpatch
d16e2a2e04
Remove duplicated header from admin_api.md
6 years ago
rinpatch
e4601b2c1d
remove admin tasks as they have their page in mix tasks category already
6 years ago
rinpatch
d0026761b7
cringe
6 years ago
rinpatch
dfae0050af
Move out of Gitlab Wiki
...
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
6 years ago
Haelwenn (lanodan) Monnier
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
6 years ago
Haelwenn (lanodan) Monnier
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
6 years ago
Haelwenn (lanodan) Monnier
e83ad12c57
pagination.ex: Drop atom keys in params
...
Atom keys could also have been transformed to string, or the other
way around but this one is more efficient and what we actually
expect with the current param_types in Pagination
6 years ago
Haelwenn (lanodan) Monnier
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
6 years ago
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
lambda
a71831d1c2
Merge branch 'admin-api-user-show' into 'develop'
...
Admin API user show
Closes #766
See merge request pleroma/pleroma!987
6 years ago
eugenijm
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
6 years ago
eugenijm
10c81fc902
Add user show endpoint for Pleroma admin API
6 years ago
Alex S
3ca6c4f443
password reset page labels align
6 years ago
Ivan Tashkinov
642075b1a9
[ #923 ] Enabled binding of multiple OAuth provider accounts to single user.
6 years ago
Ivan Tashkinov
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
Ivan Tashkinov
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
6 years ago
lambda
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
6 years ago
lambda
a5f141d9d5
Merge branch 'fix-reblog-tests' into 'develop'
...
Fix muting reblogs tests
See merge request pleroma/pleroma!984
6 years ago
rinpatch
776bb5137f
Fix muting reblogs tests
6 years ago
rinpatch
6da1999fc8
Merge branch 'hotfix/missing-announce-mastoapi' into 'develop'
...
Fix missing announces in MastoAPI home timeline
Closes #762
See merge request pleroma/pleroma!983
6 years ago
rinpatch
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
...
Closes #762
6 years ago
lambda
b2e163ec57
Merge branch 'apps-verify-credentials' into 'develop'
...
MastodonAPI: Add GET /api/v1/apps/verify_credentials
See merge request pleroma/pleroma!981
6 years ago
Maxim Filippov
3cf7539bca
Add more user filters + move search to its own module
6 years ago
eugenijm
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
6 years ago
eugenijm
691d1208b5
Add GET /api/v1/apps/verify_credentials
6 years ago
lambda
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
6 years ago
lambda
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
6 years ago
lain
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
6 years ago
Ivan Tashkinov
47b49ab1a1
Test for MastoAPI /api/v1/instance response structure (formatting fix).
6 years ago
lambda
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
6 years ago
Ivan Tashkinov
caf0e9cf33
Test for MastoAPI /api/v1/instance response structure.
6 years ago
lambda
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
6 years ago
lambda
3f44433ebd
Merge branch 'refactor/remove-activity-representer' into 'develop'
...
Remove ActivityRepresenter
See merge request pleroma/pleroma!980
6 years ago
rinpatch
aacdcac1be
Credo is upset about me not remembering the alphabet
6 years ago
rinpatch
087662d4fb
Fix formatting
6 years ago
rinpatch
406d19331f
Remove ActivityRepresenter
6 years ago
Ivan Tashkinov
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
6 years ago
eugenijm
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
Ivan Tashkinov
b0759f821b
Comments split.
6 years ago
Ivan Tashkinov
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
6 years ago
Mark Felder
c410296120
Try sending an empty map
6 years ago
Mark Felder
6f090f981b
Attempt to fix incorrect federation of default instance avatars
6 years ago
rinpatch
15aa94f40f
Merge branch 'fix/notification-id-index' into 'develop'
...
Add an `id desc nulls last` index to notifications
See merge request pleroma/pleroma!975
6 years ago
rinpatch
9725c93cea
Add an id index to notifications
6 years ago
lain
037fefe218
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
6 years ago