aboutsummaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Collapse)Author
2020-03-06Remove emoji support from AdminFEMark Felder
2020-03-05pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4ddrinpatch
2020-03-04same copyright date formatAlexander Strizhakov
2020-02-29MastoFE: Bundle 2020-01-20Haelwenn (lanodan) Monnier
2020-02-28Merge branch 'develop' into update/pleroma-fe-20200228Mark Felder
2020-02-28Update PleromaFE bundle for the 2.0 releaseMark Felder
2020-02-28Update AdminFE buildMark Felder
- Removed Grouped Reports; API needs proper architecture/refactor - Cannot set Tesla adapter in AdminFE as it's not safe yet - Layout/rendering improvements
2020-02-25Update AdminFE buildMark Felder
2020-02-25Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-24Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility ↵eugenijm
scope
2020-02-20Migrations: Make them not fail for old databaseslain
2020-02-17Update adminFE buildMark Felder
2020-02-13Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-11Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵Mark Felder
update/admin-fe-20200211
2020-02-11Update AdminFE buildMark Felder
2020-02-11Update frontendlain
2020-02-10maked `unread_count` as virtual fieldMaksim Pechnikov
2020-02-10Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-02-07Merge branch 'rename_emoji_reactios' into 'develop'rinpatch
EmojiReactions: Rename to EmojiReacts See merge request pleroma/pleroma!2181
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
Translation/errors french See merge request pleroma/pleroma!1457
2020-01-27Merge branch 'develop' into issue/1276Maksim Pechnikov
2020-01-22Merge branch 'admin-be' into 'develop'feld
Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976
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
This reverts commit 6395ad942c7087e97a8dcf2e9002005ed7b4c383
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
and moving it from instance settings
2020-01-10Update AdminFE buildAlexander Strizhakov
2020-01-10[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, ↵Ivan Tashkinov
migrated existing OAuth records. Adjusted tests.
2020-01-09Update AdminFE buildMark Felder
2019-12-12Merge branch 'feature/native-captcha' into 'develop'lain
Add native captcha and enable it by default. Closes #1017 and #1405 See merge request pleroma/pleroma!2060
2019-12-12Update frontendlain
2019-12-12Revert "Merge branch 'admin-scope-support-code' into 'develop'"lain
This reverts merge request !2055
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
This makes it possible to configure their behavior on OTP releases.
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 ↵Ivan Tashkinov
1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/user.ex
2019-12-04Add report notesMaxim Filippov
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-11-30Merge branch 'remove-info-from-users' into 'develop'rinpatch
Removed users.info field See merge request pleroma/pleroma!2006
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-22 07:23:14 +0000