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'
EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181
|
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'
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
|
5 years ago |
|
lain
|
756a029edf
|
Update frontend
|
5 years ago |
|
lain
|
2792672793
|
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
This reverts merge request !2055
|
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'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
|
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'
Emoji Reactions
See merge request pleroma/pleroma!1662
|
5 years ago |
|
lain
|
a88e834dba
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# CHANGELOG.md
|
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'
# Conflicts:
# CHANGELOG.md
|
5 years ago |
|
rinpatch
|
a502155274
|
Bump pleroma-fe bundle to 122323f35c
|
5 years ago |
|
lain
|
e8395bedd2
|
Merge branch 'develop' into 'reactions'
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
|
5 years ago |
|
Ariadne Conill
|
19962d2022
|
clean up bundled litepub schema (closes #1303)
|
5 years ago |
|
lain
|
557223b2b5
|
Merge remote-tracking branch 'origin/develop' into reactions
|
5 years ago |
|
Mark Felder
|
a562cb2c34
|
Update AdminFE bundle
|
5 years ago |
|
Ariadne Conill
|
28be12b38e
|
update admin fe
|
5 years ago |
|
lain
|
0aef18bcf4
|
Litepub Context: Add EmojiReaction.
|
5 years ago |
|
kaniini
|
26f66fb70a
|
Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
|
5 years ago |
|
Hakaba Hitoyo
|
5fb72170a7
|
Revert "add _discoverable_ keyword into ActivityPub @context"
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
5820dc40fc
|
litepub-0.1.jsonld: Add uploadMedia
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
646bf01608
|
Update AdminFE bundle
|
5 years ago |
|
rinpatch
|
16e6be340d
|
Update frontend bundle to e75ac9dd
|
5 years ago |
|
Mark Felder
|
24a731a9a6
|
Update AdminFE
Now permits server configuration. Consider this ALPHA.
|
5 years ago |
|
Hakaba Hitoyo
|
39c7bbe18f
|
Remove longfox emoji set
|
5 years ago |
|
Egor Kislitsyn
|
04f18a144b
|
Add `listMessage` to to the JSON-LD context
|
5 years ago |
|
lain
|
efad26bbb9
|
Update frontend.
|
5 years ago |
|
rinpatch
|
cfb5be3ced
|
Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'
Update mastofe to bundle-2019-06-26
See merge request pleroma/pleroma!1341
|
5 years ago |
|
Haelwenn (lanodan) Monnier
|
451931d36f
|
Update mastofe to bundle-2019-06-26
|
5 years ago |
|
Mark Felder
|
7b9e21e8a2
|
Update adminFE to latest build
|
5 years ago |
|
rinpatch
|
431a41b459
|
Update bundled pleroma-fe to c4fcdc71
|
5 years ago |
|
lambda
|
16cb9e5f1c
|
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
See merge request pleroma/pleroma!1139
|
5 years ago |
