Commit Graph

1131 Commits (23c758bbe7d5e73884e4807ae2d8b4a206fe1226)

Author SHA1 Message Date
sadposter 3508f698b9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 4709928b06 thing
5 years ago
Haelwenn (lanodan) Monnier 2a850abbeb
MastoFE: Bundle 2020-01-20
5 years ago
Mark Felder bdd603e9f3 Merge branch 'develop' into update/pleroma-fe-20200228
5 years ago
Mark Felder c28de93912 Update PleromaFE bundle for the 2.0 release
5 years ago
Mark Felder 3d24a0917b Update AdminFE build
5 years ago
Mark Felder 554bc88e8a Update AdminFE build
5 years ago
Maksim Pechnikov 10f452ad1f Merge branch 'develop' into issue/1276
5 years ago
eugenijm 7ad5c51f23 Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
lain 2d5cf0f8cd Migrations: Make them not fail for old databases
5 years ago
sadposter fae0d4ba9d Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Mark Felder 6a97c1b9ff Update adminFE build
5 years ago
Maksim Pechnikov da44ee5b0f Merge branch 'develop' into issue/1276
5 years ago
Mark Felder f9eb35d48e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
5 years ago
Mark Felder de0fea4634 Update AdminFE build
5 years ago
lain 60de311164 Update frontend
5 years ago
Maksim Pechnikov cd040691bd maked `unread_count` as virtual field
5 years ago
Maksim Pechnikov b87533760b Merge branch 'develop' into issue/1276
5 years ago
sadposter 1b03dc2031 fe
5 years ago
sadposter 7de32e2c8b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 57b3925a88 fe
5 years ago
rinpatch f13b7878b4 Merge branch 'rename_emoji_reactios' into 'develop'
5 years ago
Lain Soykaf 8a79f20c21 EmojiReactions: Rename to EmojiReacts
5 years ago
Mark Felder fed9b0d1e0 Update FE bundle
5 years ago
sadposter 646016c403 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter ff552c5151 FE
5 years ago
Maksim Pechnikov ba5e8a6444 Merge branch 'develop' into issue/1276
5 years ago
lain f5bfb29d3b Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
5 years ago
lain 6fab5fe7f8 Merge branch 'translation/errors-french' into 'develop'
5 years ago
Maksim Pechnikov e442ea5722 Merge branch 'develop' into issue/1276
5 years ago
sadposter 4646d3c9d6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
feld be27777156 Merge branch 'admin-be' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier bd3f3756fb
Update MastoFE bundle to 2020-01-22
5 years ago
Alexander Strizhakov 32a643a159
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov 7ee2f86d76 Revert "Update AdminFE build"
5 years ago
Mark Felder 2860bee604 Last AdminFE update was accidentally built from master, not develop
5 years ago
Mark Felder bc2ebdcfd6 Update AdminFE build
5 years ago
Alexander Strizhakov 503d966e9f
Merge branch 'develop' into admin-be
5 years ago
sadposter 4e069ce537 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 5664427d6c branch
5 years ago
Ivan Tashkinov d1e9768e10 [#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
5 years ago
Alexander Strizhakov 7d128ca208
dynamic_configuration renaming
5 years ago
Alexander Strizhakov 6395ad942c
Update AdminFE build
5 years ago
Ivan Tashkinov 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
5 years ago
Mark Felder fd3c23af63 Update AdminFE build
5 years ago
sadposter 6f5844cf8e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
lain 2f31cef71f Merge branch 'feature/native-captcha' into 'develop'
5 years ago
sadposter 803bce3668 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
lain 756a029edf Update frontend
5 years ago
lain 2792672793 Revert "Merge branch 'admin-scope-support-code' into 'develop'"
5 years ago
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes
5 years ago
Ivan Tashkinov 84f0aec9aa Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.
5 years ago
sadposter 97f67e0786 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type
5 years ago
sadposter d3cee00057 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
rinpatch d6c89068f3 HTML: Compile Scrubbers on boot
5 years ago
Maksim Pechnikov 6fbafb1cdc Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov 49bb0a130f Merge branch 'develop' into issue/1276
5 years ago
sadposter 8ae4ae14f3 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Maxim Filippov 4b60d41db9 Add report notes
5 years ago
lain 7722e5a67a Merge branch 'feature/move-activity' into 'develop'
5 years ago
sadposter a7ec08d853 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
rinpatch 0d24ab04c5 Merge branch 'remove-info-from-users' into 'develop'
5 years ago
Ivan Tashkinov 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain f0bdbe3f61 Migrations: Set users.following_count to NOT NULL
5 years ago
sadposter acac6e3540 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Ivan Tashkinov 1636cc5b7e Removed users.info and remaining usages.
5 years ago
Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
lain 8feb5dcb42 Merge branch 'issue/1348' into 'develop'
5 years ago
Ivan Tashkinov 4f88b1b435 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
sadposter 9d29a5063c fe
5 years ago
sadposter d8286a122a stickers
5 years ago
rinpatch 0fe08346db bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
5 years ago
Ivan Tashkinov aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
5 years ago
Ivan Tashkinov 01d9c093c3 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
5 years ago
Ivan Tashkinov c31ddce51e [#1335] Reorganized `users.mutes` as relation to UserMute entity.
5 years ago
Egor Kislitsyn 3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
5 years ago
rinpatch 6085c71bd1 Merge branch 'reactions' into 'develop'
5 years ago
sadposter 2de30812ea Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter c4f66db63c fe
5 years ago
Egor Kislitsyn e6d7e27bd6
Add `allow_following_move` setting to User
5 years ago
Ivan Tashkinov 3db988250b [#1335] User: refactored :blocks field into :blocked_users relation.
5 years ago
lain a88e834dba Merge branch 'develop' into 'reactions'
5 years ago
Phil Hagelberg 274cc18e8a Visually separate header.
5 years ago
Phil Hagelberg 1dc785b74b Move static-fe CSS to a separate file.
5 years ago
sadposter 55cc96bcf9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 058467d25c fe
5 years ago
rinpatch 3cc2437598 Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
5 years ago
lain b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
sadposter 9bc70ca0c1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Maksim Pechnikov 4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id
5 years ago
Maksim Pechnikov ff6c727739 Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov 57995fa8cf fix migrate
5 years ago
Haelwenn 9d8da9ea15 Merge branch 'fix/migration-schema' into 'develop'
5 years ago
Maksim Pechnikov fd8099fb68 Merge branch 'develop' into issue/1276
5 years ago
lain e14cae25aa Merge branch 'refactor/db-add-defaults' into 'develop'
5 years ago
Maksim Pechnikov 1b82eb6d41 move sql (update_markers) from migrate to mix task
5 years ago
Maksim Pechnikov d719078699 Merge branch 'develop' into issue/1276
5 years ago
Roman Chvanikov 8bb6da7cd6 Remove following column from the migrations
5 years ago
rinpatch c546da7cfe Fix bookmark migration using a query with a schema
5 years ago
sadposter 83a9ec228e tos
5 years ago
Egor Kislitsyn 40d5fb6ef8
Add a migration to fix blocked follows
5 years ago
Maksim Pechnikov b27a92e8fa Merge branch 'develop' into issue/1276
5 years ago
rinpatch 3e09b7c5ae Fix two migrations sharing the same module name
5 years ago
sadposter bea4a82d1e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter e50d018bfe fe
5 years ago
sadposter 55ce1daeaf Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
kPherox 5334190056
Migrate missing follow requests
5 years ago
Roman Chvanikov 435d220700 Move setDefaultsToTables to past to run before notNull migrations
5 years ago
Roman Chvanikov 4b0893631f Complete defaults
5 years ago
Egor Kislitsyn 4270861085
Merge branch 'develop' into feature/move-activity
5 years ago
Egor Kislitsyn 3c86a0ab24
Fix `SetNotNullForUsers` migration
5 years ago
lain 2480200759 Merge branch 'refactor/following-relationships' into 'develop'
5 years ago
Roman Chvanikov 0be9cb086b Add migration
5 years ago
kaniini 060adfd762 Merge branch 'improve-user-info-migration' into 'develop'
5 years ago
kaniini fbadd36cc0 Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'
5 years ago
kaniini a9cadf3905 Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop'
5 years ago
kaniini 4a72d39ca6 Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop'
5 years ago
kaniini e94144669a Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop'
5 years ago
kaniini 9e084771c6 Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'
5 years ago
kaniini 3ac6160299 Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop'
5 years ago
kaniini 26daaa9f04 Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop'
5 years ago
kaniini 1fc591fcfc Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'
5 years ago
kaniini 8b204b4d71 Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop'
5 years ago
kaniini fe97493d91 Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop'
5 years ago
kaniini 84e992d85b Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'
5 years ago
kaniini 19a625459b Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop'
5 years ago
kaniini 79702b54b6 Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop'
5 years ago
kaniini 2e7e43c853 Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop'
5 years ago
kaniini 75dab79183 Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop'
5 years ago
kaniini 24699b991a Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'
5 years ago
kaniini 3ac8eb4046 Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop'
5 years ago
kaniini 6be16b8617 Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop'
5 years ago
kaniini b05fbc890e Merge branch 'refactor/db-not-null-constraints-for-config' into 'develop'
5 years ago
kaniini 8785d7ba5d Merge branch 'refactor/db-not-null-constraints-for-bookmarks' into 'develop'
5 years ago
kaniini 93f6f173ce Merge branch 'refactor/db-not-null-constraints-for-apps' into 'develop'
5 years ago
kaniini 5cb5f9a270 Merge branch 'refactor/db-not-null-constraints-for-activity-expirations' into 'develop'
5 years ago
Roman Chvanikov 175f6c8355 Add migration
5 years ago
Roman Chvanikov bdb2039453 Add migration
5 years ago
Roman Chvanikov f5f9197fce Add migration
5 years ago
Roman Chvanikov 2e608f7cbf Add migration
5 years ago
Roman Chvanikov 2810729218 Add migration
5 years ago
Roman Chvanikov cf72b7649e Add migration
5 years ago
Roman Chvanikov a4cf664385 Add migration
5 years ago
Roman Chvanikov 776c31267f Add migration
5 years ago
Roman Chvanikov c0b0fb19c8 Add migration
5 years ago
Roman Chvanikov 5fece5f8bc Put correct migration
5 years ago
Roman Chvanikov d58cca5f0a Add migration
5 years ago
Roman Chvanikov cf0fa124a2 Add migration
5 years ago
Roman Chvanikov 13cc52dc60 Add migration
5 years ago
Roman Chvanikov 55203c198b Add migration
5 years ago
Roman Chvanikov b85bee32da Add migration
5 years ago
Roman Chvanikov b33aacc4fb Add migration
5 years ago
Roman Chvanikov 382e83fab5 Add migration
5 years ago
Roman Chvanikov 0223dc4e02 Add migration
5 years ago
Roman Chvanikov d12555a69e Add migration
5 years ago
Roman Chvanikov 7ac42fefe3 Add migration
5 years ago
Roman Chvanikov c1ff8472fd Add migration
5 years ago
Roman Chvanikov 5cb03fe801 Add migration
5 years ago
Roman Chvanikov cd0218c205 Add migration
5 years ago
Roman Chvanikov 6e7fd364a4 Add migration
5 years ago
rinpatch 12ab7b3280 User info migration improvements
5 years ago
Egor Kislitsyn b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
sadposter 1d85dc62aa Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 16107a0319 update tos
5 years ago
Egor Kislitsyn 4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Maksim Pechnikov 99cf1ef9be Merge branch 'develop' into issue/1276
5 years ago
Maksim Pechnikov d3fb9e02cc add tests
5 years ago
Maksim Pechnikov aa64b3108b fix migrate
5 years ago
Ivan Tashkinov 8cc809e44e Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Ivan Tashkinov 11cd994425 [#1304] Fixed null::jsonb handling in User.Info migration.
5 years ago
Maksim Pechnikov d4270397dc Marker: added unread_count field
5 years ago
sadposter 85b9992f86 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Ivan Tashkinov 7c7f90bc4f [#1304] Merged `develop`, handled User.Info.invisible.
5 years ago
Maksim Pechnikov 243719a965 Merge branch 'develop' into feature/masto_api_markers
5 years ago
Ivan Tashkinov a11a7176d5 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Egor Kislitsyn f726d953d5
Fix typos
5 years ago
kaniini 2ebe8c416a Merge branch 'feature/activitypub-semantics' into 'develop'
5 years ago
Egor Kislitsyn e37d4b2ddf
Revert "Skip deactivated users in followers import"
5 years ago
Ivan Tashkinov 75da202ab7 [#1304] Typo fix.
5 years ago
Egor Kislitsyn 4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov ee04fbc35a [#1304]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
5 years ago
Ivan Tashkinov c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
5 years ago
Ivan Tashkinov e8843974cb [#1304] Moved remaining fields from User.Info to User.
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
5 years ago
sadposter 1eec8d3dee frontend
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'
5 years ago
sadposter 58f9ce0deb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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'
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
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'
5 years ago
eugenijm 8249924485 Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
sadposter 8550e0ff0a stickers
5 years ago
sadposter 59e6b48553 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 76c84720f7 stickers
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'
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
5 years ago
rinpatch e9d1aa75d5 Revert subscription refactoring.
5 years ago
sadposter 1e11b97c1b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Roman Chvanikov b4b147000c Merge develop
5 years ago
Hakaba Hitoyo 5fb72170a7 Revert "add _discoverable_ keyword into ActivityPub @context"
5 years ago
sadposter f82d9e1359 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 31f932bdfb eva
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
sadposter c3de75b2a1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
rinpatch a21584556f Update oban to 0.8.1
5 years ago
Roman Chvanikov 76c3e290fc Merge develop
5 years ago
sadposter 4714b739a7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 63782e770b add stickers
5 years ago
kaniini 17142a3720 Merge branch 'feature/delivery-tracking' into 'develop'
5 years ago
sadposter b4512ddb6f thing
5 years ago
rinpatch ac4a748fad Disallow NULLs in deliveries
5 years ago
Roman Chvanikov 0bd2b85edb Separate Subscription Notifications from regular Notifications
5 years ago
sadposter f1e1ba71ce update tos
5 years ago
sadposter 8046440a16 update fe
5 years ago
sadposter cc5b65bd21 add lato
5 years ago
rinpatch 769fb778d4 Track object/create activity fetches
5 years ago
sadposter 94076a23e4 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Ivan Tashkinov ca1ba1e272 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
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
5 years ago
sadposter cc28184854 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
5 years ago
Ivan Tashkinov 256ff09aa8 [#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
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
sadposter 5b385962eb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Mark Felder 24a731a9a6 Update AdminFE
5 years ago
sadposter 8abd779bcc TOS
5 years ago
sadposter 6f8e4f5dcf TOS
5 years ago
sadposter 59c9b90169 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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'
5 years ago
lain a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
sadposter 325372b1e1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Hakaba Hitoyo 39c7bbe18f Remove longfox emoji set
5 years ago
lain f88560accd Conversations: Add recipient list to conversation participation.
5 years ago
Ivan Tashkinov 23d279e03e [#1149] Replaced RetryQueue with oban-based retries.
5 years ago
Mike Verdone 666514194a Add activity expirations table
5 years ago
Haelwenn (lanodan) Monnier a4647e9804
fr/LC_MESSAGES/errors.po: Create translation file
5 years ago
Roman Chvanikov 9bca70b10a Merge develop
5 years ago
sadposter 32ce409514 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into 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
sadposter d4348eeb62 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
sadposter dbeb8f43fe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 357b1eac0f theme
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'
5 years ago
sadposter ed709aec2c Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
sadposter 4d8f97453b Add activity get mix task
5 years ago
Maksim 85c7916c94 [#1033] Fix database migrations
5 years ago
Roman Chvanikov 657277ffc0 Resolve conflicts
5 years ago
sadposter 87ba9d1bab Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
lain efad26bbb9 Update frontend.
5 years ago
sadposter 8050baf7bf Update pleroma FE
5 years ago
sadposter 0843f3e0b6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
rinpatch cfb5be3ced Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier 451931d36f
Update mastofe to bundle-2019-06-26
5 years ago
sadposter 3a71016699 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Mark Felder 7b9e21e8a2 Update adminFE to latest build
5 years ago
kaniini 8b7860f12f Merge branch 'admin-config' into 'develop'
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
5 years ago
rinpatch 960d6b54e8 use Config in generated config when available
5 years ago
rinpatch e76115989a Move config templates to priv so they can be found in releases
5 years ago
sadposter 6f380ee337 merge
5 years ago
rinpatch 431a41b459 Update bundled pleroma-fe to c4fcdc71
5 years ago
sadposter f0fc2da964 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Alexander Strizhakov c2ca1f22a2 it is changed in compile time
5 years ago
sadposter 4cda6ed358 change panel
5 years ago
sadposter 922c25d9c7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Sergey Suprunenko a7d956d383 Remove unused imports and aliases from migration
5 years ago
Roman Chvanikov 01fe5abad1 Resolve conflicts
5 years ago
sadposter ee7459ec8c Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter febd2fdfd3 add emojo
5 years ago
Egor Kislitsyn 17004a0f1a Create index on `activities.local`
5 years ago
sadposter 9bc0f51e51 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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'
5 years ago
Mark Felder 6ef145b4fc Merge branch 'develop' into feature/digest-email
5 years ago
rinpatch cfc3c62b2f Add missing tag index on objects
5 years ago
rinpatch be56801dda Add index on inReplyTo for objects
5 years ago
sadposter c4151feb48 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter d19b99009b add instance resources
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
sadposter 3357780ea8 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
lain 022e6e4b44 RUM: Remove vacuum analyze from migration
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
sadposter c0b7bc2927 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 7f40b66d51 add emojo
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'
5 years ago
sadposter cf2741e067 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Haelwenn (lanodan) Monnier 566a968ab3
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
5 years ago
sadposter 4c11429520 Add mayushii
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
5 years ago
Roman Chvanikov b6b5b16ba4 Merge develop
5 years ago
lambda 238dd72fad Merge branch 'conversations_three' into 'develop'
5 years ago
Egor Kislitsyn 1557b99beb Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
sadposter db0fefc167 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Maksim 1040caf096 fix format
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
Sadposter fa632f9c37 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Sadposter 4b521119dc Add compressed background
5 years ago
William Pitcock 52bdfced32 update pleroma frontend
5 years ago
Alex S 229ce6abbc migration without using old field name
5 years ago
Alex S 58711a79d0 removing useless transaction
5 years ago
Alex S 6322c1e123 migration optimization
5 years ago
Alex S 324c9c8ab5 migrate user.bookmarks to separate table
5 years ago
Alex S 73d01857e3 bookmarks in separate table
5 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
6 years ago
Roman Chvanikov 8add119444 Add User.list_inactive_users_query/1
6 years ago
Sadposter c02d52c9f7 Update instance panel
6 years ago
Sadposter b134bd83ca Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
Sadposter d5e5e87d01 Update emojo
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
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
Sadposter 527093e357 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
6 years ago
lambda e5d553aa45 Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
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
6 years ago
Alex S 012bb5dcc9 renaming expire_at -> expires_at
6 years ago
eugenijm fc92a0fd8d Added limits and media attachments for scheduled activities.
6 years ago
eugenijm 7bf622ce73 Add scheduled activities
6 years ago
Alex S 47b07cec49 token -> invite renaming
6 years ago
Alex S 0484f3a8b1 generating tokens with mix
6 years ago
Sadposter ffac2593ea
Add index on subscribers
6 years ago
Ivan Tashkinov 45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Sadposter 777042b9e5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
6 years ago
Alex S 86f90c0a54 adding indexes to oauth_tokens table
6 years ago
lambda bd961a3bad Merge branch 'features/pleroma-tan' into 'develop'
6 years ago
Sadposter df7ea4c0c2 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
6 years ago
Haelwenn (lanodan) Monnier b2f3a40e53
Revert awfully long migration from 568e34858
6 years ago
Ivan Tashkinov 642075b1a9 [#923] Enabled binding of multiple OAuth provider accounts to single user.
6 years ago
Ivan Tashkinov 20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
lambda 21ff78cd40 Merge branch 'replies-count' into 'develop'
6 years ago
eugenijm 568e348588 Increment replies_count on replies (MastoAPI)
6 years ago
rinpatch 9725c93cea Add an id index to notifications
6 years ago
rinpatch b92a16aa00 Merge branch 'ecto-3-migration' into 'develop'
6 years ago
kaniini b68fb3dc17 Merge branch 'imageoptim' into 'develop'
6 years ago
rinpatch e59cfa7cac modify the migrations to use naive_datetime_usec
6 years ago
rinpatch cbc4a76b43 Fix filter migration
6 years ago
lain 41511d1926 Update frontend
6 years ago
Ivan Tashkinov e17a9a1f66 [#923] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
optikfluffel a907522690 used imageOptim to reduce size of image files
6 years ago
Ivan Tashkinov 40e9a04c31 [#923] Registration validations & unique index on [:user_id, :provider].
6 years ago
Ivan Tashkinov 26b6354095 [#923] Support for multiple (external) registrations per user via Registration.
6 years ago
Sadposter 3d24792f4f Modify static resources
6 years ago
Sadposter e751f3ec56 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
6 years ago
Ivan Tashkinov 2739057442 Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Ivan Tashkinov aacbf0f570 [#923] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
William Pearson 3dadaa4432 robots.txt
6 years ago
Haelwenn (lanodan) Monnier bae96206d0
priv/static/images: Add pleroma-tan
6 years ago
Haelwenn (lanodan) Monnier 05cad042ba
Update Mastodon Frontend to 2019-03-07 bundle
6 years ago
William Pitcock 3a097bd770 update pleroma frontend
6 years ago
Egor Kislitsyn eb84de0143 allow users to disable their own account
6 years ago
eugenijm 8a1e0c9bee Added migration to update existing user note counters
6 years ago
eugenijm 85734c0d49 Added migration for setting default tags in existing users records
6 years ago
Sadposter c413656287 favicon
6 years ago
Sadposter 6c1cf2129e chg: resources
6 years ago
Sadposter 8b6cd3857b new: Add instance resources
6 years ago
Ivan Tashkinov b227ccab82 Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`.
6 years ago
lain 553ce57d42 update frontend
6 years ago
Egor bff9eb5ef7 Reports
6 years ago
Ivan Tashkinov bc4f77b10b [#468] Merged `upstream/develop`, resolved conflicts.
6 years ago
Ivan Tashkinov 949e35e26d [#468] OAuth scopes-related data migration simplification.
6 years ago
Ivan Tashkinov 063baca5e4 [#468] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
William Pitcock dd989962e6 litepub schema: add oauthRegistrationEndpoint [ci skip]
6 years ago
Karen Konou ac72b578da Merge branch 'develop' into feature/thread-muting
6 years ago
Haelwenn (lanodan) Monnier fcd8a2d0d6
Update Mastodon Frontend to 2019-02-10 bundle
6 years ago
Karen Konou 6a150de3bd Add unique index and unique constraint check, uniqueness test fails
6 years ago
Ivan Tashkinov 4ad843fb9d [#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
6 years ago
Karen Konou 98ec578f4d Merge branch 'develop' into feature/thread-muting
6 years ago
Karen Konou c43f414a79 Somehow fixed the repo insert [skip-ci]
6 years ago
Karen Konou 77448de492 ugghhhh
6 years ago
Karen Konou f4ff4ffba2 Migration and some boilerplate stuff
6 years ago
Maxim Filippov f1b72bfb70 Split hide_networ only for local users
6 years ago
lain 78a51f4dd4 update frontend
6 years ago
kaniini d120aa63f0 Merge branch 'fix-dm-index' into 'develop'
6 years ago
Maxim Filippov c48aba3c2a Fix SQL
6 years ago
lain f3c8b02d65 Massage index until it actually does the stuff we want.
6 years ago
Maxim Filippov cd6606b7f6 Initialize hide_network with false
6 years ago
Maxim Filippov 16ce129e38 Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
kaniini 486749064f Revert "Merge branch 'feature/split-hide-network' into 'develop'"
6 years ago
kaniini 0a82a7e6d6 Merge branch 'feature/split-hide-network' into 'develop'
6 years ago
href b3b0855456 Merge branch '534_federation_targets_reachability' into 'develop'
6 years ago
lambda a43a1c6d4e Revert "Merge branch 'spc-fix-3' into 'develop'"
6 years ago
kaniini 4d3655c479 Merge branch 'spc-fix-3' into 'develop'
6 years ago
Haelwenn 00d4333373 Merge branch 'features/glitch-soc-frontend' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier de0c1c641a
[MastodonFE] Update Frontend (glitch)
6 years ago
lain 88a40308d3 update frontend
6 years ago
kaniini d03a116654 Merge branch 'hj-happiness-improvement' into 'develop'
6 years ago
Maxim Filippov 50d6183893 Split hide_network into hide_followers & hide_followings
6 years ago
Ivan Tashkinov d3f9e6f6fe [#534] Merged `upstream/develop`.
6 years ago
lain 39b2457734 Change default bg image in new config.
6 years ago
Ivan Tashkinov 9560abea10 [#534] Refactoring / tweaks per MR review.
6 years ago
Haelwenn (lanodan) Monnier cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
William Pitcock 15d12a69a4 add activities likes index, fixes favorites API call
6 years ago
href 4a13bb75bd
Change webpush endpoint to unlimited varchar
6 years ago
William Pitcock 57c3f8214c update pleroma frontend (summary_html hotfix)
6 years ago
kaniini 4df71cd88b Merge branch 'classic-flakeids' into 'develop'
6 years ago
William Pitcock 4b76f14da1 update pleroma frontend
6 years ago
href a3ba72d978
Fix clippy with one/five lines
6 years ago
href e02b19d1d7
Fix postgres activity_visibility when running in autovacuum
6 years ago
Ivan Tashkinov f161a92cb1 [#534] Initial implementation of unreachable federation targets retirement.
6 years ago
lain ab03f81219 Fix info ids.
6 years ago
href 9ba6e1fabe
FlakeId: chain alter statements
6 years ago
href e67bd93d90
Flake: migrate pinned_activities in jsonb
6 years ago
href a92c43bc4b
Clippy!
6 years ago
href 465fb4327d
Lock activities/users table during flake migration.
6 years ago
href 28d77e373c
Flake Ids for Users and Activities
6 years ago
Michael Loftis 98cbeae49c slightly changes definition so that autovacuum works paralell safe too
6 years ago
lambda 69454c8345 Merge branch 'feature/dm-sanity' into 'develop'
6 years ago
lambda 2020f26040 Merge branch '2019-1-20-update-frontend' into 'develop'
6 years ago
lain deeda94513 update frontend
6 years ago
William Pitcock 75bb663749 litepub schema: add litepub:directMessage flag
6 years ago
lain b108aeee08 Make use of the indices.
6 years ago
lain bd6c12592e Add migration to fix spc users.
6 years ago
Ivan Tashkinov 79e44042bc [#477] User trigram index adjustment.
6 years ago
Ivan Tashkinov fc965f982c [#477] Added FTS index for `users`. Fixed failing test.
6 years ago
lain 04735db193 Build the index concurrently.
6 years ago
lain 5027f82cde Add activity visibility index.
6 years ago
lain 1dd0e0ed4c update frontend
6 years ago
lain e1227d812c update frontend
6 years ago
lain 9c4344e16c update frontend
6 years ago
lain 3e1816fcd5 update frontend
6 years ago
lain 72945b5b32 update frontend
6 years ago
lain 8682be29a5 update frontend
6 years ago
lambda 94d8f1ab30 Merge branch '394_user_tags' into 'develop'
6 years ago
Ivan Tashkinov 7b19487389 [#394] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
Egor Kislitsyn 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions
6 years ago
Egor Kislitsyn 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions
6 years ago
hakabahitoyo a7b1a66be3 update-pleroma-frontend
6 years ago
lain 4996fb07d8 Genereate uuids for existing info fields.
6 years ago