Commit graph

400 commits

Author SHA1 Message Date
Roman Chvanikov
2359ee38b3 Set digest emails to false by default 2019-04-21 16:36:25 +07:00
Ekaterina Vaartis
c26724cc55 Remove finmoji and add a way to download emojis in packs
These packs are stored in a git repo on pleroma gitlab
2019-04-20 11:17:17 +03:00
Roman Chvanikov
8add119444 Add User.list_inactive_users_query/1 2019-04-19 22:19:00 +07:00
Roman Chvanikov
371a4aed2c Add User.Info.email_notifications 2019-04-13 17:40:42 +07: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
Haelwenn (lanodan) Monnier
51c97d71af
Update Mastodon Frontend to 2019-04-11 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11

[ci skip]
2019-04-11 07:29:03 +02:00
lain
de57094fca Participations: Add sort index. 2019-04-10 17:30:25 +02:00
lain
280172f6f6 Conversations: Create or bump on inserting a dm. 2019-04-10 16:33:45 +02:00
lain
d1da6b155a Conversation: Add Conversations and Participations. 2019-04-10 15:01:42 +02:00
lambda
e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token

See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions 2019-04-10 10:44:54 +01: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
Alex S
012bb5dcc9 renaming expire_at -> expires_at
keyword style change
2019-04-08 16:01:28 +07:00
eugenijm
fc92a0fd8d Added limits and media attachments for scheduled activities. 2019-04-06 23:55:58 +03:00
eugenijm
7bf622ce73 Add scheduled activities 2019-04-06 23:55:58 +03:00
Alex S
47b07cec49 token -> invite renaming 2019-04-06 20:24:22 +07:00
Alex S
0484f3a8b1 generating tokens with mix 2019-04-06 16:58:22 +07:00
Sadposter
ffac2593ea
Add index on subscribers 2019-04-05 17:30:54 +01:00
Ivan Tashkinov
45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
#	mix.exs
2019-04-04 23:43:08 +03:00
Alex S
86f90c0a54 adding indexes to oauth_tokens table 2019-04-03 20:51:09 +07:00
lambda
bd961a3bad Merge branch 'features/pleroma-tan' into 'develop'
priv/static/images: Add pleroma-tan

