akkoma

limepotato/akkoma

Fork 0

Commit graph

066fe1a697

use nil instead of empty string Jeff Becker 2018-01-29 10:06:16 -0500
8db83c3dc0 Merge branch 'feature/longfox' into 'develop' lambda 2018-01-27 11:57:34 +0000
7e1d4819ca add longfox emojis Hakaba Hitoyo 2018-01-27 08:38:48 +0900
46c8f79cd7 Merge branch 'feature/cross-origin' into 'develop' lambda 2018-01-26 23:30:11 +0000
9c0c40cf1e Access-Control-Allow-Origin Hakaba Hitoyo 2018-01-26 22:58:58 +0000
e97864bfcb Update frontend. Roger Braun 2018-01-26 15:12:34 +0100
5957c6517d Fix config. Roger Braun 2018-01-26 14:31:52 +0100
cd3210c9b8 Update frontend. Roger Braun 2018-01-26 14:28:27 +0100
dffde6631d

Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy Jeff Becker 2018-01-24 13:15:54 -0500
0f722a8c22 Stats: Make less crashy and improve query. Roger Braun 2018-01-20 18:38:30 +0100
2ed17541b7 Merge branch 'feature/remote-follow' into 'develop' lambda 2018-01-20 15:02:04 +0000
beb13bf3a9 Revert "Revert "Add remote follow pages."" eal 2018-01-18 18:42:44 +0200
57d413e655 Revert "Revert "Add remote follow path to webfinger."" eal 2018-01-18 18:42:32 +0200
b259b4e4d1 Revert "Add remote follow pages." eal 2018-01-18 03:42:18 +0200
fb5aa34092 Revert "Add remote follow path to webfinger." eal 2018-01-18 03:42:09 +0200
47e8c8db05 Add remote follow pages. eal 2018-01-18 00:22:08 +0200
bc689740f0 Add remote follow path to webfinger. eal 2018-01-16 02:17:55 +0200
ac7580df78 Merge branch 'fix/background-profile-fetch' into 'develop' lambda 2018-01-16 14:18:07 +0000
6678fe3217 Add a Caddyfile. eal 2018-01-16 15:48:27 +0200
b3e7d7ae6d Fetch external profile in the background. eal 2018-01-16 15:31:03 +0200
80f6ac412a Merge branch 'default-pictures' into 'develop' eal 2018-01-15 20:26:49 +0000
14b086eec2 Add a default profile picture and banner. eal 2018-01-15 22:18:17 +0200
baf66caefd Merge branch 'prod.exs' into 'develop' eal 2018-01-15 17:44:49 +0000
db5dfd1b3e Merge branch 'fix/pleroma.nginx' into 'develop' eal 2018-01-15 17:26:41 +0000
5a6f54b336 Merge branch 'stats-daemon' into 'develop' lambda 2018-01-15 08:04:54 +0000
aceef36e56 Correct pleroma.nginx Hakaba Hitoyo 2018-01-14 10:57:25 +0000
048f61d7f8 #95 Correct prod.exs Hakaba Hitoyo 2018-01-14 08:54:28 +0000
6e1cb86166 Fix instance test. eal 2018-01-14 08:28:35 +0200
d8db39564e Move user count to stats agent. eal 2018-01-14 08:15:11 +0200
9717166d10 Add a stats agent for storing data from expensive queries. eal 2018-01-13 18:24:16 +0200
d49109ca17 Merge branch 'add-mediaproxy-question-to-configgen' into 'develop' eal 2018-01-12 20:57:31 +0000
d56ab43609 Ask for proxy URL if proxy enabled. eal 2018-01-12 22:38:14 +0200
29b7e822fb

added question about activating mediaproxy to config generator Sebastian Huebner 2018-01-09 12:31:11 +0100
1e185b9301

apply proxy settings to media_proxy Jeff Becker 2017-12-31 09:25:00 -0500
39854d6c11

clarify Jeff Becker 2017-12-30 13:04:26 -0500
658c4754ff

docs Jeff Becker 2017-12-30 13:02:51 -0500
5ddd15d794

make httppoison use configurable http proxy Jeff Becker 2017-12-30 11:35:53 -0500
5c09d8d3f1 Unlink follow import process from the one processing request. eal 2017-12-23 16:40:43 +0200
ad180ad6dd Merge branch 'media-proxy-fix-encoding' into 'develop' lambda 2017-12-22 12:07:10 +0000
0ccd0e5cc9

Remove a useless URI.encode call in MediaProxy href 2017-12-21 20:59:10 +0100
35ac549a99 Merge branch 'media-proxy' into 'develop' lambda 2017-12-20 14:22:24 +0000
2a744cdff8 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop Lain Iwakura 2017-12-19 16:15:45 +0100
f1f79c0dca Fix timelines in subway tooter. Lain Iwakura 2017-12-19 16:15:07 +0100
29c9812789 Merge branch 'fix/twitterapi-follow-lists' into 'develop' lambda 2017-12-18 22:44:15 +0000
47887ac848 MastoAPI: Fix always-sensitive bugs. Lain Iwakura 2017-12-18 16:56:03 +0100
846d59a536 Send out salmons before websub. Lain Iwakura 2017-12-18 16:16:22 +0100
1969773fb4 Fix follower/following lists. eal 2017-12-18 16:23:04 +0200
6b48489237 Merge branch 'feature/follow-import' into 'develop' lambda 2017-12-18 10:59:57 +0000
fdfb508259 Run follow import in the background. eal 2017-12-12 21:04:41 +0200
d89193a8d7 Allow uploading a file for follow import. eal 2017-12-12 21:03:28 +0200
4a13b84887 Add recipients field to activities. Lain Iwakura 2017-12-12 18:07:14 +0100
39ccfdc084 Add follow import. eal 2017-12-12 18:35:23 +0200
f909aec050

