Dashie [Wed, 2 May 2018 20:36:19 +0000 (22:36 +0200)]
Add localPosts count, also set to 0 if null
Dashie [Wed, 2 May 2018 20:16:19 +0000 (22:16 +0200)]
Change path of nodeinfo to use .json format
Dashie [Wed, 2 May 2018 19:43:12 +0000 (21:43 +0200)]
Format files
Dashie [Wed, 2 May 2018 19:31:42 +0000 (21:31 +0200)]
Add first try at nodeinfo
lain [Sun, 29 Apr 2018 14:56:13 +0000 (16:56 +0200)]
update frontend
lain [Sun, 29 Apr 2018 09:28:26 +0000 (11:28 +0200)]
Fix format.
lambda [Sun, 29 Apr 2018 09:26:47 +0000 (09:26 +0000)]
Merge branch 'patch-bio' into 'develop'
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
lain [Sat, 28 Apr 2018 14:10:24 +0000 (16:10 +0200)]
Insert object after being rewritten.
lambda [Sat, 28 Apr 2018 13:49:12 +0000 (13:49 +0000)]
Merge branch 'fix/blocked-user-boosts' into 'develop'
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
Wim Vanderbauwhede [Sat, 28 Apr 2018 11:01:43 +0000 (12:01 +0100)]
Added a test (written by @andrewzah) for the MR
Wim Vanderbauwhede [Sat, 28 Apr 2018 10:59:01 +0000 (11:59 +0100)]
Merge remote-tracking branch 'upstream/develop' into patch-bio
lambda [Fri, 27 Apr 2018 05:49:12 +0000 (05:49 +0000)]
Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
ActivityPub MRF SimplePolicy: fix media stripping
See merge request pleroma/pleroma!133
lain [Thu, 26 Apr 2018 05:07:04 +0000 (07:07 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Thu, 26 Apr 2018 05:06:32 +0000 (07:06 +0200)]
Resurrect instance specific panel.
William Pitcock [Wed, 25 Apr 2018 21:25:56 +0000 (21:25 +0000)]
ActivityPub MRF SimplePolicy: fix media stripping
eal [Wed, 25 Apr 2018 14:35:44 +0000 (14:35 +0000)]
Merge branch 'patch-1' into 'develop'
Fix typo in MastoFE login page.
See merge request pleroma/pleroma!132
lain [Wed, 25 Apr 2018 14:10:18 +0000 (16:10 +0200)]
Optionally deactivate public timelines.
lain [Wed, 25 Apr 2018 13:41:59 +0000 (15:41 +0200)]
Align local bio limits to remote limit.
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
lambda [Tue, 24 Apr 2018 19:26:01 +0000 (19:26 +0000)]
Merge branch 'gitignore' into 'develop'
Gitignore
See merge request pleroma/pleroma!131
lain [Tue, 24 Apr 2018 19:25:31 +0000 (21:25 +0200)]
Fix formatting.
Rachel H [Tue, 24 Apr 2018 19:18:23 +0000 (12:18 -0700)]
Add common files to gitignore
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
lambda [Tue, 24 Apr 2018 12:28:59 +0000 (12:28 +0000)]
Update .gitlab-ci.yml
Wim Vanderbauwhede [Tue, 24 Apr 2018 12:28:55 +0000 (13:28 +0100)]
Changed to support \r\n and \n
lain [Tue, 24 Apr 2018 12:25:17 +0000 (14:25 +0200)]
Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into develop
Wim Vanderbauwhede [Tue, 24 Apr 2018 12:20:17 +0000 (13:20 +0100)]
Patch to replace newlines with <br> tags in bio
Dashie [Tue, 24 Apr 2018 12:12:23 +0000 (14:12 +0200)]
Correct syntax with mix format
Dashie [Tue, 24 Apr 2018 09:34:18 +0000 (11:34 +0200)]
Add User.decrease_note_count and call it from ActivityPub.delete
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
lain [Mon, 23 Apr 2018 17:23:45 +0000 (19:23 +0200)]
update frontend
lain [Mon, 23 Apr 2018 17:09:24 +0000 (19:09 +0200)]
update frontend
lain [Sun, 22 Apr 2018 08:01:10 +0000 (10:01 +0200)]
Small cleanup.
lain [Sun, 22 Apr 2018 07:56:24 +0000 (09:56 +0200)]
Merge branch 'develop' into fix/note-count-not-updating
lain [Sat, 21 Apr 2018 16:28:24 +0000 (18:28 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sat, 21 Apr 2018 16:24:45 +0000 (18:24 +0200)]
Formatter: Use proper escaping for links.
eal [Sat, 21 Apr 2018 09:58:04 +0000 (12:58 +0300)]
Update note count in ActivityPub.create.
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
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
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
lambda [Sat, 21 Apr 2018 07:57:33 +0000 (07:57 +0000)]
Update README.md
lain [Sat, 21 Apr 2018 07:43:53 +0000 (09:43 +0200)]
Formatting fixes.
lain [Sat, 21 Apr 2018 07:34:23 +0000 (09:34 +0200)]
add formatter
lain [Sat, 21 Apr 2018 07:30:15 +0000 (09:30 +0200)]
.
lain [Sat, 21 Apr 2018 07:28:44 +0000 (09:28 +0200)]
.
lain [Sat, 21 Apr 2018 07:27:35 +0000 (09:27 +0200)]
..
lain [Sat, 21 Apr 2018 07:24:51 +0000 (09:24 +0200)]
Update CI.
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.
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.
csaurus [Fri, 20 Apr 2018 22:43:49 +0000 (18:43 -0400)]
Add info about certbot with the webroot plugin to pleroma.nginx
Kawen [Fri, 20 Apr 2018 17:21:48 +0000 (19:21 +0200)]
formatting
Kawen [Fri, 20 Apr 2018 17:04:57 +0000 (19:04 +0200)]
enable instance panel by default, added some content
lain [Fri, 20 Apr 2018 11:10:57 +0000 (13:10 +0200)]
Formatting.
lain [Fri, 20 Apr 2018 11:09:41 +0000 (13:09 +0200)]
Add format checking to CI.
lain [Thu, 19 Apr 2018 19:44:29 +0000 (21:44 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Thu, 19 Apr 2018 19:44:11 +0000 (21:44 +0200)]
fix again
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
eal [Thu, 19 Apr 2018 18:46:59 +0000 (21:46 +0300)]
TwitterAPI: Add Qvitter notification endpoint.
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
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)
lain [Thu, 19 Apr 2018 11:04:29 +0000 (13:04 +0200)]
fix again
lain [Thu, 19 Apr 2018 10:50:25 +0000 (12:50 +0200)]
Fix generate config
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.
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.
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
William Pitcock [Wed, 18 Apr 2018 20:30:59 +0000 (20:30 +0000)]
CommonAPI post: kill \r with fire
eal [Wed, 18 Apr 2018 14:52:25 +0000 (17:52 +0300)]
rm_user: also ensure that cache is running.
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
eal [Wed, 18 Apr 2018 14:39:27 +0000 (17:39 +0300)]
Fix rm_user task.
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
eal [Wed, 18 Apr 2018 10:13:57 +0000 (13:13 +0300)]
MastoAPI and OAuth: allow login with either email or username.
lain [Tue, 17 Apr 2018 09:09:19 +0000 (11:09 +0200)]
update frontend
William Pitcock [Sat, 14 Apr 2018 11:31:12 +0000 (11:31 +0000)]
ActivityPub MRF: implement the SimplePolicy policy
William Pitcock [Sat, 14 Apr 2018 09:20:18 +0000 (09:20 +0000)]
ActivityPub: implement MRF core hook and baseline noop policy object
eal [Sat, 14 Apr 2018 11:26:20 +0000 (14:26 +0300)]
ActivityPub.ex: do not return boosted statuses from blocked users.
lambda [Fri, 13 Apr 2018 09:46:58 +0000 (09:46 +0000)]
Update README.md
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
Phenethylamine [Thu, 12 Apr 2018 18:30:53 +0000 (14:30 -0400)]
Switch to User.delete for rm_user task
Phenethylamine [Thu, 12 Apr 2018 06:43:48 +0000 (02:43 -0400)]
Add rm_user mix task
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
lain [Wed, 11 Apr 2018 20:03:28 +0000 (22:03 +0200)]
update frontend
lain [Wed, 11 Apr 2018 19:55:38 +0000 (21:55 +0200)]
update frontend
Gian Sass [Wed, 11 Apr 2018 19:51:02 +0000 (15:51 -0400)]
Oops
Gian Sass [Wed, 11 Apr 2018 19:48:32 +0000 (15:48 -0400)]
Add unit test for pinned statuses
Gian Sass [Wed, 11 Apr 2018 18:55:49 +0000 (14:55 -0400)]
Fix issue #124
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
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
lain [Tue, 10 Apr 2018 19:05:53 +0000 (21:05 +0200)]
Fix register_user task.
lain [Tue, 10 Apr 2018 16:38:52 +0000 (18:38 +0200)]
Order masto searches by date.
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
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
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.
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
Stanislas [Tue, 10 Apr 2018 08:08:27 +0000 (08:08 +0000)]
Indentation for Apache vhost
Morgan Bazalgette [Mon, 9 Apr 2018 20:00:42 +0000 (22:00 +0200)]
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
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
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
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
nepfag [Sun, 8 Apr 2018 19:22:24 +0000 (19:22 +0000)]
Apache config for everything on one host.
projects / akkoma / log