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

3205 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksim Pechnikov 074fa790ba fix compile warnings 2018-12-09 20:50:08 +03:00
Haelwenn cf85a9aea1 Merge branch 'angristan-docker' into 'develop' 
Update angristan/docker-pleroma URL in README

See merge request pleroma/pleroma!526
 2018-12-09 13:53:20 +00:00
Stanislas 88e463e797 Update angristan/docker-pleroma link 2018-12-09 12:56:29 +00:00
Rin Toshaka 100a06afe1 config.md: Fix typos and add option description 2018-12-09 11:09:21 +01:00
Maksim Pechnikov 068353ac0b formatting 2018-12-09 11:24:46 +03:00
Maksim Pechnikov 9442588ae9 fix hashtags in api response 2018-12-09 11:24:46 +03:00
Rin Toshaka 15616eda5e Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content 2018-12-08 21:48:49 +01:00
href f079ca7181
Remove french. 2018-12-08 11:09:35 +01:00
lambda 5436aaad4f Merge branch 'fix/add-upload.ex' into 'develop' 
Mix Tasks: Add task uploads.ex for migrating local uploads.

See merge request pleroma/pleroma!517
 2018-12-08 09:12:37 +00:00
lambda beadeaffa1 Merge branch 'fix/nodeinfo-nil-features' into 'develop' 
Nodeinfo: remove null features; relay feature.

See merge request pleroma/pleroma!520
 2018-12-08 09:12:06 +00:00
lambda 8fa5c66eab Merge branch 'fix/media-proxy-url-encoded' into 'develop' 
Media proxy: fix url encoding

See merge request pleroma/pleroma!521
 2018-12-08 09:11:18 +00:00
lambda 4976a8b05f Merge branch 'fix/typo-relay-ex' into 'develop' 
[#283] Mix Tasks: Fix a typo in relay.ex

See merge request pleroma/pleroma!522
 2018-12-08 09:08:56 +00:00
Rin Toshaka 6c73136aec [#283] Mix Tasks: Fix a typo in relay.ex 2018-12-08 08:30:34 +01:00
href bdc8112e40
Media proxy: fix url encoding 2018-12-07 21:57:59 +01:00
Rin Toshaka 578051809f Add uploadlimit to Twitter API config 2018-12-07 20:03:30 +01:00
lambda 7d86c0c53f Merge branch 'fix/gopher-respect-ip' into 'develop' 
[#155] Fix Gopher server binding only to default value

See merge request pleroma/pleroma!518
 2018-12-07 18:49:40 +00:00
lambda 94ac0075bf Merge branch 'media-proxy-follow-redirect' into 'develop' 
Media proxy: follow HTTP redirects by default

Closes #421

See merge request pleroma/pleroma!519
 2018-12-07 18:48:26 +00:00
href 134cc94cbd
Nodeinfo: remove null features; relay feature. 2018-12-07 19:44:45 +01:00
href d8fcf7c5cf
Media proxy: follow HTTP redirects by default 2018-12-07 19:36:44 +01:00
lambda 94d8f1ab30 Merge branch '394_user_tags' into 'develop' 
[#394] User tags

Closes #394

See merge request pleroma/pleroma!508
 2018-12-07 18:25:38 +00:00
Rin Toshaka 09f20de0d7 Make gopher respect ip 2018-12-07 19:21:58 +01:00
Rin Toshaka fd5c7b445f Fix a typo 2018-12-07 19:19:14 +01:00
lambda da4315b5ef Merge branch 'emoji-alphabetical-ordering' into 'develop' 
Emojis: Alphabetical ordering

Closes #366

See merge request pleroma/pleroma!515
 2018-12-07 18:13:39 +00:00
Rin Toshaka a02e0c18bc Mix Tasks: Add task uploads.ex for migrating local uploads. 2018-12-07 15:13:57 +01:00
href 3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string 
Improve docs
 2018-12-07 14:07:11 +01:00
href 3c925e9d88
Emojis: Alphabetical ordering 2018-12-07 11:16:27 +01:00
Ivan Tashkinov 1cea97df64 [#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.) 2018-12-07 12:27:32 +03:00
lambda 8764f64690 Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop' 
Add mix pleroma.user unsubscribe to mix doc

See merge request pleroma/pleroma!512
 2018-12-07 09:23:56 +00:00
lambda 4b90c7cc9d Merge branch 'fix/typo-in-relay-doc' into 'develop' 
Mix Tasks: Fix a typo in relay.ex moduledoc

See merge request pleroma/pleroma!513
 2018-12-07 09:19:15 +00:00
rinpatch 4e2250b1dd Fix a typo in relay.ex moduledoc 2018-12-07 11:41:01 +03:00
Ivan Tashkinov 6ed5044c4e [#394] Refactoring (using Ecto.Multi; "untag" route change). 2018-12-07 11:04:39 +03:00
rinpatch f7e23aee90 Oops 2018-12-07 10:44:54 +03:00
rinpatch f661813807 Add mix pleroma.user unsubscribe to mix doc 2018-12-07 10:39:54 +03:00
eal c88db2c1b1 Merge branch 'fix/add-common.ex' into 'develop' 
add common.ex

See merge request pleroma/pleroma!511
 2018-12-07 06:48:39 +00:00
rinpatch 08e10a70ec Rename def to defval 2018-12-07 09:46:13 +03:00
Rin Toshaka 1d11c4cf11 add common.ex 2018-12-07 06:12:39 +01:00
kaniini 220de24002 Merge branch 'refactor/mix-tasks' into 'develop' 
Rebased !243

See merge request pleroma/pleroma!509
 2018-12-06 22:09:27 +00:00
Ivan Tashkinov 7a2162bbcb [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map. 2018-12-06 22:26:25 +03:00
Rin Toshaka f5726a2e12 Update README.md 2018-12-06 18:45:07 +01:00
Ivan Tashkinov abbf347dc7 [#394] View tests fix. 2018-12-06 20:38:52 +03:00
Rin Toshaka 71d5cf9ed8 Remove unused vars from user.ex 2018-12-06 18:25:39 +01:00
Ivan Tashkinov 7bcb6a183a [#394] Refactoring. 2018-12-06 20:23:16 +03:00
Rin Toshaka 66313cda02 Update instance.ex for web push 2018-12-06 18:16:51 +01:00
Ivan Tashkinov 22830c8fc9 [#394] Formatting fix. 2018-12-06 20:13:07 +03:00
Rin Toshaka 88f92693f2 Merge develop 2018-12-06 18:11:22 +01:00
Ivan Tashkinov 7b19487389 [#394] Added users.tags and admin routes to tag and untag users. Added tests. 2018-12-06 20:06:50 +03:00
Rin Toshaka ca7b46fb3b Refactor common functions to common.ex 2018-12-06 18:01:28 +01:00
Rin Toshaka 4a2a7ce636 Refactor common functions to common.ex 2018-12-06 18:00:24 +01:00
Rin Toshaka 3a84511df1 remove migrate_local_uploads.ex 2018-12-06 17:35:33 +01:00
kaniini 1d531fd2f3 Merge branch 'fix/mastodon-api-settings' into 'develop' 
Fix put_settings and remove info_changeset

See merge request pleroma/pleroma!507
 2018-12-06 16:01:58 +00:00