rinpatch
|
627e5a0a49
|
Merge branch 'develop' into feature/database-compaction
|
6 years ago |
kaniini
|
73df3046e0
|
Merge branch 'feature/788-separate-email-addresses' into 'develop'
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
|
6 years ago |
Normandy
|
d4a749cfb2
|
Handle new-style mastodon follow lists
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
|
6 years ago |
rinpatch
|
5d73dca064
|
Remove inReplyToStatusId
|
6 years ago |
Alex S
|
c5d0fffeaf
|
naming fix
|
6 years ago |
lambda
|
184ae60b21
|
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
|
6 years ago |
Alex S
|
fe511a6c65
|
Merge branch 'develop' into feature/788-separate-email-addresses
|
6 years ago |
Alex S
|
fe13a1d78c
|
adding notify_email setting for trigger emails
|
6 years ago |
lambda
|
e5d553aa45
|
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
|
6 years ago |
lambda
|
c8440b5e0c
|
Merge branch 'fix/emoji-api-nonsense' into 'develop'
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
|
6 years ago |
Haelwenn (lanodan) Monnier
|
9c1b36856b
|
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
|
6 years ago |
kaniini
|
97395e013e
|
Merge branch 'notification-pleroma-settings' into 'develop'
Notification controls
Closes #738
See merge request pleroma/pleroma!988
|
6 years ago |
rinpatch
|
b57b43027c
|
Change response format of /api/pleroma/emoji to the one that actually makes sense
|
6 years ago |
Alex S
|
fee50636d0
|
removing not needed invite update
|
6 years ago |
Alex S
|
012bb5dcc9
|
renaming expire_at -> expires_at
keyword style change
|
6 years ago |
Alex S
|
47b07cec49
|
token -> invite renaming
|
6 years ago |
Alex S
|
be54e40890
|
twitter api registration
fix for twitter api tests
|
6 years ago |
Alex S
|
fa8483cb80
|
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
|
6 years ago |
lambda
|
180b87257c
|
Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
|
6 years ago |
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
6 years ago |
Egor Kislitsyn
|
20c619f85f
|
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests
|
6 years ago |
Egor Kislitsyn
|
9a59c26619
|
replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
|
6 years ago |
Egor Kislitsyn
|
11c2d6bdc4
|
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
|
6 years ago |
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
6 years ago |
Sachin Joshi
|
6386c1c9c1
|
fetch url for OStatus to know if it is a/c or status
|
6 years ago |
Sachin Joshi
|
1d01e8e656
|
[OStatus] adds status to pleroma instance if the url given is a status
|
6 years ago |
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
6 years ago |
eugenijm
|
cd90695a34
|
Add PUT /api/pleroma/notification_settings endpoint
|
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 |
kaniini
|
1c3d3d0c2b
|
Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.
See merge request pleroma/pleroma!958
|
6 years ago |
William Pitcock
|
a223e65f35
|
tests: fixup
|
6 years ago |
William Pitcock
|
fea3696799
|
common api: move context functions from twitterapi
|
6 years ago |
lain
|
bf27190f7f
|
UtilController: Return state of safe dm mentions.
|
6 years ago |
Fong-Wan Chau
|
4ed2618f6c
|
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
|
6 years ago |
eugenijm
|
43fb03be5a
|
Allow to mark a single notification as read
|
6 years ago |
Haelwenn (lanodan) Monnier
|
23960309a0
|
[Credo] Change quoted string with 3+ quotes to sigils
|
6 years ago |
Haelwenn (lanodan) Monnier
|
c42d34b2ec
|
[Credo] fix Credo.Check.Readability.MaxLineLength
|
6 years ago |
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
6 years ago |
Haelwenn (lanodan) Monnier
|
6c8743d0c0
|
[Credo] Fix the warnings
|
6 years ago |
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
6 years ago |
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.
|
6 years ago |
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
|
6 years ago |
rinpatch
|
9c6abec4d8
|
use commonapi.post instead of activitybulder
|
6 years ago |
rinpatch
|
1341ee650e
|
[#675] Do not show DMs in mentions timeline
|
6 years ago |
kaniini
|
cf426a719d
|
Merge branch 'with-mutes' into 'develop'
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
|
6 years ago |
eugenijm
|
6b11011039
|
Added deactivated to the user view
|
6 years ago |
lain
|
bbbdbec4fd
|
Remove parts of the old activity view.
Not used anymore.
|
6 years ago |
lain
|
9ade1242c2
|
Add user muted status info to twitterapi.
|
6 years ago |