aboutsummaryrefslogtreecommitdiff
path: root/priv/static
AgeCommit message (Collapse)Author
2020-03-15Update AdminFEMark Felder
2020-03-15static-fe.css: Restore from before a65ee8eaHaelwenn (lanodan) Monnier
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
2020-03-07pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6afrinpatch
2020-03-06Remove EmojiPacks from AdminFE buildMark Felder
Once more, with feeling
2020-03-05pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4ddrinpatch
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-17Update adminFE buildMark Felder
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-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-28Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9lain
2020-01-22Update MastoFE bundle to 2020-01-22Haelwenn (lanodan) Monnier
2020-01-21Last AdminFE update was accidentally built from master, not developMark Felder
2020-01-21Update AdminFE buildMark Felder
2020-01-15[#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.Ivan Tashkinov
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-11Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.Ivan Tashkinov
2019-12-02Merge branch 'feature/move-activity' into 'develop'lain
Support "Move" activity Closes #1316 See merge request pleroma/pleroma!1883
2019-11-19bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7rinpatch
2019-11-14Merge remote-tracking branch 'upstream/develop' into feature/move-activityEgor Kislitsyn
2019-11-14Merge branch 'reactions' into 'develop'rinpatch
Emoji Reactions See merge request pleroma/pleroma!1662
2019-11-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
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
2019-11-08Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-25Add `also_known_as` field to Pleroma.UserEgor Kislitsyn
2019-10-19rework to use properties instead of compound typing, per SocialCGAriadne Conill
2019-10-10Merge branch 'develop' into 'reactions'lain
# Conflicts: # CHANGELOG.md
2019-10-07Bump pleroma-fe bundle to ↵rinpatch
https://git.pleroma.social/pleroma/pleroma-fe/commit/122323f35c32a4f12a345a8b3f163e9318f5dea3
2019-10-07Merge branch 'develop' into 'reactions'lain
# Conflicts: # priv/static/schemas/litepub-0.1.jsonld
2019-10-07clean up bundled litepub schema (closes #1303)Ariadne Conill
2019-10-02Merge remote-tracking branch 'origin/develop' into reactionslain
2019-10-01Update AdminFE bundleMark Felder
2019-09-30update admin feAriadne Conill
2019-09-30Litepub Context: Add EmojiReaction.lain
2019-09-30Merge branch 'features/apc2s-media-upload' into 'develop'kaniini
AP C2S mediaUpload Closes #1171 See merge request pleroma/pleroma!1706
2019-09-26Revert "add _discoverable_ keyword into ActivityPub @context"Hakaba Hitoyo
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-24litepub-0.1.jsonld: Add uploadMediaHaelwenn (lanodan) Monnier
2019-09-23Update AdminFE bundleHaelwenn (lanodan) Monnier