rinpatch
7306d2d069
CHANGELOG.md: Add 2.0.2 entry
2020-04-09 15:45:25 -05:00
rinpatch
2a08f44b02
CHANGELOG.md: Add upgrade notes for 2.0.1
2020-04-09 15:43:54 -05:00
rinpatch
781ac28859
changelog.md: add 2.0.1 entry
2020-04-09 15:42:01 -05:00
rinpatch
fd388a0941
Merge branch 'update-changelog' into 'develop'
...
Update CHANGELOG
See merge request pleroma/pleroma!2363
2020-04-09 19:49:10 +00:00
Egor Kislitsyn
c826d5195f
Update CHANGELOG
2020-04-09 23:36:17 +04:00
c23532d24b
Merge branch 'notifications-dismiss-api' into 'develop'
...
Add `/api/v1/notifications/:id/dismiss` endpoint
Closes #1673
See merge request pleroma/pleroma!2360
2020-04-09 19:32:11 +00:00
kPherox
0e8f6d24b8
Create OTP_VERSION file by mix release
2020-04-10 00:22:50 +09:00
lain
e84c0450bf
Merge branch 'fix-otp-version-file-in-docker' into 'develop'
...
Add OTP_VERSION file to docker
Closes #1662
See merge request pleroma/pleroma!2361
2020-04-09 14:12:08 +00:00
Egor Kislitsyn
d545b883eb
Add /api/v1/notifications/:id/dismiss endpoint
2020-04-09 17:08:43 +04:00
kPherox
d37a102933
Fix OTP_VERSION file in docker
2020-04-09 21:16:29 +09:00
Ivan Tashkinov
ac672a9d6b
[ #1559 ] Addressed code review requests.
2020-04-09 15:13:37 +03:00
lain
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
2020-04-09 10:42:43 +00:00
Alexander Strizhakov
f20a19de85
typo fix
2020-04-09 13:28:54 +03:00
Alexander Strizhakov
9795ff5b01
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
2020-04-09 10:17:50 +00:00
Alexander Strizhakov
365c34a7a9
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
2020-04-09 10:17:44 +00:00
Alexander Strizhakov
1cf0d5ab0d
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
2020-04-09 10:17:36 +00:00
Alexander Strizhakov
4c60fdcbb1
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
2020-04-09 10:17:31 +00:00
Alexander Strizhakov
c8bfbf511e
Apply suggestion to docs/API/admin_api.md
2020-04-09 10:17:24 +00:00
lain
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
2020-04-09 09:48:56 +00:00
lain
564f3f01ca
Merge branch 'formatter-html-safe' into 'develop'
...
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
See merge request pleroma/pleroma!2357
2020-04-09 09:47:07 +00:00
Haelwenn
de592a6d33
Merge branch 'changelog-update' into 'develop'
...
No changelog entry - bug fixed only in develop
See merge request pleroma/pleroma!2359
2020-04-09 05:11:10 +00:00
Alexander Strizhakov
73134e248a
no changelog entry - bug fixed only in develop
2020-04-09 08:03:21 +03:00
Haelwenn
4cedecac45
Merge branch 'bugfix/objectid_validator' into 'develop'
...
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
See merge request pleroma/pleroma!2358
2020-04-09 02:43:03 +00:00
Haelwenn (lanodan) Monnier
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
2020-04-09 04:36:39 +02:00
rinpatch
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
2020-04-08 22:58:31 +03:00
Ivan Tashkinov
3965772b26
[ #1559 ] Minor change (analysis).
2020-04-08 21:33:37 +03:00
Ivan Tashkinov
f35c28bf07
[ #1559 ] Added / fixed tests for follow / follow_request notifications.
2020-04-08 21:26:22 +03:00
90cbf55236
Merge branch 'gun-pool-fix' into 'develop'
...
Fix for gun connections pool
Closes #1669 and #1664
See merge request pleroma/pleroma!2356
2020-04-08 17:13:54 +00:00
Alexander Strizhakov
5739c498c0
fix for gun connections pool
2020-04-08 18:46:01 +03:00
Ivan Tashkinov
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
rinpatch
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
2020-04-07 11:41:10 +00:00
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
kPherox
06471940e0
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
2020-04-07 08:44:53 +00:00
Egor Kislitsyn
03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
2020-04-06 17:11:00 +04:00
lain
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
2020-04-06 12:51:35 +00:00
lain
96ee0aadbf
Merge branch 'improving-test-coverage' into 'develop'
...
Tests for emoji mix task
See merge request pleroma/pleroma!2350
2020-04-06 12:49:17 +00:00
lain
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
2020-04-06 11:59:01 +00:00
lain
772bc258cd
ObjectID Validator: Refactor.
2020-04-06 13:53:24 +02:00
lain
e67cde0ed6
Transmogrifier: Refactoring / Renaming.
2020-04-06 13:46:34 +02:00
Alexander Strizhakov
a43e055916
using another fn for file deletion
2020-04-06 14:27:20 +03:00
Alexander Strizhakov
b59ac37b2c
tests for emoji mix task
2020-04-06 11:13:59 +03:00
Ivan Tashkinov
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
2020-04-06 10:20:44 +03:00
8444e7ee96
Merge branch 'fix/docs-markdown' into 'develop'
...
Fix formatting in documentation
See merge request pleroma/pleroma!2348
2020-04-02 19:36:55 +00:00
Egor Kislitsyn
8a0ffaa9ea
Fix formatting in documentation
2020-04-02 23:10:13 +04:00
7879369e4d
Merge branch '2323-accounts-relationships-hotfix' into 'develop'
...
[#2323 ] Fixed /accounts/relationships
Closes pleroma-fe#820
See merge request pleroma/pleroma!2347
2020-04-02 16:48:47 +00:00
Ivan Tashkinov
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
2020-04-02 19:38:39 +03:00
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
Egor Kislitsyn
0aa24a150b
Add oAuth
2020-04-02 17:33:23 +04:00
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
Maksim Pechnikov
591f7015d9
update Oban package
2020-04-02 09:34:11 +03:00
