lain
19335be24c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
5 years ago
lain
fd97b0e634
Chats: Basic implementation.
5 years ago
feld
fd932b14a7
Merge branch 'update/adminfe-20200331' into 'develop'
...
Update AdminFE build in preparation for Pleroma 2.0.2
See merge request pleroma/pleroma!2343
5 years ago
Mark Felder
219d3aaa2d
Update AdminFE build in preparation for Pleroma 2.0.2
5 years ago
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
lain
0adaab8e75
Bump copyright dates.
5 years ago
Egor Kislitsyn
5a34dca8ed
Add emoji support in statuses in staticfe
5 years ago
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
5 years ago
rinpatch
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
5 years ago
Mark Felder
2966377cb9
Update AdminFE
5 years ago
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
5 years ago
Haelwenn (lanodan) Monnier
a747eb6df9
static-fe.css: Restore from before a65ee8ea
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
5 years ago
Alexander Strizhakov
d9f8941dac
Merge branch 'develop' into gun
5 years ago
rinpatch
e7c49d51d7
pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af
5 years ago
rinpatch
6cf1958b02
moderation log: fix improperly migrated data
...
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes #1606
5 years ago
Mark Felder
e25bacabb1
Remove EmojiPacks from AdminFE build
...
Once more, with feeling
5 years ago
rinpatch
a65ee8ead6
pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd
5 years ago
Alexander Strizhakov
22d52f5691
same copyright date format
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
...
- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements
5 years ago
Mark Felder
554bc88e8a
Update AdminFE build
5 years ago
eugenijm
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
5 years ago
lain
2d5cf0f8cd
Migrations: Make them not fail for old databases
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'
...
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
lain
6fab5fe7f8
Merge branch 'translation/errors-french' into 'develop'
...
Translation/errors french
See merge request pleroma/pleroma!1457
5 years ago
feld
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
5 years ago
Haelwenn (lanodan) Monnier
bd3f3756fb
Update MastoFE bundle to 2020-01-22
5 years ago
Alexander Strizhakov
32a643a159
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov
7ee2f86d76
Revert "Update AdminFE build"
...
This reverts commit 6395ad942c
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
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be
5 years ago
Ivan Tashkinov
d1e9768e10
[ #1478 ] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
5 years ago
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
5 years ago
Alexander Strizhakov
6395ad942c
Update AdminFE build
5 years ago
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
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
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago