akkoma
5 years agoMerge branch 'fix/double-rt-or-fav' into 'develop'
lambda [Fri, 14 Dec 2018 08:26:08 +0000 (08:26 +0000)]
Merge branch 'fix/double-rt-or-fav' into 'develop'

Prevent accidental double RTs or favorites

See merge request pleroma/pleroma!542

5 years agoMerge branch 'fix/qvitter-fav-object' into 'develop'
lambda [Fri, 14 Dec 2018 08:25:02 +0000 (08:25 +0000)]
Merge branch 'fix/qvitter-fav-object' into 'develop'

TwitterAPI: Include favorited post in json

Closes #405

See merge request pleroma/pleroma!543

5 years agoMerge branch '2018-12-13-update-frontend' into 'develop'
lambda [Fri, 14 Dec 2018 08:23:56 +0000 (08:23 +0000)]
Merge branch '2018-12-13-update-frontend' into 'develop'

update frontend

See merge request pleroma/pleroma!544

5 years agoTwitterAPI: Include favorited post in json
eal [Fri, 14 Dec 2018 06:24:18 +0000 (08:24 +0200)]
TwitterAPI: Include favorited post in json

5 years agoPrevent accidental double RTs or favorites
eal [Fri, 14 Dec 2018 05:56:49 +0000 (07:56 +0200)]
Prevent accidental double RTs or favorites

5 years agoupdate frontend
lain [Thu, 13 Dec 2018 20:03:36 +0000 (21:03 +0100)]
update frontend

5 years agoMerge branch 'username-underscores' into 'develop'
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

5 years agoMerge branch 'fix/mix-tasks-set-user-info' into 'develop'
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

5 years agoExtended nicknames: allow dashes.
href [Wed, 12 Dec 2018 20:44:08 +0000 (21:44 +0100)]
Extended nicknames: allow dashes.

5 years agoAllow to set both admin and moderator at the same time in mix task User
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

5 years agoMerge branch 'fix/nginx-safari' into 'develop'
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

5 years agoFix toggle_activated in mix task User
link0ff [Wed, 12 Dec 2018 20:30:16 +0000 (22:30 +0200)]
Fix toggle_activated in mix task User

5 years agoAllow underscores in usernames.
href [Wed, 12 Dec 2018 17:17:15 +0000 (18:17 +0100)]
Allow underscores in usernames.

Fixes #429.

5 years agoproxy buffering still needs to be off
Mark Felder [Wed, 12 Dec 2018 17:36:00 +0000 (17:36 +0000)]
proxy buffering still needs to be off

5 years agoUpdate proxy config to improve behavior and allow compatibility with Safari on MacOS...
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

5 years agoMerge branch 'support/issue_442' into 'develop'
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

5 years agofix warnings
Maksim Pechnikov [Tue, 11 Dec 2018 12:31:52 +0000 (15:31 +0300)]
fix warnings

5 years agoMerge branch 'new-fe-options' into 'develop'
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

5 years agoDocument the new frontend options.
scarlett [Mon, 10 Dec 2018 23:23:10 +0000 (23:23 +0000)]
Document the new frontend options.

5 years agoAdd new frontend options to server-side config.
scarlett [Mon, 10 Dec 2018 23:15:01 +0000 (23:15 +0000)]
Add new frontend options to server-side config.

5 years agoMerge branch '2018-12-10-update-frontend' into 'develop'
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

5 years agoFix warnings.
lain [Mon, 10 Dec 2018 19:49:06 +0000 (20:49 +0100)]
Fix warnings.

5 years agoupdate frontend
lain [Mon, 10 Dec 2018 19:46:10 +0000 (20:46 +0100)]
update frontend

5 years agoMerge branch 'fix_empty_bio_crash' into 'develop'
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

5 years agoMerge branch 'fix/mix-task-uploads-moduledoc' into 'develop'
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

5 years agoMerge branch 'fix/config-md-typos' into 'develop'
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

5 years agoMerge branch 'support/bugfix_272' into 'develop'
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

5 years agoMerge branch 'fix/theora-detection-read-bytes' into 'develop'
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

5 years agoMerge branch 'anonymize-filter-text' into 'develop'
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

5 years agoMerge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
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

5 years agoMerge branch 'parallel588/pleroma-support/compile_warnings' into 'develop'
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

5 years agoFormat.
lain [Mon, 10 Dec 2018 18:19:40 +0000 (19:19 +0100)]
Format.

5 years agoTreat warnings as errors outside of tests.
lain [Mon, 10 Dec 2018 18:13:53 +0000 (19:13 +0100)]
Treat warnings as errors outside of tests.

5 years agoupdates
Maksim Pechnikov [Mon, 10 Dec 2018 06:39:57 +0000 (09:39 +0300)]
updates

5 years agoKeep the shortdoc descriptive
rinpatch [Mon, 10 Dec 2018 05:03:17 +0000 (08:03 +0300)]
Keep the shortdoc descriptive

