quad/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
14702 commits 10 branches 76 tags 292 MiB
Commit graph

404 commits

Author SHA1 Message Date
Ivan Tashkinov
0e1bda55e8 PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications. 
7a0e554daf
 2020-05-08 21:33:56 +03:00
sadposter
1008f9ac40 fe 2020-05-08 14:38:37 +01:00
sadposter
6e7fab3ead fe 2020-05-08 14:16:11 +01:00
sadposter
e18958a5d7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-05-08 14:12:33 +01:00
sadposter
9eede61d00 fe 2020-05-08 14:09:53 +01:00
lain
fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-07 15:05:40 +02:00
Maksim
3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
lain
c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-04 10:43:20 +02:00
rinpatch
f08c8d9932 pleroma-fe bundle: update to a0f780c4550b77d4574e0de8932a2dff288784a3 2020-05-02 18:59:12 +03:00
Ivan Tashkinov
f1bba5c787 PleromaFE bundle supporting follow request notifications. 
5f90b6a384
 2020-05-02 14:37:40 +03:00
Haelwenn (lanodan) Monnier
c6ddfa8f95
static-fe.css: Restore and move to /priv/static/static-fe 2020-05-02 08:28:42 +02:00
Mark Felder
06fbb95715 Update AdminFE build in preparation for the 2.0.3 release 2020-05-01 21:56:48 +03:00
Ivan Tashkinov
57b31e79c2 Updated PleromaFE bundle to prevent notifications loading issue due to unsupported parameter (with_move). 2020-05-01 17:59:29 +03:00
Mark Felder
3ead44a9aa Update AdminFE build in preparation for the 2.0.3 release 2020-04-29 15:49:48 -05:00
lain
1d6338f2d3 Litepub: Add ChatMessage. 2020-04-22 12:52:39 +02:00
sadposter
eee32fd993 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-04-18 16:16:27 +01:00
Mark Felder
24e0db6310 pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4 2020-04-17 13:22:25 -05:00
rinpatch
d9f36965f6 pleroma-fe bundle: update to 8e049297ff6a125298ba9d06a3a4a563b231360f 2020-04-08 16:26:06 +03:00
Mark Felder
c0a630d42f Update AdminFE build in preparation for Pleroma 2.0.2 2020-04-08 00:29:19 +03:00
sadposter
8cec5796ae Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-04-06 14:44:26 +01:00
Mark Felder
219d3aaa2d Update AdminFE build in preparation for Pleroma 2.0.2 2020-03-31 13:05:16 -05:00
sadposter
931d663a3a Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-03-29 20:57:38 +01:00
Egor Kislitsyn
5a34dca8ed
Add emoji support in statuses in staticfe 2020-03-23 14:03:31 +04:00
Egor Kislitsyn
cb8236cda6
Add embeddable posts 2020-03-20 21:46:26 +04:00
Mark Felder
aa4407be93 Update AdminFE 2020-03-15 17:01:16 +03:00
Haelwenn (lanodan) Monnier
963df689b9 static-fe.css: Restore from before a65ee8ea 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
 2020-03-15 16:55:00 +03:00
Mark Felder
2966377cb9 Update AdminFE 2020-03-13 21:55:08 +03:00
Haelwenn (lanodan) Monnier
a747eb6df9
static-fe.css: Restore from before a65ee8ea 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1616
 2020-03-11 06:35:26 +01:00
sadposter
5f625c9136 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-03-08 19:07:55 +00:00
rinpatch
e7c49d51d7 pleroma-fe bundle: update to 38455294120a27d254b6cbe237a1adcf9d27e6af 2020-03-07 18:18:43 +03:00
Mark Felder
e25bacabb1 Remove EmojiPacks from AdminFE build 
Once more, with feeling
 2020-03-06 09:54:38 -06:00
rinpatch
a65ee8ead6 pleroma-fe bundle: update to 83d8343777050f6ee5fad09832b3878885eda4dd 2020-03-05 23:41:47 +03:00
sadposter
3508f698b9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-03-03 11:16:59 +00:00
sadposter
4709928b06 thing 2020-03-03 11:14:58 +00:00
Haelwenn (lanodan) Monnier
2a850abbeb
MastoFE: Bundle 2020-01-20 2020-02-29 06:41:13 +01:00
Mark Felder
bdd603e9f3 Merge branch 'develop' into update/pleroma-fe-20200228 2020-02-28 16:18:09 -06:00
Mark Felder
c28de93912 Update PleromaFE bundle for the 2.0 release 2020-02-28 16:15:12 -06:00
Mark Felder
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
Mark Felder
554bc88e8a Update AdminFE build 2020-02-25 11:08:35 -06:00
sadposter
fae0d4ba9d Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-02-20 13:50:56 +00:00
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
sadposter
1b03dc2031 fe 2020-02-09 18:19:14 +00:00
sadposter
7de32e2c8b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-02-09 18:12:40 +00:00
sadposter
57b3925a88 fe 2020-02-09 18:12:09 +00: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
sadposter
646016c403 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-29 11:05:19 +00:00
sadposter
ff552c5151 FE 2020-01-29 10:56:34 +00:00
lain
f5bfb29d3b Update frontend to c54111797ae1058e59931b2d1f12e6ab6a6f96a9 2020-01-28 18:39:02 +01:00
sadposter
4646d3c9d6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-23 11:55:07 +00: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
sadposter
4e069ce537 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2020-01-16 16:17:56 +00:00
sadposter
5664427d6c branch 2020-01-16 16:13:51 +00: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
sadposter
6f5844cf8e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-15 14:11:26 +00: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
sadposter
803bce3668 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-12 17:48:36 +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
sadposter
8ae4ae14f3 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-04 23:20:03 +00: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
sadposter
9d29a5063c fe 2019-11-20 09:48:05 +00:00
sadposter
d8286a122a stickers 2019-11-20 09:46:08 +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
sadposter
2de30812ea Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-11-13 00:10:01 +00:00
sadposter
c4f66db63c fe 2019-11-13 00:09:56 +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
sadposter
55cc96bcf9 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-11-09 19:11:33 +00:00
sadposter
058467d25c fe 2019-11-09 19:10:22 +00: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
sadposter
83a9ec228e tos 2019-10-30 09:26:23 +00:00
sadposter
e50d018bfe fe 2019-10-29 11:01:50 +00:00
Egor Kislitsyn
b777083f3f
Add also_known_as field to Pleroma.User 2019-10-25 19:14:18 +07:00
sadposter
16107a0319 update tos 2019-10-25 12:08:34 +01:00
sadposter
85b9992f86 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-10-22 09:12:39 +01:00
Ariadne Conill
c9280b9730 rework to use properties instead of compound typing, per SocialCG 2019-10-19 23:21:37 +00:00
sadposter
1eec8d3dee frontend 2019-10-18 13:12:53 +01:00
lain
d7f9679ff2 Merge branch 'develop' into 'reactions' 
# Conflicts:
#   CHANGELOG.md
 2019-10-10 12:38:51 +00:00
sadposter
58f9ce0deb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-10-10 10:28:16 +01: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
sadposter
8550e0ff0a stickers 2019-10-04 12:04:31 +01:00
sadposter
59e6b48553 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-10-04 11:48:39 +01:00
sadposter
76c84720f7 stickers 2019-10-04 11:48:31 +01: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
sadposter
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
sadposter
f82d9e1359 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-25 13:33:10 +01:00
sadposter
31f932bdfb eva 2019-09-25 13:33:05 +01: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
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
Hakaba Hitoyo
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
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
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