Commit graph

196 commits

Author SHA1 Message Date
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
5b385962eb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-08-13 09:05:44 +01:00
Mark Felder
24a731a9a6 Update AdminFE
Now permits server configuration. Consider this ALPHA.
2019-08-12 15:00:03 -05:00
sadposter
8abd779bcc TOS 2019-08-12 14:55:20 +01:00
sadposter
6f8e4f5dcf TOS 2019-08-12 00:51:04 +01:00
sadposter
325372b1e1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-08-07 08:59:31 +01:00
39c7bbe18f Remove longfox emoji set 2019-08-04 04:32:45 +00:00
sadposter
32ce409514 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-16 11:21:31 +01:00
Egor Kislitsyn
04f18a144b Add listMessage to to the JSON-LD context 2019-07-15 14:29:13 +07:00
sadposter
357b1eac0f theme 2019-07-09 21:08:03 +01:00
sadposter
4d8f97453b Add activity get mix task 2019-07-01 17:58:51 +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
0843f3e0b6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-27 02:17:32 +01:00
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
2019-06-26 19:15:37 +00:00
Haelwenn (lanodan) Monnier
451931d36f
Update mastofe to bundle-2019-06-26 2019-06-26 21:06:28 +02:00
sadposter
3a71016699 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-06-25 12:40:02 +01:00
Mark Felder
7b9e21e8a2 Update adminFE to latest build 2019-06-23 18:36:20 -04: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
4cda6ed358 change panel 2019-06-12 15:34:27 +01:00
sadposter
febd2fdfd3 add emojo 2019-06-06 15:54:32 +01:00
sadposter
d19b99009b add instance resources 2019-05-30 12:11:56 +01:00
sadposter
c0b7bc2927 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-05-16 20:24:43 +01:00
sadposter
7f40b66d51 add emojo 2019-05-16 20:24:29 +01:00
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
2019-05-13 15:52:05 +00:00
sadposter
cf2741e067 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-05-13 12:09:35 +01:00
Haelwenn (lanodan) Monnier
566a968ab3
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
Commissioned by https://shitposter.club/users/moonman and
drawn by https://shpposter.club/users/Nightingalle

Intended to be used when mastofe crashes out and allows to report a bug
among other things.

Should require a bit of modification on mastofe to use the image as it's more
of a vanilla flavour thing.
2019-05-12 05:09:15 +02:00
sadposter
4c11429520 Add mayushii 2019-05-12 00:51:01 +01:00
c953ae8c3d Initial bundle of basic AdminFE
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
2019-05-11 01:34:17 +00:00
Sadposter
fa632f9c37 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-04-29 12:56:53 +01:00
Sadposter
4b521119dc Add compressed background 2019-04-29 12:56:08 +01:00
William Pitcock
52bdfced32 update pleroma frontend 2019-04-27 07:34:59 +00:00
Ekaterina Vaartis
c26724cc55 Remove finmoji and add a way to download emojis in packs
These packs are stored in a git repo on pleroma gitlab
2019-04-20 11:17:17 +03:00
Sadposter
c02d52c9f7 Update instance panel 2019-04-14 19:01:01 +01:00
Sadposter
b134bd83ca Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-04-14 19:00:50 +01:00
Sadposter
d5e5e87d01 Update emojo 2019-04-11 10:52:44 +01:00
Haelwenn (lanodan) Monnier
51c97d71af
Update Mastodon Frontend to 2019-04-11 bundle
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11

[ci skip]
2019-04-11 07:29:03 +02:00
Sadposter
777042b9e5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-04-04 17:46:07 +01:00
lambda
bd961a3bad Merge branch 'features/pleroma-tan' into 'develop'
priv/static/images: Add pleroma-tan

See merge request pleroma/pleroma!913
2019-04-02 11:54:04 +00: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