lambda [Tue, 18 Dec 2018 20:23:21 +0000 (20:23 +0000)]
Merge branch 'fix/formatter-ignore-html-chars' into 'develop'
[#441] Fix characters converted to HTML being picked up by hashtag parser
See merge request pleroma/pleroma!575
Rin Toshaka [Tue, 18 Dec 2018 19:30:04 +0000 (20:30 +0100)]
Fix tests
rinpatch [Tue, 18 Dec 2018 19:10:56 +0000 (22:10 +0300)]
Add test
rinpatch [Tue, 18 Dec 2018 18:39:36 +0000 (21:39 +0300)]
Merge branch 'develop' into fix/formatter-ignore-html-chars
rinpatch [Tue, 18 Dec 2018 18:38:15 +0000 (21:38 +0300)]
Ignore HTML characters in formatter.ex
lambda [Tue, 18 Dec 2018 15:42:07 +0000 (15:42 +0000)]
Merge branch 'feature/new-user-routes' into 'develop'
Use "~" as a route namespace symbol on FE
See merge request pleroma/pleroma!530
lambda [Tue, 18 Dec 2018 15:41:38 +0000 (15:41 +0000)]
Merge branch 'new-routes-integration' into 'develop'
update frontend
See merge request pleroma/pleroma!573
lain [Tue, 18 Dec 2018 15:28:13 +0000 (16:28 +0100)]
update frontend
lambda [Tue, 18 Dec 2018 15:18:10 +0000 (15:18 +0000)]
Merge branch 'ci-test-fix' into 'develop'
SetUserSessionIdPlugTest: try to fix random ci failures
See merge request pleroma/pleroma!570
href [Tue, 18 Dec 2018 12:40:25 +0000 (13:40 +0100)]
SetUserSessionIdPlugTest: try to fix random ci failures
lambda [Tue, 18 Dec 2018 10:42:56 +0000 (10:42 +0000)]
Merge branch 'runtime-static-plug' into 'develop'
Instance/Runtime static plug
See merge request pleroma/pleroma!567
href [Mon, 17 Dec 2018 21:50:59 +0000 (22:50 +0100)]
Instance/Static runtime plug
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
lambda [Mon, 17 Dec 2018 20:36:21 +0000 (20:36 +0000)]
Merge branch '2018-12-17-update-frontend' into 'develop'
2018 12 17 update frontend
See merge request pleroma/pleroma!565
lambda [Mon, 17 Dec 2018 20:24:58 +0000 (20:24 +0000)]
Merge branch 'fix-test' into 'develop'
Fix uploads test.
See merge request pleroma/pleroma!564
lain [Mon, 17 Dec 2018 20:19:00 +0000 (21:19 +0100)]
Merge remote-tracking branch 'origin/develop' into 2018-12-17-update-frontend
lambda [Mon, 17 Dec 2018 20:16:15 +0000 (20:16 +0000)]
Merge branch '459_fix_user_profile_crash' into 'develop'
Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561
lain [Mon, 17 Dec 2018 20:13:04 +0000 (21:13 +0100)]
update frontend
lambda [Mon, 17 Dec 2018 20:11:46 +0000 (20:11 +0000)]
Merge branch 'support/issue_449' into 'develop'
[#449] fix text field
See merge request pleroma/pleroma!563
lain [Mon, 17 Dec 2018 19:55:24 +0000 (20:55 +0100)]
Fix uploads test.
Maksim Pechnikov [Mon, 17 Dec 2018 19:41:36 +0000 (22:41 +0300)]
fix text field
lambda [Mon, 17 Dec 2018 19:45:14 +0000 (19:45 +0000)]
Merge branch 'captcha' into 'develop'
Captcha
See merge request pleroma/pleroma!550
lambda [Mon, 17 Dec 2018 19:38:24 +0000 (19:38 +0000)]
Merge branch 'fix-tags' into 'develop'
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
lambda [Mon, 17 Dec 2018 19:37:05 +0000 (19:37 +0000)]
Merge branch 'test-mix-tasks' into 'develop'
Add tests for Mix tasks
See merge request pleroma/pleroma!555
lambda [Mon, 17 Dec 2018 19:30:05 +0000 (19:30 +0000)]
Merge branch 'phoenix14' into 'develop'
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
lain [Mon, 17 Dec 2018 19:26:48 +0000 (20:26 +0100)]
don't re-use build
lain [Mon, 17 Dec 2018 19:12:01 +0000 (20:12 +0100)]
Fix tagging problems for existing instances.
Ekaterina Vaartis [Mon, 17 Dec 2018 17:53:42 +0000 (20:53 +0300)]
Alias Kocaptcha in the test
vaartis [Mon, 17 Dec 2018 14:19:28 +0000 (17:19 +0300)]
Use :ets.match_delete to delete old captchas
href [Mon, 17 Dec 2018 16:28:03 +0000 (17:28 +0100)]
Switch to phoenixframework/phoenix as the needed change is merged.
href [Mon, 17 Dec 2018 16:09:06 +0000 (17:09 +0100)]
Integration tests for mastodon websocket
href [Mon, 17 Dec 2018 13:39:59 +0000 (14:39 +0100)]
Cowboy handler for Mastodon WebSocket
raeno [Mon, 17 Dec 2018 15:02:26 +0000 (16:02 +0100)]
Support both OAuth token record and token string in UserView
lambda [Mon, 17 Dec 2018 09:19:27 +0000 (09:19 +0000)]
Merge branch 'testfix/webfinger-jrd' into 'develop'
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554
vaartis [Mon, 17 Dec 2018 06:41:41 +0000 (06:41 +0000)]
minutes->seconds_retained in config.md
Ekaterina Vaartis [Sun, 16 Dec 2018 20:41:11 +0000 (23:41 +0300)]
Clean captchas up periodically, not schedule it after theyre created
Ekaterina Vaartis [Sun, 16 Dec 2018 20:01:44 +0000 (23:01 +0300)]
Fix captcha tests
Ekaterina Vaartis [Sun, 16 Dec 2018 19:40:44 +0000 (22:40 +0300)]
Change minutes_retained config to seconds_retained
Ekaterina Vaartis [Sun, 16 Dec 2018 19:37:16 +0000 (22:37 +0300)]
Make the hosted kocaptcha the default value
Ekaterina Vaartis [Sun, 16 Dec 2018 19:04:43 +0000 (22:04 +0300)]
Add a configurable auto-cleanup for captchas
href [Sun, 16 Dec 2018 16:49:42 +0000 (17:49 +0100)]
More put_view.
link0ff [Sun, 16 Dec 2018 16:25:31 +0000 (18:25 +0200)]
Use bindings dbuser and dbname in sample_psql.eex
href [Sun, 16 Dec 2018 16:15:07 +0000 (17:15 +0100)]
Upgrade to Phoenix 1.4
link0ff [Sun, 16 Dec 2018 16:04:31 +0000 (18:04 +0200)]
Add more Mix task tests in relay_test.exs and uploads_test.exs.
Rename test/tasks/user.exs to test/tasks/user_test.exs.
scarlett [Sun, 16 Dec 2018 13:19:27 +0000 (13:19 +0000)]
Merge branch 'netbsd-script' into 'develop'
Add an rc.d script for NetBSD.
See merge request pleroma/pleroma!558
scarlett [Sun, 16 Dec 2018 13:11:17 +0000 (13:11 +0000)]
Simplify the NetBSD rc script.
scarlett [Sun, 16 Dec 2018 12:33:50 +0000 (12:33 +0000)]
Add an rc.d script for NetBSD.
Haelwenn [Sun, 16 Dec 2018 12:13:32 +0000 (12:13 +0000)]
Merge branch 'develop' into 'develop'
Added init file for OpenBSD
See merge request pleroma/pleroma!549
eal [Sun, 16 Dec 2018 11:21:26 +0000 (11:21 +0000)]
Merge branch 'fix/masto-put-settings' into 'develop'
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
eal [Sun, 16 Dec 2018 11:15:34 +0000 (13:15 +0200)]
Mastodon API: Fix PUT /api/web/settings
eal [Sun, 16 Dec 2018 11:08:34 +0000 (11:08 +0000)]
Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'
Enable unsecure cookies by default in dev.exs
See merge request pleroma/pleroma!556
Rin Toshaka [Sun, 16 Dec 2018 07:49:23 +0000 (08:49 +0100)]
Enable unsecure cookies by default in dev.exs
vaartis [Sun, 16 Dec 2018 07:35:45 +0000 (07:35 +0000)]
Rename captcha_test.ex to exs
link0ff [Sun, 16 Dec 2018 00:14:23 +0000 (02:14 +0200)]
Add tests for Mix tasks
nonlinear [Sat, 15 Dec 2018 22:00:00 +0000 (14:00 -0800)]
Update/add OpenBSD config files
Ekaterina Vaartis [Sat, 15 Dec 2018 20:39:23 +0000 (23:39 +0300)]
Fix style
Ekaterina Vaartis [Sat, 15 Dec 2018 20:38:19 +0000 (23:38 +0300)]
Add a test for kocaptcha
Ekaterina Vaartis [Sat, 15 Dec 2018 19:43:28 +0000 (22:43 +0300)]
Replace HTTPoison with Tesla for kocaptha
Ekaterina Vaartis [Sat, 15 Dec 2018 19:38:39 +0000 (22:38 +0300)]
Add a captcha mock for tests
Ekaterina Vaartis [Sat, 15 Dec 2018 19:12:20 +0000 (22:12 +0300)]
Add captcha documentation to config.md
Ekaterina Vaartis [Sat, 15 Dec 2018 19:08:26 +0000 (22:08 +0300)]
Formatting fixes
Ekaterina Vaartis [Sat, 15 Dec 2018 19:06:44 +0000 (22:06 +0300)]
Separate captcha implementation into a behaviour and use it
Haelwenn (lanodan) Monnier [Sat, 15 Dec 2018 16:34:37 +0000 (17:34 +0100)]
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
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
Ekaterina Vaartis [Fri, 14 Dec 2018 23:00:00 +0000 (02:00 +0300)]
Add an ability to disabled captcha
Ekaterina Vaartis [Fri, 14 Dec 2018 22:31:19 +0000 (01:31 +0300)]
Add base CAPTCHA support (currently only kocaptcha)
nonlinear [Fri, 14 Dec 2018 21:13:14 +0000 (13:13 -0800)]
Added init file for OpenBSD
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.
projects / akkoma / log