ilja/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
7425 commits 9 branches 72 tags 311 MiB
Commit graph

215 commits

Author SHA1 Message Date
sadposter
e50d018bfe fe 2019-10-29 11:01:50 +00: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
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
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
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
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