5 years agoFixes #415. Properly handle nil and empty string by User.parse_bio
raeno [Sun, 9 Dec 2018 21:01:43 +0000 (01:01 +0400)]
Fixes #415. Properly handle nil and empty string by User.parse_bio

5 years agoMix tasks: improve uploads.ex moduledoc
Rin Toshaka [Sun, 9 Dec 2018 19:17:35 +0000 (20:17 +0100)]
Mix tasks: improve uploads.ex moduledoc

5 years agofix compile warnings
Maksim Pechnikov [Sun, 9 Dec 2018 09:12:48 +0000 (12:12 +0300)]
fix compile warnings

5 years agoMerge branch 'angristan-docker' into 'develop'
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

5 years agoUpdate angristan/docker-pleroma link
Stanislas [Sun, 9 Dec 2018 12:56:29 +0000 (12:56 +0000)]
Update angristan/docker-pleroma link

5 years agoconfig.md: Fix typos and add option description
Rin Toshaka [Sun, 9 Dec 2018 10:09:21 +0000 (11:09 +0100)]
config.md: Fix typos and add  option description

5 years agoformatting
Maksim Pechnikov [Fri, 7 Dec 2018 04:53:14 +0000 (07:53 +0300)]
formatting

5 years agofix hashtags in api response
Maksim Pechnikov [Thu, 6 Dec 2018 18:50:34 +0000 (21:50 +0300)]
fix hashtags in api response

5 years agoRemove french.
href [Sat, 8 Dec 2018 10:09:35 +0000 (11:09 +0100)]
Remove french.

5 years agoMerge branch 'fix/add-upload.ex' into 'develop'
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

5 years agoMerge branch 'fix/nodeinfo-nil-features' into 'develop'
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

5 years agoMerge branch 'fix/media-proxy-url-encoded' into 'develop'
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

5 years agoMerge branch 'fix/typo-relay-ex' into 'develop'
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

