raeno [Fri, 14 Dec 2018 19:23:51 +0000 (20:23 +0100)]
Fix tests
Notice test has been failing due to missing placeholder in index.html
I've tried to use fixtures to substitute that file in test environment but it became too much hassle. Fixtures are not copied to _build directory so I'd need to change file fetching logic. IMO it doesn't worth it since pleroma-fe already has this placeholder merged and all future updated of index.html will include it.
raeno [Fri, 14 Dec 2018 18:55:40 +0000 (19:55 +0100)]
Handle "users/:id" links as well. Fix comments in MR.
raeno [Fri, 14 Dec 2018 01:59:33 +0000 (02:59 +0100)]
Fix tests. Remove oembed template
raeno [Thu, 13 Dec 2018 21:16:54 +0000 (22:16 +0100)]
Remove oembed for now, will submit it in another MR. Fix warnings
raeno [Thu, 13 Dec 2018 21:13:02 +0000 (22:13 +0100)]
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
raeno [Wed, 12 Dec 2018 19:57:01 +0000 (22:57 +0300)]
Set Pleroma.instance.domain when config is generated
raeno [Wed, 12 Dec 2018 19:55:01 +0000 (22:55 +0300)]
Extract opengraph/oembed into separate module
raeno [Wed, 12 Dec 2018 19:37:00 +0000 (22:37 +0300)]
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
raeno [Mon, 10 Dec 2018 19:08:02 +0000 (23:08 +0400)]
WIP. Implement oembed route and handle both json/xml for "Note" type activity
raeno [Mon, 10 Dec 2018 12:25:33 +0000 (16:25 +0400)]
Insert meta tags into static index.html on the fly for OStatus#notice
lambda [Thu, 13 Dec 2018 15:13:24 +0000 (15:13 +0000)]
Merge branch 'username-underscores' into 'develop'
Allow underscores/dashes in usernames.
Closes #429
See merge request pleroma/pleroma!537
lambda [Thu, 13 Dec 2018 15:10:50 +0000 (15:10 +0000)]
Merge branch 'fix/mix-tasks-set-user-info' into 'develop'
Fix mix task User
See merge request pleroma/pleroma!539
href [Wed, 12 Dec 2018 20:44:08 +0000 (21:44 +0100)]
Extended nicknames: allow dashes.
link0ff [Wed, 12 Dec 2018 20:32:32 +0000 (22:32 +0200)]
Allow to set both admin and moderator at the same time in mix task User
lambda [Wed, 12 Dec 2018 20:38:03 +0000 (20:38 +0000)]
Merge branch 'fix/nginx-safari' into 'develop'
Update proxy config to improve behavior and allow compatibility with Safari on MacOS and iOS
See merge request pleroma/pleroma!538
link0ff [Wed, 12 Dec 2018 20:30:16 +0000 (22:30 +0200)]
Fix toggle_activated in mix task User
href [Wed, 12 Dec 2018 17:17:15 +0000 (18:17 +0100)]
Allow underscores in usernames.
Fixes #429.
Mark Felder [Wed, 12 Dec 2018 17:36:00 +0000 (17:36 +0000)]
proxy buffering still needs to be off
Mark Felder [Wed, 12 Dec 2018 17:31:47 +0000 (17:31 +0000)]
Update proxy config to improve behavior and allow compatibility with Safari on MacOS and iOS
kaniini [Wed, 12 Dec 2018 07:28:47 +0000 (07:28 +0000)]
Merge branch 'support/issue_442' into 'develop'
[#442] fix warnings
See merge request pleroma/pleroma!536
Maksim Pechnikov [Tue, 11 Dec 2018 12:31:52 +0000 (15:31 +0300)]
fix warnings
scarlett [Mon, 10 Dec 2018 23:32:29 +0000 (23:32 +0000)]
Merge branch 'new-fe-options' into 'develop'
Add new frontend options to server-side config.
See merge request pleroma/pleroma!535
scarlett [Mon, 10 Dec 2018 23:23:10 +0000 (23:23 +0000)]
Document the new frontend options.
scarlett [Mon, 10 Dec 2018 23:15:01 +0000 (23:15 +0000)]
Add new frontend options to server-side config.
lambda [Mon, 10 Dec 2018 19:55:32 +0000 (19:55 +0000)]
Merge branch '2018-12-10-update-frontend' into 'develop'
2018 12 10 update frontend
See merge request pleroma/pleroma!534
lain [Mon, 10 Dec 2018 19:49:06 +0000 (20:49 +0100)]
Fix warnings.
lain [Mon, 10 Dec 2018 19:46:10 +0000 (20:46 +0100)]
update frontend
lambda [Mon, 10 Dec 2018 19:08:35 +0000 (19:08 +0000)]
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
lambda [Mon, 10 Dec 2018 19:06:39 +0000 (19:06 +0000)]
Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'
Mix tasks: improve uploads.ex moduledoc
See merge request pleroma/pleroma!528
lambda [Mon, 10 Dec 2018 19:06:13 +0000 (19:06 +0000)]
Merge branch 'fix/config-md-typos' into 'develop'
config.md: Fix typos and add `federating` option description
See merge request pleroma/pleroma!525
lambda [Mon, 10 Dec 2018 19:05:16 +0000 (19:05 +0000)]
Merge branch 'support/bugfix_272' into 'develop'
[#272] fix hashtags in api
See merge request pleroma/pleroma!510
lambda [Mon, 10 Dec 2018 19:04:06 +0000 (19:04 +0000)]
Merge branch 'fix/theora-detection-read-bytes' into 'develop'
Fix Theora detection in mime.ex
See merge request pleroma/pleroma!493
lambda [Mon, 10 Dec 2018 19:03:06 +0000 (19:03 +0000)]
Merge branch 'anonymize-filter-text' into 'develop'
AnonymizeFilename: allow for a pre-defined text instead of random string
See merge request pleroma/pleroma!516
lambda [Mon, 10 Dec 2018 18:33:36 +0000 (18:33 +0000)]
Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
# Conflicts:
# lib/mix/tasks/pleroma/uploads.ex
lambda [Mon, 10 Dec 2018 18:28:02 +0000 (18:28 +0000)]
Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop'
Parallel588/pleroma support/compile warnings
See merge request pleroma/pleroma!532
lain [Mon, 10 Dec 2018 18:19:40 +0000 (19:19 +0100)]
Format.
lain [Mon, 10 Dec 2018 18:13:53 +0000 (19:13 +0100)]
Treat warnings as errors outside of tests.
Maksim Pechnikov [Mon, 10 Dec 2018 06:39:57 +0000 (09:39 +0300)]
updates
rinpatch [Mon, 10 Dec 2018 05:03:17 +0000 (08:03 +0300)]
Keep the shortdoc descriptive
raeno [Sun, 9 Dec 2018 21:01:43 +0000 (01:01 +0400)]
Fixes #415. Properly handle nil and empty string by User.parse_bio
Rin Toshaka [Sun, 9 Dec 2018 19:17:35 +0000 (20:17 +0100)]
Mix tasks: improve uploads.ex moduledoc
Maksim Pechnikov [Sun, 9 Dec 2018 09:12:48 +0000 (12:12 +0300)]
fix compile warnings
Haelwenn [Sun, 9 Dec 2018 13:53:20 +0000 (13:53 +0000)]
Merge branch 'angristan-docker' into 'develop'
Update angristan/docker-pleroma URL in README
See merge request pleroma/pleroma!526
Stanislas [Sun, 9 Dec 2018 12:56:29 +0000 (12:56 +0000)]
Update angristan/docker-pleroma link
Rin Toshaka [Sun, 9 Dec 2018 10:09:21 +0000 (11:09 +0100)]
config.md: Fix typos and add option description
Maksim Pechnikov [Fri, 7 Dec 2018 04:53:14 +0000 (07:53 +0300)]
formatting
Maksim Pechnikov [Thu, 6 Dec 2018 18:50:34 +0000 (21:50 +0300)]
fix hashtags in api response
href [Sat, 8 Dec 2018 10:09:35 +0000 (11:09 +0100)]
Remove french.
lambda [Sat, 8 Dec 2018 09:12:37 +0000 (09:12 +0000)]
Merge branch 'fix/add-upload.ex' into 'develop'
Mix Tasks: Add task uploads.ex for migrating local uploads.
See merge request pleroma/pleroma!517
lambda [Sat, 8 Dec 2018 09:12:06 +0000 (09:12 +0000)]
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
lambda [Sat, 8 Dec 2018 09:11:18 +0000 (09:11 +0000)]
Merge branch 'fix/media-proxy-url-encoded' into 'develop'
Media proxy: fix url encoding
See merge request pleroma/pleroma!521
lambda [Sat, 8 Dec 2018 09:08:56 +0000 (09:08 +0000)]
Merge branch 'fix/typo-relay-ex' into 'develop'
[#283] Mix Tasks: Fix a typo in relay.ex
See merge request pleroma/pleroma!522
Rin Toshaka [Sat, 8 Dec 2018 07:30:34 +0000 (08:30 +0100)]
[#283] Mix Tasks: Fix a typo in relay.ex
href [Fri, 7 Dec 2018 20:44:04 +0000 (21:44 +0100)]
Media proxy: fix url encoding
lambda [Fri, 7 Dec 2018 18:49:40 +0000 (18:49 +0000)]
Merge branch 'fix/gopher-respect-ip' into 'develop'
[#155] Fix Gopher server binding only to default value
See merge request pleroma/pleroma!518
lambda [Fri, 7 Dec 2018 18:48:26 +0000 (18:48 +0000)]
Merge branch 'media-proxy-follow-redirect' into 'develop'
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
href [Fri, 7 Dec 2018 18:44:45 +0000 (19:44 +0100)]
Nodeinfo: remove null features; relay feature.
href [Fri, 7 Dec 2018 18:36:44 +0000 (19:36 +0100)]
Media proxy: follow HTTP redirects by default
lambda [Fri, 7 Dec 2018 18:25:38 +0000 (18:25 +0000)]
Merge branch '394_user_tags' into 'develop'
[#394] User tags
Closes #394
See merge request pleroma/pleroma!508
Rin Toshaka [Fri, 7 Dec 2018 18:21:58 +0000 (19:21 +0100)]
Make gopher respect ip
Rin Toshaka [Fri, 7 Dec 2018 18:19:14 +0000 (19:19 +0100)]
Fix a typo
lambda [Fri, 7 Dec 2018 18:13:39 +0000 (18:13 +0000)]
Merge branch 'emoji-alphabetical-ordering' into 'develop'
Emojis: Alphabetical ordering
Closes #366
See merge request pleroma/pleroma!515
Rin Toshaka [Fri, 7 Dec 2018 14:13:57 +0000 (15:13 +0100)]
Mix Tasks: Add task uploads.ex for migrating local uploads.
href [Fri, 7 Dec 2018 13:07:11 +0000 (14:07 +0100)]
AnonymizeFilename: allow for a pre-defined text instead of random string
Improve docs
href [Fri, 7 Dec 2018 10:16:27 +0000 (11:16 +0100)]
Emojis: Alphabetical ordering
Ivan Tashkinov [Fri, 7 Dec 2018 09:27:32 +0000 (12:27 +0300)]
[#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
lambda [Fri, 7 Dec 2018 09:23:56 +0000 (09:23 +0000)]
Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'
Add mix pleroma.user unsubscribe to mix doc
See merge request pleroma/pleroma!512
lambda [Fri, 7 Dec 2018 09:19:15 +0000 (09:19 +0000)]
Merge branch 'fix/typo-in-relay-doc' into 'develop'
Mix Tasks: Fix a typo in relay.ex moduledoc
See merge request pleroma/pleroma!513
rinpatch [Fri, 7 Dec 2018 08:41:01 +0000 (11:41 +0300)]
Fix a typo in relay.ex moduledoc
Ivan Tashkinov [Fri, 7 Dec 2018 08:04:39 +0000 (11:04 +0300)]
[#394] Refactoring (using Ecto.Multi; "untag" route change).
rinpatch [Fri, 7 Dec 2018 07:44:54 +0000 (10:44 +0300)]
Oops
rinpatch [Fri, 7 Dec 2018 07:39:54 +0000 (10:39 +0300)]
Add mix pleroma.user unsubscribe to mix doc
eal [Fri, 7 Dec 2018 06:48:39 +0000 (06:48 +0000)]
Merge branch 'fix/add-common.ex' into 'develop'
add common.ex
See merge request pleroma/pleroma!511
rinpatch [Fri, 7 Dec 2018 06:46:13 +0000 (09:46 +0300)]
Rename def to defval
Rin Toshaka [Fri, 7 Dec 2018 05:12:39 +0000 (06:12 +0100)]
add common.ex
kaniini [Thu, 6 Dec 2018 22:09:27 +0000 (22:09 +0000)]
Merge branch 'refactor/mix-tasks' into 'develop'
Rebased !243
See merge request pleroma/pleroma!509
Ivan Tashkinov [Thu, 6 Dec 2018 19:26:25 +0000 (22:26 +0300)]
[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
Rin Toshaka [Thu, 6 Dec 2018 17:45:07 +0000 (18:45 +0100)]
Update README.md
Ivan Tashkinov [Thu, 6 Dec 2018 17:38:52 +0000 (20:38 +0300)]
[#394] View tests fix.
Rin Toshaka [Thu, 6 Dec 2018 17:25:39 +0000 (18:25 +0100)]
Remove unused vars from user.ex
Ivan Tashkinov [Thu, 6 Dec 2018 17:23:16 +0000 (20:23 +0300)]
[#394] Refactoring.
Rin Toshaka [Thu, 6 Dec 2018 17:16:51 +0000 (18:16 +0100)]
Update instance.ex for web push
Ivan Tashkinov [Thu, 6 Dec 2018 17:13:07 +0000 (20:13 +0300)]
[#394] Formatting fix.
Rin Toshaka [Thu, 6 Dec 2018 17:11:22 +0000 (18:11 +0100)]
Merge develop
Ivan Tashkinov [Thu, 6 Dec 2018 17:06:50 +0000 (20:06 +0300)]
[#394] Added `users.tags` and admin routes to tag and untag users. Added tests.
Rin Toshaka [Thu, 6 Dec 2018 17:01:28 +0000 (18:01 +0100)]
Refactor common functions to common.ex
Rin Toshaka [Thu, 6 Dec 2018 17:00:24 +0000 (18:00 +0100)]
Refactor common functions to common.ex
Rin Toshaka [Thu, 6 Dec 2018 16:35:33 +0000 (17:35 +0100)]
remove migrate_local_uploads.ex
kaniini [Thu, 6 Dec 2018 16:01:58 +0000 (16:01 +0000)]
Merge branch 'fix/mastodon-api-settings' into 'develop'
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
kaniini [Thu, 6 Dec 2018 15:57:56 +0000 (15:57 +0000)]
Merge branch 'correct-and-improve-http-options' into 'develop'
Correct and improve http options
See merge request pleroma/pleroma!505
kaniini [Thu, 6 Dec 2018 15:36:41 +0000 (15:36 +0000)]
Merge branch 're-mrf' into 'develop'
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
kaniini [Thu, 6 Dec 2018 15:35:30 +0000 (15:35 +0000)]
Merge branch 'feature/compat/push-subscriptions' into 'develop'
Web Push Subscriptions
See merge request pleroma/pleroma!506
rinpatch [Thu, 6 Dec 2018 14:42:07 +0000 (17:42 +0300)]
MastoAPI: Fix put_settings
scarlett [Thu, 6 Dec 2018 14:00:41 +0000 (14:00 +0000)]
Rename regular expression 'have_re' to 'reply_prefix'.
Egor Kislitsyn [Thu, 6 Dec 2018 13:55:46 +0000 (20:55 +0700)]
use `User.avatar_url`
Egor Kislitsyn [Thu, 6 Dec 2018 13:50:20 +0000 (20:50 +0700)]
cleanup
scarlett [Thu, 6 Dec 2018 13:48:12 +0000 (13:48 +0000)]
Harden re: detection.
Egor Kislitsyn [Thu, 6 Dec 2018 13:42:00 +0000 (20:42 +0700)]
clean up
Egor Kislitsyn [Thu, 6 Dec 2018 13:17:00 +0000 (20:17 +0700)]
add VAPID to test config
Egor Kislitsyn [Thu, 6 Dec 2018 13:15:16 +0000 (20:15 +0700)]
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
projects / akkoma / log