9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
196cad46f3
Resolve merge conflicts
5 years ago
ae4fc58589
Remove flavour from userinfo
5 years ago
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
0c2dcb4c69
Add follow information refetching after following/unfollowing
5 years ago
e5b850a991
Refactor fetching follow information to a separate function
5 years ago
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
5 years ago
eae991b06a
merge develop
5 years ago
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
5 years ago
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
5 years ago
a237c6a2d4
support for idna domains
5 years ago
beba7bbc85
removing synchronization worker
5 years ago
93a0eeab16
Add license/copyright to all project files
5 years ago
371d39e160
Merge develop
5 years ago
d6b0fce6e9
Fix/1019 correct count remote users
5 years ago
23d4781e73
change for local user search
5 years ago
6dadf5d6f4
[ #1043 ] fix search accounts.
5 years ago
657277ffc0
Resolve conflicts
5 years ago
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
5 years ago
6f29865d43
Add option to restrict all users to local content
5 years ago
01fe5abad1
Resolve conflicts
5 years ago
cb2bcee842
User Search: Boost friends more strongly.
5 years ago
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
5 years ago
5b04f07a1e
Limit search for unauthenticated users to local users only
5 years ago
b1b1a270e8
Fix conflict
5 years ago
4f2e359687
Merge branch 'develop' into issue/941
5 years ago
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
5 years ago
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
080e1aa70e
add option skip_thread_containment
5 years ago
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
5 years ago
5d3ece2861
Remove now useless flavours switching
5 years ago
7861974ab2
MastodonAPI: Add extension to set and get pleroma_settings_store.
5 years ago
eb2963bc43
User: Add settings store to Info, AccountView
...
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
5 years ago
ce47017c89
Merge develop
5 years ago
750ede5764
notification: remove local/remote match rules (too complicated)
5 years ago
e7e2e7a1a6
user info: allow formdata for notification settings like every other API
5 years ago
4030837d91
notification: add non_follows/non_followers notification control settings
5 years ago
daeae8e2e7
Move default mascot configuration to `config/`
5 years ago
3d0d9e7a56
Use string map for default mascot
5 years ago
54e9cb5c2d
Add API endpoints for a custom user mascot
5 years ago
73ae58fdfa
Feature/896 toggling confirmation
5 years ago
b92c004ea8
Reuse query from User.restrict_deactivated/1
5 years ago
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
f1f7a11222
Merge develop
5 years ago
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
5 years ago
b6b5b16ba4
Merge develop
5 years ago
2f76a40d02
formatter.ex: Add get_emoji_map/1
5 years ago
0f0cc2703b
Merge develop
5 years ago
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
5 years ago
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
5 years ago
2359ee38b3
Set digest emails to false by default
5 years ago
371a4aed2c
Add User.Info.email_notifications
6 years ago
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
9ca91cbb87
Change relationship direction of subscriptions
6 years ago
007762e767
Add notification checks
6 years ago
79910ce5cc
Add API endpoints and user column for subscription
6 years ago
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
6 years ago
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
094e1ef048
formatting
6 years ago
da53c079db
Refactor to store user ap_id, add tests
6 years ago
c8f31e0bc2
Implement mastodon's reblog hiding feature
6 years ago
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
6 years ago
25eb6cf1cb
Add "roles" to users admin API
6 years ago
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.
6 years ago
5a46d37af9
Update the mute implementation to the current codebase
...
Make it part of the info thing (and do a migration to ensure it's there)
6 years ago
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
6 years ago
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
6 years ago
4df455f69b
[MastoAPI] Add switching of frontend flavours
6 years ago
269d3e1ca6
WelcomeMessage: Get rid of Ecto reference.
6 years ago
d812a347ca
Add optional welcome message.
6 years ago
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
6 years ago
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
6 years ago
035eaeb9b8
Allow to configure visibility for admin and moderator badges
6 years ago
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
973c9eed18
Treat User.Info pinned ids as strings
6 years ago
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
6 years ago
0015d43e13
user: factor out illogical User.Info.superuser?/1.
...
any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching.
6 years ago
63dbd87568
rename `post` to `status`
6 years ago
380e9fba21
add pinned posts
6 years ago
980b5288ed
update copyright years to 2019
6 years ago
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
6 years ago
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
2ae1128d9f
MastoAPI: Fix put_settings
6 years ago
7d5720f2e4
Fix merge.
6 years ago
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
839526a913
TwitterAPI: Add network hiding.
6 years ago
6be0ab1e55
Hide network in ap.
6 years ago
91065e1968
Fix background updating / handling.
6 years ago
f18b86fd5f
More fixes for Info schema.
6 years ago
93f2dc19d9
TwitterAPI: Fix banner and background update.
6 years ago
347df6421d
Fix masto api user updating.
6 years ago
1c67277c80
Fix admin api.
6 years ago
48b95a9b95
Assorted fixes.
6 years ago
d407f662af
Fix TwitterApiController.
6 years ago
e002858071
Fix ostatus test.
6 years ago
badbe2656c
More fixes.
6 years ago
ec464ef20a
HTTP sig fixes.
6 years ago
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
2887f4ff1d
Fix formatter tests.
6 years ago
fbb70d25fe
Several twitter api fixes.
6 years ago
40d9d2098c
Fix user updating from AP.
6 years ago
4c918392c6
Fix most User tests.
6 years ago
e7cd6e9739
Fix setting of keys.
6 years ago
d5af41b577
Fix note count update.
6 years ago
812f5b058a
Fix blocking.
6 years ago
756764266c
Formatting.
6 years ago
b396dba425
Fix follower count setting.
6 years ago
5c8f07f0a8
Fix note counting.
6 years ago
50585d051b
Add User.Info module
...
To validate and mutate the user.info field.
6 years ago
Roman Chvanikov