Commit Graph

382 Commits (df81abb68c46e36dfb2af7aab77e0e57a1a1eb28)

Author SHA1 Message Date
lain 560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Mark Felder 24a731a9a6 Update AdminFE
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
Hakaba Hitoyo 39c7bbe18f Remove longfox emoji set
5 years ago
lain f88560accd Conversations: Add recipient list to conversation participation.
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'
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'
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'
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
rinpatch 431a41b459 Update bundled pleroma-fe to c4fcdc71
5 years ago
Alexander Strizhakov c2ca1f22a2 it is changed in compile time
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'
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
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
5 years ago