lain [Sun, 13 May 2018 08:56:44 +0000 (10:56 +0200)]
Format.
lain [Sun, 13 May 2018 08:56:11 +0000 (10:56 +0200)]
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
lambda [Sun, 13 May 2018 08:39:37 +0000 (08:39 +0000)]
Merge branch 'patch-2' into 'develop'
Nginx config - secure defaults
See merge request pleroma/pleroma!146
lambda [Sun, 13 May 2018 08:34:58 +0000 (08:34 +0000)]
Merge branch 'feld-varnish' into 'develop'
More varnish fixes
See merge request pleroma/pleroma!149
lambda [Sun, 13 May 2018 08:24:18 +0000 (08:24 +0000)]
Merge branch 'feature/chain-policies' into 'develop'
chain policies
See merge request pleroma/pleroma!150
lambda [Sun, 13 May 2018 08:16:54 +0000 (08:16 +0000)]
Merge branch 'no-self-notification' into 'develop'
Do not create notification for yourself
Closes #121
See merge request pleroma/pleroma!148
Pierrick Brun [Mon, 7 May 2018 18:51:14 +0000 (20:51 +0200)]
do not create notification for yourself
lambda [Fri, 11 May 2018 07:18:25 +0000 (07:18 +0000)]
Merge branch 'patch-1' into 'develop'
Remove alias directive in service file
See merge request pleroma/pleroma!151
Normandy [Fri, 11 May 2018 05:19:20 +0000 (05:19 +0000)]
Remove alias directive in service file
Systemd will complain otherwise.
href [Thu, 10 May 2018 16:51:58 +0000 (18:51 +0200)]
format & made get_policies/1 private
href [Thu, 10 May 2018 16:34:09 +0000 (18:34 +0200)]
Chain policies
- The `:pleroma, :instance, :rewrite_policy` can now be either a policy
or a list of policies
- Made a behaviour for MRF policies
Mark Felder [Mon, 7 May 2018 23:44:40 +0000 (23:44 +0000)]
Don't strip headers from backend for /notice/ either
Mark Felder [Mon, 7 May 2018 23:43:27 +0000 (23:43 +0000)]
Caching notice URLs does not produce pleasant results
lain [Mon, 7 May 2018 16:11:37 +0000 (18:11 +0200)]
More warning fixes.
lambda [Sun, 6 May 2018 18:43:57 +0000 (18:43 +0000)]
Merge branch 'feld-varnish' into 'develop'
Caching /objects/ URLs breaks them in Mastoweb as they don't redirect to the /notice/
See merge request pleroma/pleroma!110
lambda [Sun, 6 May 2018 18:42:31 +0000 (18:42 +0000)]
Merge branch 'feld-warnings' into 'develop'
Clean up warnings
See merge request pleroma/pleroma!144
lambda [Sun, 6 May 2018 18:41:46 +0000 (18:41 +0000)]
Merge branch 'fix/unsafe-variables' into 'develop'
Get rid of unsafe variables.
See merge request pleroma/pleroma!145
Artik Banana [Sun, 6 May 2018 14:19:29 +0000 (14:19 +0000)]
Added headers for a more secure default.
eal [Sun, 6 May 2018 06:58:59 +0000 (09:58 +0300)]
Get rid of unsafe variables.
lain [Sat, 5 May 2018 11:41:27 +0000 (13:41 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sat, 5 May 2018 11:40:47 +0000 (13:40 +0200)]
Streamer: Don't send out stream events for blocked users.
lain [Sat, 5 May 2018 11:40:31 +0000 (13:40 +0200)]
Unify wss uri generation.
lambda [Sat, 5 May 2018 09:58:17 +0000 (09:58 +0000)]
Merge branch 'feld-test.secret' into 'develop'
Make it possible to use custom database connection parameters
See merge request pleroma/pleroma!143
lain [Sat, 5 May 2018 09:15:57 +0000 (11:15 +0200)]
Idempotency: Use special cache, keep for 6 hours.
Mark Felder [Fri, 4 May 2018 22:31:46 +0000 (22:31 +0000)]
Group def renders here as well
Mark Felder [Fri, 4 May 2018 22:28:13 +0000 (22:28 +0000)]
Group def renders together to fix warning
Mark Felder [Fri, 4 May 2018 22:05:19 +0000 (22:05 +0000)]
Merge branch 'feld-test.secret' into feld-warnings
Mark Felder [Fri, 4 May 2018 22:05:01 +0000 (22:05 +0000)]
Speling
Mark Felder [Fri, 4 May 2018 22:03:14 +0000 (22:03 +0000)]
Fix formatting
Mark Felder [Fri, 4 May 2018 21:59:21 +0000 (21:59 +0000)]
Group response declarations together
Mark Felder [Fri, 4 May 2018 21:53:52 +0000 (21:53 +0000)]
That last change was stupid. Multiline comments in Elixir don't really exist.
Instead we'll just pad with # intstead of playing stupid games with the compiler.
Mark Felder [Fri, 4 May 2018 21:48:30 +0000 (21:48 +0000)]
Dirty hack to remove the warning
warning: code block contains unused literal "internal -> Mastodon\n" (remove the literal or assign it to _ to avoid warnings)
lib/pleroma/web/activity_pub/transmogrifier.ex
Mark Felder [Fri, 4 May 2018 21:42:20 +0000 (21:42 +0000)]
Fix unused variables, imports, and aliases
Mark Felder [Fri, 4 May 2018 21:26:33 +0000 (21:26 +0000)]
Fix build. Too eager with the fixing of unused variables.
== Compilation error in file lib/pleroma/web/activity_pub/views/user_view.ex ==
** (CompileError) lib/pleroma/web/activity_pub/views/user_view.ex:54: undefined function _total/0
(stdlib) lists.erl:1338: :lists.foreach/2
(stdlib) erl_eval.erl:670: :erl_eval.do_apply/6
Mark Felder [Fri, 4 May 2018 21:25:31 +0000 (21:25 +0000)]
Clean up unused aliases and imports
lain [Fri, 4 May 2018 21:16:16 +0000 (23:16 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Mark Felder [Fri, 4 May 2018 21:16:02 +0000 (21:16 +0000)]
More unused variables
lain [Fri, 4 May 2018 21:15:33 +0000 (23:15 +0200)]
update frontend
Mark Felder [Fri, 4 May 2018 21:02:14 +0000 (21:02 +0000)]
Merge branch 'feld-test.secret' into feld-warnings
Mark Felder [Fri, 4 May 2018 21:00:18 +0000 (21:00 +0000)]
Make it possible to use custom database connection parameters
Mark Felder [Fri, 4 May 2018 20:59:01 +0000 (20:59 +0000)]
Fix a bunch of unused variable warnings
lambda [Fri, 4 May 2018 19:17:19 +0000 (19:17 +0000)]
Merge branch 'feature/nodeinfo' into 'develop'
Implements the nodeinfo endpoints
See merge request pleroma/pleroma!140
lain [Fri, 4 May 2018 19:15:39 +0000 (21:15 +0200)]
Don't expire idempotency cache for five minutes.
lain [Fri, 4 May 2018 18:30:29 +0000 (20:30 +0200)]
MastodonAPI: Support idempotency key.
Dashie [Thu, 3 May 2018 13:31:39 +0000 (15:31 +0200)]
Use a variable for stats to avoid double call
Dashie [Thu, 3 May 2018 08:52:20 +0000 (10:52 +0200)]
Add metadata.nodeName
Dashie [Thu, 3 May 2018 08:50:02 +0000 (10:50 +0200)]
Return the right content-type for the schema call
Dashie [Wed, 2 May 2018 20:45:20 +0000 (22:45 +0200)]
Explicit error message
Dashie [Wed, 2 May 2018 20:44:13 +0000 (22:44 +0200)]
Simplify version and fix typo
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
William Pitcock [Sun, 29 Apr 2018 02:53:19 +0000 (02:53 +0000)]
ActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy as for blocks
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
projects / akkoma / log