Commit Graph

219 Commits (e4323141056afc47c2bef7352aaca90edc467a64)

Author SHA1 Message Date
rinpatch d73e8b6b12 Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'
4 years ago
Mark Felder 6a291b1834 Restore deleted icons. No idea how this happened.
4 years ago
Ivan Tashkinov 0e1bda55e8 PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
4 years ago
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
Ivan Tashkinov f1bba5c787 PleromaFE bundle supporting follow request notifications.
4 years ago
Haelwenn (lanodan) Monnier c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe
4 years ago
Ivan Tashkinov 57b31e79c2 Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (`with_move`).
4 years ago
Mark Felder 3ead44a9aa Update AdminFE build in preparation for the 2.0.3 release
4 years ago
Mark Felder 24e0db6310 pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4
4 years ago
Mark Felder 219d3aaa2d Update AdminFE build in preparation for Pleroma 2.0.2
5 years ago
Egor Kislitsyn 5a34dca8ed
Add emoji support in statuses in staticfe
5 years ago
Mark Felder 2966377cb9 Update AdminFE
5 years ago
Haelwenn (lanodan) Monnier a747eb6df9
static-fe.css: Restore from before a65ee8ea
5 years ago
rinpatch e7c49d51d7 pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af
5 years ago
Mark Felder e25bacabb1 Remove EmojiPacks from AdminFE build
5 years ago
rinpatch a65ee8ead6 pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
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
Mark Felder 6a97c1b9ff Update adminFE build
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
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
lain f5bfb29d3b Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
5 years ago
Haelwenn (lanodan) Monnier bd3f3756fb
Update MastoFE bundle to 2020-01-22
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
Ivan Tashkinov d1e9768e10 [#1478] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
5 years ago
Mark Felder fd3c23af63 Update AdminFE build
5 years ago
lain 2f31cef71f Merge branch 'feature/native-captcha' 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
Ivan Tashkinov 84f0aec9aa Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.
5 years ago
lain 7722e5a67a Merge branch 'feature/move-activity' into 'develop'
5 years ago
rinpatch 0fe08346db bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
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
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
rinpatch 3cc2437598 Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
5 years ago
lain b22ee9d966 Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Egor Kislitsyn b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
Ariadne Conill c9280b9730 rework to use properties instead of compound typing, per SocialCG
5 years ago
lain d7f9679ff2 Merge branch 'develop' into 'reactions'
5 years ago