5 years ago[#283] Mix Tasks: Fix a typo in relay.ex
Rin Toshaka [Sat, 8 Dec 2018 07:30:34 +0000 (08:30 +0100)]
[#283] Mix Tasks: Fix a typo in relay.ex

5 years agoMedia proxy: fix url encoding
href [Fri, 7 Dec 2018 20:44:04 +0000 (21:44 +0100)]
Media proxy: fix url encoding

5 years agoMerge branch 'fix/gopher-respect-ip' into 'develop'
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

5 years agoMerge branch 'media-proxy-follow-redirect' into 'develop'
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

5 years agoNodeinfo: remove null features; relay feature.
href [Fri, 7 Dec 2018 18:44:45 +0000 (19:44 +0100)]
Nodeinfo: remove null features; relay feature.

5 years agoMedia proxy: follow HTTP redirects by default
href [Fri, 7 Dec 2018 18:36:44 +0000 (19:36 +0100)]
Media proxy: follow HTTP redirects by default

5 years agoMerge branch '394_user_tags' into 'develop'
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

5 years agoMake gopher respect ip
Rin Toshaka [Fri, 7 Dec 2018 18:21:58 +0000 (19:21 +0100)]
Make gopher respect ip

5 years agoFix a typo
Rin Toshaka [Fri, 7 Dec 2018 18:19:14 +0000 (19:19 +0100)]
Fix a typo

5 years agoMerge branch 'emoji-alphabetical-ordering' into 'develop'
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

5 years agoMix Tasks: Add task uploads.ex for migrating local uploads.
Rin Toshaka [Fri, 7 Dec 2018 14:13:57 +0000 (15:13 +0100)]
Mix Tasks: Add task uploads.ex for migrating local uploads.

5 years agoAnonymizeFilename: allow for a pre-defined text instead of random string
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

5 years agoEmojis: Alphabetical ordering
href [Fri, 7 Dec 2018 10:16:27 +0000 (11:16 +0100)]
Emojis: Alphabetical ordering

5 years ago[#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
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.)

5 years agoMerge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'
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

5 years agoMerge branch 'fix/typo-in-relay-doc' into 'develop'
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

5 years agoFix a typo in relay.ex moduledoc
rinpatch [Fri, 7 Dec 2018 08:41:01 +0000 (11:41 +0300)]
Fix a typo in relay.ex moduledoc

5 years ago[#394] Refactoring (using Ecto.Multi; "untag" route change).
Ivan Tashkinov [Fri, 7 Dec 2018 08:04:39 +0000 (11:04 +0300)]
[#394] Refactoring (using Ecto.Multi; "untag" route change).

5 years agoOops
rinpatch [Fri, 7 Dec 2018 07:44:54 +0000 (10:44 +0300)]
Oops

5 years agoAdd mix pleroma.user unsubscribe to mix doc
rinpatch [Fri, 7 Dec 2018 07:39:54 +0000 (10:39 +0300)]
Add mix pleroma.user unsubscribe to mix doc

5 years agoMerge branch 'fix/add-common.ex' into 'develop'
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

5 years agoRename def to defval
rinpatch [Fri, 7 Dec 2018 06:46:13 +0000 (09:46 +0300)]
Rename def to defval

5 years agoadd common.ex
Rin Toshaka [Fri, 7 Dec 2018 05:12:39 +0000 (06:12 +0100)]
add common.ex

5 years agoMerge branch 'refactor/mix-tasks' into 'develop'
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

5 years ago[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
Ivan Tashkinov [Thu, 6 Dec 2018 19:26:25 +0000 (22:26 +0300)]
[#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.

5 years agoUpdate README.md
Rin Toshaka [Thu, 6 Dec 2018 17:45:07 +0000 (18:45 +0100)]
Update README.md

5 years ago[#394] View tests fix.
Ivan Tashkinov [Thu, 6 Dec 2018 17:38:52 +0000 (20:38 +0300)]
[#394] View tests fix.

5 years agoRemove unused vars from user.ex
Rin Toshaka [Thu, 6 Dec 2018 17:25:39 +0000 (18:25 +0100)]
Remove unused vars from user.ex

5 years ago[#394] Refactoring.
Ivan Tashkinov [Thu, 6 Dec 2018 17:23:16 +0000 (20:23 +0300)]
[#394] Refactoring.

5 years agoUpdate instance.ex for web push
Rin Toshaka [Thu, 6 Dec 2018 17:16:51 +0000 (18:16 +0100)]
Update instance.ex for web push

5 years ago[#394] Formatting fix.
Ivan Tashkinov [Thu, 6 Dec 2018 17:13:07 +0000 (20:13 +0300)]
[#394] Formatting fix.

5 years agoMerge develop
Rin Toshaka [Thu, 6 Dec 2018 17:11:22 +0000 (18:11 +0100)]
Merge develop

5 years ago[#394] Added `users.tags` and admin routes to tag and untag users. Added tests.
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.

5 years agoRefactor common functions to common.ex
Rin Toshaka [Thu, 6 Dec 2018 17:01:28 +0000 (18:01 +0100)]
Refactor common functions to common.ex

5 years agoRefactor common functions to common.ex
Rin Toshaka [Thu, 6 Dec 2018 17:00:24 +0000 (18:00 +0100)]
Refactor common functions to common.ex

5 years agoremove migrate_local_uploads.ex
Rin Toshaka [Thu, 6 Dec 2018 16:35:33 +0000 (17:35 +0100)]
remove migrate_local_uploads.ex

5 years agoMerge branch 'fix/mastodon-api-settings' into 'develop'
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

5 years agoMerge branch 'correct-and-improve-http-options' into 'develop'
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

5 years agoMerge branch 're-mrf' into 'develop'
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

5 years agoMerge branch 'feature/compat/push-subscriptions' into 'develop'
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

5 years agoMastoAPI: Fix put_settings
rinpatch [Thu, 6 Dec 2018 14:42:07 +0000 (17:42 +0300)]
MastoAPI: Fix put_settings

5 years agoRename regular expression 'have_re' to 'reply_prefix'.
scarlett [Thu, 6 Dec 2018 14:00:41 +0000 (14:00 +0000)]
Rename regular expression 'have_re' to 'reply_prefix'.

5 years agouse `User.avatar_url`
Egor Kislitsyn [Thu, 6 Dec 2018 13:55:46 +0000 (20:55 +0700)]
use `User.avatar_url`

5 years agocleanup
Egor Kislitsyn [Thu, 6 Dec 2018 13:50:20 +0000 (20:50 +0700)]
cleanup

5 years agoHarden re: detection.
scarlett [Thu, 6 Dec 2018 13:48:12 +0000 (13:48 +0000)]
Harden re: detection.

5 years agoclean up
Egor Kislitsyn [Thu, 6 Dec 2018 13:42:00 +0000 (20:42 +0700)]
clean up

5 years agoadd VAPID to test config
Egor Kislitsyn [Thu, 6 Dec 2018 13:17:00 +0000 (20:17 +0700)]
add VAPID to test config

5 years agoMerge branch 'develop' into feature/compat/push-subscriptions
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

5 years agoshow warning if VAPID is not set
Egor Kislitsyn [Thu, 6 Dec 2018 12:56:56 +0000 (19:56 +0700)]
show warning if VAPID is not set

5 years agoMerge branch 'develop' into feature/compat/push-subscriptions
Egor Kislitsyn [Thu, 6 Dec 2018 12:55:58 +0000 (19:55 +0700)]
Merge branch 'develop' into feature/compat/push-subscriptions

# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock

5 years agoAdd web push support
Egor Kislitsyn [Thu, 6 Dec 2018 12:29:04 +0000 (19:29 +0700)]
Add web push support

5 years agoUse object.normalize.
scarlett [Thu, 6 Dec 2018 11:37:29 +0000 (11:37 +0000)]
Use object.normalize.