93f6f173ce
Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'
...
Add NOT NULL constraints for apps table
See merge request pleroma/pleroma!1890
2019-10-27 05:27:43 +00:00
5cb5f9a270
Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop'
...
Add NOT NULL constraints for activity_expirations table
See merge request pleroma/pleroma!1889
2019-10-27 05:27:24 +00:00
175f6c8355
Add migration
2019-10-26 22:59:24 +03:00
bdb2039453
Add migration
2019-10-26 22:58:37 +03:00
f5f9197fce
Add migration
2019-10-26 22:57:43 +03:00
2e608f7cbf
Add migration
2019-10-26 22:56:48 +03:00
2810729218
Add migration
2019-10-26 22:55:29 +03:00
cf72b7649e
Add migration
2019-10-26 22:54:37 +03:00
a4cf664385
Add migration
2019-10-26 22:53:41 +03:00
776c31267f
Add migration
2019-10-26 22:52:49 +03:00
c0b0fb19c8
Add migration
2019-10-26 22:50:52 +03:00
5fece5f8bc
Put correct migration
2019-10-26 22:49:37 +03:00
d58cca5f0a
Add migration
2019-10-26 22:46:09 +03:00
cf0fa124a2
Add migration
2019-10-26 22:45:24 +03:00
13cc52dc60
Add migration
2019-10-26 22:44:42 +03:00
55203c198b
Add migration
2019-10-26 22:43:32 +03:00
b85bee32da
Add migration
2019-10-26 22:42:24 +03:00
b33aacc4fb
Add migration
2019-10-26 22:40:51 +03:00
382e83fab5
Add migration
2019-10-26 22:39:24 +03:00
0223dc4e02
Add migration
2019-10-26 22:38:07 +03:00
d12555a69e
Add migration
2019-10-26 22:37:30 +03:00
7ac42fefe3
Add migration
2019-10-26 22:36:43 +03:00
c1ff8472fd
Add migration
2019-10-26 22:33:18 +03:00
5cb03fe801
Add migration
2019-10-26 22:32:31 +03:00
cd0218c205
Add migration
2019-10-26 22:31:25 +03:00
6e7fd364a4
Add migration
2019-10-26 22:28:18 +03:00
12ab7b3280
User info migration improvements
...
- Move column additions into a separate migration, so postgres doesn't
need an exclusive lock on the table for the main part
- Fill in columns by using one big update statement instead of a bunch
of small ones because it's much faster (the migration took 140s on
patch.cx database)
2019-10-26 03:45:24 +03:00
b777083f3f
Add `also_known_as` field to Pleroma.User
2019-10-25 19:14:18 +07:00
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07:00
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
11cd994425
[ #1304 ] Fixed null::jsonb handling in User.Info migration.
2019-10-23 17:15:48 +03:00
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
2019-10-21 11:58:22 +03:00
243719a965
Merge branch 'develop' into feature/masto_api_markers
2019-10-21 11:32:28 +03:00
a11a7176d5
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21 11:05:09 +03:00
f726d953d5
Fix typos
2019-10-21 14:56:39 +07:00
2ebe8c416a
Merge branch 'feature/activitypub-semantics' into 'develop'
...
activitypub semantics
See merge request pleroma/pleroma!1798
2019-10-21 07:54:48 +00:00
e37d4b2ddf
Revert "Skip deactivated users in followers import"
...
This reverts commit 8ad015ef64
2019-10-21 14:52:52 +07:00
75da202ab7
[ #1304 ] Typo fix.
2019-10-21 10:20:28 +03:00
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
2019-10-21 14:19:15 +07:00
ee04fbc35a
[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.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
2019-10-20 22:29:56 +03:00
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
2019-10-20 20:43:18 +03:00
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
34754938ba
add missing migration to drop websub table
2019-10-20 10:39:03 +00:00
c9280b9730
rework to use properties instead of compound typing, per SocialCG
2019-10-19 23:21:37 +00:00
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
2019-10-18 15:22:07 +03:00
66b5d0ff55
add Markers /api/v1/markers
2019-10-17 15:26:59 +03:00
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
8ad015ef64
Skip deactivated users in followers import
2019-10-14 14:16:57 +07:00
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07:00
2c7ff32e5b
Add `thread_visibility` to migrations
2019-10-10 21:11:34 +07:00
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-10 12:38:51 +00:00
761ad0b48e
Split CreateFollowingRelationships to multiple migrations
2019-10-08 20:27:42 +07:00
6291eaa590
Update CreateFollowingRelationships
2019-10-08 20:19:38 +07:00
32808208be
Enable `mix format` for migrations
2019-10-08 15:16:39 +03:00
12ebeef130
Add CreateFollowingRelationships migration
2019-10-08 18:05:23 +07:00
a502155274
Bump pleroma-fe bundle to 122323f35c
2019-10-07 17:42:33 +03:00
e8395bedd2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
2019-10-07 12:10:27 +00:00
19962d2022
clean up bundled litepub schema ( closes #1303 )
2019-10-07 11:33:58 +00:00
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-07 12:30:59 +02:00
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
2019-10-06 18:06:04 +03:00
125f96e706
Fix the use of queries with a schema in a migration
2019-10-06 17:23:43 +03:00
fefbd31c6e
Move local keys out of `user.info`
2019-10-06 16:56:36 +03:00
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-06 08:11:47 +00:00
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
2019-10-05 20:12:00 +03:00
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-02 13:27:55 +02:00
a562cb2c34
Update AdminFE bundle
2019-10-01 18:29:39 -05:00
28be12b38e
update admin fe
2019-09-30 12:52:28 +00:00
0aef18bcf4
Litepub Context: Add EmojiReaction.
2019-09-30 14:26:59 +02:00
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
1fba66178d
Merge branch 'develop' into cleanup/drop-subscription-table-if-exists
2019-09-30 00:26:49 +03:00
81b4243173
Remove subscription_notifications table if it existed
...
Followup to !1741
2019-09-29 23:52:40 +03:00
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
b4b147000c
Merge develop
2019-09-26 10:38:54 +03:00
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
5820dc40fc
litepub-0.1.jsonld: Add uploadMedia
2019-09-24 19:00:31 +02:00
646bf01608
Update AdminFE bundle
2019-09-23 21:13:39 +02:00
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
2019-09-17 13:04:43 +03:00
76c3e290fc
Merge develop
2019-09-16 20:30:42 +03:00
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
2019-09-16 07:39:58 +00:00
ac4a748fad
Disallow NULLs in deliveries
2019-09-13 19:28:35 +03:00
0bd2b85edb
Separate Subscription Notifications from regular Notifications
2019-09-13 18:25:27 +03:00
769fb778d4
Track object/create activity fetches
2019-09-12 21:37:36 +03:00
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06 13:26:05 +03:00
16e6be340d
Update frontend bundle to e75ac9dd
2019-09-06 11:31:44 +03:00
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-24 09:29:54 +03:00
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.
2019-08-23 03:17:20 +03:00
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
2019-08-22 20:59:58 +03:00
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
24a731a9a6
Update AdminFE
...
Now permits server configuration. Consider this ALPHA.
2019-08-12 15:00:03 -05:00
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-09 20:09:56 +03:00
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-08 16:04:20 +02:00
39c7bbe18f
Remove longfox emoji set
2019-08-04 04:32:45 +00:00
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
2019-08-02 11:55:41 +02:00
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
2019-08-01 17:28:00 +03:00
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.
2019-07-24 13:14:52 +02:00
a4647e9804
fr/LC_MESSAGES/errors.po: Create translation file
2019-07-20 16:59:37 +02:00
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
04f18a144b
Add `listMessage` to to the JSON-LD context
2019-07-15 14:29:13 +07:00
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-07-15 14:11:54 +07:00
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
e7c39b7ac8
Feature/1072 muting notifications
2019-07-14 13:29:31 +00:00
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
936050257d
saving following_address for existing users
2019-07-10 17:42:18 +03:00
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
406efb3688
Add Russian translation
2019-07-10 18:10:09 +07:00
5104f65b69
Wrap error messages into gettext helpers
2019-07-10 18:10:09 +07:00
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
2019-07-10 01:46:49 +05:45
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
2019-07-09 16:54:32 +00:00
efefee8241
Split alters rather than work with indexes
2019-07-03 14:56:02 +03:00
4f42093220
Remove Uploaders.Swift
2019-07-03 14:11:04 +07:00
291d95dcc3
Fix migration
2019-07-03 01:14:40 +03:00
85c7916c94
[ #1033 ] Fix database migrations
2019-07-01 01:08:07 +00:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
efad26bbb9
Update frontend.
2019-06-28 14:29:26 +02:00
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
2019-06-26 19:15:37 +00:00
451931d36f
Update mastofe to bundle-2019-06-26
2019-06-26 21:06:28 +02:00
7b9e21e8a2
Update adminFE to latest build
2019-06-23 18:36:20 -04:00
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
2019-06-23 05:42:37 +00:00
982cad0268
support for config groups
2019-06-23 08:16:16 +03:00
3ac5ecbac1
Support RUM indexes in the config generator
2019-06-22 12:54:16 +03:00
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.
2019-06-22 02:29:49 +03:00
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.
2019-06-21 22:01:59 +03:00
e76115989a
Move config templates to priv so they can be found in releases
2019-06-21 19:54:04 +03:00
431a41b459
Update bundled pleroma-fe to c4fcdc71
2019-06-19 00:04:00 +03:00
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
a7d956d383
Remove unused imports and aliases from migration
2019-06-10 13:20:37 +00:00
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
17004a0f1a
Create index on `activities.local`
2019-06-05 16:37:43 +07:00
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
94d12a79c4
Merge branch 'hotfix/add-in_reply_to_index' into 'develop'
...
Add index on inReplyTo for objects
See merge request pleroma/pleroma!1240
2019-06-04 05:38:13 +00:00
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
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.
2019-06-03 20:42:13 +03:00
be56801dda
Add index on inReplyTo for objects
...
Fixes the performance of `get_existing_votes`
2019-06-03 19:26:43 +03:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
5fbbc57c1b
add migration to add notification settings to user accounts
2019-05-25 07:25:13 +00:00
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-24 21:05:57 +07:00
022e6e4b44
RUM: Remove vacuum analyze from migration
...
Can't be run in a trnasaction.
2019-05-17 14:59:01 +02:00
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-17 19:57:14 +07:00
f2936e0a07
Add `ap_id` to List
2019-05-17 19:56:37 +07:00
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
2019-05-17 12:26:59 +02:00
e2b3a27204
Add Reports to Admin API
2019-05-16 19:09:18 +00:00
f3971cbde3
thread visibility function: fix use of no longer used author variable
2019-05-15 17:02:40 +00:00
kaniini
Roman Chvanikov
rinpatch
Egor Kislitsyn
Ivan Tashkinov
Maksim Pechnikov
lain
eugenijm
Mark Felder
Hakaba Hitoyo
Haelwenn (lanodan) Monnier
Maxim Filippov
Mike Verdone
Alexander Strizhakov
Sachin Joshi
kaniini
Sergey Suprunenko
Roman Chvanikov
Roman Chvanikov
William Pitcock