sadposter
|
6f5844cf8e
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-12-15 14:11:26 +00:00 |
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
|
2019-12-12 18:43:21 +00:00 |
|
sadposter
|
803bce3668
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-12-12 17:48:36 +00:00 |
|
lain
|
756a029edf
|
Update frontend
|
2019-12-12 17:05:22 +01:00 |
|
lain
|
2792672793
|
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
This reverts merge request !2055
|
2019-12-12 09:37:02 +00:00 |
Ivan Tashkinov
|
84f0aec9aa
|
Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.
|
2019-12-11 19:48:00 +03:00 |
|
sadposter
|
9d29a5063c
|
fe
|
2019-11-20 09:48:05 +00:00 |
|
sadposter
|
d8286a122a
|
stickers
|
2019-11-20 09:46:08 +00:00 |
rinpatch
|
0fe08346db
|
bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
|
2019-11-19 23:28:34 +03:00 |
|
sadposter
|
2de30812ea
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-11-13 00:10:01 +00:00 |
|
sadposter
|
c4f66db63c
|
fe
|
2019-11-13 00:09:56 +00:00 |
Phil Hagelberg
|
274cc18e8a
|
Visually separate header.
|
2019-11-09 18:08:08 -08:00 |
|
Phil Hagelberg
|
1dc785b74b
|
Move static-fe CSS to a separate file.
|
2019-11-09 18:07:50 -08:00 |
|
sadposter
|
55cc96bcf9
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-11-09 19:11:33 +00:00 |
|
sadposter
|
058467d25c
|
fe
|
2019-11-09 19:10:22 +00:00 |
|
rinpatch
|
3cc2437598
|
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
|
2019-11-09 01:49:36 +03:00 |
|
sadposter
|
83a9ec228e
|
tos
|
2019-10-30 09:26:23 +00:00 |
|
sadposter
|
e50d018bfe
|
fe
|
2019-10-29 11:01:50 +00:00 |
|
sadposter
|
16107a0319
|
update tos
|
2019-10-25 12:08:34 +01:00 |
|
sadposter
|
1eec8d3dee
|
frontend
|
2019-10-18 13:12:53 +01:00 |
|
sadposter
|
58f9ce0deb
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-10 10:28:16 +01:00 |
|
rinpatch
|
a502155274
|
Bump pleroma-fe bundle to 122323f35c
|
2019-10-07 17:42:33 +03:00 |
|
sadposter
|
8550e0ff0a
|
stickers
|
2019-10-04 12:04:31 +01:00 |
|
sadposter
|
76c84720f7
|
stickers
|
2019-10-04 11:48:31 +01:00 |
|
sadposter
|
31f932bdfb
|
eva
|
2019-09-25 13:33:05 +01:00 |
|
sadposter
|
63782e770b
|
add stickers
|
2019-09-16 12:14:42 +01:00 |
|
sadposter
|
b4512ddb6f
|
thing
|
2019-09-14 00:20:48 +01:00 |
|
sadposter
|
f1e1ba71ce
|
update tos
|
2019-09-13 16:23:28 +01:00 |
|
sadposter
|
8046440a16
|
update fe
|
2019-09-13 16:18:38 +01:00 |
|
sadposter
|
cc5b65bd21
|
add lato
|
2019-09-13 15:27:51 +01:00 |
|
sadposter
|
94076a23e4
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-09-10 21:11:03 +01:00 |
|
rinpatch
|
16e6be340d
|
Update frontend bundle to e75ac9dd
|
2019-09-06 11:31:44 +03:00 |
|
sadposter
|
8abd779bcc
|
TOS
|
2019-08-12 14:55:20 +01:00 |
|
sadposter
|
6f8e4f5dcf
|
TOS
|
2019-08-12 00:51:04 +01:00 |
|
sadposter
|
357b1eac0f
|
theme
|
2019-07-09 21:08:03 +01:00 |
|
sadposter
|
87ba9d1bab
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-06-28 18:55:01 +01:00 |
|
lain
|
efad26bbb9
|
Update frontend.
|
2019-06-28 14:29:26 +02:00 |
|
sadposter
|
8050baf7bf
|
Update pleroma FE
|
2019-06-27 02:25:30 +01:00 |
|
sadposter
|
6f380ee337
|
merge
|
2019-06-19 14:20:26 +01:00 |
|
rinpatch
|
431a41b459
|
Update bundled pleroma-fe to c4fcdc71
|
2019-06-19 00:04:00 +03:00 |
|
sadposter
|
4c11429520
|
Add mayushii
|
2019-05-12 00:51:01 +01:00 |
|
Sadposter
|
fa632f9c37
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-04-29 12:56:53 +01:00 |
William Pitcock
|
52bdfced32
|
update pleroma frontend
|
2019-04-27 07:34:59 +00:00 |
|
Sadposter
|
d5e5e87d01
|
Update emojo
|
2019-04-11 10:52:44 +01:00 |
|
Sadposter
|
df7ea4c0c2
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-03-30 18:07:38 +00:00 |
kaniini
|
b68fb3dc17
|
Merge branch 'imageoptim' into 'develop'
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
|
2019-03-21 00:59:24 +00:00 |
|
lain
|
41511d1926
|
Update frontend
|
2019-03-20 08:58:25 +01:00 |
optikfluffel
|
a907522690
|
used imageOptim to reduce size of image files
|
2019-03-19 10:10:48 +01:00 |
|
Sadposter
|
3d24792f4f
|
Modify static resources
|
2019-03-18 13:13:19 +00:00 |
|
Sadposter
|
e751f3ec56
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-03-18 13:13:07 +00:00 |