|
|
0f6bece60d
|
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
|
2022-01-08 21:45:12 +00:00 |
|
|
|
0d012ebea1
|
Revert "Merge branch 'remove/mastofe' into 'develop'"
This reverts commit 6b3842cf50, reversing
changes made to 6b1282a829.
|
2022-01-08 21:44:37 +00:00 |
|
sadposter
|
6f86baf491
|
update adminfe
|
2021-12-06 10:17:54 +00:00 |
|
sadposter
|
bd9c9136f9
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-09-13 16:14:58 +01:00 |
|
Haelwenn
|
6b3842cf50
|
Merge branch 'remove/mastofe' into 'develop'
Remove MastoFE from Pleroma, fixes #2625
Closes #2625
See merge request pleroma/pleroma!3392
|
2021-09-07 16:41:53 +00:00 |
|
sadposter
|
b202cf15d6
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-08-30 22:04:42 +01:00 |
|
Haelwenn (lanodan) Monnier
|
0910777d41
|
Update PleromaFE Bundle (2.4.0)
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
|
2021-08-08 15:21:21 +02:00 |
|
Haelwenn (lanodan) Monnier
|
5f8a9b671f
|
Update AdminFE bundle
|
2021-08-01 08:26:39 +02:00 |
|
Sean King
|
2de41770d0
|
Remove Twemoji stuff from MastoFE
|
2021-04-16 18:02:08 -06:00 |
|
Sean King
|
0f8da39b72
|
Remove priv/static/sounds folder
|
2021-04-16 15:56:00 -06:00 |
|
Sean King
|
f3b403fa98
|
Remove MastoFE stuff from docs and default panel
|
2021-04-15 23:37:18 -06:00 |
|
Sean King
|
4f55d5123b
|
Remove MastoFE-related backend code and frontend pieces
|
2021-04-15 22:56:21 -06:00 |
|
sadposter
|
292ddf730c
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-03-03 13:51:07 +00:00 |
|
lain
|
5058de328e
|
Update frontend
|
2021-03-01 20:04:53 +01:00 |
|
sadposter
|
5f33699169
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-02-20 15:27:56 +00:00 |
|
Shpuld Shpuldson
|
956bbc1ec7
|
replace avi.png
|
2021-02-15 15:44:27 +02:00 |
|
Lain Soykaf
|
93e3b89350
|
Update frontend
|
2021-02-01 10:12:05 +01:00 |
|
|
|
c3dd06b540
|
Update PleromaFE: pleroma-fe@eb2975b64d849af6bdc327dabac34b8e6d952eae
|
2021-01-25 09:50:26 -06:00 |
|
|
|
9e3fcb4b29
|
Update AdminFE: admin-fe@8a390584676b27b611d3363eca2a1194d94ed71f
|
2021-01-25 09:45:58 -06:00 |
|
sadposter
|
3aa25b008d
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2021-01-23 22:38:07 +00:00 |
|
|
|
d49387e9d2
|
Update AdminFE: admin-fe@27db721e3969d9d017a70b9e16dc262d4f31202f
|
2021-01-18 13:44:59 -06:00 |
|
|
|
8a230667cc
|
Update AdminFE: pleroma/admin-fe@d4c7989f05
|
2021-01-18 11:25:13 -06:00 |
|
|
|
8864ac65c6
|
Add dinosaur gif from https://gifs.cc
"Our animations are free to be used to enhance your website."
|
2021-01-05 13:25:14 -06:00 |
|
sadposter
|
6cd0586ef9
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-12-29 13:16:14 +00:00 |
|
Alexander Strizhakov
|
cebe3c7def
|
Fix for dropping posts/notifs in WS when mix task is executed
- start oban in mix tasks with empty queues, plugins and crontab
- fix for update_users_following_followers_counts
- fix for removed logo.png
- typo in resend confirmation emails mix task docs
- fix for uploads mix task (start Majic.Pool)
- fix for creating user mix task (start :fast_html app)
|
2020-12-14 11:02:32 -06:00 |
|
Ivan Tashkinov
|
f1b07a2b2b
|
OAuth form user remembering feature. Local MastoFE login / logout fixes.
|
2020-11-28 21:51:06 +03:00 |
|
Mark Felder
|
ad7fc35252
|
Update AdminFE build to pleroma/admin-fe@5b38aea279
|
2020-11-17 17:01:34 -06:00 |
|
rinpatch
|
77c239f309
|
Import stable commits into develop after releasing 2.2.0
Updates the frontend bundle and syncs the changelog.
|
2020-11-17 15:14:25 +03:00 |
|
sadposter
|
7947236575
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-11-15 19:40:23 +00:00 |
|
rinpatch
|
b4c6b262d6
|
pleroma-fe bundle: update to 8e87e3d88bef3691b625c0a25407aa08bdf983ad
|
2020-11-11 23:28:15 +03:00 |
|
lain
|
25bd64b03a
|
Bundled FE: Remove title tag
|
2020-11-11 17:17:41 +01:00 |
|
Haelwenn (lanodan) Monnier
|
179936609f
|
favicon: Update to pleroma logo, provided by @shpuld
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2270
|
2020-11-03 09:52:17 +01:00 |
|
sadposter
|
ddf36b096e
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-11-01 12:22:28 +00:00 |
|
sadposter
|
2ed87fecfa
|
fix CSS
|
2020-11-01 12:22:18 +00:00 |
|
Mark Felder
|
eea879eb36
|
Update AdminFE build to latest develop
|
2020-10-13 07:51:48 -05:00 |
|
sadposter
|
a9938611f7
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-10-02 15:09:47 +01:00 |
|
rinpatch
|
34afc2b074
|
pleroma-fe bundle: bump to b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
|
2020-09-17 21:22:06 +03:00 |
|
sadposter
|
d0ffefc270
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-09-09 09:35:48 +01:00 |
|
rinpatch
|
7528a7e447
|
pleroma-fe bundle: update to 938887ef91a12dcaaaaa0884af4e76abd1c6c679
|
2020-09-08 19:45:44 +03:00 |
|
sadposter
|
7ac5f210ea
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-08-30 02:05:25 +01:00 |
|
lain
|
82bf27172c
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
2020-08-27 15:38:03 +02:00 |
|
Mark Felder
|
f1b9e3595d
|
Update AdminFE build in preparation for 2.1.0 release
|
2020-08-26 15:43:34 -05:00 |
|
lain
|
ea2b5c07e3
|
Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0
|
2020-08-25 15:38:12 +02:00 |
|
sadposter
|
166db7a3b6
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-08-24 17:04:51 +01:00 |
|
Mark Felder
|
f510dc30b4
|
Update AdminFE bundle for 2.1.0 release
|
2020-08-14 12:48:49 -05:00 |
|
sadposter
|
735ceb2115
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-08-13 20:03:33 +01:00 |
|
lain
|
5bcf15d553
|
Update frontend
|
2020-08-13 16:04:34 +02:00 |
|
sadposter
|
992deaa09b
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-08-01 19:32:31 +01:00 |
|
Mark Felder
|
34d1d3e93e
|
Update FE bundle
|
2020-07-15 09:38:56 -05:00 |
|
lain
|
b39eb6ecc5
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
|
2020-07-10 12:26:53 +02:00 |
|
