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

3842 Commits

Author SHA1 Message Date
succfemboi db407e4d50
add feather to webclients 2019-02-10 16:18:04 +01:00
lambda 57501defb4 Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop' 
Recommend the acme-challenge path that is used in the installation guides

See merge request pleroma/pleroma!803
 2019-02-10 14:21:12 +00:00
lambda 612ace96de Merge branch 'docs/pleroma-clients' into 'develop' 
docs/Clients.md: Add documentation about clients supporting pleroma

See merge request pleroma/pleroma!726
 2019-02-10 13:47:26 +00:00
Haelwenn (lanodan) Monnier 94385313b5
docs/Clients.md: Add Nekonium 
[ci skip]
 2019-02-10 14:42:32 +01:00
Haelwenn (lanodan) Monnier daa25f3403
docs/Clients.md: Add Twidere, Remove SubwayTooter, sort alphabetically 
[ci skip]
 2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier f2d5989ffa
docs/Clients.md: Add Social (GNOME) 
[ci skip]
 2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier 91a41ec670
docs/Clients.md: Add per-type sections 
helps differenciate between Electrons and others like Brutaldon.
[ci skip]
 2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier 5f767be331
docs/Clients.md: Add Brutaldon, Sengi, Halcyon, Pinafore 2019-02-10 14:32:42 +01:00
Haelwenn (lanodan) Monnier d0cf58d032
WIP: docs/Clients.md: Add documentation about clients supporting pleroma 
[ci skip]
 2019-02-10 14:32:42 +01:00
Karen Konou cc21fc5f53 refactor, status view updating, error handling 2019-02-10 10:42:30 +01:00
rinpatch e0de0fcf22 Merge branch 'object-creation' into 'develop' 
Do object insertion through Cachex

See merge request pleroma/pleroma!802
 2019-02-10 07:39:27 +00:00
shibayashi 1d8b578bb7
Recommend the acme-challenge path that is used in the installation guides 2019-02-09 23:08:27 +01:00
kaniini d5fe05c37e Merge branch 'follow-enhancements' into 'develop' 
Respect blocks in mass follow.

See merge request pleroma/pleroma!797
 2019-02-09 21:03:42 +00:00
lain f8388be9c6 Do object insertion through Cachex 
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
 2019-02-09 22:01:08 +01:00
Karen Konou 6a150de3bd Add unique index and unique constraint check, uniqueness test fails 2019-02-09 20:52:11 +01:00
Karen Konou 478a05b4c9 Merged "check mute" test into the other two 2019-02-09 18:34:00 +01:00
Karen Konou 638456ce8f elixir too new for CI's mix format lol 2019-02-09 18:08:46 +01:00
Karen Konou a0d732ec55 it works!! 2019-02-09 17:47:57 +01:00
Haelwenn (lanodan) Monnier 6ca633ddd3
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure) 2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier d924dc73ba
de-group import/s 2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier 6a6a5b3251
de-group alias/es 2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier 381fe44172
HTML.Scrubber.Default: Consistency 2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier 2272934a5e
Stash 2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it 2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier bd9b5fffbc
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation 2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier 473095faf2
Web.Federator: Fix unused variable 2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier 60ea29dfe6
Credo fixes: alias grouping/ordering 2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier 106f4e7a0f
Credo fixes: parameter consistency 2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier 8bcfac93a8
Make credo happy 2019-02-09 14:59:20 +01:00
Karen Konou 4430a0ad12 added another test 2019-02-09 14:34:42 +01:00
Karen Konou 09189c3a7c Made a test! 2019-02-09 14:23:51 +01:00
lain 563f04e81b Do autofollow first. 2019-02-09 13:39:57 +01:00
lain bbd0049fae Respect blocks in mass follow. 2019-02-09 13:24:23 +01:00
lambda 99fd199bda Merge branch 'add-media-path-to-caddy-cache' into 'develop' 
Add /media to Caddy cache

See merge request pleroma/pleroma!791
 2019-02-09 11:39:01 +00:00
shibayashi e868cfe619 Add /media to Caddy cache 2019-02-09 11:39:01 +00:00
lambda 1eecbc1cd1 Merge branch 'feature/keyword-policy' into 'develop' 
Add keyword policy

See merge request pleroma/pleroma!794
 2019-02-09 11:38:37 +00:00
rinpatch b05a341187 oof 2019-02-09 08:12:30 +03:00
rinpatch 9a23f8f3ea Add tests and fix a typo in docs 2019-02-08 20:23:26 +03:00
Karen Konou 7e47a810a2 help i am not good with git 2019-02-08 13:22:29 +01:00
Karen Konou 5c5b228f21 Added thread unmuting (still a bit buggy maybe) 2019-02-08 13:20:40 +01:00
lambda c5f8df08a7 Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop' 
Split hide_network only for local users

See merge request pleroma/pleroma!781
 2019-02-08 12:18:05 +00:00
Karen Konou a44e532fb1 Added thread unmuting (still a bit buggy maybe) 2019-02-08 13:17:11 +01:00
rinpatch 38ff9b3568 fix typo in config.md 2019-02-08 15:12:44 +03:00
rinpatch 7356659273 wow 2019-02-08 15:12:13 +03:00
lambda ba7d7ffd80 Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop' 
Mark streaming feature for iOS apps in readme

See merge request pleroma/pleroma!790
 2019-02-08 12:10:35 +00:00
lambda b4271de770 Merge branch 'oauth2_strengthening' into 'develop' 
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix

See merge request pleroma/pleroma!793
 2019-02-08 12:09:43 +00:00
Karen Konou 98ec578f4d Merge branch 'develop' into feature/thread-muting 2019-02-08 12:44:02 +01:00
rinpatch f88dec8b33 What idiot did that? (me) 2019-02-08 13:16:50 +03:00
rinpatch 6c21f5aa16 Merge branch 'develop' into feature/keyword-policy 2019-02-08 13:12:33 +03:00
rinpatch 8a0b755c19 rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy 2019-02-08 13:12:09 +03:00