Calv Collins [Thu, 8 Feb 2018 16:58:31 +0000 (16:58 +0000)]
Merge branch 'develop' of https://git.pleroma.social/calv/pleroma into develop
Calv Collins [Thu, 8 Feb 2018 16:57:30 +0000 (16:57 +0000)]
Create action_fallback for username/password incorrect input
Roger Braun [Thu, 8 Feb 2018 15:03:30 +0000 (16:03 +0100)]
Fix compile errors on 1.4.5
Roger Braun [Wed, 7 Feb 2018 12:44:52 +0000 (13:44 +0100)]
update frontend
eal [Mon, 5 Feb 2018 22:06:29 +0000 (00:06 +0200)]
Update required Elixir version in README
Also remove the erlang packages, they're specified in the Debian guide.
eal [Mon, 5 Feb 2018 21:57:17 +0000 (21:57 +0000)]
Merge branch 'fix/no-image-upload-filetype' into 'develop'
Detect file type if none given.
See merge request pleroma/pleroma!62
eal [Sun, 4 Feb 2018 13:14:08 +0000 (15:14 +0200)]
Detect file type if none given.
lambda [Sat, 3 Feb 2018 13:05:20 +0000 (13:05 +0000)]
Merge branch 'move-backend-images' into 'develop'
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
Hakaba Hitoyo [Sat, 3 Feb 2018 11:52:01 +0000 (20:52 +0900)]
add backend endpoint /images
Hakaba Hitoyo [Sat, 3 Feb 2018 11:43:14 +0000 (20:43 +0900)]
move avi.png & banner.png from /priv/static/static to /priv/static/images
Roger Braun [Fri, 2 Feb 2018 16:14:58 +0000 (17:14 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Fri, 2 Feb 2018 16:14:23 +0000 (17:14 +0100)]
Update frontend.
lambda [Fri, 2 Feb 2018 07:33:09 +0000 (07:33 +0000)]
Merge branch 'feature/remote-follow' into 'develop'
Add remote following of local profiles.
See merge request pleroma/pleroma!59
eal [Thu, 1 Feb 2018 22:00:48 +0000 (00:00 +0200)]
Add remote following of local profiles.
eal [Thu, 1 Feb 2018 19:41:19 +0000 (21:41 +0200)]
TwitterAPI: Add is_local to user view.
eal [Wed, 31 Jan 2018 21:47:42 +0000 (23:47 +0200)]
Revert renaming emoji.txt
eal [Wed, 31 Jan 2018 18:34:52 +0000 (18:34 +0000)]
Merge branch 'feature/instance-thumbnail-api' into 'develop'
Provide instance thumbnail in /api/v1/instance
See merge request pleroma/pleroma!55
lambda [Wed, 31 Jan 2018 15:24:36 +0000 (15:24 +0000)]
Merge branch 'fix/split-custom-emoji' into 'develop'
Split emoji to default and custom.
See merge request pleroma/pleroma!56
eal [Wed, 31 Jan 2018 14:23:31 +0000 (16:23 +0200)]
Split emoji to default and custom.
Hakaba Hitoyo [Wed, 31 Jan 2018 14:09:47 +0000 (23:09 +0900)]
provide instance thumbnail at /api/v1/instance (debug)
Hakaba Hitoyo [Wed, 31 Jan 2018 14:04:34 +0000 (23:04 +0900)]
provide instance thumbnail at /api/v1/instance (debug)
Hakaba Hitoyo [Wed, 31 Jan 2018 13:57:43 +0000 (22:57 +0900)]
provide instance thumbnail at /api/v1/instance (debug)
Hakaba Hitoyo [Wed, 31 Jan 2018 13:51:25 +0000 (22:51 +0900)]
provide instance thumbnail at /api/v1/instance
Roger Braun [Tue, 30 Jan 2018 11:21:05 +0000 (12:21 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Tue, 30 Jan 2018 11:20:39 +0000 (12:20 +0100)]
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
Roger Braun [Tue, 30 Jan 2018 11:20:14 +0000 (12:20 +0100)]
Make specs less breaky.
Roger Braun [Tue, 30 Jan 2018 11:17:01 +0000 (12:17 +0100)]
Fix specs.
Hakaba Hitoyo [Tue, 30 Jan 2018 10:37:04 +0000 (19:37 +0900)]
provide logo at feed.atom (debug)
Hakaba Hitoyo [Tue, 30 Jan 2018 10:26:07 +0000 (19:26 +0900)]
provide logo at feed.atom
lambda [Tue, 30 Jan 2018 08:16:31 +0000 (08:16 +0000)]
Merge branch 'pr-upstream-http-proxy' into 'develop'
Pr upstream http proxy
See merge request pleroma/pleroma!43
lambda [Tue, 30 Jan 2018 08:14:07 +0000 (08:14 +0000)]
Merge branch 'feature/caddyfile' into 'develop'
Add a Caddyfile.
See merge request pleroma/pleroma!50
Roger Braun [Mon, 29 Jan 2018 16:45:44 +0000 (17:45 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Roger Braun [Mon, 29 Jan 2018 16:44:35 +0000 (17:44 +0100)]
Fix incoming Pleroma CWs. Closes #96.
Jeff Becker [Mon, 29 Jan 2018 15:06:16 +0000 (10:06 -0500)]
use nil instead of empty string
lambda [Sat, 27 Jan 2018 11:57:34 +0000 (11:57 +0000)]
Merge branch 'feature/longfox' into 'develop'
add longfox emojis
See merge request pleroma/pleroma!53
Hakaba Hitoyo [Fri, 26 Jan 2018 23:38:48 +0000 (08:38 +0900)]
add longfox emojis
lambda [Fri, 26 Jan 2018 23:30:11 +0000 (23:30 +0000)]
Merge branch 'feature/cross-origin' into 'develop'
Access-Control-Allow-Origin
See merge request pleroma/pleroma!52
Hakaba Hitoyo [Fri, 26 Jan 2018 22:58:58 +0000 (22:58 +0000)]
Access-Control-Allow-Origin
Roger Braun [Fri, 26 Jan 2018 14:12:34 +0000 (15:12 +0100)]
Update frontend.
Roger Braun [Fri, 26 Jan 2018 13:31:52 +0000 (14:31 +0100)]
Fix config.
Roger Braun [Fri, 26 Jan 2018 13:28:27 +0000 (14:28 +0100)]
Update frontend.
Jeff Becker [Wed, 24 Jan 2018 18:15:54 +0000 (13:15 -0500)]
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
Roger Braun [Sat, 20 Jan 2018 17:38:30 +0000 (18:38 +0100)]
Stats: Make less crashy and improve query.
lambda [Sat, 20 Jan 2018 15:02:04 +0000 (15:02 +0000)]
Merge branch 'feature/remote-follow' into 'develop'
remote follow
See merge request pleroma/pleroma!51
eal [Thu, 18 Jan 2018 16:42:44 +0000 (18:42 +0200)]
Revert "Revert "Add remote follow pages.""
This reverts commit
b259b4e4d1dc27528b99744fffabfb05c676ec3f.
eal [Thu, 18 Jan 2018 16:42:32 +0000 (18:42 +0200)]
Revert "Revert "Add remote follow path to webfinger.""
This reverts commit
fb5aa34092cf8aa04b3b7001e81cf1585ee0041a.
eal [Thu, 18 Jan 2018 01:42:18 +0000 (03:42 +0200)]
Revert "Add remote follow pages."
This reverts commit
47e8c8db05dbe1f9d0ad7790be9ae9ed40f4e909.
eal [Thu, 18 Jan 2018 01:42:09 +0000 (03:42 +0200)]
Revert "Add remote follow path to webfinger."
This reverts commit
bc689740f09ee8201982455988bf5f4ccb02fe57.
eal [Wed, 17 Jan 2018 22:22:08 +0000 (00:22 +0200)]
Add remote follow pages.
eal [Tue, 16 Jan 2018 00:17:55 +0000 (02:17 +0200)]
Add remote follow path to webfinger.
lambda [Tue, 16 Jan 2018 14:18:07 +0000 (14:18 +0000)]
Merge branch 'fix/background-profile-fetch' into 'develop'
Fetch external profile in the background.
See merge request pleroma/pleroma!49
eal [Tue, 16 Jan 2018 13:48:27 +0000 (15:48 +0200)]
Add a Caddyfile.
eal [Tue, 16 Jan 2018 13:31:03 +0000 (15:31 +0200)]
Fetch external profile in the background.
eal [Mon, 15 Jan 2018 20:26:49 +0000 (20:26 +0000)]
Merge branch 'default-pictures' into 'develop'
Add a default profile picture and banner.
See merge request pleroma/pleroma!48
eal [Mon, 15 Jan 2018 20:18:17 +0000 (22:18 +0200)]
Add a default profile picture and banner.
This removes the placehold.it dependency.
eal [Mon, 15 Jan 2018 17:44:49 +0000 (17:44 +0000)]
Merge branch 'prod.exs' into 'develop'
Correct prod.exs
See merge request pleroma/pleroma!47
eal [Mon, 15 Jan 2018 17:26:41 +0000 (17:26 +0000)]
Merge branch 'fix/pleroma.nginx' into 'develop'
Correct pleroma.nginx
See merge request pleroma/pleroma!46
lambda [Mon, 15 Jan 2018 08:04:54 +0000 (08:04 +0000)]
Merge branch 'stats-daemon' into 'develop'
Add a stats agent for storing data from expensive queries.
See merge request pleroma/pleroma!45
Hakaba Hitoyo [Sun, 14 Jan 2018 10:57:25 +0000 (10:57 +0000)]
Correct pleroma.nginx
Hakaba Hitoyo [Sun, 14 Jan 2018 08:54:28 +0000 (08:54 +0000)]
#95 Correct prod.exs
eal [Sun, 14 Jan 2018 06:28:35 +0000 (08:28 +0200)]
Fix instance test.
eal [Sun, 14 Jan 2018 06:15:11 +0000 (08:15 +0200)]
Move user count to stats agent.
eal [Sat, 13 Jan 2018 16:24:16 +0000 (18:24 +0200)]
Add a stats agent for storing data from expensive queries.
eal [Fri, 12 Jan 2018 20:57:31 +0000 (20:57 +0000)]
Merge branch 'add-mediaproxy-question-to-configgen' into 'develop'
added question about activating mediaproxy to config generator
See merge request pleroma/pleroma!44
eal [Fri, 12 Jan 2018 20:38:14 +0000 (22:38 +0200)]
Ask for proxy URL if proxy enabled.
Also change the true/false question to y/n
Sebastian Huebner [Tue, 9 Jan 2018 11:31:11 +0000 (12:31 +0100)]
added question about activating mediaproxy to config generator
Jeff Becker [Sun, 31 Dec 2017 14:25:00 +0000 (09:25 -0500)]
apply proxy settings to media_proxy
Jeff Becker [Sat, 30 Dec 2017 18:04:26 +0000 (13:04 -0500)]
clarify
Jeff Becker [Sat, 30 Dec 2017 18:02:51 +0000 (13:02 -0500)]
docs
Jeff Becker [Sat, 30 Dec 2017 16:35:53 +0000 (11:35 -0500)]
make httppoison use configurable http proxy
eal [Sat, 23 Dec 2017 14:40:43 +0000 (16:40 +0200)]
Unlink follow import process from the one processing request.
Mistakes were made.
lambda [Fri, 22 Dec 2017 12:07:10 +0000 (12:07 +0000)]
Merge branch 'media-proxy-fix-encoding' into 'develop'
Remove a useless URI.encode call in MediaProxy
See merge request pleroma/pleroma!42
href [Thu, 21 Dec 2017 19:59:10 +0000 (20:59 +0100)]
Remove a useless URI.encode call in MediaProxy
lambda [Wed, 20 Dec 2017 14:22:24 +0000 (14:22 +0000)]
Merge branch 'media-proxy' into 'develop'
Media proxy
See merge request pleroma/pleroma!34
Lain Iwakura [Tue, 19 Dec 2017 15:15:45 +0000 (16:15 +0100)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Lain Iwakura [Tue, 19 Dec 2017 15:15:07 +0000 (16:15 +0100)]
Fix timelines in subway tooter.
lambda [Mon, 18 Dec 2017 22:44:15 +0000 (22:44 +0000)]
Merge branch 'fix/twitterapi-follow-lists' into 'develop'
Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41
Lain Iwakura [Mon, 18 Dec 2017 15:56:03 +0000 (16:56 +0100)]
MastoAPI: Fix always-sensitive bugs.
Lain Iwakura [Mon, 18 Dec 2017 15:16:22 +0000 (16:16 +0100)]
Send out salmons before websub.
eal [Mon, 18 Dec 2017 14:23:04 +0000 (16:23 +0200)]
Fix follower/following lists.
Add tests.
lambda [Mon, 18 Dec 2017 10:59:57 +0000 (10:59 +0000)]
Merge branch 'feature/follow-import' into 'develop'
Add follow import.
See merge request pleroma/pleroma!40
eal [Tue, 12 Dec 2017 19:04:41 +0000 (21:04 +0200)]
Run follow import in the background.
eal [Tue, 12 Dec 2017 19:03:28 +0000 (21:03 +0200)]
Allow uploading a file for follow import.
eal [Tue, 12 Dec 2017 16:35:23 +0000 (18:35 +0200)]
Add follow import.
href [Tue, 12 Dec 2017 11:30:24 +0000 (12:30 +0100)]
proxy emojis
(i fix emojos better than gargon but sshhhhh)
href [Tue, 12 Dec 2017 10:45:55 +0000 (11:45 +0100)]
fix content-type and fallback to image/jpeg
eal [Mon, 11 Dec 2017 19:01:36 +0000 (21:01 +0200)]
Fix some more tests.
eal [Mon, 11 Dec 2017 16:41:03 +0000 (18:41 +0200)]
Fix tests.
lambda [Mon, 11 Dec 2017 16:21:43 +0000 (16:21 +0000)]
Merge branch 'fix/tootdon-mentions' into 'develop'
Fix Tootdon linking the whole status when mentioning someone.
See merge request pleroma/pleroma!39
eal [Mon, 11 Dec 2017 16:14:33 +0000 (18:14 +0200)]
Add a bunch of useless HTML to mentions.
href [Mon, 11 Dec 2017 01:45:28 +0000 (02:45 +0100)]
Merge remote-tracking branch 'upstream/develop' into media-proxy
href [Mon, 11 Dec 2017 01:40:19 +0000 (02:40 +0100)]
nginx sample config, quickly tested
href [Mon, 11 Dec 2017 01:31:37 +0000 (02:31 +0100)]
Limit body size to 25MB
Roger Braun [Sat, 9 Dec 2017 09:10:45 +0000 (10:10 +0100)]
Merge branch 'feature/user_deletion' into develop
Lain Iwakura [Fri, 8 Dec 2017 17:17:30 +0000 (18:17 +0100)]
Delete notifications on activity deletion.
Lain Iwakura [Fri, 8 Dec 2017 16:50:11 +0000 (17:50 +0100)]
Basic user deletion.
lambda [Fri, 8 Dec 2017 12:34:03 +0000 (12:34 +0000)]
Merge branch 'fix/linkify' into 'develop'
Fix links with HTML elements and/or parentheses.
See merge request pleroma/pleroma!38
lambda [Fri, 8 Dec 2017 12:32:33 +0000 (12:32 +0000)]
Merge branch 'fix/mastoapi-attachment-linking' into 'develop'
MastoAPI: don't add attachment links.
Closes #92
See merge request pleroma/pleroma!37
lambda [Fri, 8 Dec 2017 12:31:14 +0000 (12:31 +0000)]
Merge branch 'postgresetup' into 'develop'
first version of safe DB setup
See merge request pleroma/pleroma!32
eal [Thu, 7 Dec 2017 19:38:31 +0000 (21:38 +0200)]
Allow parentheses in links.
projects / akkoma / log