proxy emojis href 2017-12-12 12:30:24 +0100
8e82547179

fix content-type and fallback to image/jpeg href 2017-12-12 11:45:55 +0100
888ec9e579 ActivityPub: Check inbox requests for valid signature. Roger Braun 2017-12-12 10:17:50 +0100
a9c23e1c32 Add plug to validate signed http requests. Roger Braun 2017-12-12 10:17:21 +0100
9223038319 Fix some more tests. eal 2017-12-11 21:01:36 +0200
e2e6365035 ActivityPub: Add controller tests. Lain Iwakura 2017-12-11 18:22:48 +0100
64330d9455 ActivityPub: Add object routes / controller. Lain Iwakura 2017-12-11 18:21:33 +0100
a89a613e4e ActivityPub: Use only string keys in views. Lain Iwakura 2017-12-11 18:20:41 +0100
da005d3332 ActivityPub: Add Objects View. Lain Iwakura 2017-12-11 18:19:46 +0100
79b3397c17 Fix tests. eal 2017-12-11 18:41:03 +0200
4b06e46a3a Merge branch 'fix/tootdon-mentions' into 'develop' lambda 2017-12-11 16:21:43 +0000
b00e230760 Add a bunch of useless HTML to mentions. eal 2017-12-11 18:14:33 +0200
c3bcafc51b HTTPSig: Add method to validate conn Roger Braun 2017-12-11 10:37:40 +0100
5599c5920c Basic incoming AP support. Roger Braun 2017-12-11 10:37:22 +0100
9093b2cf49

Merge remote-tracking branch 'upstream/develop' into media-proxy href 2017-12-11 02:45:28 +0100
d1806ec07f

nginx sample config, quickly tested href 2017-12-11 02:40:19 +0100
077faaed8c

Limit body size to 25MB href 2017-12-11 02:31:37 +0100
25118aeef7 Add link to AP address in webfinger. Roger Braun 2017-12-09 15:34:43 +0100
30e9b22f96 Merge branch 'develop' into feature/activitypub Roger Braun 2017-12-09 11:00:56 +0100
d5a13c10ac Merge branch 'feature/user_deletion' into develop Roger Braun 2017-12-09 10:10:45 +0100
ef2322bdb7 Delete notifications on activity deletion. Lain Iwakura 2017-12-08 18:17:30 +0100
bad499b3fd Basic user deletion. Lain Iwakura 2017-12-08 17:50:11 +0100
35cfbf43a0 Merge branch 'fix/linkify' into 'develop' lambda 2017-12-08 12:34:03 +0000
40c30ab895 Merge branch 'fix/mastoapi-attachment-linking' into 'develop' lambda 2017-12-08 12:32:33 +0000
d7da3ca05d Merge branch 'postgresetup' into 'develop' lambda 2017-12-08 12:31:14 +0000
a3e68f0233 Allow parentheses in links. eal 2017-12-07 21:38:31 +0200
bf91e5659f Fix HTML escape breaking some links. eal 2017-12-07 21:34:25 +0200
5436dbaeaf MastoAPI: don't add attachment links. eal 2017-12-07 20:44:09 +0200
afd0ea37f3 Add websocket upgrade to example nginx config. eal 2017-12-07 20:07:51 +0200
6df6ad0b42 User deletion: Remove relationships. Lain Iwakura 2017-12-07 18:13:05 +0100
a78ae2a685 Don't follow deactivated users. Lain Iwakura 2017-12-07 17:51:55 +0100
b727ecc5e7 Add function to deactivate users. Lain Iwakura 2017-12-07 17:47:23 +0100
0ec5aeb8a7 Don't log in deactivated users. Lain Iwakura 2017-12-07 17:41:34 +0100
e31a5ff4af Priority queue fixes. Lain Iwakura 2017-12-06 16:51:11 +0100
66c3813ea6 Add basic queue prioritization. Lain Iwakura 2017-12-05 18:21:30 +0100
72f7baa654

Merge remote-tracking branch 'upstream/develop' into media-proxy href 2017-12-05 14:12:15 +0100
08e7e249b1 Merge branch 'feature/chat' into 'develop' lambda 2017-12-05 11:27:11 +0000
e7c2472abd Fix tests. Lain Iwakura 2017-12-05 12:18:04 +0100
74e92152b7 Update frontend. Lain Iwakura 2017-12-05 12:11:46 +0100
b652dc5f2e Update frontend. Lain Iwakura 2017-12-05 11:53:12 +0100
1c90bfb4f6 Merge remote-tracking branch 'origin/develop' into feature/chat Roger Braun 2017-12-05 10:20:00 +0100
7f336cb8b1 Merge branch 'fix/odd-passwords' into 'develop' lambda 2017-12-05 09:10:37 +0000
5945ec84e9 Don't save user in socket, just save the name. Roger Braun 2017-12-05 10:01:36 +0100
69f1024bb0 Add basic channel state. Roger Braun 2017-12-05 09:36:26 +0100
c1fa1e8844 Fix basic auth for passwords with a colon. eal 2017-12-04 22:45:16 +0200
d01243c16e Update frontend. Lain Iwakura 2017-12-04 19:12:31 +0100
5c40986120 Basic backend chat. Lain Iwakura 2017-12-04 19:10:15 +0100
964e2dd2f0 unfuck Henry Jameson 2017-12-04 04:06:52 +0300