3ead44a9aa
Update AdminFE build in preparation for the 2.0.3 release
4 years ago
1d6338f2d3
Litepub: Add ChatMessage.
4 years ago
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
79445ae5d2
Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
Closes #1697
See merge request pleroma/pleroma!2403
4 years ago
d698ecef9b
Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs
4 years ago
eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo
4 years ago
24e0db6310
pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4
4 years ago
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
6936854878
Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
...
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
Closes #1695
See merge request pleroma/pleroma!2398
4 years ago
46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering
4 years ago
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
4 years ago
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
4 years ago
4b3b1fec4e
added an endpoint for getting unread notification count
4 years ago
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
5 years ago
7c060432fc
Revert "Merge branch 'marker-update-fix' into 'develop'"
...
This reverts merge request !2380
5 years ago
d8b12ffd59
Marker update migration: Don't try to update virtual field.
5 years ago
a16b3dbcbf
Merge branch 'develop' into issue/1276
5 years ago
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
5 years ago
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
5 years ago
ad92cef844
fix Oban migration
5 years ago
e89078ac2a
User: remove source_data
5 years ago
9172d719cc
profile emojis in User.emoji instead of source_data
5 years ago
62656ab259
User: Move inbox & shared_inbox to own fields
5 years ago
19eedb3d04
User: Move public_key from source_data to own field
5 years ago
d9f36965f6
pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360f
5 years ago
c0a630d42f
Update AdminFE build in preparation for Pleroma 2.0.2
5 years ago
19335be24c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
5 years ago
fd97b0e634
Chats: Basic implementation.
5 years ago
dbcfac11b4
Merge branch 'develop' into issue/1276
5 years ago
591f7015d9
update Oban package
5 years ago
fd932b14a7
Merge branch 'update/adminfe-20200331' into 'develop'
...
Update AdminFE build in preparation for Pleroma 2.0.2
See merge request pleroma/pleroma!2343
5 years ago
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
5 years ago
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
5 years ago
219d3aaa2d
Update AdminFE build in preparation for Pleroma 2.0.2
5 years ago
ea9c57b26e
[ #2332 ] Misc. improvements per code change requests.
5 years ago
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
5 years ago
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
dfd2c74184
Merge branch 'develop' into issue/1276
5 years ago
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
5 years ago
0adaab8e75
Bump copyright dates.
5 years ago
5a34dca8ed
Add emoji support in statuses in staticfe
5 years ago
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
cb8236cda6
Add embeddable posts
5 years ago
f0651730bd
Merge branch 'develop' into gun
5 years ago
9d09755291
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
5 years ago
aa4407be93
Update AdminFE
5 years ago
963df689b9
static-fe.css: Restore from before a65ee8ea
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
5 years ago
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
5 years ago
2966377cb9
Update AdminFE
5 years ago
39ed608b13
Merge branch 'develop' into gun
5 years ago
a747eb6df9
static-fe.css: Restore from before a65ee8ea
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
5 years ago
d9f8941dac
Merge branch 'develop' into gun
5 years ago
edb659dc57
Merge branch 'develop' into issue/1276
5 years ago
e7c49d51d7
pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af
5 years ago
6cf1958b02
moderation log: fix improperly migrated data
...
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes #1606
5 years ago
15d36b7f5f
Revert "Merge branch 'update/admin-fe-without-emojipack' into 'develop'"
...
This reverts merge request !2274
5 years ago
e25bacabb1
Remove EmojiPacks from AdminFE build
...
Once more, with feeling
5 years ago
d283c9abc1
Remove emoji support from AdminFE
5 years ago
a65ee8ead6
pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
5 years ago
22d52f5691
same copyright date format
5 years ago
2a850abbeb
MastoFE: Bundle 2020-01-20
5 years ago
bdd603e9f3
Merge branch 'develop' into update/pleroma-fe-20200228
5 years ago
c28de93912
Update PleromaFE bundle for the 2.0 release
5 years ago
3d24a0917b
Update AdminFE build
...
- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements
5 years ago
554bc88e8a
Update AdminFE build
5 years ago
10f452ad1f
Merge branch 'develop' into issue/1276
5 years ago
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
2d5cf0f8cd
Migrations: Make them not fail for old databases
5 years ago
6a97c1b9ff
Update adminFE build
5 years ago
da44ee5b0f
Merge branch 'develop' into issue/1276
5 years ago
f9eb35d48e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
5 years ago
de0fea4634
Update AdminFE build
5 years ago
60de311164
Update frontend
5 years ago
cd040691bd
maked `unread_count` as virtual field
5 years ago
b87533760b
Merge branch 'develop' into issue/1276
5 years ago
f13b7878b4
Merge branch 'rename_emoji_reactios' into 'develop'
...
EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181
5 years ago
8a79f20c21
EmojiReactions: Rename to EmojiReacts
5 years ago
fed9b0d1e0
Update FE bundle
5 years ago
ba5e8a6444
Merge branch 'develop' into issue/1276
5 years ago
f5bfb29d3b
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
5 years ago
6fab5fe7f8
Merge branch 'translation/errors-french' into 'develop'
...
Translation/errors french
See merge request pleroma/pleroma!1457
5 years ago
e442ea5722
Merge branch 'develop' into issue/1276
5 years ago
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
5 years ago
bd3f3756fb
Update MastoFE bundle to 2020-01-22
5 years ago
32a643a159
Merge branch 'develop' into admin-be
5 years ago
7ee2f86d76
Revert "Update AdminFE build"
...
This reverts commit 6395ad942c
5 years ago
2860bee604
Last AdminFE update was accidentally built from master, not develop
5 years ago
bc2ebdcfd6
Update AdminFE build
5 years ago
503d966e9f
Merge branch 'develop' into admin-be
5 years ago
d1e9768e10
[ #1478 ] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
5 years ago
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
5 years ago
6395ad942c
Update AdminFE build
5 years ago
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
fd3c23af63
Update AdminFE build
5 years ago
2f31cef71f
Merge branch 'feature/native-captcha' into 'develop'
...
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
5 years ago
756a029edf
Update frontend
5 years ago
2792672793
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
...
This reverts merge request !2055
5 years ago
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
84f0aec9aa
Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.
5 years ago
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
d6c89068f3
HTML: Compile Scrubbers on boot
...
This makes it possible to configure their behavior on OTP releases.
5 years ago
6fbafb1cdc
Merge branch 'develop' into issue/1276
5 years ago
49bb0a130f
Merge branch 'develop' into issue/1276
5 years ago
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
4b60d41db9
Add report notes
5 years ago
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
5 years ago
0d24ab04c5
Merge branch 'remove-info-from-users' into 'develop'
...
Removed users.info field
See merge request pleroma/pleroma!2006
5 years ago
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
5 years ago
f0bdbe3f61
Migrations: Set users.following_count to NOT NULL
...
Also set following_count for local users to the correct value and for remote
users to 0.
5 years ago
1636cc5b7e
Removed users.info and remaining usages.
5 years ago
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
5 years ago
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
5 years ago
4f88b1b435
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
0fe08346db
bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
5 years ago
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
5 years ago
e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
5 years ago
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
274cc18e8a
Visually separate header.
5 years ago
1dc785b74b
Move static-fe CSS to a separate file.
5 years ago
3cc2437598
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
5 years ago
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
ff6c727739
Merge branch 'develop' into issue/1276
5 years ago
57995fa8cf
fix migrate
...
update migrate
5 years ago
9d8da9ea15
Merge branch 'fix/migration-schema' into 'develop'
...
Fix bookmark migration using a query with a schema
See merge request pleroma/pleroma!1923
5 years ago
fd8099fb68
Merge branch 'develop' into issue/1276
5 years ago
e14cae25aa
Merge branch 'refactor/db-add-defaults' into 'develop'
...
Set defaults to fields with NULL values
Closes #1358
See merge request pleroma/pleroma!1914
5 years ago
1b82eb6d41
move sql (update_markers) from migrate to mix task
5 years ago
d719078699
Merge branch 'develop' into issue/1276
5 years ago
8bb6da7cd6
Remove following column from the migrations
5 years ago
c546da7cfe
Fix bookmark migration using a query with a schema
...
This resulted in failures when updating from Pleroma <1.0 because of all
the new fields that were added to the user schema.
5 years ago
40d5fb6ef8
Add a migration to fix blocked follows
5 years ago
b27a92e8fa
Merge branch 'develop' into issue/1276
5 years ago
3e09b7c5ae
Fix two migrations sharing the same module name
...
This makes ecto execute only the latter one.
5 years ago
5334190056
Migrate missing follow requests
5 years ago
435d220700
Move setDefaultsToTables to past to run before notNull migrations
5 years ago
4b0893631f
Complete defaults
5 years ago
4270861085
Merge branch 'develop' into feature/move-activity
5 years ago
3c86a0ab24
Fix `SetNotNullForUsers` migration
5 years ago
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
5 years ago
0be9cb086b
Add migration
5 years ago
060adfd762
Merge branch 'improve-user-info-migration' into 'develop'
...
User info migration improvements
See merge request pleroma/pleroma!1887
5 years ago
fbadd36cc0
Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'
...
Add NOT NULL constraints for users table
See merge request pleroma/pleroma!1910
5 years ago
a9cadf3905
Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop'
...
Add NOT NULL constraints for user_invite_tokens table
See merge request pleroma/pleroma!1909
5 years ago
4a72d39ca6
Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop'
...
Add NOT NULL constraints for thread_mutes table
See merge request pleroma/pleroma!1908
5 years ago
e94144669a
Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop'
...
Add NOT NULL constraints for scheduled_activities table
See merge request pleroma/pleroma!1907
5 years ago
9e084771c6
Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'
...
Add NOT NULL constraints for registrations table
See merge request pleroma/pleroma!1906
5 years ago
3ac6160299
Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop'
...
Add NOT NULL constraints for push_subscriptions table
See merge request pleroma/pleroma!1905
5 years ago
26daaa9f04
Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop'
...
Add NOT NULL constraints for password_reset_tokens table
See merge request pleroma/pleroma!1904
5 years ago
1fc591fcfc
Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'
...
Add NOT NULL constraints for objects table
See merge request pleroma/pleroma!1903
5 years ago
8b204b4d71
Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop'
...
Add NOT NULL constraints for oauth_authorizations table
See merge request pleroma/pleroma!1902
5 years ago
fe97493d91
Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop'
...
Add NOT NULL constraints for oauth_tokens table
See merge request pleroma/pleroma!1901
5 years ago
84e992d85b
Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'
...
Add NOT NULL constraints for notifications table
See merge request pleroma/pleroma!1900
5 years ago
19a625459b
Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop'
...
Add NOT NULL constraints for moderation_log table
See merge request pleroma/pleroma!1899
5 years ago
79702b54b6
Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop'
...
Add NOT NULL constraints for markers table
See merge request pleroma/pleroma!1898
5 years ago
2e7e43c853
Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop'
...
Add NOT NULL constraints for lists table
See merge request pleroma/pleroma!1897
5 years ago
75dab79183
Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop'
...
Add NOT NULL constraints for instances table
See merge request pleroma/pleroma!1896
5 years ago
24699b991a
Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'
...
Add NOT NULL constraints for filters table
See merge request pleroma/pleroma!1895
5 years ago
3ac8eb4046
Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop'
...
Add NOT NULL constraints for conversation_participations table
See merge request pleroma/pleroma!1894
5 years ago
6be16b8617
Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop'
...
Add NOT NULL constraints for conversation_participation_recipient_ships table
See merge request pleroma/pleroma!1893
5 years ago
b05fbc890e
Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'
...
Add NOT NULL constraints for config table
See merge request pleroma/pleroma!1892
5 years ago
8785d7ba5d
Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'
...
Add NOT NULL constraints for bookmarks table
See merge request pleroma/pleroma!1891
5 years ago
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
5 years ago
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
5 years ago
175f6c8355
Add migration
5 years ago
bdb2039453
Add migration
5 years ago
f5f9197fce
Add migration
5 years ago
2e608f7cbf
Add migration
5 years ago
2810729218
Add migration
5 years ago
cf72b7649e
Add migration
5 years ago
a4cf664385
Add migration
5 years ago
776c31267f
Add migration
5 years ago
c0b0fb19c8
Add migration
5 years ago
5fece5f8bc
Put correct migration
5 years ago
d58cca5f0a
Add migration
5 years ago
cf0fa124a2
Add migration
5 years ago
13cc52dc60
Add migration
5 years ago
55203c198b
Add migration
5 years ago
b85bee32da
Add migration
5 years ago
b33aacc4fb
Add migration
5 years ago
382e83fab5
Add migration
5 years ago
0223dc4e02
Add migration
5 years ago
d12555a69e
Add migration
5 years ago
7ac42fefe3
Add migration
5 years ago
c1ff8472fd
Add migration
5 years ago
5cb03fe801
Add migration
5 years ago
cd0218c205
Add migration
5 years ago
6e7fd364a4
Add migration
5 years ago
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)
5 years ago
b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
99cf1ef9be
Merge branch 'develop' into issue/1276
5 years ago
d3fb9e02cc
add tests
5 years ago
aa64b3108b
fix migrate
5 years ago
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
11cd994425
[ #1304 ] Fixed null::jsonb handling in User.Info migration.
5 years ago
d4270397dc
Marker: added unread_count field
5 years ago
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
5 years ago
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
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
5 years ago
f726d953d5
Fix typos
5 years ago
2ebe8c416a
Merge branch 'feature/activitypub-semantics' into 'develop'
...
activitypub semantics
See merge request pleroma/pleroma!1798
5 years ago
e37d4b2ddf
Revert "Skip deactivated users in followers import"
...
This reverts commit 8ad015ef64
5 years ago
75da202ab7
[ #1304 ] Typo fix.
5 years ago
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
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
5 years ago
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
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
34754938ba
add missing migration to drop websub table
5 years ago
c9280b9730
rework to use properties instead of compound typing, per SocialCG
5 years ago
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
5 years ago
66b5d0ff55
add Markers /api/v1/markers
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
8ad015ef64
Skip deactivated users in followers import
5 years ago
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
2c7ff32e5b
Add `thread_visibility` to migrations
5 years ago
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
761ad0b48e
Split CreateFollowingRelationships to multiple migrations
5 years ago
6291eaa590
Update CreateFollowingRelationships
5 years ago
32808208be
Enable `mix format` for migrations
5 years ago
12ebeef130
Add CreateFollowingRelationships migration
5 years ago
a502155274
Bump pleroma-fe bundle to 122323f35c
5 years ago
e8395bedd2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
5 years ago
19962d2022
clean up bundled litepub schema ( closes #1303 )
5 years ago
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
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
125f96e706
Fix the use of queries with a schema in a migration
5 years ago
fefbd31c6e
Move local keys out of `user.info`
5 years ago
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
a562cb2c34
Update AdminFE bundle
5 years ago
28be12b38e
update admin fe
5 years ago
0aef18bcf4
Litepub Context: Add EmojiReaction.
5 years ago
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
5 years ago
1fba66178d
Merge branch 'develop' into cleanup/drop-subscription-table-if-exists
5 years ago
81b4243173
Remove subscription_notifications table if it existed
...
Followup to !1741
5 years ago
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
5 years ago
b4b147000c
Merge develop
5 years ago
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
5820dc40fc
litepub-0.1.jsonld: Add uploadMedia
5 years ago
646bf01608
Update AdminFE bundle
5 years ago
Mark Felder