sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
8198 commits 2 branches 40 tags 290 MiB
Commit graph

192 commits

Author SHA1 Message Date
Lain Soykaf
8a79f20c21 EmojiReactions: Rename to EmojiReacts 2020-02-06 18:09:57 +01: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
Hakaba Hitoyo
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
Hakaba Hitoyo
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
feld
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