Alex S
|
7410aee886
|
Merge develop to 770-add-emoji-tags
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
|
6 years ago |
rinpatch
|
79cb34a4b0
|
Fix preview not being usable in form data
|
6 years ago |
lambda
|
256b492a58
|
Merge branch 'bugfix/wrong-date-format' into 'develop'
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
|
6 years ago |
lambda
|
a79ce94dd4
|
Merge branch 'feature/fake-statuses' into 'develop'
Add fake status submit
See merge request pleroma/pleroma!995
|
6 years ago |
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
6 years ago |
rinpatch
|
fdb4357e9b
|
Rename fake param to preview and make the tests check that the object was not inserted to the db
|
6 years ago |
Egor Kislitsyn
|
1b3d921921
|
change `Repo.get(User, id)` => `User.get_by_id(id)`
|
6 years ago |
Egor Kislitsyn
|
4212527928
|
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
|
6 years ago |
Sergey Suprunenko
|
3db9235150
|
Ignore dates in wrong formats
|
6 years ago |
Sergey Suprunenko
|
b6f9f7b8aa
|
Handle dates in the Unix timestamp format (Fixes #763)
|
6 years ago |
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
6 years ago |
rinpatch
|
1bb4d5d65b
|
Implement fake status submit
|
6 years ago |
William Pitcock
|
a6973a668e
|
formatting
|
6 years ago |
William Pitcock
|
e75e43b949
|
common api: use the optimized Object.normalize whenever possible
|
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
|
fea3696799
|
common api: move context functions from twitterapi
|
6 years ago |
lain
|
8468f3f6d4
|
Add safe dm mode option.
|
6 years ago |
kaniini
|
6d6f48d079
|
Merge branch 'feature/federated-flags' into 'develop'
Federated reports
See merge request pleroma/pleroma!935
|
6 years ago |
Karen Konou
|
da53c079db
|
Refactor to store user ap_id, add tests
|
6 years ago |
Karen Konou
|
c8f31e0bc2
|
Implement mastodon's reblog hiding feature
|
6 years ago |
William Pitcock
|
5c7b774f09
|
reports: unify sending e-mail for both remote and local reports
|
6 years ago |
William Pitcock
|
3b48d5f0c2
|
common api: add support for forwarding reports
|
6 years ago |
eugenijm
|
e416c344dd
|
Unify unfollow, accept and reject follow requests using CommonAPI
|
6 years ago |
Haelwenn (lanodan) Monnier
|
c3d41b2b6e
|
[Credo] make all variables use snake_case
|
6 years ago |
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
6 years ago |
eugenijm
|
2827dfea50
|
Allow an admin to delete a user status
|
6 years ago |
eugenijm
|
594694607c
|
Unify Mastodon and Twitter follow implementations using CommonAPI
|
6 years ago |
Egor Kislitsyn
|
5d961d536c
|
fix formatter
|
6 years ago |
Egor
|
c3ac9424d2
|
AutoLinker
|
6 years ago |
Egor
|
bff9eb5ef7
|
Reports
|
6 years ago |
Wim Vanderbauwhede
|
04b1c13554
|
Merge remote-tracking branch 'upstream/develop' into patch-image-description
|
6 years ago |
Karen Konou
|
ac72b578da
|
Merge branch 'develop' into feature/thread-muting
|
6 years ago |
Karen Konou
|
c01ef574c1
|
Refactor as per Rin's suggestions, add endpoint tests
|
6 years ago |
Haelwenn (lanodan) Monnier
|
6a6a5b3251
|
de-group alias/es
|
6 years ago |
Haelwenn (lanodan) Monnier
|
60ea29dfe6
|
Credo fixes: alias grouping/ordering
|
6 years ago |
Haelwenn (lanodan) Monnier
|
106f4e7a0f
|
Credo fixes: parameter consistency
|
6 years ago |
Haelwenn (lanodan) Monnier
|
8bcfac93a8
|
Make credo happy
|
6 years ago |
kaniini
|
4c99b6d35a
|
Merge branch 'fix/tusky-dm' into 'develop'
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
|
6 years ago |
Maxim Filippov
|
9274cabe01
|
Use correct logic to determine "attentions" list
|
6 years ago |
lain
|
2de208817c
|
Merge branch 'develop' into rename/pleroma_activity_consistency
|
6 years ago |
Haelwenn (lanodan) Monnier
|
98c8184c1f
|
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
|
6 years ago |
William Pitcock
|
9adc80afff
|
common api: set directMessage flag on our own posts
|
6 years ago |
kaniini
|
651ce1c97b
|
Merge branch '491_full_mentions_in_user_bio' into 'develop'
[#491] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
|
6 years ago |
Ivan Tashkinov
|
65bb9b2fba
|
[#491] Made full nicknames be preserved in user links text only in Bio.
|
6 years ago |
Mark Felder
|
849c83ed46
|
formatting
|
6 years ago |
Mark Felder
|
6bc9a641ba
|
Default to disabled in the code in case the setting is absent from config.exs
|
6 years ago |
Mark Felder
|
8c368d42a2
|
Make attachment links configurable
Thanks @href!
|
6 years ago |
Egor Kislitsyn
|
b594a54d0c
|
unpin when deleting a status
|
6 years ago |
Haelwenn
|
ab4c5f5bf7
|
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
|
6 years ago |
William Pitcock
|
0bdbd4f968
|
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
ok @lanodan
|
6 years ago |