akkoma
6 years agoFix typo in MastoFE login page.
Normandy [Tue, 24 Apr 2018 21:58:45 +0000 (21:58 +0000)]
Fix typo in MastoFE login page.

see https://git.pleroma.social/pleroma/mastofe/issues/13

6 years agoMerge branch 'gitignore' into 'develop'
lambda [Tue, 24 Apr 2018 19:26:01 +0000 (19:26 +0000)]
Merge branch 'gitignore' into 'develop'

Gitignore

See merge request pleroma/pleroma!131

6 years agoFix formatting.
lain [Tue, 24 Apr 2018 19:25:31 +0000 (21:25 +0200)]
Fix formatting.

6 years agoAdd common files to gitignore
Rachel H [Tue, 24 Apr 2018 19:18:23 +0000 (12:18 -0700)]
Add common files to gitignore

6 years agoMerge branch 'feature/message-rewrite-facility' into 'develop'
lambda [Tue, 24 Apr 2018 17:21:28 +0000 (17:21 +0000)]
Merge branch 'feature/message-rewrite-facility' into 'develop'

message rewrite facility

See merge request pleroma/pleroma!112

6 years agoUpdate .gitlab-ci.yml
lambda [Tue, 24 Apr 2018 12:28:59 +0000 (12:28 +0000)]
Update .gitlab-ci.yml

6 years agoMerge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop
lain [Tue, 24 Apr 2018 12:25:17 +0000 (14:25 +0200)]
Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop

6 years agoCorrect syntax with mix format
Dashie [Tue, 24 Apr 2018 12:12:23 +0000 (14:12 +0200)]
Correct syntax with mix format

6 years agoAdd User.decrease_note_count and call it from ActivityPub.delete
Dashie [Tue, 24 Apr 2018 09:34:18 +0000 (11:34 +0200)]
Add User.decrease_note_count and call it from ActivityPub.delete

6 years agoMerge branch 'favicon_tag' into 'develop'
lambda [Tue, 24 Apr 2018 05:54:28 +0000 (05:54 +0000)]
Merge branch 'favicon_tag' into 'develop'

Fix endpoint for favicon

See merge request pleroma/pleroma!84

6 years agoupdate frontend
lain [Mon, 23 Apr 2018 17:23:45 +0000 (19:23 +0200)]
update frontend

6 years agoupdate frontend
lain [Mon, 23 Apr 2018 17:09:24 +0000 (19:09 +0200)]
update frontend

6 years agoSmall cleanup.
lain [Sun, 22 Apr 2018 08:01:10 +0000 (10:01 +0200)]
Small cleanup.

