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 |
|
|
lain
|
328062308a
|
Update frontend
|
2020-07-10 11:41:10 +02:00 |
|
|
sadposter
|
02a2f25027
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-07-09 22:22:25 +01:00 |
|
|
sadposter
|
1389ae9aab
|
update adminfe
|
2020-07-09 22:21:28 +01:00 |
|
|
Dym Sohin
|
ab773fa5c9
|
[static-fe] limit according to- and within- existing ruleset
|
2020-07-09 09:37:50 +00:00 |
|
|
lain
|
8594181597
|
Update static-fe.css
|
2020-07-09 09:30:15 +00:00 |
|
|
Dym Sohin
|
8eecc708ef
|
fix wide2x emojis within nicknames
|
2020-07-09 09:03:24 +00:00 |
|
|
lain
|
4c9295adcc
|
Update frontend
|
2020-07-07 17:13:23 +02:00 |
|
|
lain
|
f787eb1acf
|
Update frontend
|
2020-07-06 12:20:20 +02:00 |
|
|
lain
|
30d0df8e2f
|
Update frontend
|
2020-07-06 12:17:08 +02:00 |
|
|
lain
|
208baf157a
|
ActivityPub: Add new 'capabilities' to user.
|
2020-07-06 11:38:40 +02:00 |
|
|
lain
|
8289ec67a8
|
Litepub: Add acceptsChatMessages to schema.
|
2020-07-03 13:39:21 +02:00 |
|
|
Mark Felder
|
a5d611abc2
|
Update AdminFE build to utilize new MRF metadata
|
2020-07-02 10:16:19 -05:00 |
|
|
Mark Felder
|
d9e4623628
|
Update AdminFE build
|
2020-06-25 14:55:00 -05:00 |
|
|
sadposter
|
be48c1bafb
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-06-19 10:40:55 +01:00 |
|
|
Haelwenn (lanodan) Monnier
|
e313aa0977
|
static-fe.css: Restore and move to /priv/static/static-fe
|
2020-06-12 20:42:43 +03:00 |
|
|
sadposter
|
780ac9cedb
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-06-06 18:20:10 +01:00 |
|
|
lain
|
a8ca030d85
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-06-05 16:53:56 +02:00 |
|
|
Egor Kislitsyn
|
6b84c62d4a
|
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
|
2020-06-01 17:38:57 +04:00 |
|
|
lain
|
af6d01ec93
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-29 12:36:17 +02:00 |
|
|
Mark Felder
|
d28b9708d2
|
Update AdminFE build, re-enables emoji packs
|
2020-05-27 13:50:24 -05:00 |
|
|
sadposter
|
77caabba17
|
resync
|
2020-05-25 15:13:28 +01:00 |
|
|
lain
|
ee35bb5ac2
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-25 13:57:27 +02:00 |
|
|
rinpatch
|
fabc11bf9a
|
priv/static: Add a warning discouraging admins from modifying the static files directly
|
2020-05-22 17:33:19 +03:00 |
|
|
lain
|
814c3e5171
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-21 15:00:05 +02:00 |
|
|
Haelwenn (lanodan) Monnier
|
c2dd4639d6
|
MastoFE: update to bundle-2020-05-20
|
2020-05-20 07:55:14 +02:00 |
|
|
lain
|
9c17109765
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-17 12:14:49 +02:00 |
|
|
lain
|
21c85a106c
|
Merge branch 'pleroma-fe-2020-05-13-with-relationships-support' into 'develop'
PleromaFE bundle supporting `with_relationships` param
See merge request pleroma/pleroma!2530
|
2020-05-17 07:26:56 +00:00 |
|
|
Mark Felder
|
3525400eb2
|
Sync FE static/config.json
|
2020-05-13 15:57:39 -05:00 |
|
|
Ivan Tashkinov
|
74912dd9ee
|
PleromaFE bundle supporting with_relationships param.
https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1107/diffs?commit_id=9c7cb3a95431bbea44391f79da465f77565a4b49
|
2020-05-13 19:20:21 +03:00 |
|
|
rinpatch
|
3a63f84c45
|
pleroma-fe bundle: update to 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7
|
2020-05-13 00:33:38 +03:00 |
|
|
lain
|
c272669909
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-10 12:32:57 +02:00 |
|
|
rinpatch
|
d73e8b6b12
|
Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'
PleromaFE bundle dropping requirement for embedded account relationships
See merge request pleroma/pleroma!2494
|
2020-05-09 15:30:39 +00:00 |
|
|
Mark Felder
|
6a291b1834
|
Restore deleted icons. No idea how this happened.
|
2020-05-08 14:22:49 -05:00 |
|
|
Ivan Tashkinov
|
0e1bda55e8
|
PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
7a0e554daf
|
2020-05-08 21:33:56 +03:00 |
|
|
sadposter
|
1008f9ac40
|
fe
|
2020-05-08 14:38:37 +01:00 |
|
|
sadposter
|
6e7fab3ead
|
fe
|
2020-05-08 14:16:11 +01:00 |
|
|
sadposter
|
e18958a5d7
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-05-08 14:12:33 +01:00 |
|
|
sadposter
|
9eede61d00
|
fe
|
2020-05-08 14:09:53 +01:00 |
|
|
lain
|
fb2d284d28
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
|
2020-05-07 15:05:40 +02:00 |
|