See merge request pleroma/pleroma!913
2019-04-02 11:54:04 +00:00
Haelwenn (lanodan) Monnier
b2f3a40e53
Revert awfully long migration from 568e34858 2019-03-29 01:57:02 +01:00
Ivan Tashkinov
642075b1a9 [#923] Enabled binding of multiple OAuth provider accounts to single user. 2019-03-27 16:20:50 +03:00
Ivan Tashkinov
20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
lambda
21ff78cd40 Merge branch 'replies-count' into 'develop'
Increment replies_count (MastoAPI)

Closes #756

See merge request pleroma/pleroma!974
2019-03-26 14:49:09 +00:00
eugenijm
568e348588 Increment replies_count on replies (MastoAPI) 2019-03-26 15:27:04 +03:00
rinpatch
9725c93cea Add an id index to notifications 2019-03-25 21:59:52 +03:00
rinpatch
b92a16aa00 Merge branch 'ecto-3-migration' into 'develop'
Ecto 3.0.7 (ecto_sql 3.0.5) migration

See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
kaniini
b68fb3dc17 Merge branch 'imageoptim' into 'develop'
used imageOptim to reduce size of image files

See merge request pleroma/pleroma!944
2019-03-21 00:59:24 +00:00
rinpatch
e59cfa7cac modify the migrations to use naive_datetime_usec 2019-03-20 16:16:29 +03:00
rinpatch
cbc4a76b43 Fix filter migration 2019-03-20 16:13:23 +03:00
lain
41511d1926 Update frontend 2019-03-20 08:58:25 +01:00
Ivan Tashkinov
e17a9a1f66 [#923] Nickname & email selection for external registrations, option to connect to existing account. 2019-03-20 10:35:31 +03:00
optikfluffel
a907522690 used imageOptim to reduce size of image files 2019-03-19 10:10:48 +01:00
Ivan Tashkinov
40e9a04c31 [#923] Registration validations & unique index on [:user_id, :provider]. 2019-03-18 20:31:24 +03:00
Ivan Tashkinov
26b6354095 [#923] Support for multiple (external) registrations per user via Registration. 2019-03-18 17:23:38 +03:00
Ivan Tashkinov
2739057442 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 2019-03-15 17:11:00 +03:00
Ivan Tashkinov
aacbf0f570 [#923] OAuth: prototype of sign in / sign up with Twitter. 2019-03-15 17:08:03 +03:00
William Pearson
3dadaa4432 robots.txt
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
2019-03-15 02:28:18 +00:00
Haelwenn (lanodan) Monnier
bae96206d0
priv/static/images: Add pleroma-tan
Source: https://shitposter.club/objects/9be7c3f4-5a29-45a9-ac40-301312578a02

pleroma-fox-tan-smol.png is pleroma-fox-tan.png but the width
got divided by two in The GIMP.
All the pleroma*.png got optimised with mat2 and optipng/pngcrush,
depending on their best results.

[ci skip]
2019-03-08 07:51:05 +01:00
Haelwenn (lanodan) Monnier
05cad042ba
Update Mastodon Frontend to 2019-03-07 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07

[ci skip]
2019-03-08 00:28:40 +01:00
William Pitcock
3a097bd770 update pleroma frontend 2019-03-07 13:31:03 +00:00
Egor Kislitsyn
eb84de0143 allow users to disable their own account 2019-03-04 19:55:11 +07:00
eugenijm
8a1e0c9bee Added migration to update existing user note counters 2019-03-03 15:35:32 +03:00
eugenijm
85734c0d49 Added migration for setting default tags in existing users records 2019-03-01 14:02:25 +03:00
Ivan Tashkinov
b227ccab82 Fixed scopes of apps / authorizations / tokens from apps initially created with space-delimited scope. 2019-02-22 14:00:18 +03:00
lain
553ce57d42 update frontend 2019-02-21 09:04:35 +01:00
Egor
bff9eb5ef7 Reports 2019-02-20 16:51:25 +00:00
Ivan Tashkinov
bc4f77b10b [#468] Merged upstream/develop, resolved conflicts. 2019-02-17 14:07:04 +03:00
Ivan Tashkinov
949e35e26d [#468] OAuth scopes-related data migration simplification. 2019-02-14 14:28:26 +03:00
Ivan Tashkinov
063baca5e4 [#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages. 2019-02-14 00:29:29 +03:00
William Pitcock
dd989962e6 litepub schema: add oauthRegistrationEndpoint [ci skip] 2019-02-13 19:34:43 +00:00
Karen Konou
ac72b578da Merge branch 'develop' into feature/thread-muting 2019-02-11 12:10:49 +01:00
Haelwenn (lanodan) Monnier
fcd8a2d0d6
Update Mastodon Frontend to 2019-02-10 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10

[ci skip]
2019-02-10 19:55:22 +01:00
Karen Konou
6a150de3bd Add unique index and unique constraint check, uniqueness test fails 2019-02-09 20:52:11 +01:00
Ivan Tashkinov
4ad843fb9d [#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions. 2019-02-09 17:09:08 +03:00
Karen Konou
98ec578f4d Merge branch 'develop' into feature/thread-muting 2019-02-08 12:44:02 +01:00
Karen Konou
c43f414a79 Somehow fixed the repo insert [skip-ci] 2019-02-07 23:44:49 +01:00
Karen Konou
77448de492 ugghhhh 2019-02-07 22:25:07 +01:00
Karen Konou
f4ff4ffba2 Migration and some boilerplate stuff 2019-02-07 17:36:14 +01:00
Maxim Filippov
f1b72bfb70 Split hide_networ only for local users 2019-02-06 13:41:36 +03:00
lain
78a51f4dd4 update frontend 2019-02-06 10:40:01 +01:00
kaniini
d120aa63f0 Merge branch 'fix-dm-index' into 'develop'
Massage index until it actually does the stuff we want.

See merge request pleroma/pleroma!772
2019-02-05 20:27:31 +00:00
Maxim Filippov
c48aba3c2a Fix SQL 2019-02-05 10:22:31 +03:00
lain
f3c8b02d65 Massage index until it actually does the stuff we want.
Also makes the index a lot smoler.
2019-02-04 23:47:29 +01:00
Maxim Filippov
cd6606b7f6 Initialize hide_network with false 2019-02-04 22:23:09 +03:00
Maxim Filippov
16ce129e38 Split hide_network into hide_followers & hide_followings (fixed) 2019-02-03 21:55:04 +03:00
kaniini
486749064f Revert "Merge branch 'feature/split-hide-network' into 'develop'"
This reverts merge request !733
2019-02-01 20:22:58 +00:00
kaniini
0a82a7e6d6 Merge branch 'feature/split-hide-network' into 'develop'
Split hide_network into hide_followers & hide_followings

See merge request pleroma/pleroma!733
2019-02-01 17:05:29 +00:00
href
b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop'
[#534] Unreachable federation targets retirement

Closes #534

See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
lambda
a43a1c6d4e Revert "Merge branch 'spc-fix-3' into 'develop'"
This reverts merge request !682
2019-01-31 12:16:23 +00:00
kaniini
4d3655c479 Merge branch 'spc-fix-3' into 'develop'
Spc fix 3

See merge request pleroma/pleroma!682
2019-01-31 11:29:29 +00:00
Haelwenn
00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop'
Features/glitch soc frontend

See merge request pleroma/pleroma!192
2019-01-31 10:16:11 +00:00
Haelwenn (lanodan) Monnier
de0c1c641a
[MastodonFE] Update Frontend (glitch) 2019-01-31 10:35:44 +01:00
lain
88a40308d3 update frontend 2019-01-30 21:04:58 +01:00
kaniini
d03a116654 Merge branch 'hj-happiness-improvement' into 'develop'
New frontend configuration mechanism.

Closes #445

See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
Maxim Filippov
50d6183893 Split hide_network into hide_followers & hide_followings 2019-01-28 21:40:08 +03:00
Ivan Tashkinov
d3f9e6f6fe [#534] Merged upstream/develop. 2019-01-28 15:39:14 +03:00
lain
39b2457734 Change default bg image in new config. 2019-01-28 13:04:51 +01:00
Ivan Tashkinov
9560abea10 [#534] Refactoring / tweaks per MR review. 2019-01-28 11:03:52 +03:00
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks 2019-01-28 04:47:32 +01:00
William Pitcock
15d12a69a4 add activities likes index, fixes favorites API call 2019-01-27 15:15:33 +00:00
href
4a13bb75bd
Change webpush endpoint to unlimited varchar
Fixes #552
2019-01-26 17:18:34 +01:00
William Pitcock
57c3f8214c update pleroma frontend (summary_html hotfix) 2019-01-25 10:17:00 +00:00
kaniini
4df71cd88b Merge branch 'classic-flakeids' into 'develop'
Flake Ids for Users and Activities

Closes #450

See merge request pleroma/pleroma!645
2019-01-25 04:59:06 +00:00
William Pitcock
4b76f14da1 update pleroma frontend 2019-01-25 04:49:35 +00:00
href
a3ba72d978
Fix clippy with one/five lines 2019-01-24 16:53:14 +01:00
href
e02b19d1d7
Fix postgres activity_visibility when running in autovacuum 2019-01-24 14:13:20 +01:00
Ivan Tashkinov
f161a92cb1 [#534] Initial implementation of unreachable federation targets retirement. 2019-01-23 18:37:25 +03:00
lain
ab03f81219 Fix info ids.
The previous migration actually created values for the key "id", including the
quotes. This one should fill out all missing ids.

Closes #511
2019-01-23 14:01:44 +01:00
href
9ba6e1fabe
FlakeId: chain alter statements 2019-01-23 12:09:21 +01:00
href
e67bd93d90
Flake: migrate pinned_activities in jsonb 2019-01-23 11:26:39 +01:00
href
a92c43bc4b
Clippy! 2019-01-23 11:26:38 +01:00
href
465fb4327d
Lock activities/users table during flake migration. 2019-01-23 11:26:37 +01:00
href
28d77e373c
Flake Ids for Users and Activities 2019-01-23 11:26:27 +01:00
Michael Loftis
98cbeae49c slightly changes definition so that autovacuum works paralell safe too 2019-01-22 15:35:21 +00:00
lambda
69454c8345 Merge branch 'feature/dm-sanity' into 'develop'
DM sanitization

See merge request pleroma/pleroma!458
2019-01-21 12:35:10 +00:00
lambda
2020f26040 Merge branch '2019-1-20-update-frontend' into 'develop'
update frontend

See merge request pleroma/pleroma!686
2019-01-20 10:42:06 +00:00
lain
deeda94513 update frontend 2019-01-20 11:28:11 +01:00
William Pitcock
75bb663749 litepub schema: add litepub:directMessage flag 2019-01-20 02:27:48 +00:00
lain
b108aeee08 Make use of the indices.
Indices in postgresql rely on operators, so they won't be used if you use only functions.
2019-01-20 00:31:17 +01:00
lain
bd6c12592e Add migration to fix spc users. 2019-01-18 19:35:47 +01:00
Ivan Tashkinov
79e44042bc [#477] User trigram index adjustment. 2019-01-18 10:57:42 +03:00
Ivan Tashkinov
fc965f982c [#477] Added FTS index for users. Fixed failing test. 2019-01-15 12:04:54 +03:00
lain
04735db193 Build the index concurrently. 2019-01-09 16:55:05 +01:00
lain
5027f82cde Add activity visibility index. 2019-01-09 16:45:09 +01:00
lain
1dd0e0ed4c update frontend 2019-01-01 17:45:03 +01:00
lain
e1227d812c update frontend 2018-12-29 14:30:44 +01:00
lain
9c4344e16c update frontend 2018-12-18 16:28:13 +01:00
lain
3e1816fcd5 update frontend 2018-12-17 21:13:04 +01:00
lain
72945b5b32 update frontend 2018-12-13 21:04:39 +01:00
lain
8682be29a5 update frontend 2018-12-10 20:46:10 +01:00
lambda
94d8f1ab30 Merge branch '394_user_tags' into 'develop'
[#394] User tags

Closes #394

See merge request pleroma/pleroma!508
2018-12-07 18:25:38 +00:00
Ivan Tashkinov
7b19487389 [#394] Added users.tags and admin routes to tag and untag users. Added tests. 2018-12-06 20:06:50 +03:00
Egor Kislitsyn
4944498133 Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex
2018-12-06 20:15:16 +07: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
hakabahitoyo
a7b1a66be3 update-pleroma-frontend 2018-12-03 13:24:25 +09:00
lain
4996fb07d8 Genereate uuids for existing info fields. 2018-12-01 12:00:33 +01:00
William Pitcock
db8f269cd3 update pleroma frontend 2018-11-18 17:27:48 +00:00
William Pitcock
2a75de84e1 update pleroma frontend 2018-11-14 16:08:22 +00:00
Haelwenn (lanodan) Monnier
934125695d
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld 2018-11-08 20:21:45 +01:00
Haelwenn (lanodan) Monnier
705bfe39e9
priv/static/litepub-1.0.jsonld: Local copy of https://litepub.github.io/litepub/context.jsonld 2018-11-08 19:35:23 +01:00
hakabahitoyo
72a880431f update pleroma frontend 2018-10-26 23:35:06 +09:00
scarlett
7cb227dc62 update pleroma-fe 2018-10-23 12:16:49 +01:00
scarlett
f6dda65dda update pleroma-fe 2018-10-23 12:15:48 +01:00
hakabahitoyo
be7bb90bef update-pleroma-frontend 2018-10-07 09:58:08 +09:00
William Pitcock
bb213a85c5 update pleroma frontend 2018-09-22 05:08:15 +00:00
Martin Kühl
d94ee5cd50 Mastodon API: Support push subscription CRUD 2018-09-22 07:04:01 +02:00
William Pitcock
c9f6eb9a41 user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task) 2018-09-20 23:50:56 +00:00
Haelwenn (lanodan) Monnier
83e3afac2c Update mastodon frontend 2018-09-20 16:13:13 +00:00
hakabahitoyo
f829b18273 update-pleroma-frontend 2018-09-14 10:47:10 +09:00
William Pitcock
e5546c282f update pleroma frontend 2018-09-09 12:14:34 +00:00
kaniini
76c67a41c1 Merge branch 'develop' into 'feature/staff-discovery-api'
# Conflicts:
#   lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2018-09-03 14:55:42 +00:00
kaniini
1c9e539b47 Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
Add/Fix Mastodon endpoints for 2.4.3 compatibility

See merge request pleroma/pleroma!266
2018-09-03 12:33:36 +00:00
William Pitcock
cf5d1302aa migrations: add is_moderator index for users table 2018-09-03 11:55:12 +00:00
William Pitcock
2b4b4888a9 update pleroma frontend 2018-08-31 04:35:18 +00:00
William Pitcock
1a70d41f8e migrations: add index creation migration and recipients_to/cc removal migration 2018-08-29 18:41:02 +00:00
William Pitcock
038139d641 migrations: drop filler migration 2018-08-29 18:41:02 +00:00
William Pitcock
40ea07cd2f migrations: add migration to fill in recipients_to/recipients_cc fields 2018-08-29 08:43:24 +00:00
William Pitcock
81673b8136 activity: add recipients_to and recipients_cc fields 2018-08-29 08:42:33 +00:00
Haelwenn (lanodan) Monnier
6e030129fb
[MastodonAPI] Add filters 2018-08-27 15:09:05 +02:00
William Pitcock
5ffaa2bf69 Revert "enable scope options and such"
This reverts commit e5642d7566.
2018-08-27 10:49:12 +00:00
William Pitcock
e5642d7566 enable scope options and such 2018-08-27 10:46:01 +00:00
hakabahitoyo
ce8c7e77a1 update pleroma frontend 2018-08-26 21:08:03 +09:00
William Pitcock
47661ce44b update pleroma frontend 2018-08-24 21:59:57 +00:00
William Pitcock
d8fb340565 update pleroma frontend 2018-08-20 18:10:29 +00:00
William Pitcock
7a11ea1ceb update pleroma frontend 2018-08-20 04:45:34 +00:00
William Pitcock
d8bb27970b update pleroma frontend 2018-08-18 18:19:11 +00:00
lain
701f5df45c update frontend 2018-08-12 18:16:19 +02:00