Mark Felder
6a97c1b9ff
Update adminFE build
2020-02-17 15:50:45 -06:00
Mark Felder
f9eb35d48e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
2020-02-11 10:33:41 -06:00
Mark Felder
de0fea4634
Update AdminFE build
2020-02-11 10:24:38 -06:00
lain
60de311164
Update frontend
2020-02-11 13:59:04 +01:00
rinpatch
f13b7878b4
Merge branch 'rename_emoji_reactios' into 'develop'
...
EmojiReactions: Rename to EmojiReacts
See merge request pleroma/pleroma!2181
2020-02-07 10:35:37 +00:00
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
Mark Felder
fed9b0d1e0
Update FE bundle
2020-02-06 10:59:41 -06:00
lain
f5bfb29d3b
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
2020-01-28 18:39:02 +01:00
Haelwenn (lanodan) Monnier
bd3f3756fb
Update MastoFE bundle to 2020-01-22
2020-01-22 16:00:23 +01:00
Mark Felder
2860bee604
Last AdminFE update was accidentally built from master, not develop
2020-01-21 15:09:16 -06:00
Mark Felder
bc2ebdcfd6
Update AdminFE build
2020-01-21 13:41:22 -06:00
Ivan Tashkinov
d1e9768e10
[ #1478 ] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
2020-01-15 18:38:18 +03:00
Mark Felder
fd3c23af63
Update AdminFE build
2020-01-09 10:00:15 -06: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
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
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
rinpatch
0fe08346db
bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
2019-11-19 23:28:34 +03:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
rinpatch
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
lain
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-11-10 11:32:50 +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
rinpatch
3cc2437598
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
2019-11-09 01:49:36 +03:00
lain
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
2019-11-08 13:27:11 +01:00
Egor Kislitsyn
b777083f3f
Add also_known_as field to Pleroma.User
2019-10-25 19:14:18 +07:00
Ariadne Conill
c9280b9730
rework to use properties instead of compound typing, per SocialCG
2019-10-19 23:21:37 +00:00
lain
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-10 12:38:51 +00:00
rinpatch
a502155274
Bump pleroma-fe bundle to 122323f35c
2019-10-07 17:42:33 +03:00
lain
e8395bedd2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
2019-10-07 12:10:27 +00:00
Ariadne Conill
19962d2022
clean up bundled litepub schema ( closes #1303 )
2019-10-07 11:33:58 +00:00
lain
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-02 13:27:55 +02:00
Mark Felder
a562cb2c34
Update AdminFE bundle
2019-10-01 18:29:39 -05:00
Ariadne Conill
28be12b38e
update admin fe
2019-09-30 12:52:28 +00:00
lain
0aef18bcf4
Litepub Context: Add EmojiReaction.
2019-09-30 14:26:59 +02:00
kaniini
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
Haelwenn (lanodan) Monnier
5820dc40fc
litepub-0.1.jsonld: Add uploadMedia
2019-09-24 19:00:31 +02:00
Haelwenn (lanodan) Monnier
646bf01608
Update AdminFE bundle
2019-09-23 21:13:39 +02:00
rinpatch
16e6be340d
Update frontend bundle to e75ac9dd
2019-09-06 11:31:44 +03:00
Mark Felder
24a731a9a6
Update AdminFE
...
Now permits server configuration. Consider this ALPHA.
2019-08-12 15:00:03 -05:00
39c7bbe18f
Remove longfox emoji set
2019-08-04 04:32:45 +00:00
Egor Kislitsyn
04f18a144b
Add listMessage to to the JSON-LD context
2019-07-15 14:29:13 +07:00
lain
efad26bbb9
Update frontend.
2019-06-28 14:29:26 +02: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
Mark Felder
7b9e21e8a2
Update adminFE to latest build
2019-06-23 18:36:20 -04:00
rinpatch
431a41b459
Update bundled pleroma-fe to c4fcdc71
2019-06-19 00:04:00 +03: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
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
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
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
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
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
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
William Pearson
3dadaa4432
robots.txt
...
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
2019-03-15 02:28:18 +00:00
Haelwenn (lanodan) Monnier
bae96206d0
priv/static/images: Add pleroma-tan
...
Source: https://shitposter.club/objects/9be7c3f4-5a29-45a9-ac40-301312578a02
pleroma-fox-tan-smol.png is pleroma-fox-tan.png but the width
got divided by two in The GIMP.
All the pleroma*.png got optimised with mat2 and optipng/pngcrush,
depending on their best results.
[ci skip]
2019-03-08 07:51:05 +01:00
Haelwenn (lanodan) Monnier
05cad042ba
Update Mastodon Frontend to 2019-03-07 bundle
...
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07
[ci skip]
2019-03-08 00:28:40 +01:00
William Pitcock
3a097bd770
update pleroma frontend
2019-03-07 13:31:03 +00:00
lain
553ce57d42
update frontend
2019-02-21 09:04:35 +01:00
William Pitcock
dd989962e6
litepub schema: add oauthRegistrationEndpoint [ci skip]
2019-02-13 19:34:43 +00:00
Haelwenn (lanodan) Monnier
fcd8a2d0d6
Update Mastodon Frontend to 2019-02-10 bundle
...
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10
[ci skip]
2019-02-10 19:55:22 +01:00
lain
78a51f4dd4
update frontend
2019-02-06 10:40:01 +01:00
Haelwenn (lanodan) Monnier
de0c1c641a
[MastodonFE] Update Frontend (glitch)
2019-01-31 10:35:44 +01:00
lain
88a40308d3
update frontend
2019-01-30 21:04:58 +01:00
kaniini
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
lain
39b2457734
Change default bg image in new config.
2019-01-28 13:04:51 +01:00
William Pitcock
57c3f8214c
update pleroma frontend (summary_html hotfix)
2019-01-25 10:17:00 +00:00
William Pitcock
4b76f14da1
update pleroma frontend
2019-01-25 04:49:35 +00:00
lambda
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
2019-01-21 12:35:10 +00:00
lain
deeda94513
update frontend
2019-01-20 11:28:11 +01:00
William Pitcock
75bb663749
litepub schema: add litepub:directMessage flag
2019-01-20 02:27:48 +00:00
lain
1dd0e0ed4c
update frontend
2019-01-01 17:45:03 +01:00
lain
e1227d812c
update frontend
2018-12-29 14:30:44 +01:00
lain
9c4344e16c
update frontend
2018-12-18 16:28:13 +01:00
lain
3e1816fcd5
update frontend
2018-12-17 21:13:04 +01:00
lain
72945b5b32
update frontend
2018-12-13 21:04:39 +01:00
lain
8682be29a5
update frontend
2018-12-10 20:46:10 +01:00
hakabahitoyo
a7b1a66be3
update-pleroma-frontend
2018-12-03 13:24:25 +09:00
William Pitcock
db8f269cd3
update pleroma frontend
2018-11-18 17:27:48 +00:00
William Pitcock
2a75de84e1
update pleroma frontend
2018-11-14 16:08:22 +00:00
Haelwenn (lanodan) Monnier
934125695d
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
2018-11-08 20:21:45 +01:00
Haelwenn (lanodan) Monnier
705bfe39e9
priv/static/litepub-1.0.jsonld: Local copy of https://litepub.github.io/litepub/context.jsonld
2018-11-08 19:35:23 +01:00
hakabahitoyo
72a880431f
update pleroma frontend
2018-10-26 23:35:06 +09:00
scarlett
7cb227dc62
update pleroma-fe
2018-10-23 12:16:49 +01:00
scarlett
f6dda65dda
update pleroma-fe
2018-10-23 12:15:48 +01:00
hakabahitoyo
be7bb90bef
update-pleroma-frontend
2018-10-07 09:58:08 +09:00
William Pitcock
bb213a85c5
update pleroma frontend
2018-09-22 05:08:15 +00:00
Haelwenn (lanodan) Monnier
83e3afac2c
Update mastodon frontend
2018-09-20 16:13:13 +00:00
hakabahitoyo
f829b18273
update-pleroma-frontend
2018-09-14 10:47:10 +09:00
William Pitcock
e5546c282f
update pleroma frontend
2018-09-09 12:14:34 +00:00
William Pitcock
2b4b4888a9
update pleroma frontend
2018-08-31 04:35:18 +00:00
William Pitcock
5ffaa2bf69
Revert "enable scope options and such"
...
This reverts commit e5642d7566
2018-08-27 10:49:12 +00:00
William Pitcock
e5642d7566
enable scope options and such
2018-08-27 10:46:01 +00:00
hakabahitoyo
ce8c7e77a1
update pleroma frontend
2018-08-26 21:08:03 +09:00
William Pitcock
47661ce44b
update pleroma frontend
2018-08-24 21:59:57 +00:00
