Ivan Tashkinov
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
Ivan Tashkinov
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
Ariadne Conill
34754938ba
add missing migration to drop websub table
5 years ago
Ariadne Conill
c9280b9730
rework to use properties instead of compound typing, per SocialCG
5 years ago
rinpatch
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
5 years ago
Maksim Pechnikov
66b5d0ff55
add Markers /api/v1/markers
5 years ago
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
Egor Kislitsyn
8ad015ef64
Skip deactivated users in followers import
5 years ago
Egor Kislitsyn
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
Egor Kislitsyn
2c7ff32e5b
Add `thread_visibility` to migrations
5 years ago
lain
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Egor Kislitsyn
761ad0b48e
Split CreateFollowingRelationships to multiple migrations
5 years ago
Egor Kislitsyn
6291eaa590
Update CreateFollowingRelationships
5 years ago
rinpatch
32808208be
Enable `mix format` for migrations
5 years ago
Egor Kislitsyn
12ebeef130
Add CreateFollowingRelationships migration
5 years ago
rinpatch
a502155274
Bump pleroma-fe bundle to 122323f35c
5 years ago
lain
e8395bedd2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
5 years ago
Ariadne Conill
19962d2022
clean up bundled litepub schema ( closes #1303 )
5 years ago
lain
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
rinpatch
ee88afb2e2
Fix muted notification migration only working with a schema
...
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
5 years ago
rinpatch
125f96e706
Fix the use of queries with a schema in a migration
5 years ago
rinpatch
fefbd31c6e
Move local keys out of `user.info`
5 years ago
lain
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
eugenijm
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Mark Felder
a562cb2c34
Update AdminFE bundle
5 years ago
Ariadne Conill
28be12b38e
update admin fe
5 years ago
lain
0aef18bcf4
Litepub Context: Add EmojiReaction.
5 years ago
kaniini
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
5 years ago
rinpatch
1fba66178d
Merge branch 'develop' into cleanup/drop-subscription-table-if-exists
5 years ago
rinpatch
81b4243173
Remove subscription_notifications table if it existed
...
Followup to !1741
5 years ago
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10
, reversing
changes made to c4fbb56984
.
5 years ago
Roman Chvanikov
b4b147000c
Merge develop
5 years ago
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
Haelwenn (lanodan) Monnier
5820dc40fc
litepub-0.1.jsonld: Add uploadMedia
5 years ago
Haelwenn (lanodan) Monnier
646bf01608
Update AdminFE bundle
5 years ago
rinpatch
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
5 years ago
Roman Chvanikov
76c3e290fc
Merge develop
5 years ago
kaniini
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
5 years ago
rinpatch
ac4a748fad
Disallow NULLs in deliveries
5 years ago
Roman Chvanikov
0bd2b85edb
Separate Subscription Notifications from regular Notifications
5 years ago
rinpatch
769fb778d4
Track object/create activity fetches
5 years ago
Ivan Tashkinov
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
rinpatch
16e6be340d
Update frontend bundle to e75ac9dd
5 years ago
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
Maxim Filippov
37dd3867bb
Log admin/moderator actions
5 years ago
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Ivan Tashkinov
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch
05e7d0a438
Add an index on object likes
...
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
5 years ago
Ivan Tashkinov
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
5 years ago
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Mark Felder
24a731a9a6
Update AdminFE
...
Now permits server configuration. Consider this ALPHA.
5 years ago
Ivan Tashkinov
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
lain
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Hakaba Hitoyo
39c7bbe18f
Remove longfox emoji set
5 years ago
lain
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
5 years ago
Ivan Tashkinov
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
5 years ago
Mike Verdone
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
5 years ago
Roman Chvanikov
9bca70b10a
Merge develop
5 years ago
Egor Kislitsyn
04f18a144b
Add `listMessage` to to the JSON-LD context
5 years ago
Egor Kislitsyn
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
Alexander Strizhakov
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
Roman Chvanikov
eae991b06a
merge develop
5 years ago
Egor Kislitsyn
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
5 years ago
Alex S
936050257d
saving following_address for existing users
5 years ago
Alex S
f8786fa6f2
adding following_address field to user
5 years ago
Egor Kislitsyn
406efb3688
Add Russian translation
5 years ago
Egor Kislitsyn
5104f65b69
Wrap error messages into gettext helpers
5 years ago
Sachin Joshi
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
5 years ago
Roman Chvanikov
371d39e160
Merge develop
5 years ago
kaniini
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
5 years ago
Roman Chvanikov
efefee8241
Split alters rather than work with indexes
5 years ago
Egor Kislitsyn
4f42093220
Remove Uploaders.Swift
5 years ago
Roman Chvanikov
291d95dcc3
Fix migration
5 years ago
Maksim
85c7916c94
[ #1033 ] Fix database migrations
5 years ago
Roman Chvanikov
657277ffc0
Resolve conflicts
5 years ago
lain
efad26bbb9
Update frontend.
5 years ago
rinpatch
cfb5be3ced
Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'
...
Update mastofe to bundle-2019-06-26
See merge request pleroma/pleroma!1341
5 years ago
Haelwenn (lanodan) Monnier
451931d36f
Update mastofe to bundle-2019-06-26
5 years ago
Mark Felder
7b9e21e8a2
Update adminFE to latest build
5 years ago
kaniini
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
5 years ago
Alex S
982cad0268
support for config groups
5 years ago
rinpatch
3ac5ecbac1
Support RUM indexes in the config generator
5 years ago
rinpatch
f4009b6706
Fallback to Config if Mix.Config does not exist, even if Config does not
...
exist either
For some weird reason Code.ensure_loaded?(Config) is false on OTP
releases even though `use Config` from config files works just fine.
5 years ago
rinpatch
960d6b54e8
use Config in generated config when available
...
Mix.Config is deprecated and does not work on OTP releases. However
we can't fully switch to Config because it is not present in
Elixir < 1.9. I tried to evaluate if Config is available at runtime,
but for some weird reason OTP releases crash if I do that.
5 years ago
rinpatch
e76115989a
Move config templates to priv so they can be found in releases
5 years ago
rinpatch
431a41b459
Update bundled pleroma-fe to c4fcdc71
5 years ago
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
Sergey Suprunenko
a7d956d383
Remove unused imports and aliases from migration
5 years ago
Roman Chvanikov
01fe5abad1
Resolve conflicts
5 years ago
Egor Kislitsyn
17004a0f1a
Create index on `activities.local`
5 years ago
Roman Chvanikov
b1b1a270e8
Fix conflict
5 years ago
Egor Kislitsyn
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
kaniini
94d12a79c4
Merge branch 'hotfix/add-in_reply_to_index' into 'develop'
...
Add index on inReplyTo for objects
See merge request pleroma/pleroma!1240
5 years ago
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
rinpatch
cfc3c62b2f
Add missing tag index on objects
...
The previous activity index is useless because objects are not embedded
anymore and instead a joined object is queried.
5 years ago
rinpatch
be56801dda
Add index on inReplyTo for objects
...
Fixes the performance of `get_existing_votes`
5 years ago
Roman Chvanikov
ce47017c89
Merge develop
5 years ago
William Pitcock
5fbbc57c1b
add migration to add notification settings to user accounts
5 years ago
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain
022e6e4b44
RUM: Remove vacuum analyze from migration
...
Can't be run in a trnasaction.
5 years ago
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn
f2936e0a07
Add `ap_id` to List
5 years ago
lain
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
Sergey Suprunenko
e2b3a27204
Add Reports to Admin API
5 years ago
William Pitcock
f3971cbde3
thread visibility function: fix use of no longer used author variable
5 years ago
William Pitcock
71fa7eeb6f
thread visibility function: significantly improve efficiency
5 years ago
William Pitcock
12f45e2a89
update migration
5 years ago
William Pitcock
75ce6adcff
migration: only care about Create activities
5 years ago
William Pitcock
958b4cfde9
migrations: add function to see if a thread can be satisfied
5 years ago
lain
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Sachin Joshi
7701a4c841
Make irreversible field default to false in filters
5 years ago
lambda
16cb9e5f1c
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
...
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
See merge request pleroma/pleroma!1139
5 years ago
Haelwenn (lanodan) Monnier
566a968ab3
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
...
Commissioned by https://shitposter.club/users/moonman and
drawn by https://shpposter.club/users/Nightingalle
Intended to be used when mastofe crashes out and allows to report a bug
among other things.
Should require a bit of modification on mastofe to use the image as it's more
of a vanilla flavour thing.
5 years ago
lain
01c45ddc9e
Search: Use RUM index.
5 years ago
Roman Chvanikov
f1f7a11222
Merge develop
5 years ago
feld
c953ae8c3d
Initial bundle of basic AdminFE
...
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
5 years ago
Roman Chvanikov
b6b5b16ba4
Merge develop
5 years ago
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
lain
0e37fddd5a
Search: Add fts index on objects table.
5 years ago
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Roman Chvanikov
0f0cc2703b
Merge develop
5 years ago
rinpatch
f8f6af4cc1
Fix MigrateOldBookmarks migration crashing on deleted activities
5 years ago
William Pitcock
52bdfced32
update pleroma frontend
5 years ago
Alex S
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
6 years ago
Alex S
58711a79d0
removing useless transaction
6 years ago
Alex S
6322c1e123
migration optimization
...
changelog wording
6 years ago
Alex S
324c9c8ab5
migrate user.bookmarks to separate table
6 years ago
Alex S
73d01857e3
bookmarks in separate table
6 years ago
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
Roman Chvanikov
2359ee38b3
Set digest emails to false by default
6 years ago
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
6 years ago
Roman Chvanikov
8add119444
Add User.list_inactive_users_query/1
6 years ago
Roman Chvanikov
371a4aed2c
Add User.Info.email_notifications
6 years ago
Egor Kislitsyn
db4badc6aa
move user disable into deactivation
6 years ago
Egor Kislitsyn
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
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]
6 years ago
lain
de57094fca
Participations: Add sort index.
6 years ago
lain
280172f6f6
Conversations: Create or bump on inserting a dm.
6 years ago
lain
d1da6b155a
Conversation: Add Conversations and Participations.
6 years ago
lambda
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
6 years ago
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
Ivan Tashkinov
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
Alex S
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago