fa37acfcc7
TwitterAPI: Add Qvitter notification endpoint.
7 years ago
678fed47ee
Merge branch 'patch-2' into 'develop'
...
Ignore setup_db.psql and specify a folder for custom emojis
See merge request pleroma/pleroma!121
7 years ago
f08f9d4498
ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case)
7 years ago
7b96a756fb
fix again
7 years ago
77fc40d5d7
Fix generate config
7 years ago
8696c25efd
Ignore setup_db.psql and ignore a folder for custom emojis
...
Wiki page should also be updated to recommend that admins put their custom emojis in /priv/static/emoji/custom/. This both makes for less hassle when doing a pull. And also prevents more mess in the /priv/static/emoji/ folder.
7 years ago
e30a056476
Revert "Ask for proxy URL if proxy enabled."
...
The most common case is running it on the same server.
7 years ago
e4da81d662
Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'
...
CommonAPI post: kill \r with fire
See merge request pleroma/pleroma!120
7 years ago
32a26eb910
Fix TwitterAPI.delete call
7 years ago
ee6f15529d
CommonAPI post: kill \r with fire
7 years ago
b586ead6b8
rm_user: also ensure that cache is running.
7 years ago
8b5ea91f68
Merge branch 'fix/rm-user-task' into 'develop'
...
Fix rm_user task.
See merge request pleroma/pleroma!119
7 years ago
4e3fc530db
Fix rm_user task.
7 years ago
a80cdd5906
Merge branch 'fix/login-with-username-or-email' into 'develop'
...
MastoAPI and OAuth: allow login with either email or username.
See merge request pleroma/pleroma!118
7 years ago
947431e9aa
MastoAPI and OAuth: allow login with either email or username.
7 years ago
7b4f55238e
Handle unrepeats via the TwitterAPI
7 years ago
687db1bc3a
Expose unannounce activity so that it can be tested
7 years ago
0251690e96
Add federation for unrepeats
7 years ago
e153b364a7
update frontend
7 years ago
c9e7b984d5
Add make_unannounce_data helper function
7 years ago
85bd191291
Remove unretweet function for now
7 years ago
42279f54cf
Return target status in MastoAPI endpoint instead of reblog activity
7 years ago
d16877251a
doc fixes
7 years ago
5b0d0b9ab2
Add unreblogging tests
7 years ago
b949577472
Add unrepeat functionality
7 years ago
d24ddd9fb9
ActivityPub MRF: implement the SimplePolicy policy
7 years ago
4a178b3d65
ActivityPub: implement MRF core hook and baseline noop policy object
7 years ago
48380aeccc
ActivityPub.ex: do not return boosted statuses from blocked users.
7 years ago
5256c712dc
Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/
...
Not sure why it matters if you cache it or not. What's different about this JSON blob?
Perhaps it's a header that needs to be set for the redirect to happen?
7 years ago
fef8daa454
Update README.md
7 years ago
3b68eaa0ce
Merge branch 'mix_task_rm_user' into 'develop'
...
Add rm_user mix task
See merge request pleroma/pleroma!109
7 years ago
13a64b82e3
Switch to User.delete for rm_user task
7 years ago
4478b9115c
Add rm_user mix task
7 years ago
3d636cf533
Merge branch 'develop' into 'develop'
...
Fix issue #124
Closes #124
See merge request pleroma/pleroma!108
7 years ago
5612716c25
update frontend
7 years ago
a8dddd9279
update frontend
7 years ago
2de2e29df2
Oops
7 years ago
3a5c0465eb
Add unit test for pinned statuses
7 years ago
907df9b8ed
Fix issue #124
7 years ago
faa0feb095
Merge branch 'feld-hackneyupdate' into 'develop'
...
Update httpoison to get the latest hackney.
See merge request pleroma/pleroma!107
7 years ago
366138fa72
Update httpoison to get the latest hackney.
...
Works on my computer ^TM
7 years ago
b910483c16
Fix register_user task.
7 years ago
1dd2c8163f
Order masto searches by date.
7 years ago
d7654f4b3c
Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'
...
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec
See merge request pleroma/pleroma!104
7 years ago
6ff583e5e1
Merge branch 'feld-varnish' into 'develop'
...
Remove attempted caching of toots
See merge request pleroma/pleroma!106
7 years ago
fcb32345d7
Remove attempted caching of toots
...
This does not work as expected. We should not attempt to be clever here.
Varnish will do the right thing if we just teach Pleroma to set headers
properly for content we know can be cached.
7 years ago
fcc941adfd
Merge branch 'patch-1' into 'develop'
...
Indentation for Apache vhost
See merge request pleroma/pleroma!105
7 years ago
73ca18744e
Indentation for Apache vhost
7 years ago
fc13a3ff24
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec
7 years ago
d7c2909ce2
Merge branch 'bugfix/user-search-with-at-sign' into 'develop'
...
user: strip leading @ from user query when searching for users if present
Closes #117
See merge request pleroma/pleroma!99
7 years ago
eal