alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,250 Commits 1 Branch 0 Tags 177 MiB
Commit Graph

5250 Commits

Author SHA1 Message Date
lain 718b59a263 Dependencies: Update ecto sql once more. 2019-05-17 11:19:30 +02:00
rinpatch 642a67dd44 Render polls in statuses 2019-05-17 11:44:47 +03:00
rinpatch 3e5301ad5c Merge branch 'fix/902-random-compile-failing' into 'develop' 
Fix/902 random compile failing

Closes #902

See merge request pleroma/pleroma!1168
 2019-05-17 07:25:20 +00:00
Alexander Strizhakov 7ed682213f Fix/902 random compile failing 2019-05-17 07:25:20 +00:00
Haelwenn (lanodan) Monnier 68c75a08e8
MastoAPI account_view.ex: requested is false when following is true 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
 2019-05-17 07:44:09 +02:00
kaniini 99f50bf3e8 Merge branch 'fix/mrf-tag-typo' into 'develop' 
Fix MRF "tag" typo

See merge request pleroma/pleroma!1167
 2019-05-17 01:20:04 +00:00
Aaron Tinio 443cd68a4c Add tests for MRF.SimplePolicy 2019-05-17 09:02:34 +08:00
Aaron Tinio 70235ce840 Fix typo: s/"tags"/"tag"/g 2019-05-17 09:02:34 +08:00
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
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