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

3070 Commits

Author SHA1 Message Date
lambda 0863ec2737 Merge branch 'fix_empty_bio_crash' into 'develop' 
Fixes #415. Do not crash during registration when hasn't filled bio field

Closes #415

See merge request pleroma/pleroma!529
 2018-12-10 19:08:35 +00:00
lambda 8aa646ca31 Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop' 
Mix tasks: improve uploads.ex moduledoc

See merge request pleroma/pleroma!528
 2018-12-10 19:06:39 +00:00
lambda 729321ad20 Merge branch 'fix/config-md-typos' into 'develop' 
config.md: Fix typos and add  `federating` option description

See merge request pleroma/pleroma!525
 2018-12-10 19:06:13 +00:00
lambda ff10b9927b Merge branch 'support/bugfix_272' into 'develop' 
[#272] fix hashtags in api

See merge request pleroma/pleroma!510
 2018-12-10 19:05:16 +00:00
lambda 6786ad3d98 Merge branch 'fix/theora-detection-read-bytes' into 'develop' 
Fix Theora detection in mime.ex

See merge request pleroma/pleroma!493
 2018-12-10 19:04:06 +00:00
lambda 0554d91dcd Merge branch 'anonymize-filter-text' into 'develop' 
AnonymizeFilename: allow for a pre-defined text instead of random string

See merge request pleroma/pleroma!516
 2018-12-10 19:03:06 +00:00
lambda bda25b999b Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc' 
# Conflicts:
#   lib/mix/tasks/pleroma/uploads.ex
 2018-12-10 18:33:36 +00:00
lambda ab98c92d86 Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop' 
Parallel588/pleroma support/compile warnings

See merge request pleroma/pleroma!532
 2018-12-10 18:28:02 +00:00
lain b621ebb7a6 Format. 2018-12-10 19:19:40 +01:00
lain c81c74d847 Treat warnings as errors outside of tests. 2018-12-10 19:13:53 +01:00
Maksim Pechnikov e94c3442f4 updates 2018-12-10 13:27:37 +03:00
rinpatch 993c8c8bd4 Keep the shortdoc descriptive 2018-12-10 08:03:17 +03:00
Maxim Filippov 09c13d0929 Use "~" as a route namespace symbol on FE 2018-12-10 01:22:50 +03:00
raeno 9ba4a1c5fe Fixes #415. Properly handle nil and empty string by User.parse_bio 2018-12-10 01:01:43 +04:00
Rin Toshaka cbe048bb3f Mix tasks: improve uploads.ex moduledoc 2018-12-09 20:17:35 +01:00
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