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 |
|
Alexander Strizhakov
|
73ae58fdfa
|
Feature/896 toggling confirmation
|
2019-05-16 13:23:41 +00:00 |
|
Egor Kislitsyn
|
fc7246d715
|
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
|
2019-05-16 17:54:24 +07:00 |
|
Alex S
|
4711d8151c
|
try this
|
2019-05-16 17:35:07 +07:00 |
|
Alex S
|
8355d0607e
|
trailing spaces
|
2019-05-16 17:03:12 +07:00 |
|
Alex S
|
9d14214eb9
|
Merge branch 'develop' into feature/890-add-report-uri
|
2019-05-16 12:54:06 +07:00 |
|
Alex S
|
aa11fa4864
|
add report uri and report to
|
2019-05-16 12:49:40 +07:00 |
|
kaniini
|
a2771869a3
|
Merge branch 'docs/update_debian_instructions' into 'develop'
Added package to dependency list documentation
See merge request pleroma/pleroma!1161
|
2019-05-16 05:03:37 +00:00 |
|
kaniini
|
2180136039
|
Merge branch 'chore/docs-update' into 'develop'
Update Admin API docs
See merge request pleroma/pleroma!1162
|
2019-05-16 05:02:50 +00:00 |
|
kaniini
|
3a96c29c65
|
Merge branch 'fix/slow-federation' into 'develop'
publisher: use the correct queue name for outgoing federation
See merge request pleroma/pleroma!1163
|
2019-05-16 04:50:15 +00:00 |
|
William Pitcock
|
c31026423c
|
publisher: use the correct queue name for outgoing federation
|
2019-05-16 04:41:27 +00:00 |
|
Angelina Filippova
|
107c83ab2b
|
Note that nicknames is an array
|
2019-05-16 01:48:53 +03:00 |
|
Angelina Filippova
|
0641e685c1
|
Note that nicknames is an array
|
2019-05-16 01:46:43 +03:00 |
|
Angelina Filippova
|
1d2923e5d0
|
Update tag/untag docs
|
2019-05-16 01:36:26 +03:00 |
|
PolymerWitch
|
0ae15c2306
|
Added package to dependency list
Added the erlang-ssh package to the dependency list and the installation
command instructions. The project wouldn't build otherwise.
|
2019-05-15 15:36:20 -07:00 |
|
Aaron Tinio
|
793f1834d2
|
Use named binding to conditionally join object
|
2019-05-16 06:25:14 +08:00 |
|
Aaron Tinio
|
2b6119dfbf
|
Restrict reblogs of activities from blocked domains
|
2019-05-16 05:53:51 +08:00 |
|
Aaron Tinio
|
64495b96e9
|
Add test for blocked domains
|
2019-05-16 05:53:51 +08:00 |
|
rinpatch
|
62e42b03ab
|
Handle incoming Question objects
|
2019-05-15 20:10:16 +03:00 |
|
William Pitcock
|
f3971cbde3
|
thread visibility function: fix use of no longer used author variable
|
2019-05-15 17:02:40 +00:00 |
|
William Pitcock
|
a591ab6112
|
activity pub: remove Ecto SQL query dumps
|
2019-05-15 16:56:46 +00:00 |
|
William Pitcock
|
71fa7eeb6f
|
thread visibility function: significantly improve efficiency
|
2019-05-15 16:54:14 +00:00 |
|
William Pitcock
|
f09c3afdf5
|
chase test failures
|
2019-05-15 16:23:01 +00:00 |
|
William Pitcock
|
12f45e2a89
|
update migration
|
2019-05-15 16:22:52 +00:00 |
|
William Pitcock
|
0aada88b55
|
bbs: chase timeline containment patch
|
2019-05-15 16:02:15 +00:00 |
|
William Pitcock
|
75ce6adcff
|
migration: only care about Create activities
|
2019-05-15 15:54:10 +00:00 |
|
William Pitcock
|
c7644313e7
|
test: update obsolete test
|
2019-05-15 15:54:10 +00:00 |
|
William Pitcock
|
31db31c587
|
activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread
|
2019-05-15 15:54:10 +00:00 |
|
William Pitcock
|
de114ffbb0
|
activitypub: remove contain_timeline()
|
2019-05-15 15:53:06 +00:00 |
|
William Pitcock
|
0387f52138
|
activitypub: add restrict_thread_visibility()
|
2019-05-15 15:53:06 +00:00 |
|
William Pitcock
|
958b4cfde9
|
migrations: add function to see if a thread can be satisfied
|
2019-05-15 15:53:06 +00:00 |
|
lain
|
f168a1cbdc
|
Merge remote-tracking branch 'origin/develop' into conversations-import
|
2019-05-15 17:47:29 +02:00 |
|
kaniini
|
62516be9c4
|
Merge branch 'fix/public-option-not-working' into 'develop'
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
|
2019-05-15 15:42:21 +00:00 |
|
lambda
|
4440e23547
|
Merge branch 'chore/extricate-http-signatures' into 'develop'
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
|
2019-05-15 15:37:31 +00:00 |
|
William Pitcock
|
4429c1b7da
|
tests: fixup
|
2019-05-15 15:29:42 +00:00 |
|
kaniini
|
18f2d2024d
|
Merge branch 'prevent-public-answers' into 'develop'
Prevent public answers to direct messages
See merge request pleroma/pleroma!1159
|
2019-05-15 15:26:07 +00:00 |
|
lambda
|
0992094bd6
|
Merge branch 'cleanup' into 'develop'
Remove unused queue from the config
See merge request pleroma/pleroma!1158
|
2019-05-15 15:23:13 +00:00 |
|
lambda
|
3456f643a8
|
Merge branch 'ci/coverage' into 'develop'
Excoveralls for code coverage
See merge request pleroma/pleroma!1156
|
2019-05-15 15:19:20 +00:00 |
|
feld
|
f831acf912
|
Excoveralls for code coverage
|
2019-05-15 15:19:20 +00:00 |
|