Commit Graph

402 Commits (bf3f934275cc0e2f957483c3a2ee53f93a191986)

Author SHA1 Message Date
sadposter a9938611f7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
rinpatch 34afc2b074 pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
4 years ago
sadposter d0ffefc270 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
rinpatch 7528a7e447 pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679
4 years ago
sadposter 7ac5f210ea Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
lain 82bf27172c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
Mark Felder f1b9e3595d Update AdminFE build in preparation for 2.1.0 release
4 years ago
lain ea2b5c07e3 Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
4 years ago
sadposter 166db7a3b6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Mark Felder f510dc30b4 Update AdminFE bundle for 2.1.0 release
4 years ago
sadposter 735ceb2115 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
lain 5bcf15d553 Update frontend
4 years ago
sadposter 992deaa09b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Mark Felder 34d1d3e93e Update FE bundle
4 years ago
lain b39eb6ecc5 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
4 years ago
lain 328062308a Update frontend
4 years ago
sadposter 02a2f25027 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
sadposter 1389ae9aab update adminfe
4 years ago
Dym Sohin ab773fa5c9 [static-fe] limit according to- and within- existing ruleset
4 years ago
lain 8594181597 Update static-fe.css
4 years ago
Dym Sohin 8eecc708ef fix wide2x emojis within nicknames
4 years ago
lain 4c9295adcc Update frontend
4 years ago
lain f787eb1acf Update frontend
4 years ago
lain 30d0df8e2f Update frontend
4 years ago
lain 208baf157a ActivityPub: Add new 'capabilities' to user.
4 years ago
lain 8289ec67a8 Litepub: Add acceptsChatMessages to schema.
4 years ago
Mark Felder a5d611abc2 Update AdminFE build to utilize new MRF metadata
4 years ago
Mark Felder d9e4623628 Update AdminFE build
4 years ago
sadposter be48c1bafb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Haelwenn (lanodan) Monnier e313aa0977 static-fe.css: Restore and move to /priv/static/static-fe
4 years ago
sadposter 780ac9cedb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
lain a8ca030d85 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Egor Kislitsyn 6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
4 years ago
lain af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Mark Felder d28b9708d2 Update AdminFE build, re-enables emoji packs
4 years ago
sadposter 77caabba17 resync
4 years ago
lain ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch fabc11bf9a priv/static: Add a warning discouraging admins from modifying the static files directly
4 years ago
lain 814c3e5171 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Haelwenn (lanodan) Monnier c2dd4639d6
MastoFE: update to bundle-2020-05-20
4 years ago
lain 9c17109765 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
lain 21c85a106c Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'
4 years ago
Mark Felder 3525400eb2 Sync FE static/config.json
4 years ago
Ivan Tashkinov 74912dd9ee PleromaFE bundle supporting `with_relationships` param.
4 years ago
rinpatch 3a63f84c45 pleroma-fe bundle: update to 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7
4 years ago
lain c272669909 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
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
sadposter 1008f9ac40 fe
4 years ago
sadposter 6e7fab3ead fe
4 years ago
sadposter e18958a5d7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
sadposter 9eede61d00 fe
4 years ago
lain fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
4 years ago
lain c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
4 years ago
rinpatch f08c8d9932 pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3
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
Mark Felder 06fbb95715 Update AdminFE build in preparation for the 2.0.3 release
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
lain 1d6338f2d3 Litepub: Add ChatMessage.
4 years ago
sadposter eee32fd993 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
4 years ago
Mark Felder 24e0db6310 pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4
4 years ago
rinpatch d9f36965f6 pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360f
5 years ago
Mark Felder c0a630d42f Update AdminFE build in preparation for Pleroma 2.0.2
5 years ago
sadposter 8cec5796ae Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Mark Felder 219d3aaa2d Update AdminFE build in preparation for Pleroma 2.0.2
5 years ago
sadposter 931d663a3a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
Egor Kislitsyn 5a34dca8ed
Add emoji support in statuses in staticfe
5 years ago
Egor Kislitsyn cb8236cda6
Add embeddable posts
5 years ago
Mark Felder aa4407be93 Update AdminFE
5 years ago
Haelwenn (lanodan) Monnier 963df689b9 static-fe.css: Restore from before a65ee8ea
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
sadposter 5f625c9136 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
sadposter 3508f698b9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 4709928b06 thing
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
sadposter fae0d4ba9d Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
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
sadposter 1b03dc2031 fe
5 years ago
sadposter 7de32e2c8b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter 57b3925a88 fe
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
sadposter 646016c403 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
5 years ago
sadposter ff552c5151 FE
5 years ago