6 years agoMerge branch 'develop' into fix/note-count-not-updating
lain [Sun, 22 Apr 2018 07:56:24 +0000 (09:56 +0200)]
Merge branch 'develop' into fix/note-count-not-updating

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sat, 21 Apr 2018 16:28:24 +0000 (18:28 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoFormatter: Use proper escaping for links.
lain [Sat, 21 Apr 2018 16:24:45 +0000 (18:24 +0200)]
Formatter: Use proper escaping for links.

6 years agoUpdate note count in ActivityPub.create.
eal [Sat, 21 Apr 2018 09:58:04 +0000 (12:58 +0300)]
Update note count in ActivityPub.create.

6 years agoMerge branch '146-enable-custom-panel-by-default-and-have-default-content' into ...
lambda [Sat, 21 Apr 2018 08:05:36 +0000 (08:05 +0000)]
Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop'

Resolve "Enable custom panel by default and have default content"

Closes #146

See merge request pleroma/pleroma!124

6 years agoMerge branch 'readme-update' into 'develop'
lambda [Sat, 21 Apr 2018 08:05:04 +0000 (08:05 +0000)]
Merge branch 'readme-update' into 'develop'

Elaborate on setup steps and CLI commands.

See merge request pleroma/pleroma!126

6 years agoMerge branch 'nginx-certbot-doc' into 'develop'
lambda [Sat, 21 Apr 2018 07:59:49 +0000 (07:59 +0000)]
Merge branch 'nginx-certbot-doc' into 'develop'

Add info about certbot with the webroot plugin to pleroma.nginx

See merge request pleroma/pleroma!125

6 years agoUpdate README.md
lambda [Sat, 21 Apr 2018 07:57:33 +0000 (07:57 +0000)]
Update README.md

6 years agoFormatting fixes.
lain [Sat, 21 Apr 2018 07:43:53 +0000 (09:43 +0200)]
Formatting fixes.

6 years agoadd formatter
lain [Sat, 21 Apr 2018 07:34:23 +0000 (09:34 +0200)]
add formatter

6 years ago.
lain [Sat, 21 Apr 2018 07:30:15 +0000 (09:30 +0200)]
.

6 years ago.
lain [Sat, 21 Apr 2018 07:28:44 +0000 (09:28 +0200)]
.

6 years ago..
lain [Sat, 21 Apr 2018 07:27:35 +0000 (09:27 +0200)]
..

6 years agoUpdate CI.
lain [Sat, 21 Apr 2018 07:24:51 +0000 (09:24 +0200)]
Update CI.

6 years agoMake search use id index too.
lain [Sat, 21 Apr 2018 07:22:31 +0000 (09:22 +0200)]
Make search use id index too.

Seems to be faster in general, query planner chooses well.

6 years agoElaborate on setup steps and CLI commands.
csaurus [Fri, 20 Apr 2018 22:17:01 +0000 (18:17 -0400)]
Elaborate on setup steps and CLI commands.

* How to use MIX_ENV

* How to create a user

* Link to certbot's site with the webform which advises how to obtain
  a certificate based on web server/OS.

6 years agoAdd info about certbot with the webroot plugin to pleroma.nginx
csaurus [Fri, 20 Apr 2018 22:43:49 +0000 (18:43 -0400)]
Add info about certbot with the webroot plugin to pleroma.nginx

6 years agoformatting
Kawen [Fri, 20 Apr 2018 17:21:48 +0000 (19:21 +0200)]
formatting

6 years agoenable instance panel by default, added some content
Kawen [Fri, 20 Apr 2018 17:04:57 +0000 (19:04 +0200)]
enable instance panel by default, added some content

6 years agoFormatting.
lain [Fri, 20 Apr 2018 11:10:57 +0000 (13:10 +0200)]
Formatting.

6 years agoAdd format checking to CI.
lain [Fri, 20 Apr 2018 11:09:41 +0000 (13:09 +0200)]
Add format checking to CI.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Thu, 19 Apr 2018 19:44:29 +0000 (21:44 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agofix again
lain [Thu, 19 Apr 2018 19:44:11 +0000 (21:44 +0200)]
fix again

6 years agoMerge branch 'feature/qvitter-notification-endpoint' into 'develop'
lambda [Thu, 19 Apr 2018 19:03:35 +0000 (19:03 +0000)]
Merge branch 'feature/qvitter-notification-endpoint' into 'develop'

TwitterAPI: Add Qvitter notification endpoint.

Closes #142

See merge request pleroma/pleroma!123

6 years agoTwitterAPI: Add Qvitter notification endpoint.
eal [Thu, 19 Apr 2018 18:46:59 +0000 (21:46 +0300)]
TwitterAPI: Add Qvitter notification endpoint.

6 years agoMerge branch 'patch-2' into 'develop'
lambda [Thu, 19 Apr 2018 14:30:13 +0000 (14:30 +0000)]
Merge branch 'patch-2' into 'develop'

Ignore setup_db.psql and specify a folder for custom emojis

See merge request pleroma/pleroma!121

6 years agoActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right...
nenolod@dereferenced.org [Thu, 19 Apr 2018 12:29:35 +0000 (12:29 +0000)]
ActivityPub MRF: fix nsfw tagging of objects with attachments by looking at the right object (the child in this case)

6 years agofix again
lain [Thu, 19 Apr 2018 11:04:29 +0000 (13:04 +0200)]
fix again

6 years agoFix generate config
lain [Thu, 19 Apr 2018 10:50:25 +0000 (12:50 +0200)]
Fix generate config

6 years agoIgnore setup_db.psql and ignore a folder for custom emojis
Dominik V. Salonen [Thu, 19 Apr 2018 10:42:22 +0000 (10:42 +0000)]
Ignore setup_db.psql and ignore a folder for custom emojis

Wiki page should also be updated to recommend that admins put their custom emojis in /priv/static/emoji/custom/. This both makes for less hassle when doing a pull. And also prevents more mess in the /priv/static/emoji/ folder.

6 years agoRevert "Ask for proxy URL if proxy enabled."
eal [Thu, 19 Apr 2018 10:29:14 +0000 (13:29 +0300)]
Revert "Ask for proxy URL if proxy enabled."

The most common case is running it on the same server.

6 years agoMerge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'
lambda [Thu, 19 Apr 2018 07:41:09 +0000 (07:41 +0000)]
Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'

CommonAPI post: kill \r with fire

See merge request pleroma/pleroma!120

6 years agoCommonAPI post: kill \r with fire
William Pitcock [Wed, 18 Apr 2018 20:30:59 +0000 (20:30 +0000)]
CommonAPI post: kill \r with fire

6 years agorm_user: also ensure that cache is running.
eal [Wed, 18 Apr 2018 14:52:25 +0000 (17:52 +0300)]
rm_user: also ensure that cache is running.

6 years agoMerge branch 'fix/rm-user-task' into 'develop'
lambda [Wed, 18 Apr 2018 14:41:03 +0000 (14:41 +0000)]
Merge branch 'fix/rm-user-task' into 'develop'

Fix rm_user task.

See merge request pleroma/pleroma!119

6 years agoFix rm_user task.
eal [Wed, 18 Apr 2018 14:39:27 +0000 (17:39 +0300)]
Fix rm_user task.

6 years agoMerge branch 'fix/login-with-username-or-email' into 'develop'
lambda [Wed, 18 Apr 2018 11:26:38 +0000 (11:26 +0000)]
Merge branch 'fix/login-with-username-or-email' into 'develop'

MastoAPI and OAuth: allow login with either email or username.

See merge request pleroma/pleroma!118

6 years agoMastoAPI and OAuth: allow login with either email or username.
eal [Wed, 18 Apr 2018 10:13:57 +0000 (13:13 +0300)]
MastoAPI and OAuth: allow login with either email or username.

6 years agoupdate frontend
lain [Tue, 17 Apr 2018 09:09:19 +0000 (11:09 +0200)]
update frontend

6 years agoActivityPub MRF: implement the SimplePolicy policy
William Pitcock [Sat, 14 Apr 2018 11:31:12 +0000 (11:31 +0000)]
ActivityPub MRF: implement the SimplePolicy policy

6 years agoActivityPub: implement MRF core hook and baseline noop policy object
William Pitcock [Sat, 14 Apr 2018 09:20:18 +0000 (09:20 +0000)]
ActivityPub: implement MRF core hook and baseline noop policy object

6 years agoUpdate README.md
lambda [Fri, 13 Apr 2018 09:46:58 +0000 (09:46 +0000)]
Update README.md

6 years agoMerge branch 'mix_task_rm_user' into 'develop'
lambda [Fri, 13 Apr 2018 07:43:32 +0000 (07:43 +0000)]
Merge branch 'mix_task_rm_user' into 'develop'

Add rm_user mix task

See merge request pleroma/pleroma!109

6 years agoSwitch to User.delete for rm_user task
Phenethylamine [Thu, 12 Apr 2018 18:30:53 +0000 (14:30 -0400)]
Switch to User.delete for rm_user task

6 years agoAdd rm_user mix task
Phenethylamine [Thu, 12 Apr 2018 06:43:48 +0000 (02:43 -0400)]
Add rm_user mix task

6 years agoMerge branch 'develop' into 'develop'
lambda [Wed, 11 Apr 2018 20:58:25 +0000 (20:58 +0000)]
Merge branch 'develop' into 'develop'

Fix issue #124

Closes #124

See merge request pleroma/pleroma!108

6 years agoupdate frontend
lain [Wed, 11 Apr 2018 20:03:28 +0000 (22:03 +0200)]
update frontend

6 years agoupdate frontend
lain [Wed, 11 Apr 2018 19:55:38 +0000 (21:55 +0200)]
update frontend

6 years agoOops
Gian Sass [Wed, 11 Apr 2018 19:51:02 +0000 (15:51 -0400)]
Oops

6 years agoAdd unit test for pinned statuses
Gian Sass [Wed, 11 Apr 2018 19:48:32 +0000 (15:48 -0400)]
Add unit test for pinned statuses

6 years agoFix issue #124
Gian Sass [Wed, 11 Apr 2018 18:55:49 +0000 (14:55 -0400)]
Fix issue #124

6 years agoMerge branch 'feld-hackneyupdate' into 'develop'
lambda [Wed, 11 Apr 2018 14:27:52 +0000 (14:27 +0000)]
Merge branch 'feld-hackneyupdate' into 'develop'

Update httpoison to get the latest hackney.

See merge request pleroma/pleroma!107

6 years agoUpdate httpoison to get the latest hackney.
Mark Felder [Wed, 11 Apr 2018 13:55:54 +0000 (13:55 +0000)]
Update httpoison to get the latest hackney.

Works on my computer ^TM

6 years agoFix register_user task.
lain [Tue, 10 Apr 2018 19:05:53 +0000 (21:05 +0200)]
Fix register_user task.

6 years agoOrder masto searches by date.
lain [Tue, 10 Apr 2018 16:38:52 +0000 (18:38 +0200)]
Order masto searches by date.

6 years agoMerge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'
lambda [Tue, 10 Apr 2018 14:46:04 +0000 (14:46 +0000)]
Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'

Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec

See merge request pleroma/pleroma!104

6 years agoMerge branch 'feld-varnish' into 'develop'
lambda [Tue, 10 Apr 2018 14:45:46 +0000 (14:45 +0000)]
Merge branch 'feld-varnish' into 'develop'

Remove attempted caching of toots

See merge request pleroma/pleroma!106

6 years agoRemove attempted caching of toots
Mark Felder [Tue, 10 Apr 2018 14:17:23 +0000 (14:17 +0000)]
Remove attempted caching of toots

This does not work as expected. We should not attempt to be clever here.
Varnish will do the right thing if we just teach Pleroma to set headers
properly for content we know can be cached.

6 years agoMerge branch 'patch-1' into 'develop'
lambda [Tue, 10 Apr 2018 08:14:38 +0000 (08:14 +0000)]
Merge branch 'patch-1' into 'develop'

Indentation for Apache vhost

See merge request pleroma/pleroma!105

6 years agoIndentation for Apache vhost
Stanislas [Tue, 10 Apr 2018 08:08:27 +0000 (08:08 +0000)]
Indentation for Apache vhost

6 years agoBring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec
Morgan Bazalgette [Mon, 9 Apr 2018 20:00:42 +0000 (22:00 +0200)]
Bring mastofe up-to-date with 250c885de655ed0b45b76cc35c5782e019b5a0ec

6 years agoMerge branch 'bugfix/user-search-with-at-sign' into 'develop'
lambda [Mon, 9 Apr 2018 08:42:01 +0000 (08:42 +0000)]
Merge branch 'bugfix/user-search-with-at-sign' into 'develop'

user: strip leading @ from user query when searching for users if present

Closes #117

See merge request pleroma/pleroma!99

6 years agoMerge branch 'develop' into 'develop'
lambda [Mon, 9 Apr 2018 08:41:34 +0000 (08:41 +0000)]
Merge branch 'develop' into 'develop'

Fix max upload size in nginx config.

See merge request pleroma/pleroma!102

6 years agouser: strip leading @ from user query when searching for users if present
William Pitcock [Sat, 7 Apr 2018 21:44:55 +0000 (21:44 +0000)]
user: strip leading @ from user query when searching for users if present

closes #117

6 years agoMerge branch 'develop' into 'develop'
lambda [Mon, 9 Apr 2018 06:58:28 +0000 (06:58 +0000)]
Merge branch 'develop' into 'develop'

Apache config for everything on one host.

See merge request pleroma/pleroma!103

6 years agoApache config for everything on one host.
nepfag [Sun, 8 Apr 2018 19:22:24 +0000 (19:22 +0000)]
Apache config for everything on one host.

6 years agoFix max upload size in nginx config.
Hector A. Escobedo [Sun, 8 Apr 2018 15:15:04 +0000 (11:15 -0400)]
Fix max upload size in nginx config.

The built-in nginx default does not allow users to upload images
larger than 1 MB. This increases the maximum request size to match
the default Pleroma config upload_limit parameter. Some helpful
comments were also added.

6 years agoMerge branch 'feature/mastodon-api-for-tootstream' into 'develop'
lambda [Sun, 8 Apr 2018 06:02:11 +0000 (06:02 +0000)]
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'

mastodon api emulation improvements for tootstream

Closes #101

See merge request pleroma/pleroma!100

6 years agoMerge branch 'fix/persisted-mastofe-settings' into 'develop'
lambda [Sun, 8 Apr 2018 06:01:06 +0000 (06:01 +0000)]
Merge branch 'fix/persisted-mastofe-settings' into 'develop'

MastoAPI: Persist frontend timelines and settings.

Closes #113

See merge request pleroma/pleroma!98

6 years agomastodon api: report version as the Mastodon API version supported with the real...
William Pitcock [Sat, 7 Apr 2018 22:27:16 +0000 (22:27 +0000)]
mastodon api: report version as the Mastodon API version supported with the real version in parenthesis

6 years agomastodon api: implement /api/v1/lists stub
William Pitcock [Sat, 7 Apr 2018 22:27:00 +0000 (22:27 +0000)]
mastodon api: implement /api/v1/lists stub

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sat, 7 Apr 2018 14:41:47 +0000 (16:41 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoOnly search in public data for now.
lain [Sat, 7 Apr 2018 14:40:03 +0000 (16:40 +0200)]
Only search in public data for now.

This should be the data the user is allowed to see later, but this
will stop accidental private message leaks.

6 years agoUpdate Readme.
lain [Sat, 7 Apr 2018 14:35:55 +0000 (16:35 +0200)]
Update Readme.

6 years agoMastoAPI: Persist frontend timelines and settings.
eal [Sat, 7 Apr 2018 14:26:56 +0000 (17:26 +0300)]
MastoAPI: Persist frontend timelines and settings.

6 years agoMerge branch 'bugfix/html-webfinger-host-meta' into 'develop'
lambda [Sat, 7 Apr 2018 12:19:49 +0000 (12:19 +0000)]
Merge branch 'bugfix/html-webfinger-host-meta' into 'develop'

webfinger: handle situations where the well-known endpoint returns HTML

See merge request pleroma/pleroma!94

6 years agoMerge branch 'fix/follow-import-by-uri' into 'develop'
lambda [Sat, 7 Apr 2018 12:19:08 +0000 (12:19 +0000)]
Merge branch 'fix/follow-import-by-uri' into 'develop'

Follow import: allow URI in addition to screen_name.

See merge request pleroma/pleroma!96

6 years agoFollow import: allow URI in addition to screen_name.
eal [Sat, 7 Apr 2018 11:54:34 +0000 (14:54 +0300)]
Follow import: allow URI in addition to screen_name.

6 years agoXML: use try/catch with XPath functions
William Pitcock [Tue, 3 Apr 2018 19:43:59 +0000 (19:43 +0000)]
XML: use try/catch with XPath functions

6 years agoAccept port number in urls.
lain [Fri, 6 Apr 2018 14:35:54 +0000 (16:35 +0200)]
Accept port number in urls.

6 years agoMastodonAPI search: return only create activities.
lain [Thu, 5 Apr 2018 11:59:53 +0000 (13:59 +0200)]
MastodonAPI search: return only create activities.

6 years agoDelete Caddyfile
lambda [Thu, 5 Apr 2018 11:15:02 +0000 (11:15 +0000)]
Delete Caddyfile

It doesn't work correctly.

6 years agoMerge branch 'develop' into 'develop'
lambda [Thu, 5 Apr 2018 10:54:07 +0000 (10:54 +0000)]
Merge branch 'develop' into 'develop'

Fix failure to serve media from custom upload path

See merge request pleroma/pleroma!95

6 years agoFix failure to serve media from custom upload path
RX14 [Thu, 5 Apr 2018 10:46:33 +0000 (11:46 +0100)]
Fix failure to serve media from custom upload path

6 years agoTwitterAPI: Don't put follows into the public tls.
lain [Wed, 4 Apr 2018 13:23:27 +0000 (15:23 +0200)]
TwitterAPI: Don't put follows into the public tls.

6 years agoHandle + in links.
lain [Wed, 4 Apr 2018 09:29:03 +0000 (11:29 +0200)]
Handle + in links.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Tue, 3 Apr 2018 16:34:07 +0000 (18:34 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop