lambda [Sat, 15 Dec 2018 15:31:30 +0000 (15:31 +0000)]
Merge branch 'bugfix/webfinger-jrd' into 'develop'
Fix requesting application/jrd+json on webfinger
See merge request pleroma/pleroma!553
lambda [Sat, 15 Dec 2018 15:23:51 +0000 (15:23 +0000)]
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
lambda [Sat, 15 Dec 2018 15:22:59 +0000 (15:22 +0000)]
Merge branch 'tests-warning-as-errors' into 'develop'
Enable warnings_as_errors for tests
See merge request pleroma/pleroma!548
lambda [Sat, 15 Dec 2018 15:21:40 +0000 (15:21 +0000)]
Merge branch 'feature/mix-task-instance-port-specification' into 'develop'
Allow port specification in `instance.ex` config generator
See merge request pleroma/pleroma!552
Haelwenn (lanodan) Monnier [Sat, 15 Dec 2018 15:17:44 +0000 (16:17 +0100)]
Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints
Haelwenn (lanodan) Monnier [Sat, 15 Dec 2018 14:58:51 +0000 (15:58 +0100)]
config/config.exs: Add application/jrd+json => jrd+json to fix webfinger
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/551
Rin Toshaka [Sat, 15 Dec 2018 10:00:54 +0000 (11:00 +0100)]
Allow port specification in instance.ex
href [Fri, 14 Dec 2018 20:30:35 +0000 (20:30 +0000)]
Merge branch 'fix/issue_433' into 'develop'
[#433] fix markdown formatting
See merge request pleroma/pleroma!545
href [Fri, 14 Dec 2018 20:22:24 +0000 (20:22 +0000)]
Merge branch '114_email_invites' into 'develop'
[#114] Email invites
See merge request pleroma/pleroma!541
href [Fri, 14 Dec 2018 20:20:30 +0000 (20:20 +0000)]
Merge branch 'fix/issue_272' into 'develop'
[#272] fix tags
See merge request pleroma/pleroma!540
Maksim Pechnikov [Fri, 14 Dec 2018 19:56:37 +0000 (22:56 +0300)]
fix case when tags is invalid
Maksim Pechnikov [Thu, 13 Dec 2018 12:13:02 +0000 (15:13 +0300)]
fix tags
href [Fri, 14 Dec 2018 18:50:44 +0000 (18:50 +0000)]
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
Improve web push
Closes #393, #422, and #452
See merge request pleroma/pleroma!524
Maksim Pechnikov [Fri, 14 Dec 2018 18:21:37 +0000 (21:21 +0300)]
fixed typo
href [Fri, 14 Dec 2018 17:14:40 +0000 (18:14 +0100)]
Enable warning_as_errors for tests
href [Fri, 14 Dec 2018 16:24:33 +0000 (17:24 +0100)]
TwitterAPI.ActivityView: Ignore unhandled activities
href [Fri, 14 Dec 2018 15:17:27 +0000 (16:17 +0100)]
Warn if push is disabled..
Haelwenn [Fri, 14 Dec 2018 15:06:04 +0000 (15:06 +0000)]
Update config.md
Maksim Pechnikov [Fri, 14 Dec 2018 09:41:55 +0000 (12:41 +0300)]
fix markdown formatting
href [Fri, 14 Dec 2018 13:00:24 +0000 (13:00 +0000)]
Merge branch 'feature/file-size-checking' into 'develop'
[#36] Add warnings when file upload fails
See merge request pleroma/pleroma!523
href [Fri, 14 Dec 2018 12:56:42 +0000 (13:56 +0100)]
Fix warning
href [Mon, 10 Dec 2018 14:50:10 +0000 (15:50 +0100)]
Pleroma.Activity.mastodon_notification_type/1
href [Sun, 9 Dec 2018 12:45:21 +0000 (13:45 +0100)]
Properly disable Web Push if no VAPID key is set
href [Sat, 8 Dec 2018 19:02:59 +0000 (20:02 +0100)]
Typos
href [Sat, 8 Dec 2018 17:07:10 +0000 (18:07 +0100)]
Push: respect alerts settings
href [Sat, 8 Dec 2018 16:34:13 +0000 (17:34 +0100)]
Push: add missing notification_type field
href [Sat, 8 Dec 2018 16:32:58 +0000 (17:32 +0100)]
Push.Subscription: convert base64 to base64 urlsafe
Egor Kislitsyn [Fri, 7 Dec 2018 14:08:42 +0000 (21:08 +0700)]
improve push message format (compatibility with mastodon)
lambda [Fri, 7 Dec 2018 09:32:59 +0000 (09:32 +0000)]
Update config.md
Egor Kislitsyn [Fri, 7 Dec 2018 08:55:28 +0000 (15:55 +0700)]
fix and improve web push; add configuration docs
Ivan Tashkinov [Fri, 14 Dec 2018 11:13:13 +0000 (14:13 +0300)]
[#114] Added `invitesEnabled` to `metadata` of nodeinfo.
Ivan Tashkinov [Fri, 14 Dec 2018 11:01:00 +0000 (14:01 +0300)]
[#114] Removed `confirm_email` action stub (to be addressed in a separate MR).
Ivan Tashkinov [Fri, 14 Dec 2018 10:52:04 +0000 (13:52 +0300)]
[#114] Improved tests.
Ivan Tashkinov [Fri, 14 Dec 2018 09:37:06 +0000 (12:37 +0300)]
[#114] Readded `invites_enabled` config setting, updated readme.
Ivan Tashkinov [Thu, 13 Dec 2018 15:23:05 +0000 (18:23 +0300)]
[#114] Moved email_invite action to AdminAPIController, adjusted tests.
Ivan Tashkinov [Thu, 13 Dec 2018 14:58:40 +0000 (17:58 +0300)]
[#114] Added UserInviteToken creation, adjusted invitation email link to include it.
Ivan Tashkinov [Thu, 13 Dec 2018 13:30:10 +0000 (16:30 +0300)]
[#114] Naive implementation of email invitations.
href [Fri, 14 Dec 2018 09:16:03 +0000 (09:16 +0000)]
Merge branch '114_user_registration_emails' into 'develop'
[#114] User registration emails
Closes #114
See merge request pleroma/pleroma!531
Ivan Tashkinov [Fri, 14 Dec 2018 09:09:55 +0000 (12:09 +0300)]
[#114] Addressed MR comments. Removed functionality to be extracted to other MRs.
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
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
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
eal [Fri, 14 Dec 2018 06:24:18 +0000 (08:24 +0200)]
TwitterAPI: Include favorited post in json
eal [Fri, 14 Dec 2018 05:56:49 +0000 (07:56 +0200)]
Prevent accidental double RTs or favorites
lain [Thu, 13 Dec 2018 20:03:36 +0000 (21:03 +0100)]
update frontend
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
Ivan Tashkinov [Thu, 13 Dec 2018 13:22:42 +0000 (16:22 +0300)]
[#114] Removed `email_invite` implementation (to be addressed separately).
Ivan Tashkinov [Thu, 13 Dec 2018 13:22:42 +0000 (16:22 +0300)]
[#114] Removed `email_invite` implementation (to be addressed separately).
Ivan Tashkinov [Thu, 13 Dec 2018 11:30:48 +0000 (14:30 +0300)]
[#114] Initial implementation of user email invitations.
Ivan Tashkinov [Thu, 13 Dec 2018 10:17:49 +0000 (13:17 +0300)]
[#114] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
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
Ivan Tashkinov [Wed, 12 Dec 2018 17:15:43 +0000 (20:15 +0300)]
[#114] Routes and config for `confirm_email` and `email_invite` (Twitter API).
Ivan Tashkinov [Wed, 12 Dec 2018 14:14:31 +0000 (17:14 +0300)]
[#114] Addressed warnings. Fix of `with` statement clause in `password_reset`.
Ivan Tashkinov [Wed, 12 Dec 2018 13:28:00 +0000 (16:28 +0300)]
[#114] Added tests for "POST /api/account/password_reset".
Ivan Tashkinov [Tue, 11 Dec 2018 17:17:49 +0000 (20:17 +0300)]
[#114] Initial implementation of user password reset emails (user-initiated).
Ivan Tashkinov [Tue, 11 Dec 2018 11:59:25 +0000 (14:59 +0300)]
[#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
Ivan Tashkinov [Mon, 10 Dec 2018 17:20:50 +0000 (20:20 +0300)]
[#114] SMTP deps and config.
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
Rin Toshaka [Sat, 8 Dec 2018 20:48:49 +0000 (21:48 +0100)]
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
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
projects / akkoma / log