moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,877 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

4877 Commits

Author SHA1 Message Date
lambda 4977e96fa4 Merge branch 'use-jobs-in-webpush' into 'develop' 
Use PleromaJobQueue in Pleroma.Web.Push

See merge request pleroma/pleroma!1023
 2019-04-08 11:53:18 +00:00
Egor Kislitsyn 9abf832b03 Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 18:48:10 +07:00
Sadposter 13ff312c48
Sever subscription in case of block 2019-04-08 12:46:12 +01:00
lambda e19590c93f Merge branch 'improve_upgrade_user_from_ap_id' into 'develop' 
Improve Transmogrifier.upgrade_user_from_ap_id/2

See merge request pleroma/pleroma!1019
 2019-04-08 11:42:20 +00:00
lambda fd45cab9ec Merge branch 'twitter_oauth' into 'develop' 
OAuth consumer (sign in / sign up with external provider)

See merge request pleroma/pleroma!923
 2019-04-08 11:41:50 +00:00
lambda ff9290836b Merge branch 'feature/697-language-tag-metadata' into 'develop' 
adding language tag

See merge request pleroma/pleroma!1034
 2019-04-08 11:03:10 +00:00
Alexander Strizhakov 36c0a10fdf adding language tag 2019-04-08 11:03:10 +00:00
Alex S f0ca0696c8 test for valid_invite? 2019-04-08 17:06:04 +07:00
lambda 23067908de Merge branch 'feature/770-add-emoji-tags' into 'develop' 
Feature/770 add emoji tags

See merge request pleroma/pleroma!998
 2019-04-08 09:50:00 +00:00
Egor Kislitsyn c3d5c3513a Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush 2019-04-08 16:46:59 +07:00
Ivan Tashkinov 44829d9181 AdminApiControllerTest unused variables fix. 2019-04-08 12:32:55 +03:00
Egor Kislitsyn a1a854646e Merge branch 'develop' into use-jobs-in-webpush 2019-04-08 16:29:20 +07:00
Ivan Tashkinov bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
 2019-04-08 12:20:26 +03:00
lambda b4da2bc1d0 Merge branch 'develop' into 'improve_upgrade_user_from_ap_id' 
# Conflicts:
#   config/config.exs
#   docs/config.md
 2019-04-08 09:18:01 +00:00
lambda b177e1e7f3 Merge branch 'scheduled-activities' into 'develop' 
Scheduled activities

See merge request pleroma/pleroma!989
 2019-04-08 09:08:18 +00:00
Alex S 012bb5dcc9 renaming expire_at -> expires_at 
keyword style change
 2019-04-08 16:01:28 +07:00
Sadposter 76fdfd1c7f Add check on activity visibility in sub notification 2019-04-07 15:11:29 +01:00
Alex S 56c75aec12 credo fix 2019-04-07 20:59:53 +07:00
Alex S b810aac117 added docs to docs/api/admin_api.md 
code style and little renamings
 2019-04-07 19:48:52 +07:00
Ivan Tashkinov e3328bc138 [#923] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring. 2019-04-07 11:08:37 +03:00
feld fb2040d061 Merge branch 'fix/deactivated-user-error' into 'develop' 
Return 403 for deactivated user on token request

Closes #785

See merge request pleroma/pleroma!1031
 2019-04-06 22:19:30 +00:00
eugenijm 2056efa714 Add scheduler for sending scheduled activities to the queue 2019-04-06 23:56:29 +03:00
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
eugenijm b3870df51f Handle `scheduled_at` on status creation. 2019-04-06 23:55:58 +03:00
eugenijm 7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
eugenijm 7aa53d52bd Return 403 on oauth token exchange for a deactivated user 2019-04-06 23:27:55 +03:00
feld 876965a7e7 Merge branch 'fix/failed-legacy-test' into 'develop' 
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS

See merge request pleroma/pleroma!1030
 2019-04-06 16:03:35 +00:00
Alex S ce8d457132 little channges 2019-04-06 22:38:35 +07:00
Sadposter e6778003ab
JSON need quotes! 2019-04-06 16:24:21 +01:00
Sadposter c05fe4da0a
Document subscription endpoints, fix typos 
Also adds a quick error case on the subscription endpoints
to avoid 500s
 2019-04-06 16:20:06 +01:00
feld 9aeac7dcca Merge branch 'feature/prometheus' into 'develop' 
Upstream: Metrics and debugging

See merge request pleroma/pleroma!1020
 2019-04-06 14:51:46 +00:00
Mark Felder b395aebf24 Pin recon dependency to 2.4.0 2019-04-06 09:30:36 -05:00
Alex S 76d8928cf1 fix for field name 2019-04-06 20:49:43 +07:00
Alex S a53d591ac5 code style 2019-04-06 20:47:05 +07:00
Alex S 7410aee886 Merge develop to 770-add-emoji-tags 
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
 2019-04-06 20:34:00 +07:00
Alex S dcc54f8cfa admin api endpoints for invites 2019-04-06 20:25:19 +07:00
Alex S 47b07cec49 token -> invite renaming 2019-04-06 20:24:22 +07:00
Alex S be54e40890 twitter api registration 
fix for twitter api tests
 2019-04-06 17:18:59 +07:00
Alex S 0484f3a8b1 generating tokens with mix 2019-04-06 16:58:22 +07:00
Haelwenn 3c5daa0235 Merge branch 'feature/mastofe-redurect-to-referer-after-login' into 'develop' 
Redirect to the referer url after mastofe authorization

Closes #717

See merge request pleroma/pleroma!1025
 2019-04-05 23:36:42 +00:00
Sergey Suprunenko 325a268017 Redirect to the referer url after mastofe authorization 2019-04-05 23:36:42 +00:00
Sergey Suprunenko e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS 2019-04-05 22:48:11 +02:00
rinpatch e3ca9f708f Merge branch 'revert-8607ae68' into 'develop' 
Revert "Merge branch 'test-coverage' into 'develop'"

See merge request pleroma/pleroma!1028
 2019-04-05 20:04:16 +00:00
rinpatch e5df8cadea Revert "Merge branch 'test-coverage' into 'develop'" 
This reverts merge request !1027
 2019-04-05 19:59:03 +00:00
rinpatch 8607ae6841 Merge branch 'test-coverage' into 'develop' 
Use --cover option when running CI tests

See merge request pleroma/pleroma!1027
 2019-04-05 19:49:20 +00:00
optikfluffel fb1be1d798 Use --cover option when running CI tests 2019-04-05 20:12:44 +02:00
feld 3fb3f42e77 Merge branch 'feature/admin-api-follow' into 'develop' 
Feature/admin api follow

See merge request pleroma/pleroma!1026
 2019-04-05 17:15:55 +00:00
Mark Felder fac76bfa35 We actually want the user id not nickname in the test... 2019-04-05 12:11:19 -05:00
Mark Felder c746087f57 Also remove Repo functions in the tests 2019-04-05 11:59:56 -05:00
Mark Felder b5a2d384f7 Redundant Repo.get_by usage was recently removed from the codebase 2019-04-05 11:41:41 -05:00