Commit graph

5130 commits

Author SHA1 Message Date
rinpatch aafe30d94e Handle poll votes 2019-05-21 14:12:10 +03:00
rinpatch 3f96b3e4b8 Enforce poll limits and add error handling for MastodonAPI's post endpoint 2019-05-21 10:54:20 +03:00
rinpatch 76a7429bef Add poll limits to /api/v1/instance and initial state 2019-05-21 09:13:10 +03:00
rinpatch 6430cb1bf7 Restrict poll replies from fetch queries by default 2019-05-19 17:44:18 +03:00
rinpatch 1d90f9b969 Remove tags/mentions/rich text from poll options because Mastodon and
add custom emoji
2019-05-19 17:06:44 +03:00
rinpatch 5ece901af3 Resolve merge conflicts and remove IO.inspects 2019-05-18 13:37:38 +03:00
rinpatch fd920c8973 Mastodon API: Add support for posting polls 2019-05-18 13:29:28 +03:00
rinpatch 8e9a764dfc Merge branch 'feature/mrf-always-nsfw' into 'develop'
suppress link previews from posts marked sensitive

Closes #865

See merge request pleroma/pleroma!1173
2019-05-18 07:13:18 +00:00
Haelwenn cd7a6a25d2 Merge branch 'feature/http-ua-header-always' into 'develop'
http: request builder: send user-agent when making requests

Closes #546

See merge request pleroma/pleroma!1174
2019-05-18 04:42:11 +00:00
William Pitcock c4a55e167a add Changelog entry 2019-05-17 23:00:14 +00:00
William Pitcock dc08159538 also suppress link previews from posts marked #nsfw 2019-05-17 22:13:24 +00:00
William Pitcock c234ce546a add CHANGELOG entry 2019-05-17 20:31:39 +00:00
William Pitcock 290f5b2cfe config: make sending the user agent configurable, disable sending the user agent in tests 2019-05-17 20:28:58 +00:00
William Pitcock d3b8cd342f http: request builder: send user-agent when making requests 2019-05-17 19:04:17 +00:00
William Pitcock 0da1233e8e rich media: suppress link previews if post is marked as sensitive 2019-05-17 18:49:43 +00:00
William Pitcock 78588dbd80 mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw 2019-05-17 18:49:10 +00:00
rinpatch d2dacadb6b Merge branch 'rum-index' into 'develop'
Search: Use RUM index.

See merge request pleroma/pleroma!1136
2019-05-17 16:35:19 +00:00
lain ef63cf7088 CI: Use the correct image with the correct hostname. 2019-05-17 15:30:50 +02:00
lain 8784a7d1b4 RUM: Set rum status by the environment. 2019-05-17 15:21:24 +02:00
lain 022e6e4b44 RUM: Remove vacuum analyze from migration
Can't be run in a trnasaction.
2019-05-17 14:59:01 +02:00
lain a3fc7294da CI: Add rum variant testing. 2019-05-17 14:26:07 +02:00
lain 412a3d8a0f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index 2019-05-17 12:26:59 +02:00
lambda e5b34f5e05 Merge branch 'ecto_sql_update' into 'develop'
Dependencies: Update Ecto SQL.

See merge request pleroma/pleroma!1160
2019-05-17 10:21:38 +00:00
lambda 0498fa244f Merge branch 'update-tzdata' into 'develop'
Dependencies: Update tzdata.

Closes #910

See merge request pleroma/pleroma!1171
2019-05-17 10:21:14 +00:00
lambda 1dcdcd8871 Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
MastoAPI account_view.ex: requested is false when following is true

Closes #903

See merge request pleroma/pleroma!1169
2019-05-17 10:07:51 +00:00
lambda 46684db84d Update account_view.ex 2019-05-17 09:53:44 +00:00
lain 5743124c77 Dependencies: Update tzdata.
This fixes the bug that tz data could not be loaded. Closes #910.
2019-05-17 11:51:50 +02:00
lain 249b31ffe5 Fix specs. 2019-05-17 11:49:13 +02:00
lain 67af50ec71 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update 2019-05-17 11:33:04 +02:00
lain e39c190f04 Configuration: disable migration lock. 2019-05-17 11:30:35 +02:00
lain 718b59a263 Dependencies: Update ecto sql once more. 2019-05-17 11:19:30 +02:00
rinpatch 642a67dd44 Render polls in statuses 2019-05-17 11:44:47 +03:00
rinpatch 3e5301ad5c Merge branch 'fix/902-random-compile-failing' into 'develop'
Fix/902 random compile failing

Closes #902

See merge request pleroma/pleroma!1168
2019-05-17 07:25:20 +00:00
Alexander Strizhakov 7ed682213f Fix/902 random compile failing 2019-05-17 07:25:20 +00:00
Haelwenn (lanodan) Monnier 68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
2019-05-17 07:44:09 +02:00
kaniini 99f50bf3e8 Merge branch 'fix/mrf-tag-typo' into 'develop'
Fix MRF "tag" typo

See merge request pleroma/pleroma!1167
2019-05-17 01:20:04 +00:00
Aaron Tinio 443cd68a4c Add tests for MRF.SimplePolicy 2019-05-17 09:02:34 +08:00
Aaron Tinio 70235ce840 Fix typo: s/"tags"/"tag"/g 2019-05-17 09:02:34 +08:00
kaniini bf84d50c76 Merge branch 'feature/890-add-report-uri' into 'develop'
Feature/890 add report uri

Closes #890

See merge request pleroma/pleroma!1164
2019-05-16 20:11:12 +00:00
feld a328251a52 Merge branch 'feature/task-update-following' into 'develop'
Remove duplicated entries in users' following lists

Closes #888

See merge request pleroma/pleroma!1166
2019-05-16 20:04:08 +00:00
Sergey Suprunenko 2c303afc8b Remove duplicated entries in users' following lists 2019-05-16 20:04:08 +00:00
feld 0f8892686a Merge branch 'feature/admin-api-reports' into 'develop'
Add Reports to Admin API

Closes #774

See merge request pleroma/pleroma!1107
2019-05-16 19:09:19 +00:00
Sergey Suprunenko e2b3a27204 Add Reports to Admin API 2019-05-16 19:09:18 +00:00
feld e190b3022b Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
Fix domain-unblocked reblogs

Closes #892

See merge request pleroma/pleroma!1157
2019-05-16 18:57:14 +00:00
rinpatch ad76307a82 Merge branch 'conversations-import' into 'develop'
Conversations import

Closes #871

See merge request pleroma/pleroma!1127
2019-05-16 18:32:42 +00:00
Mark Felder cd127d2fa4 Update CHANGELOG 2019-05-16 13:17:09 -05:00
Mark Felder efa61c1610 Move to pleroma.database mix task 2019-05-16 13:14:48 -05:00
Mark Felder ebb0482116 Merge branch 'develop' into conversations-import 2019-05-16 13:11:17 -05:00
lambda fde30aee43 Merge branch 'feature/sql-thread-sat' into 'develop'
SQL thread visibility solver

See merge request pleroma/pleroma!971
2019-05-16 13:44:22 +00:00
rinpatch 103f205097 Merge branch 'feature/896-toggling-confirmation' into 'develop'
Feature/896 toggling confirmation

Closes #896

See merge request pleroma/pleroma!1165
2019-05-16 13:23:42 +00:00