limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
14798 commits 27 branches 107 tags 315 MiB
Commit graph

163 commits

Author SHA1 Message Date
Thomas Citharel
d2f1c4f658
Add ActivityPub Object Event type support 
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-12-17 16:16:21 +01:00
Ivan Tashkinov
7973cbdb9f OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage. 2019-12-15 22:32:42 +03:00
Ivan Tashkinov
b93856874d [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
 2019-10-06 17:12:17 +03:00
Ivan Tashkinov
64095961fe [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
#	lib/pleroma/web/router.ex
 2019-10-02 20:42:40 +03:00
Maksim Pechnikov
1a858134ed Merge branch 'develop' into issue/1218 2019-09-25 12:24:12 +03:00
Ivan Tashkinov
01c1078015 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
 2019-09-17 22:53:26 +03:00
Ivan Tashkinov
efbc2edba1 [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes 
# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub_controller.ex
#	lib/pleroma/web/router.ex
 2019-09-15 18:52:27 +03:00
Ivan Tashkinov
e6f43a831b [#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes). 2019-09-15 18:22:08 +03:00
Ivan Tashkinov
6bcedb693c [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue 
# Conflicts:
#	docs/config.md
#	mix.lock
 2019-09-14 16:11:44 +03:00
Egor Kislitsyn
25d8216804 Add email change endpoint 2019-09-13 13:09:35 +07:00
Ivan Tashkinov
b63faf9819 [#1234] Mastodon 2.4.3 hierarchical scopes initial support (WIP). 2019-09-08 15:00:03 +03:00
Maksim Pechnikov
6ef0103ca0 added Emoji struct 2019-08-31 10:14:53 +03:00
Maksim Pechnikov
d7808b5db4 added code\path fields without html tags in ets 2019-08-30 07:30:54 +03:00
Ivan Tashkinov
0e1c481a94 [#1149] Added more oban workers. Refactoring. 2019-08-13 20:20:26 +03:00
Maksim
58443d0cd6 tests for TwitterApi/UtilController 2019-07-31 15:14:36 +00:00
Ariadne Conill
3850812503 twitter api: utils: rework do_remote_follow() to use CommonAPI 
Closes #1138
 2019-07-29 20:00:57 +00:00
kPherox
e818381042
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1 2019-07-23 19:47:27 +09:00
Maksim
c2e2aadc42 #1110 fixed /api/pleroma/healthcheck 2019-07-19 16:20:23 +00:00
Moonman
f98f7ad1b9 detect and use sha512-crypt for stored password hash. 2019-07-14 09:48:42 -07:00
Maksim
a0c4ebb4d7 [#184] small refactoring reset password 2019-06-24 19:01:56 +00:00
Sachin Joshi
ee22fff5ac remove deprecated PleromaFE configuration 2019-05-15 15:29:59 +05:45
lambda
692919c7d2 Merge branch 'refactor/use-job-queue-everywhere' into 'develop' 
use job queue everywhere

Closes #862

See merge request pleroma/pleroma!1142
 2019-05-14 15:27:34 +00:00
William Pitcock
ac3a3abf6b clean up follow/block imports a little 2019-05-14 15:07:38 +00:00
William Pitcock
69a9e0563c user: migrate follow/blocks import to job queue 2019-05-13 19:36:00 +00:00
Egor Kislitsyn
1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-05-07 16:51:11 +07:00
Alexander Strizhakov
ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion 2019-05-06 16:45:22 +00:00
Egor Kislitsyn
c157e27a00 Merge branch 'develop' into feature/disable-account 2019-04-25 13:41:10 +07:00
Alex S
d35246c449 added healthcheck setting to instance config 2019-04-22 17:00:06 +07:00
Egor
b9cdf6d3b9 Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
Alexander Strizhakov
88f0be9693 Feature/826 healthcheck endpoint 2019-04-22 07:19:53 +00:00
Egor Kislitsyn
e8c2f9a73a Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-22 13:08:30 +07:00
Ekaterina Vaartis
52ed287e87 Fix incorrect multiple emoji tag handling introduced in initial impl 2019-04-20 11:17:17 +03:00
rinpatch
627e5a0a49 Merge branch 'develop' into feature/database-compaction 2019-04-17 12:22:32 +03:00
Normandy
d4a749cfb2 Handle new-style mastodon follow lists 
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
 2019-04-16 18:35:38 +00:00
Egor Kislitsyn
db4badc6aa move user disable into deactivation 2019-04-11 17:22:42 +07:00
Egor Kislitsyn
0f2f7d2cec Merge remote-tracking branch 'pleroma/develop' into feature/disable-account 2019-04-11 15:51:52 +07:00
lambda
c8440b5e0c Merge branch 'fix/emoji-api-nonsense' into 'develop' 
Change response format of /api/pleroma/emoji so it makes sense

See merge request pleroma/pleroma!1038
 2019-04-10 06:22:51 +00:00
kaniini
97395e013e Merge branch 'notification-pleroma-settings' into 'develop' 
Notification controls

Closes #738

See merge request pleroma/pleroma!988
 2019-04-10 02:10:31 +00:00
rinpatch
b57b43027c Change response format of /api/pleroma/emoji to the one that actually makes sense 2019-04-09 23:20:31 +03:00
Alex S
fa8483cb80 Merging develop into feature/770-add-emoji-tags 
Conflict test/web/twitter_api/util_controller_test.exs
 2019-04-02 20:39:52 +07:00
lambda
180b87257c Merge branch 'bugfix/share-mastodon' into 'develop' 
[OStatus] adds status to pleroma instance if the url given is a status

See merge request pleroma/pleroma!1002
 2019-04-02 12:47:40 +00:00
Alex S
9e0567ec52 Merge develop into feature/770-add-emoji-tags 2019-04-02 19:16:29 +07:00
Egor Kislitsyn
1b3d921921 change Repo.get(User, id) => User.get_by_id(id) 2019-04-02 17:01:26 +07:00
Sachin Joshi
f20e8d28de add support for all status type (ostatus) and replase case with if 2019-04-02 12:18:00 +05:45
Sachin Joshi
6386c1c9c1 fetch url for OStatus to know if it is a/c or status 2019-04-02 10:26:09 +05:45
Sachin Joshi
1d01e8e656 [OStatus] adds status to pleroma instance if the url given is a status 2019-04-01 22:26:58 +05:45
Alex S
3601f03147 Adding tag to emoji ets table 
changes in apis
 2019-04-01 17:17:57 +07:00
eugenijm
cd90695a34 Add PUT /api/pleroma/notification_settings endpoint 2019-03-28 18:55:16 +03:00
lain
bf27190f7f UtilController: Return state of safe dm mentions. 2019-03-21 16:20:58 +01:00
eugenijm
43fb03be5a Allow to mark a single notification as read 2019-03-15 23:56:14 +03:00
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder 2019-03-13 04:26:54 +01:00
Egor Kislitsyn
eb84de0143 allow users to disable their own account 2019-03-04 19:55:11 +07:00
Haelwenn (lanodan) Monnier
6a6a5b3251
de-group alias/es 2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier
60ea29dfe6
Credo fixes: alias grouping/ordering 2019-02-09 14:59:20 +01:00
lain
8e8a1e1ba8 Return new-style config if old-style config is set to false. 
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
 2019-01-28 13:07:12 +01:00
lain
e221c681dc New frontend configuration mechanism. 2019-01-23 12:40:57 +01:00
William Pitcock
980b5288ed update copyright years to 2019 2018-12-31 15:41:47 +00:00
Ivan Tashkinov
67b4297f4d [#483] Refactored blocks and follows import, added tests. 2018-12-29 12:02:37 +03:00
Ivan Tashkinov
700661b761 [#483] Blocked users list import (TwitterAPI). 2018-12-28 23:01:03 +03:00
William Pitcock
2791ce9a1f add license boilerplate to pleroma core 2018-12-23 20:56:42 +00:00
Ivan Tashkinov
1de0aa2f10 [#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed. 2018-12-18 17:21:05 +03:00
Ekaterina Vaartis
a2399c1c7c Add base CAPTCHA support (currently only kocaptcha) 2018-12-15 03:12:44 +03:00
href
bfe27c1b55 Merge branch '114_email_invites' into 'develop' 
[#114] Email invites

See merge request pleroma/pleroma!541
 2018-12-14 20:22:24 +00:00
href
980131b4db Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' 
Improve web push

Closes #393, #422, and #452

See merge request pleroma/pleroma!524
 2018-12-14 18:50:44 +00:00
href
91236c60c7 Merge branch 'feature/file-size-checking' into 'develop' 
[#36] Add warnings when file upload fails

See merge request pleroma/pleroma!523
 2018-12-14 13:00:24 +00:00
href
331396cbcd
Properly disable Web Push if no VAPID key is set 2018-12-14 13:05:51 +01:00
Ivan Tashkinov
9666376f5f [#114] Readded invites_enabled config setting, updated readme. 2018-12-14 12:37:06 +03:00
scarlett
213176c3c3 Add new frontend options to server-side config. 2018-12-10 23:15:01 +00:00
Maksim Pechnikov
074fa790ba fix compile warnings 2018-12-09 20:50:08 +03:00
Rin Toshaka
15616eda5e Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content 2018-12-08 21:48:49 +01:00
Rin Toshaka
578051809f Add uploadlimit to Twitter API config 2018-12-07 20:03:30 +01:00
Egor Kislitsyn
8b4397c704 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
 2018-12-06 19:55:58 +07:00
Egor Kislitsyn
04a48286e6 Add web push support 2018-12-06 19:29:04 +07:00
href
bc5cf2c192
Improved version string 2018-11-20 17:55:03 +01:00
href
5bb88fd174
Runtime configuration 
Related to #85

Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
 2018-11-06 19:41:15 +01:00
href
763fc7b44f
Runtime configured emojis 
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.

This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
 2018-11-05 13:24:00 +01:00
scarlett
a253c1466e New frontend options 2018-10-21 12:52:52 +01:00
scarlett
7562912f6a Use maybe_direct_follow for follow imports 2018-10-17 04:16:11 +01:00
William Pitcock
16307da311 twitterapi: frontend config: add formattingOptionsEnabled 2018-10-05 20:49:34 +00:00
William Pitcock
e2ce0e9e05 run mix format. 2018-09-01 21:12:42 +00:00
William Pitcock
c921d99898 config: add ability to disable Pleroma FE config management (closes #276) 2018-09-01 21:05:32 +00:00
William Pitcock
856b5e1ca4 config: chase pleroma-fe updates from MR pleroma-fe!324. 2018-08-31 04:01:21 +00:00
hakabahitoyo
946a0769c4 remove unused settings from /api/statusnet/config 2018-08-26 17:40:15 +09:00
William Pitcock
09cb402203 fe config: add collapse_message_with_subject fe option 2018-08-24 18:21:42 +00:00
eal
db5cdfa333 Remote follow: don't show confusing error if already following 2018-08-09 20:47:29 +03:00
William Pitcock
b23630076f TwitterAPI: present pleroma frontend config in API 2018-07-17 15:46:24 +00:00
Rachel H
1525a0404b Fix follow errors 2018-06-07 00:39:24 -07:00
Syldexia
d0690622cd Added endpoint for changing passwords 2018-05-21 23:06:03 +01:00
Syldexia
d1366f8d46 Modified deleting an account to run as a task 2018-05-19 13:35:49 +01:00
Syldexia
5bfb7b4ce6 Moved account deletion stuff to somewhere that hopefully makes more sense 2018-05-13 14:36:02 +01:00
Mark Felder
aaacebd906 Fix unused variables, imports, and aliases 2018-05-04 21:42:20 +00:00
eal
e7ddda44c0 Follow import: allow URI in addition to screen_name. 2018-04-07 15:00:23 +03:00
lain
4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
Roger Braun
08f458e6df UtilController: Fix statusnet config api compatibility. 2018-02-09 13:43:12 +01:00
eal
29be70c008 Add remote following of local profiles. 2018-02-02 00:14:05 +02:00
eal
beb13bf3a9 Revert "Revert "Add remote follow pages."" 
This reverts commit b259b4e4d1.
 2018-01-18 18:42:44 +02:00
eal
b259b4e4d1 Revert "Add remote follow pages." 
This reverts commit 47e8c8db05.
 2018-01-18 03:42:18 +02:00
eal
47e8c8db05 Add remote follow pages. 2018-01-18 03:11:03 +02:00
eal
5c09d8d3f1 Unlink follow import process from the one processing request. 
Mistakes were made.
 2017-12-23 16:40:43 +02:00
eal
fdfb508259 Run follow import in the background. 2017-12-12 21:04:41 +02:00