4709928b06
thing
2020-03-03 11:14:58 +00:00
2a850abbeb
MastoFE: Bundle 2020-01-20
2020-02-29 06:41:13 +01:00
bdd603e9f3
Merge branch 'develop' into update/pleroma-fe-20200228
2020-02-28 16:18:09 -06:00
c28de93912
Update PleromaFE bundle for the 2.0 release
2020-02-28 16:15:12 -06:00
3d24a0917b
Update AdminFE build
...
- Removed Grouped Reports; API needs proper architecture/refactor
- Cannot set Tesla adapter in AdminFE as it's not safe yet
- Layout/rendering improvements
2020-02-28 12:32:44 -06:00
554bc88e8a
Update AdminFE build
2020-02-25 11:08:35 -06:00
fae0d4ba9d
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-02-20 13:50:56 +00:00
6a97c1b9ff
Update adminFE build
2020-02-17 15:50:45 -06:00
f9eb35d48e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update/admin-fe-20200211
2020-02-11 10:33:41 -06:00
de0fea4634
Update AdminFE build
2020-02-11 10:24:38 -06:00
60de311164
Update frontend
2020-02-11 13:59:04 +01:00
1b03dc2031
fe
2020-02-09 18:19:14 +00:00
7de32e2c8b
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-02-09 18:12:40 +00:00
57b3925a88
fe
2020-02-09 18:12:09 +00:00
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
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
fed9b0d1e0
Update FE bundle
2020-02-06 10:59:41 -06:00
646016c403
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-01-29 11:05:19 +00:00
ff552c5151
FE
2020-01-29 10:56:34 +00:00
f5bfb29d3b
Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9
2020-01-28 18:39:02 +01:00
4646d3c9d6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-01-23 11:55:07 +00:00
bd3f3756fb
Update MastoFE bundle to 2020-01-22
2020-01-22 16:00:23 +01:00
2860bee604
Last AdminFE update was accidentally built from master, not develop
2020-01-21 15:09:16 -06:00
bc2ebdcfd6
Update AdminFE build
2020-01-21 13:41:22 -06:00
4e069ce537
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2020-01-16 16:17:56 +00:00
5664427d6c
branch
2020-01-16 16:13:51 +00:00
d1e9768e10
[ #1478 ] Bundled PleromaFE 7397636914a9d3e7fd30373034c25175273ab808.
2020-01-15 18:38:18 +03:00
fd3c23af63
Update AdminFE build
2020-01-09 10:00:15 -06:00
6f5844cf8e
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-12-15 14:11:26 +00:00
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
803bce3668
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-12-12 17:48:36 +00:00
756a029edf
Update frontend
2019-12-12 17:05:22 +01:00
2792672793
Revert "Merge branch 'admin-scope-support-code' into 'develop'"
...
This reverts merge request !2055
2019-12-12 09:37:02 +00:00
84f0aec9aa
Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f.
2019-12-11 19:48:00 +03:00
8ae4ae14f3
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-12-04 23:20:03 +00:00
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
9d29a5063c
fe
2019-11-20 09:48:05 +00:00
d8286a122a
stickers
2019-11-20 09:46:08 +00:00
0fe08346db
bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7
2019-11-19 23:28:34 +03:00
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
2de30812ea
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-11-13 00:10:01 +00:00
c4f66db63c
fe
2019-11-13 00:09:56 +00:00
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-11-10 11:32:50 +00:00
274cc18e8a
Visually separate header.
2019-11-09 18:08:08 -08:00
1dc785b74b
Move static-fe CSS to a separate file.
2019-11-09 18:07:50 -08:00
55cc96bcf9
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-11-09 19:11:33 +00:00
058467d25c
fe
2019-11-09 19:10:22 +00:00
3cc2437598
Bump pleroma-fe bundle to 044c9ad0562af059dd961d50961a3880fca9c642
2019-11-09 01:49:36 +03:00
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
2019-11-08 13:27:11 +01:00
83a9ec228e
tos
2019-10-30 09:26:23 +00:00
e50d018bfe
fe
2019-10-29 11:01:50 +00:00
b777083f3f
Add `also_known_as` field to Pleroma.User
2019-10-25 19:14:18 +07:00
16107a0319
update tos
2019-10-25 12:08:34 +01:00
85b9992f86
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-10-22 09:12:39 +01:00
c9280b9730
rework to use properties instead of compound typing, per SocialCG
2019-10-19 23:21:37 +00:00
1eec8d3dee
frontend
2019-10-18 13:12:53 +01:00
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-10 12:38:51 +00:00
58f9ce0deb
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-10-10 10:28:16 +01:00
a502155274
Bump pleroma-fe bundle to 122323f35c
2019-10-07 17:42:33 +03:00
e8395bedd2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# priv/static/schemas/litepub-0.1.jsonld
2019-10-07 12:10:27 +00:00
19962d2022
clean up bundled litepub schema ( closes #1303 )
2019-10-07 11:33:58 +00:00
8550e0ff0a
stickers
2019-10-04 12:04:31 +01:00
59e6b48553
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-10-04 11:48:39 +01:00
76c84720f7
stickers
2019-10-04 11:48:31 +01:00
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-02 13:27:55 +02:00
a562cb2c34
Update AdminFE bundle
2019-10-01 18:29:39 -05:00
28be12b38e
update admin fe
2019-09-30 12:52:28 +00:00
0aef18bcf4
Litepub Context: Add EmojiReaction.
2019-09-30 14:26:59 +02:00
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
1e11b97c1b
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-26 23:22:24 +01:00
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
f82d9e1359
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-25 13:33:10 +01:00
31f932bdfb
eva
2019-09-25 13:33:05 +01:00
5820dc40fc
litepub-0.1.jsonld: Add uploadMedia
2019-09-24 19:00:31 +02:00
646bf01608
Update AdminFE bundle
2019-09-23 21:13:39 +02:00
63782e770b
add stickers
2019-09-16 12:14:42 +01:00
b4512ddb6f
thing
2019-09-14 00:20:48 +01:00
f1e1ba71ce
update tos
2019-09-13 16:23:28 +01:00
8046440a16
update fe
2019-09-13 16:18:38 +01:00
cc5b65bd21
add lato
2019-09-13 15:27:51 +01:00
94076a23e4
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-10 21:11:03 +01:00
16e6be340d
Update frontend bundle to e75ac9dd
2019-09-06 11:31:44 +03:00
5b385962eb
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-13 09:05:44 +01:00
24a731a9a6
Update AdminFE
...
Now permits server configuration. Consider this ALPHA.
2019-08-12 15:00:03 -05:00
8abd779bcc
TOS
2019-08-12 14:55:20 +01:00
6f8e4f5dcf
TOS
2019-08-12 00:51:04 +01:00
325372b1e1
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-07 08:59:31 +01:00
Hakaba Hitoyo
39c7bbe18f
Remove longfox emoji set
2019-08-04 04:32:45 +00:00
32ce409514
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-07-16 11:21:31 +01:00
04f18a144b
Add `listMessage` to to the JSON-LD context
2019-07-15 14:29:13 +07:00
357b1eac0f
theme
2019-07-09 21:08:03 +01:00
4d8f97453b
Add activity get mix task
2019-07-01 17:58:51 +01:00
87ba9d1bab
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-28 18:55:01 +01:00
efad26bbb9
Update frontend.
2019-06-28 14:29:26 +02:00
8050baf7bf
Update pleroma FE
2019-06-27 02:25:30 +01:00
0843f3e0b6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-27 02:17:32 +01:00
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
451931d36f
Update mastofe to bundle-2019-06-26
2019-06-26 21:06:28 +02:00
3a71016699
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-25 12:40:02 +01:00
7b9e21e8a2
Update adminFE to latest build
2019-06-23 18:36:20 -04:00
6f380ee337
merge
2019-06-19 14:20:26 +01:00
431a41b459
Update bundled pleroma-fe to c4fcdc71
2019-06-19 00:04:00 +03:00
4cda6ed358
change panel
2019-06-12 15:34:27 +01:00
febd2fdfd3
add emojo
2019-06-06 15:54:32 +01:00
d19b99009b
add instance resources
2019-05-30 12:11:56 +01:00
c0b7bc2927
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-16 20:24:43 +01:00
7f40b66d51
add emojo
2019-05-16 20:24:29 +01:00
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
cf2741e067
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-13 12:09:35 +01:00
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
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
fa632f9c37
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-04-29 12:56:53 +01:00
4b521119dc
Add compressed background
2019-04-29 12:56:08 +01:00
52bdfced32
update pleroma frontend
2019-04-27 07:34:59 +00:00
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
c02d52c9f7
Update instance panel
2019-04-14 19:01:01 +01:00
b134bd83ca
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-04-14 19:00:50 +01:00
d5e5e87d01
Update emojo
2019-04-11 10:52:44 +01:00
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
777042b9e5
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-04-04 17:46:07 +01:00
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
df7ea4c0c2
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-03-30 18:07:38 +00:00
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
41511d1926
Update frontend
2019-03-20 08:58:25 +01:00
a907522690
used imageOptim to reduce size of image files
2019-03-19 10:10:48 +01:00
3d24792f4f
Modify static resources
2019-03-18 13:13:19 +00:00
e751f3ec56
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-03-18 13:13:07 +00:00
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
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
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
3a097bd770
update pleroma frontend
2019-03-07 13:31:03 +00:00
c413656287
favicon
2019-02-23 22:28:10 +00:00
6c1cf2129e
chg: resources
2019-02-23 22:26:33 +00:00
8b6cd3857b
new: Add instance resources
2019-02-23 22:23:03 +00:00
553ce57d42
update frontend
2019-02-21 09:04:35 +01:00
dd989962e6
litepub schema: add oauthRegistrationEndpoint [ci skip]
2019-02-13 19:34:43 +00:00
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
78a51f4dd4
update frontend
2019-02-06 10:40:01 +01:00
de0c1c641a
[MastodonFE] Update Frontend (glitch)
2019-01-31 10:35:44 +01:00
88a40308d3
update frontend
2019-01-30 21:04:58 +01:00
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
39b2457734
Change default bg image in new config.
2019-01-28 13:04:51 +01:00
57c3f8214c
update pleroma frontend (summary_html hotfix)
2019-01-25 10:17:00 +00:00
4b76f14da1
update pleroma frontend
2019-01-25 04:49:35 +00:00
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
2019-01-21 12:35:10 +00:00
deeda94513
update frontend
2019-01-20 11:28:11 +01:00
75bb663749
litepub schema: add litepub:directMessage flag
2019-01-20 02:27:48 +00:00
1dd0e0ed4c
update frontend
2019-01-01 17:45:03 +01:00
e1227d812c
update frontend
2018-12-29 14:30:44 +01:00
9c4344e16c
update frontend
2018-12-18 16:28:13 +01:00
3e1816fcd5
update frontend
2018-12-17 21:13:04 +01:00
72945b5b32
update frontend
2018-12-13 21:04:39 +01:00
8682be29a5
update frontend
2018-12-10 20:46:10 +01:00
a7b1a66be3
update-pleroma-frontend
2018-12-03 13:24:25 +09:00
db8f269cd3
update pleroma frontend
2018-11-18 17:27:48 +00:00
2a75de84e1
update pleroma frontend
2018-11-14 16:08:22 +00:00
934125695d
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
2018-11-08 20:21:45 +01:00
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
72a880431f
update pleroma frontend
2018-10-26 23:35:06 +09:00
7cb227dc62
update pleroma-fe
2018-10-23 12:16:49 +01:00
f6dda65dda
update pleroma-fe
2018-10-23 12:15:48 +01:00
be7bb90bef
update-pleroma-frontend
2018-10-07 09:58:08 +09:00
bb213a85c5
update pleroma frontend
2018-09-22 05:08:15 +00:00
83e3afac2c
Update mastodon frontend
2018-09-20 16:13:13 +00:00
f829b18273
update-pleroma-frontend
2018-09-14 10:47:10 +09:00
e5546c282f
update pleroma frontend
2018-09-09 12:14:34 +00:00
2b4b4888a9
update pleroma frontend
2018-08-31 04:35:18 +00:00
5ffaa2bf69
Revert "enable scope options and such"
...
This reverts commit e5642d7566
2018-08-27 10:49:12 +00:00
e5642d7566
enable scope options and such
2018-08-27 10:46:01 +00:00
ce8c7e77a1
update pleroma frontend
2018-08-26 21:08:03 +09:00
47661ce44b
update pleroma frontend
2018-08-24 21:59:57 +00:00
d8fb340565
update pleroma frontend
2018-08-20 18:10:29 +00:00
7a11ea1ceb
update pleroma frontend
2018-08-20 04:45:34 +00:00
d8bb27970b
update pleroma frontend
2018-08-18 18:19:11 +00:00
701f5df45c
update frontend
2018-08-12 18:16:19 +02:00
4a612b8c1b
Update Mastofe.
2018-08-12 18:02:43 +02:00
ddc654d587
update frontend
2018-06-12 19:38:25 +02:00
991b8a6b9d
Replace avi.png with the Pleroma logo
2018-06-12 11:55:38 +00:00
9d054d30bc
Revert "Update Mastofe."
...
This reverts commit 726b131b0a
2018-06-02 19:45:23 +02:00
726b131b0a
Update Mastofe.
2018-06-02 16:11:38 +02:00
6b9a683833
update frontend
2018-05-24 19:25:44 +02:00
dde5ad9e37
update frontend
2018-05-20 18:29:12 +02:00
bdfe0991d2
update frontend
2018-05-20 13:24:16 +02:00
2e9aa16b86
update frontend
2018-05-16 13:02:53 +02:00
12f0ad1392
update frontend
2018-05-04 23:15:33 +02:00
5b6d6d7f2d
update frontend
2018-04-29 16:56:13 +02:00
3bad2b827a
Resurrect instance specific panel.
2018-04-26 07:06:32 +02:00
fc6f5bcad3
update frontend
2018-04-23 19:23:45 +02:00
661fd3c93e
update frontend
2018-04-23 19:09:24 +02:00
Kawen
90ad55b8ff
formatting
2018-04-20 19:21:48 +02:00
Kawen
b0671be283
enable instance panel by default, added some content
2018-04-20 19:04:57 +02:00
e153b364a7
update frontend
2018-04-17 11:09:19 +02:00
5612716c25
update frontend
2018-04-11 22:03:28 +02:00
a8dddd9279
update frontend
2018-04-11 21:55:38 +02:00
fc13a3ff24
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec
2018-04-09 22:00:42 +02:00
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
6d20410314
update mastofe
2018-04-01 11:36:53 +02:00
ce1f66aa2d
Update with mastofe repo
2018-03-31 19:14:05 +02:00
sadposter
Haelwenn (lanodan) Monnier
Mark Felder
lain
rinpatch
Ivan Tashkinov
Egor Kislitsyn
Phil Hagelberg
Ariadne Conill
Hakaba Hitoyo
feld
William Pitcock
Ekaterina Vaartis
kaniini
optikfluffel
William Pearson
lambda
hakabahitoyo
scarlett
Artik Banana
Kawen
Morgan Bazalgette