e4dc3f71ae
Resolve merge conflict
6 years ago
9a6236e69d
Reset index.html to develop
6 years ago
00ddfbe1c2
Remove .idea
6 years ago
19b6a82393
Merge branch 'bugfix/pinned-statuses' into 'develop'
...
Unpin when deleting a status
See merge request pleroma/pleroma!655
6 years ago
eeb9e632e4
Merge branch 'fix-spellign' into 'develop'
...
Fix spellign.
See merge request pleroma/pleroma!656
6 years ago
9eba6b96dc
Fix spellign.
6 years ago
728587fdaa
typo
6 years ago
b594a54d0c
unpin when deleting a status
6 years ago
e4b2cfa7b5
Merge branch 'fix-varnish-chunked' into 'develop'
...
Fix varnish chunked and general improvements
See merge request pleroma/pleroma!653
6 years ago
e4afe1359b
Merge branch 'activitypub-dereference-activity-id' into 'develop'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
6 years ago
efaa41fad2
Consistent intentation
6 years ago
fda942c329
Cache partial objects for 10 minutes
...
This enables caching/streaming of chunked responses
6 years ago
ce224ba5f0
Streaming is enabled by default
...
Support more filetypes for caching static media
6 years ago
9be539f0c1
Merge branch 'feature/add-twitter-card-parser' into 'develop'
...
Add Twitter Card parser
See merge request pleroma/pleroma!643
6 years ago
1f851a0723
Add Twitter Card parser
6 years ago
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
6 years ago
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
490c80bc96
test: common api: add tests for format_input/4
6 years ago
0bdbd4f968
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
...
ok @lanodan
6 years ago
2ecf81f10c
common api: fix newlines in markdown code blocks
6 years ago
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
6 years ago
f85d108c41
Merge branch 'mass-follow' into 'develop'
...
Mass follow
See merge request pleroma/pleroma!642
6 years ago
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
6 years ago
be92edcb29
Merge branch 'fix-alphasort' into 'develop'
...
Alpha sort the restricted nicknames
See merge request pleroma/pleroma!650
6 years ago
5419b1a030
Alpha sort the restricted nicknames
6 years ago
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
6 years ago
a2d7f0e0e9
Remove :commit since a tuple is already returned
6 years ago
a99e156f2c
Add integer casts.
6 years ago
7ac152ed38
TwitterAPI: Add follower/following pagination.
6 years ago
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
6 years ago
8df348a3da
Add test for summary_html
6 years ago
04735db193
Build the index concurrently.
6 years ago
5027f82cde
Add activity visibility index.
6 years ago
6cbe63726d
improve tests
6 years ago
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
```
6 years ago
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
6 years ago
65fc2df7cc
Use follow_all in autofollow.
6 years ago
26938d65fd
Add User mass following function.
6 years ago
28afcb7c31
move defaults from sample_config.exs to config.exs
6 years ago
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
6 years ago
20c0dd1e24
Support activity+json request for activity
6 years ago
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
6 years ago
567651fb3f
test: user: add tests for visible_for?/2
6 years ago
f2a4f89abe
tests: user: add tests for superuser?/1
6 years ago
f15183178c
user: fix auth_active?/1 for remote users
6 years ago
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.
6 years ago
74f48beec3
user: remove entirely redundant remote_or_auth_active?/1.
...
auth_active?/1 can check remote users and return true directly.
6 years ago
2af67353c5
user: harden auth_active?/1, superuser?/1, visible_for?/1
6 years ago
4124c9aa4a
tests: user: add regression test for remote_or_auth_active?/1
6 years ago
595a970493
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
6 years ago
rinpatch