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
William Pitcock
d8fb340565
update pleroma frontend
2018-08-20 18:10:29 +00:00
William Pitcock
7a11ea1ceb
update pleroma frontend
2018-08-20 04:45:34 +00:00
William Pitcock
d8bb27970b
update pleroma frontend
2018-08-18 18:19:11 +00:00
lain
701f5df45c
update frontend
2018-08-12 18:16:19 +02:00
lain
4a612b8c1b
Update Mastofe.
2018-08-12 18:02:43 +02:00
lain
ddc654d587
update frontend
2018-06-12 19:38:25 +02:00
Artik Banana
991b8a6b9d
Replace avi.png with the Pleroma logo
2018-06-12 11:55:38 +00:00
lain
9d054d30bc
Revert "Update Mastofe."
...
This reverts commit 726b131b0a
2018-06-02 19:45:23 +02:00
lain
726b131b0a
Update Mastofe.
2018-06-02 16:11:38 +02:00
lain
6b9a683833
update frontend
2018-05-24 19:25:44 +02:00
lain
dde5ad9e37
update frontend
2018-05-20 18:29:12 +02:00
lain
bdfe0991d2
update frontend
2018-05-20 13:24:16 +02:00
lain
2e9aa16b86
update frontend
2018-05-16 13:02:53 +02:00
lain
12f0ad1392
update frontend
2018-05-04 23:15:33 +02:00
lain
5b6d6d7f2d
update frontend
2018-04-29 16:56:13 +02:00
lain
3bad2b827a
Resurrect instance specific panel.
2018-04-26 07:06:32 +02:00
lain
fc6f5bcad3
update frontend
2018-04-23 19:23:45 +02:00
lain
661fd3c93e
update frontend
2018-04-23 19:09:24 +02:00
90ad55b8ff
formatting
2018-04-20 19:21:48 +02:00
b0671be283
enable instance panel by default, added some content
2018-04-20 19:04:57 +02:00
lain
e153b364a7
update frontend
2018-04-17 11:09:19 +02:00
lain
5612716c25
update frontend
2018-04-11 22:03:28 +02:00
lain
a8dddd9279
update frontend
2018-04-11 21:55:38 +02:00
Morgan Bazalgette
fc13a3ff24
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec
2018-04-09 22:00:42 +02:00
Morgan Bazalgette
676f2ca479
Bring mastofe up to date
...
Commit 5edce20302#7008 ) - unarist (upstream/master)
| * e7a17167 - (5 hours ago) Implement the ability for an Administrator or Moderator to remove an account avatar (#6998 ) - Emelia Smith
| * 4fd71acc - (5 hours ago) Fix issues with sending direct messages from user profile (#6999 ) - Emelia Smith
| * 3f51c6ef - (5 hours ago) Weblate translations (2018-04-02) (#7007 ) - Yamagishi Kazutoshi
| * b04f73ce - (6 hours ago) Russian language updated (#7005 ) - Evgeny Petrov
| * 24611d8d - (6 hours ago) i18n: update zh-HK translation (#7004 ) - luzi82
| * f890d2a7 - (16 hours ago) Support all ActivityPub actor types (#6997 ) - Eugen Rochko
| * 33513753 - (16 hours ago) Fix unpermitted parameters warning when generating pagination URLs (#6995 ) - Eugen Rochko
| * 123a343d - (19 hours ago) [WIP] Enable custom emoji on account pages and in the sidebar (#6124 ) - David Underwood
| * f464f98f - (19 hours ago) Update Ruby to version 2.4.4 (#6964 ) - Yamagishi Kazutoshi
| * 6a895e1a - (20 hours ago) Fix: Prevent submission using same logic as submit button disabling. (#6993 ) - Emelia Smith
* | 011eda08 - (7 minutes ago) Properly cache requests using service workers - Morgan Bazalgette
* | 8dd77f17 - (5 hours ago) Fix build - Morgan Bazalgette
* | 99373236 - (19 hours ago) Add build status - Morgan Bazalgette
* | b448a3a5 - (19 hours ago) Update README - Morgan Bazalgette
* | 68fd7ee6 - (20 hours ago) Fix statuses embedded in like/boost notifs being white - Morgan Bazalgette
* | 7a9212df - (21 hours ago) Temporary workaround to only show related statuses - Morgan Bazalgette
* | 00bd10fa - (26 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette
|\ \
| |/
| * 993ce0e5 - (28 hours ago) improve zh-HK localization by referring zh-TW and zh-CN (#6988 ) - luzi82
* | 05832497 - (30 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette
\ \
|/
* 929f58f1 - (32 hours ago) i18n: Update Polish translation (#6985 ) - Marcin Mikołajczak
```
2018-04-02 18:31:57 +02:00
Morgan Bazalgette
6d20410314
update mastofe
2018-04-01 11:36:53 +02:00
Morgan Bazalgette
ce1f66aa2d
Update with mastofe repo
2018-03-31 19:14:05 +02:00
Morgan Bazalgette
10773888ad
Bring Mastodon frontend up-to-date
...
with my fork of it, @ https://git.pleroma.social/howl/mastofe .
2018-03-31 18:15:28 +02:00
lain
5cc1cfcfd7
update frontend
2018-03-31 12:52:34 +02:00
Morgan Bazalgette
ed22105e72
mastofe: remove excess accent colours; fix the always-starred bug
2018-03-23 21:33:25 +01:00
Mark Felder
3a7ba5dbb1
Set max characters for the compose field to 5000 to match pleroma default
...
Of course you can't tell what the change is because the entire file is
written on one line, so the nearly impossible to read.
It's nice to be able to use 5000 chars from my computer and have access
to CW feature as well.
2018-03-15 14:46:28 +00:00
lain
2b2fa94e94
Move stuff around.
2018-03-13 14:58:49 +01:00
Wim Vanderbauwhede
36f615135f
A small patch to show the instance name and favicon in the browser title
...
bar.
2018-03-13 09:37:55 +00:00
lain
b0d242cd92
update frontend
2018-03-08 19:50:51 +01:00
lain
e946f300ae
update frontend
2018-02-11 20:58:08 +01:00
lain
dfc23e717f
update frontend
2018-02-11 20:55:02 +01:00
Hakaba Hitoyo
9cf293c84b
Merge remote-tracking branch 'hakabahitoyo/feature/instance-specific-panel' into feature/instance-specific-panel
2018-02-11 18:08:27 +09:00
Roger Braun
0e2ca77eec
update frontend
2018-02-09 17:14:11 +01:00
Roger Braun
103eca482c
update frontend
2018-02-07 13:44:52 +01:00
Hakaba Hitoyo
a2fac9b0e8
adjust panel.html
2018-02-04 00:31:46 +09:00
Hakaba Hitoyo
bffc78f2a8
add backend default for instance specific panel
2018-02-03 23:09:26 +09:00
lambda
61c16193de
Merge branch 'move-backend-images' into 'develop'
...
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
2018-02-03 13:05:20 +00:00
Hakaba Hitoyo
ea6d1b2b17
move avi.png & banner.png from /priv/static/static to /priv/static/images
2018-02-03 20:43:14 +09:00
Roger Braun
9a9766d648
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2018-02-02 17:14:58 +01:00
Roger Braun
2203fa2fdb
Update frontend.
2018-02-02 17:14:23 +01:00
Hakaba Hitoyo
e47f60c053
provide instance thumbnail at /api/v1/instance (debug)
2018-01-31 23:04:34 +09:00
Hakaba Hitoyo
10753178ea
provide instance thumbnail at /api/v1/instance (debug)
2018-01-31 22:57:43 +09:00
Hakaba Hitoyo
a4335e391f
provide instance thumbnail at /api/v1/instance
2018-01-31 22:51:25 +09:00
lambda
8db83c3dc0
Merge branch 'feature/longfox' into 'develop'
...
add longfox emojis
See merge request pleroma/pleroma!53
2018-01-27 11:57:34 +00:00
Hakaba Hitoyo
7e1d4819ca
add longfox emojis
2018-01-27 08:38:48 +09:00
Roger Braun
e97864bfcb
Update frontend.
2018-01-26 15:12:34 +01:00
Roger Braun
5957c6517d
Fix config.
2018-01-26 14:31:52 +01:00
Roger Braun
cd3210c9b8
Update frontend.
2018-01-26 14:28:27 +01:00
eal
14b086eec2
Add a default profile picture and banner.
...
This removes the placehold.it dependency.
2018-01-15 22:18:17 +02:00
Lain Iwakura
74e92152b7
Update frontend.
2017-12-05 12:11:46 +01:00
Lain Iwakura
b652dc5f2e
Update frontend.
2017-12-05 11:53:12 +01:00
Lain Iwakura
d01243c16e
Update frontend.
2017-12-04 19:12:31 +01:00
Roger Braun
44f7154fb9
Update frontend.
2017-11-24 08:37:41 +01:00
Roger Braun
ad90da07f5
untoot.
2017-11-22 16:10:03 +01:00
lambda
698a75cb39
Merge branch 'develop' into 'develop'
...
Pleroma-Dark default theme for the Mastodon Frontend
See merge request pleroma/pleroma!27
2017-11-22 14:19:27 +00:00
Hyper! (Stitch)
d7b6fa79cb
Fixed in-reply CSS, also included full column width (to have timelines take the whole screen size.)
2017-11-22 14:12:04 +00:00
Roger Braun
0716f8e626
Update frontend.
2017-11-22 12:19:13 +01:00
Hyper! (Stitch)
dae2949bcc
Fix a links... Retweet button still broken.
2017-11-20 17:19:22 +00:00
Hyper! (Stitch)
0c68e75b93
Update pl-dark-masto-fe.css
2017-11-20 17:09:14 +00:00
Hyper! (Stitch)
cb071745b5
Update pl-dark-masto-fe.css, fix notification_message and retweet
2017-11-20 16:54:32 +00:00
Hyper! (Stitch)
f065689407
Update pl-dark-masto-fe.css
2017-11-19 19:04:51 +00:00
