ce224ba5f0
Streaming is enabled by default
...
Support more filetypes for caching static media
2019-01-10 18:23:22 +00:00
9be539f0c1
Merge branch 'feature/add-twitter-card-parser' into 'develop'
...
Add Twitter Card parser
See merge request pleroma/pleroma!643
2019-01-10 18:09:56 +00:00
1f851a0723
Add Twitter Card parser
2019-01-10 18:09:56 +00:00
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
2019-01-10 18:03:32 +00:00
ab4c5f5bf7
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
...
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
2019-01-10 03:54:29 +00:00
490c80bc96
test: common api: add tests for format_input/4
2019-01-10 03:46:34 +00:00
0bdbd4f968
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
...
ok @lanodan
2019-01-10 03:45:58 +00:00
2ecf81f10c
common api: fix newlines in markdown code blocks
2019-01-10 03:37:37 +00:00
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
2019-01-10 02:39:53 +00:00
f85d108c41
Merge branch 'mass-follow' into 'develop'
...
Mass follow
See merge request pleroma/pleroma!642
2019-01-10 02:33:11 +00:00
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
2019-01-10 02:31:29 +00:00
be92edcb29
Merge branch 'fix-alphasort' into 'develop'
...
Alpha sort the restricted nicknames
See merge request pleroma/pleroma!650
2019-01-10 01:08:33 +00:00
5419b1a030
Alpha sort the restricted nicknames
2019-01-10 00:06:03 +00:00
b57db828c7
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
...
Rich media: Remove :commit since a tuple is already returned
See merge request pleroma/pleroma!649
2019-01-09 18:42:00 +00:00
a2d7f0e0e9
Remove :commit since a tuple is already returned
2019-01-09 21:35:01 +03:00
a99e156f2c
Add integer casts.
2019-01-09 18:17:23 +01:00
7ac152ed38
TwitterAPI: Add follower/following pagination.
2019-01-09 18:14:32 +01:00
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
2019-01-09 16:26:38 +00:00
8df348a3da
Add test for summary_html
2019-01-09 17:18:37 +01:00
04735db193
Build the index concurrently.
2019-01-09 16:55:05 +01:00
5027f82cde
Add activity visibility index.
2019-01-09 16:45:09 +01:00
6cbe63726d
improve tests
2019-01-09 19:54:37 +07:00
44a1e69484
Add Twitter API for the pinned statuses
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
2019-01-09 19:54:19 +07:00
9854978b8b
Remove recent activity restriction.
...
This should be fine now, everything should be covered by indices.
2019-01-09 12:38:23 +01:00
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
2019-01-09 17:40:15 +07:00
65fc2df7cc
Use follow_all in autofollow.
2019-01-09 11:38:45 +01:00
26938d65fd
Add User mass following function.
2019-01-09 11:35:23 +01:00
28afcb7c31
move defaults from sample_config.exs to config.exs
2019-01-09 17:02:30 +07:00
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
2019-01-09 16:56:31 +07:00
20c0dd1e24
Support activity+json request for activity
2019-01-09 09:33:30 +01:00
5c5c8508c2
Merge branch 'hotfix/media-proxy-uri' into 'develop'
...
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
2019-01-09 07:09:39 +00:00
567651fb3f
test: user: add tests for visible_for?/2
2019-01-09 07:03:32 +00:00
f2a4f89abe
tests: user: add tests for superuser?/1
2019-01-09 06:50:31 +00:00
f15183178c
user: fix auth_active?/1 for remote users
2019-01-09 06:45:17 +00:00
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.
2019-01-09 06:44:50 +00:00
74f48beec3
user: remove entirely redundant remote_or_auth_active?/1.
...
auth_active?/1 can check remote users and return true directly.
2019-01-09 06:36:50 +00:00
2af67353c5
user: harden auth_active?/1, superuser?/1, visible_for?/1
2019-01-09 06:21:21 +00:00
4124c9aa4a
tests: user: add regression test for remote_or_auth_active?/1
2019-01-09 06:02:18 +00:00
595a970493
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
2019-01-09 06:02:18 +00:00
3aee8bb67b
Merge branch 'autofollow' into 'develop'
...
Add a setting for users to autofollow on sign up.
See merge request pleroma/pleroma!639
2019-01-08 22:58:19 +00:00
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
2019-01-08 16:32:07 +07:00
6428ef77ad
add default configuration for the pinned statuses and some doc
2019-01-08 16:11:03 +07:00
7b6c5f0a9d
improve test readability
2019-01-08 16:01:35 +07:00
0fae04c4e3
Add a setting for users to autofollow on sign up.
2019-01-08 09:57:53 +01:00
db6f4496eb
fix test
2019-01-08 15:32:06 +07:00
e679da4c34
add `pinned` property to `StatusView`
2019-01-08 15:27:02 +07:00
63dbd87568
rename `post` to `status`
2019-01-08 15:25:50 +07:00
4e5b156047
Merge branch 'features/syslog_logger' into 'develop'
...
Add logging to syslog
See merge request pleroma/pleroma!622
2019-01-07 22:25:02 +00:00
3065fa4dfd
Merge branch 'spc-fix-2' into 'develop'
...
Actually put some onformation in the error user, make it actually properly parse in conversations.
See merge request pleroma/pleroma!638
2019-01-07 20:39:46 +00:00
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
2019-01-07 20:59:30 +01:00
Mark Felder