aboutsummaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Expand)Author
2020-02-06EmojiReactions: Rename to EmojiReactsLain Soykaf
2020-02-06Update FE bundleMark Felder
2020-01-28Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-01-28Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9lain
2020-01-28Merge branch 'translation/errors-french' into 'develop'lain
2020-01-27Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-01-22Merge branch 'admin-be' into 'develop'feld
2020-01-22Update MastoFE bundle to 2020-01-22Haelwenn (lanodan) Monnier
2020-01-22Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-22Revert "Update AdminFE build"Alexander Strizhakov
2020-01-21Last AdminFE update was accidentally built from master, not developMark Felder
2020-01-21Update AdminFE buildMark Felder
2020-01-21Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-15[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.Ivan Tashkinov
2020-01-10dynamic_configuration renamingAlexander Strizhakov
2020-01-10Update AdminFE buildAlexander Strizhakov
2020-01-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, mig...Ivan Tashkinov
2020-01-09Update AdminFE buildMark Felder
2019-12-12Merge branch 'feature/native-captcha' into 'develop'lain
2019-12-12Update frontendlain
2019-12-12Revert "Merge branch 'admin-scope-support-code' into 'develop'"lain
2019-12-12Merge branch 'develop' into feature/report-notesMaxim Filippov
2019-12-11Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.Ivan Tashkinov
2019-12-10[ActivityPub] Configurable ActivityPub actor typeHakaba Hitoyo
2019-12-08HTML: Compile Scrubbers on bootrinpatch
2019-12-08Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-12-05Merge branch 'develop' into issue/1276Maksim Pechnikov
2019-12-04Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-12-04Add report notesMaxim Filippov
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
2019-11-30Merge branch 'remove-info-from-users' into 'develop'rinpatch
2019-11-29Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-28Migrations: Set users.following_count to NOT NULLlain
2019-11-23Removed users.info and remaining usages.Ivan Tashkinov
2019-11-21Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-21Merge branch 'issue/1348' into 'develop'lain
2019-11-20Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-20[#1335] Reorganized users.subscribers as UserRelationship. Added tests for Us...Ivan Tashkinov
2019-11-19bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7rinpatch
2019-11-18[#1335] Refactored UserMute and UserBlock into UserRelationship, introduced E...Ivan Tashkinov
2019-11-15Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id...Ivan Tashkinov
2019-11-15[#1335] Reorganized `users.mutes` as relation to UserMute entity.Ivan Tashkinov
2019-11-14Merge remote-tracking branch 'upstream/develop' into feature/move-activityEgor Kislitsyn
2019-11-14Merge branch 'reactions' into 'develop'rinpatch
2019-11-12Add `allow_following_move` setting to UserEgor Kislitsyn
2019-11-10[#1335] User: refactored :blocks field into :blocked_users relation.Ivan Tashkinov
2019-11-10Merge branch 'develop' into 'reactions'lain
2019-11-09Visually separate header.Phil Hagelberg
2019-11-09Move static-fe CSS to a separate file.Phil Hagelberg
2019-11-09Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642rinpatch