Dashie
|
804497542d
|
Return the right content-type for the schema call
|
2018-05-03 10:50:02 +02:00 |
|
Dashie
|
e448734952
|
Explicit error message
|
2018-05-02 22:45:20 +02:00 |
|
Dashie
|
fd0bf3aa71
|
Simplify version and fix typo
|
2018-05-02 22:44:13 +02:00 |
|
Dashie
|
b8789cc8b6
|
Add localPosts count, also set to 0 if null
|
2018-05-02 22:36:19 +02:00 |
|
Dashie
|
abeb009acc
|
Change path of nodeinfo to use .json format
|
2018-05-02 22:16:19 +02:00 |
|
Dashie
|
65168393d8
|
Format files
|
2018-05-02 21:43:12 +02:00 |
|
Dashie
|
67dadd954e
|
Add first try at nodeinfo
|
2018-05-02 21:31:42 +02:00 |
|
lain
|
bc215f5684
|
Fix format.
|
2018-04-29 11:28:26 +02:00 |
|
lambda
|
b7584edcea
|
Merge branch 'patch-bio' into 'develop'
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
|
2018-04-29 09:26:47 +00:00 |
|
lain
|
4d55d7c95e
|
Insert object after being rewritten.
|
2018-04-28 16:10:24 +02:00 |
|
lambda
|
a7a40bb8f1
|
Merge branch 'fix/blocked-user-boosts' into 'develop'
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
|
2018-04-28 13:49:12 +00:00 |
|
Wim Vanderbauwhede
|
634c0c52a1
|
Merge remote-tracking branch 'upstream/develop' into patch-bio
|
2018-04-28 11:59:01 +01:00 |
|
lambda
|
39c80a3667
|
Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
ActivityPub MRF SimplePolicy: fix media stripping
See merge request pleroma/pleroma!133
|
2018-04-27 05:49:12 +00:00 |
|
William Pitcock
|
90bbd94614
|
ActivityPub MRF SimplePolicy: fix media stripping
|
2018-04-25 16:28:53 -05:00 |
|
eal
|
845bd56c9c
|
Merge branch 'patch-1' into 'develop'
Fix typo in MastoFE login page.
See merge request pleroma/pleroma!132
|
2018-04-25 14:35:44 +00:00 |
|
lain
|
a7eb148d61
|
Optionally deactivate public timelines.
|
2018-04-25 16:11:07 +02:00 |
|
lain
|
279b1d19f0
|
Align local bio limits to remote limit.
|
2018-04-25 15:41:59 +02:00 |
|
Normandy
|
715c90e54f
|
Fix typo in MastoFE login page.
see https://git.pleroma.social/pleroma/mastofe/issues/13
|
2018-04-24 21:58:45 +00:00 |
|
lain
|
c78e7d8b11
|
Fix formatting.
|
2018-04-24 21:25:31 +02:00 |
|
lambda
|
7a52c4549c
|
Merge branch 'feature/message-rewrite-facility' into 'develop'
message rewrite facility
See merge request pleroma/pleroma!112
|
2018-04-24 17:21:28 +00:00 |
|
Wim Vanderbauwhede
|
7517155544
|
Changed to support \r\n and \n
|
2018-04-24 13:28:55 +01:00 |
|
Wim Vanderbauwhede
|
52ee91efce
|
Patch to replace newlines with <br> tags in bio
|
2018-04-24 13:20:17 +01:00 |
|
Dashie
|
afe892ddac
|
Correct syntax with mix format
|
2018-04-24 14:12:23 +02:00 |
|
Dashie
|
9972678a68
|
Add User.decrease_note_count and call it from ActivityPub.delete
|
2018-04-24 11:34:18 +02:00 |
|
lambda
|
62a2287bba
|
Merge branch 'favicon_tag' into 'develop'
Fix endpoint for favicon
See merge request pleroma/pleroma!84
|
2018-04-24 05:54:28 +00:00 |
|
lain
|
0574df273c
|
Small cleanup.
|
2018-04-22 10:01:10 +02:00 |
|
lain
|
114ca9e069
|
Merge branch 'develop' into fix/note-count-not-updating
|
2018-04-22 09:56:24 +02:00 |
|
lain
|
0c221943ef
|
Formatter: Use proper escaping for links.
|
2018-04-21 18:27:31 +02:00 |
|
eal
|
22bfeac256
|
Update note count in ActivityPub.create.
|
2018-04-21 12:58:04 +03:00 |
|
lain
|
9e6ae44729
|
Formatting fixes.
|
2018-04-21 09:43:53 +02:00 |
|
lain
|
ff5e957476
|
Make search use id index too.
Seems to be faster in general, query planner chooses well.
|
2018-04-21 09:22:31 +02:00 |
|
lain
|
a61e8ac154
|
Formatting.
|
2018-04-20 13:10:57 +02:00 |
|
lain
|
193be32f45
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
|
2018-04-19 21:44:29 +02:00 |
|
lain
|
0b4ff1bfe2
|
fix again
|
2018-04-19 21:44:11 +02:00 |
|
eal
|
fa37acfcc7
|
TwitterAPI: Add Qvitter notification endpoint.
|
2018-04-19 21:46:59 +03:00 |
|
nenolod@dereferenced.org
|
f08f9d4498
|
ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case)
|
2018-04-19 07:45:09 -05:00 |
|
lain
|
7b96a756fb
|
fix again
|
2018-04-19 13:04:29 +02:00 |
|
lain
|
77fc40d5d7
|
Fix generate config
|
2018-04-19 12:52:24 +02:00 |
|
eal
|
e30a056476
|
Revert "Ask for proxy URL if proxy enabled."
The most common case is running it on the same server.
|
2018-04-19 13:29:14 +03:00 |
|
William Pitcock
|
ee6f15529d
|
CommonAPI post: kill \r with fire
|
2018-04-18 15:46:39 -05:00 |
|
eal
|
b586ead6b8
|
rm_user: also ensure that cache is running.
|
2018-04-18 17:52:25 +03:00 |
|
lambda
|
8b5ea91f68
|
Merge branch 'fix/rm-user-task' into 'develop'
Fix rm_user task.
See merge request pleroma/pleroma!119
|
2018-04-18 14:41:03 +00:00 |
|
eal
|
4e3fc530db
|
Fix rm_user task.
|
2018-04-18 17:39:27 +03:00 |
|
eal
|
947431e9aa
|
MastoAPI and OAuth: allow login with either email or username.
|
2018-04-18 13:13:57 +03:00 |
|
William Pitcock
|
d24ddd9fb9
|
ActivityPub MRF: implement the SimplePolicy policy
|
2018-04-14 06:32:45 -05:00 |
|
William Pitcock
|
4a178b3d65
|
ActivityPub: implement MRF core hook and baseline noop policy object
|
2018-04-14 06:32:44 -05:00 |
|
eal
|
48380aeccc
|
ActivityPub.ex: do not return boosted statuses from blocked users.
|
2018-04-14 14:26:20 +03:00 |
|
Phenethylamine
|
13a64b82e3
|
Switch to User.delete for rm_user task
|
2018-04-12 14:30:53 -04:00 |
|
Phenethylamine
|
4478b9115c
|
Add rm_user mix task
|
2018-04-12 02:43:48 -04:00 |
|
Gian Sass
|
907df9b8ed
|
Fix issue #124
|
2018-04-11 14:55:49 -04:00 |
|