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
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
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.
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.
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
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
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
William Pitcock [Sat, 7 Apr 2018 22:27:00 +0000 (22:27 +0000)]
mastodon api: implement /api/v1/lists stub
lain [Sat, 7 Apr 2018 14:41:47 +0000 (16:41 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
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.
lain [Sat, 7 Apr 2018 14:35:55 +0000 (16:35 +0200)]
Update Readme.
eal [Sat, 7 Apr 2018 14:26:56 +0000 (17:26 +0300)]
MastoAPI: Persist frontend timelines and settings.
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
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
eal [Sat, 7 Apr 2018 11:54:34 +0000 (14:54 +0300)]
Follow import: allow URI in addition to screen_name.
William Pitcock [Tue, 3 Apr 2018 19:43:59 +0000 (19:43 +0000)]
XML: use try/catch with XPath functions
lain [Fri, 6 Apr 2018 14:35:54 +0000 (16:35 +0200)]
Accept port number in urls.
lain [Thu, 5 Apr 2018 11:59:53 +0000 (13:59 +0200)]
MastodonAPI search: return only create activities.
lambda [Thu, 5 Apr 2018 11:15:02 +0000 (11:15 +0000)]
Delete Caddyfile
It doesn't work correctly.
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
RX14 [Thu, 5 Apr 2018 10:46:33 +0000 (11:46 +0100)]
Fix failure to serve media from custom upload path
lain [Wed, 4 Apr 2018 13:23:27 +0000 (15:23 +0200)]
TwitterAPI: Don't put follows into the public tls.
lain [Wed, 4 Apr 2018 09:29:03 +0000 (11:29 +0200)]
Handle + in links.
lain [Tue, 3 Apr 2018 16:34:07 +0000 (18:34 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Tue, 3 Apr 2018 16:32:46 +0000 (18:32 +0200)]
Use user url in mention if we have it.
lambda [Mon, 2 Apr 2018 17:05:02 +0000 (17:05 +0000)]
Merge branch 'mastofe-
5edce2030238293463c041537da4aaeea5cb3875' into 'develop'
Bring mastofe up to date
See merge request pleroma/pleroma!93
Morgan Bazalgette [Mon, 2 Apr 2018 16:31:57 +0000 (18:31 +0200)]
Bring mastofe up to date
Commit https://git.pleroma.social/tyge/mastofe/commit/
5edce2030238293463c041537da4aaeea5cb3875
summary:
```
*
5edce203 - (4 minutes ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette (HEAD -> master, origin/master, origin/HEAD)
|\
| *
2c51bc0c - (4 hours ago) Add missing rejection handling for Promises (#7008) - unarist (upstream/master)
| *
e7a17167 - (5 hours ago) Implement the ability for an Administrator or Moderator to remove an account avatar (#6998) - Emelia Smith
| *
4fd71acc - (5 hours ago) Fix issues with sending direct messages from user profile (#6999) - Emelia Smith
| *
3f51c6ef - (5 hours ago) Weblate translations (2018-04-02) (#7007) - Yamagishi Kazutoshi
| *
b04f73ce - (6 hours ago) Russian language updated (#7005) - Evgeny Petrov
| *
24611d8d - (6 hours ago) i18n: update zh-HK translation (#7004) - luzi82
| *
f890d2a7 - (16 hours ago) Support all ActivityPub actor types (#6997) - Eugen Rochko
| *
33513753 - (16 hours ago) Fix unpermitted parameters warning when generating pagination URLs (#6995) - Eugen Rochko
| *
123a343d - (19 hours ago) [WIP] Enable custom emoji on account pages and in the sidebar (#6124) - David Underwood
| *
f464f98f - (19 hours ago) Update Ruby to version 2.4.4 (#6964) - Yamagishi Kazutoshi
| *
6a895e1a - (20 hours ago) Fix: Prevent submission using same logic as submit button disabling. (#6993) - Emelia Smith
* |
011eda08 - (7 minutes ago) Properly cache requests using service workers - Morgan Bazalgette
* |
8dd77f17 - (5 hours ago) Fix build - Morgan Bazalgette
* |
99373236 - (19 hours ago) Add build status - Morgan Bazalgette
* |
b448a3a5 - (19 hours ago) Update README - Morgan Bazalgette
* |
68fd7ee6 - (20 hours ago) Fix statuses embedded in like/boost notifs being white - Morgan Bazalgette
* |
7a9212df - (21 hours ago) Temporary workaround to only show related statuses - Morgan Bazalgette
* |
00bd10fa - (26 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette
|\ \
| |/
| *
993ce0e5 - (28 hours ago) improve zh-HK localization by referring zh-TW and zh-CN (#6988) - luzi82
* |
05832497 - (30 hours ago) Merge branch 'master' of github.com:tootsuite/mastodon - Morgan Bazalgette
\ \
|/
*
929f58f1 - (32 hours ago) i18n: Update Polish translation (#6985) - Marcin Mikołajczak
```
lain [Mon, 2 Apr 2018 14:27:36 +0000 (16:27 +0200)]
Load all users at once in timelines.
lain [Mon, 2 Apr 2018 13:29:05 +0000 (15:29 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Mon, 2 Apr 2018 13:28:35 +0000 (15:28 +0200)]
Use context_ids directly if we have them.
lain [Mon, 2 Apr 2018 13:17:09 +0000 (15:17 +0200)]
Generates contexts and ids on insertion time.
lain [Mon, 2 Apr 2018 12:46:56 +0000 (14:46 +0200)]
Pre-fetch conversation ids.
lambda [Mon, 2 Apr 2018 11:24:12 +0000 (11:24 +0000)]
Merge branch 'fix-107' into 'develop'
masto api: run emojis through mediaproxy
Closes #107
See merge request pleroma/pleroma!92
lain [Mon, 2 Apr 2018 11:15:38 +0000 (13:15 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Mon, 2 Apr 2018 11:13:14 +0000 (13:13 +0200)]
Fail faster.
projects / akkoma / log