nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
5082 commits 2 branches 0 tags 272 MiB
Commit graph

5082 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksim 1040caf096 fix format 
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
 2019-05-06 17:51:03 +00:00
lambda aacac9da0b Merge branch 'feature/bbs' into 'develop' 
BBS / SSH

See merge request pleroma/pleroma!997
 2019-05-06 17:17:03 +00:00
lambda 4dabf64af4 Merge branch 'feature/845-improve-status-deletion' into 'develop' 
Improve status deletion

Closes #845

See merge request pleroma/pleroma!1104
 2019-05-06 16:45:22 +00:00
Alexander Strizhakov ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion 2019-05-06 16:45:22 +00:00
Haelwenn (lanodan) Monnier 69a5074893
Remove H1 in @moduledoc 2019-05-06 04:53:12 +02:00
Haelwenn (lanodan) Monnier e41a2f98d5
mrf/tag_policy.ex: Add some documentation 
mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one?
 2019-05-06 04:53:11 +02:00
Haelwenn (lanodan) Monnier af62ace954
Add short documentation on every MRF Policy 2019-05-06 04:49:50 +02:00
lain eb0fb73ddb BBS: Credo fixes. 2019-05-04 15:47:50 +02:00
lain c58fd4c038 BBS: Fix tests. 2019-05-04 15:36:48 +02:00
lain c9d1cb2dce BBS: Use cached user fetcher. 2019-05-04 15:08:07 +02:00
lain 4c76f49e60 BBS: small fixes. 2019-05-04 15:06:18 +02:00
lain 6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs 2019-05-04 15:00:45 +02:00
rinpatch d089ff2460 Merge branch 'fix/embeded-relationship-in-follows' into 'develop' 
Fix embeded relationships in Mastodon API

See merge request pleroma/pleroma!1118
 2019-05-03 20:36:13 +00:00
rinpatch 9907e974ca Merge branch 'fix-search-speed' into 'develop' 
Search: Add fts index on objects table.

See merge request pleroma/pleroma!1120
 2019-05-03 18:35:02 +00:00
lain a23206a4ae Just have Benchee in all environments. 2019-05-03 20:28:06 +02:00
lain a7709cc267 Mix: Also have benchee in test. 2019-05-03 19:42:49 +02:00
lambda 4948a73e37 Merge branch 'bugfix/emoji-size' into 'develop' 
Bugfix: emoji size in profile

Closes #269

See merge request pleroma/pleroma!792
 2019-05-03 17:26:39 +00:00
lain 0e37fddd5a Search: Add fts index on objects table. 2019-05-03 19:21:09 +02:00
Haelwenn (lanodan) Monnier b5ad1715b2
MastoAPI: profile update with emoji_map 2019-05-03 16:41:23 +02:00
Haelwenn (lanodan) Monnier 46bbf9e1cf
TwitterAPI: profile update with emoji_map 2019-05-03 16:30:24 +02:00
Haelwenn (lanodan) Monnier 85434669bb
Web.TwitterAPI.UserView: Also view local user emojis 2019-05-03 16:27:51 +02:00
Haelwenn (lanodan) Monnier 2f76a40d02
formatter.ex: Add get_emoji_map/1 2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier d70af32127
Pleroma.User: remove emojify on parse_bio 2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier 85b5c60694
Pleroma.Formatter: width/height to class=emoji 2019-05-03 16:25:58 +02:00
lain c42ded13a2 Credo fixes. 2019-05-03 13:53:17 +02:00
lambda 027ded0df7 Merge branch 'fix/replace-ws' into 'develop' 
Standardize construction of websocket URL

See merge request pleroma/pleroma!1115
 2019-05-03 11:45:04 +00:00
feld acb04306b6 Standardize construction of websocket URL 
This follows up on the change made in d747bd98
 2019-05-03 11:45:04 +00:00
lain a0c755cc4a MastodonApi: Bump api level. 2019-05-03 13:40:43 +02:00
lain 81d1aa424d Streamer: Stream out Conversations/Participations. 2019-05-03 13:39:14 +02:00
rinpatch 38b79461df Fix embeded relationships in Mastodon API 
Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case
 2019-05-03 00:49:17 +03:00
lambda 497d34b825 Merge branch 'iss-849' into 'develop' 
Parse access_token from body parameters and URL parameters

See merge request pleroma/pleroma!1103
 2019-05-02 14:17:17 +00:00
AkiraFukushima a53a6c9d64 Add oauth plug tests for url and body parameters 2019-05-02 22:25:21 +09:00
AkiraFukushima dff6afc7c8 fix: Add mix deps.get before unit-testing 2019-05-02 21:04:09 +09:00
AkiraFukushima 533d8cd581 Parse access_token from body parameters and URL parameters 2019-05-02 21:04:00 +09:00
Roman Chvanikov 8af55728e4 Fix tests 2019-05-01 19:03:55 +02:00
lain 45f790becc Merge remote-tracking branch 'origin/develop' into conversations_three 2019-05-01 18:40:41 +02:00
lambda d107919b3d Merge branch 'support/oauth' into 'develop' 
Refactored Pleroma.Web.Auth.Authenticator

See merge request pleroma/pleroma!1108
 2019-05-01 13:28:04 +00:00
Maksim c854bff8f5 Refactored Pleroma.Web.Auth.Authenticator 2019-05-01 13:28:04 +00:00
rinpatch 622c804c9a Merge branch 'fix/remove-redundant-ensure-scrubbed-html' into 'develop' 
Remove redundant ensure_scrubbed_html

See merge request pleroma/pleroma!1114
 2019-05-01 11:02:08 +00:00
rinpatch 51e26f14f7 Remove redundant ensure_scrubbed_html 
It is never used as handling for fake and non-fake activities was merged
into one function above it
 2019-05-01 13:52:44 +03:00
lambda a58813e7a1 Merge branch 'features/download-mastofe-build' into 'develop' 
installation/download-mastofe-build.sh: Add mastofe CI-artifacts download

See merge request pleroma/pleroma!1052
 2019-05-01 10:48:30 +00:00
lambda 0bcdaf378e Merge branch 'bugfix/web-notification-special-char' into 'develop' 
fix the web push notification with special char for status created

See merge request pleroma/pleroma!1092
 2019-05-01 10:45:32 +00:00
lambda 297596ce48 Merge branch 'harmonize_return_types_in_user_module' into 'develop' 
Harmonize return types in user module

Closes #718

See merge request pleroma/pleroma!1112
 2019-05-01 10:41:00 +00:00
rinpatch a7c9e3b242 Merge branch 'docs/fix-config.md' into 'develop' 
[docs/config.md]Fix syntax highlighting + clarify :frontend_configuration

See merge request pleroma/pleroma!1110
 2019-05-01 09:16:25 +00:00
rinpatch 7c5f1ef327 Merge branch 'update_auto_linker' into 'develop' 
Update `auto_linker`

See merge request pleroma/pleroma!1111
 2019-05-01 09:14:10 +00:00
Alex S f11e7037c2 test fixes 2019-05-01 16:09:53 +07:00
Egor Kislitsyn 04fd7cf817 Update auto_linker 2019-05-01 15:18:12 +07:00
Alex S bdfa3a6fa8 Merging with develop 
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
 2019-05-01 12:29:33 +07:00
xse 2982061dfa Fix syntax highlighting + clarify :frontend_configuration 2019-05-01 01:26:14 +02:00
Sachin Joshi 85fa2fbce4 add scrubber for html special char 2019-05-01 01:37:17 +05:45