akkoma
6 years agoAdd direct_note[_activity]_factory and a couple tests
csaurus [Tue, 15 May 2018 01:48:06 +0000 (21:48 -0400)]
Add direct_note[_activity]_factory and a couple tests

6 years agoHandle cases where a to/cc field is absent on a status
csaurus [Tue, 15 May 2018 01:46:09 +0000 (21:46 -0400)]
Handle cases where a to/cc field is absent on a status

6 years agoPost direct status test
csaurus [Mon, 14 May 2018 01:21:42 +0000 (21:21 -0400)]
Post direct status test

6 years agoFormatting
csaurus [Sun, 13 May 2018 19:36:41 +0000 (15:36 -0400)]
Formatting

6 years agoFix tests.
csaurus [Sun, 13 May 2018 19:33:59 +0000 (15:33 -0400)]
Fix tests.

6 years agoapi/v1/timelines/direct implementation
csaurus [Fri, 11 May 2018 02:17:33 +0000 (22:17 -0400)]
api/v1/timelines/direct implementation

6 years agoStream function to handle direct messages.
csaurus [Fri, 11 May 2018 02:15:42 +0000 (22:15 -0400)]
Stream function to handle direct messages.

6 years agoDetect and try to stream incoming "direct" messages
csaurus [Fri, 11 May 2018 02:17:59 +0000 (22:17 -0400)]
Detect and try to stream incoming "direct" messages

6 years agoMore warning fixes.
lain [Mon, 7 May 2018 16:11:37 +0000 (18:11 +0200)]
More warning fixes.

6 years agoMerge branch 'feld-varnish' into 'develop'
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

6 years agoMerge branch 'feld-warnings' into 'develop'
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

6 years agoMerge branch 'fix/unsafe-variables' into 'develop'
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

6 years agoGet rid of unsafe variables.
eal [Sun, 6 May 2018 06:58:59 +0000 (09:58 +0300)]
Get rid of unsafe variables.

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Sat, 5 May 2018 11:41:27 +0000 (13:41 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoStreamer: Don't send out stream events for blocked users.
lain [Sat, 5 May 2018 11:40:47 +0000 (13:40 +0200)]
Streamer: Don't send out stream events for blocked users.

6 years agoUnify wss uri generation.
lain [Sat, 5 May 2018 11:40:31 +0000 (13:40 +0200)]
Unify wss uri generation.

6 years agoMerge branch 'feld-test.secret' into 'develop'
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

6 years agoIdempotency: Use special cache, keep for 6 hours.
lain [Sat, 5 May 2018 09:15:57 +0000 (11:15 +0200)]
Idempotency: Use special cache, keep for 6 hours.

6 years agoGroup def renders here as well
Mark Felder [Fri, 4 May 2018 22:31:46 +0000 (22:31 +0000)]
Group def renders here as well

6 years agoGroup def renders together to fix warning
Mark Felder [Fri, 4 May 2018 22:28:13 +0000 (22:28 +0000)]
Group def renders together to fix warning

6 years agoMerge branch 'feld-test.secret' into feld-warnings
Mark Felder [Fri, 4 May 2018 22:05:19 +0000 (22:05 +0000)]
Merge branch 'feld-test.secret' into feld-warnings

6 years agoSpeling
Mark Felder [Fri, 4 May 2018 22:05:01 +0000 (22:05 +0000)]
Speling

6 years agoFix formatting
Mark Felder [Fri, 4 May 2018 22:03:14 +0000 (22:03 +0000)]
Fix formatting

6 years agoGroup response declarations together
Mark Felder [Fri, 4 May 2018 21:59:21 +0000 (21:59 +0000)]
Group response declarations together

6 years agoThat last change was stupid. Multiline comments in Elixir don't really exist.
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.

6 years agoDirty hack to remove the warning
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

6 years agoFix unused variables, imports, and aliases
Mark Felder [Fri, 4 May 2018 21:42:20 +0000 (21:42 +0000)]
Fix unused variables, imports, and aliases

6 years agoFix build. Too eager with the fixing of unused variables.
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

6 years agoClean up unused aliases and imports
Mark Felder [Fri, 4 May 2018 21:25:31 +0000 (21:25 +0000)]
Clean up unused aliases and imports

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Fri, 4 May 2018 21:16:16 +0000 (23:16 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoMore unused variables
Mark Felder [Fri, 4 May 2018 21:16:02 +0000 (21:16 +0000)]
More unused variables

6 years agoupdate frontend
lain [Fri, 4 May 2018 21:15:33 +0000 (23:15 +0200)]
update frontend

6 years agoMerge branch 'feld-test.secret' into feld-warnings
Mark Felder [Fri, 4 May 2018 21:02:14 +0000 (21:02 +0000)]
Merge branch 'feld-test.secret' into feld-warnings

6 years agoMake it possible to use custom database connection parameters
Mark Felder [Fri, 4 May 2018 21:00:18 +0000 (21:00 +0000)]
Make it possible to use custom database connection parameters

6 years agoFix a bunch of unused variable warnings
Mark Felder [Fri, 4 May 2018 20:59:01 +0000 (20:59 +0000)]
Fix a bunch of unused variable warnings

6 years agoMerge branch 'feature/nodeinfo' into 'develop'
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

6 years agoDon't expire idempotency cache for five minutes.
lain [Fri, 4 May 2018 19:15:39 +0000 (21:15 +0200)]
Don't expire idempotency cache for five minutes.

6 years agoMastodonAPI: Support idempotency key.
lain [Fri, 4 May 2018 18:30:29 +0000 (20:30 +0200)]
MastodonAPI: Support idempotency key.

6 years agoUse a variable for stats to avoid double call
Dashie [Thu, 3 May 2018 13:31:39 +0000 (15:31 +0200)]
Use a variable for stats to avoid double call

6 years agoAdd metadata.nodeName
Dashie [Thu, 3 May 2018 08:52:20 +0000 (10:52 +0200)]
Add metadata.nodeName

6 years agoReturn the right content-type for the schema call
Dashie [Thu, 3 May 2018 08:50:02 +0000 (10:50 +0200)]
Return the right content-type for the schema call

6 years agoExplicit error message
Dashie [Wed, 2 May 2018 20:45:20 +0000 (22:45 +0200)]
Explicit error message

6 years agoSimplify version and fix typo
Dashie [Wed, 2 May 2018 20:44:13 +0000 (22:44 +0200)]
Simplify version and fix typo

6 years agoAdd localPosts count, also set to 0 if null
Dashie [Wed, 2 May 2018 20:36:19 +0000 (22:36 +0200)]
Add localPosts count, also set to 0 if null

6 years agoChange path of nodeinfo to use .json format
Dashie [Wed, 2 May 2018 20:16:19 +0000 (22:16 +0200)]
Change path of nodeinfo to use .json format

6 years agoFormat files
Dashie [Wed, 2 May 2018 19:43:12 +0000 (21:43 +0200)]
Format files

6 years agoAdd first try at nodeinfo
Dashie [Wed, 2 May 2018 19:31:42 +0000 (21:31 +0200)]
Add first try at nodeinfo

6 years agoupdate frontend
lain [Sun, 29 Apr 2018 14:56:13 +0000 (16:56 +0200)]
update frontend

6 years agoFix format.
lain [Sun, 29 Apr 2018 09:28:26 +0000 (11:28 +0200)]
Fix format.

6 years agoMerge branch 'patch-bio' into 'develop'
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

6 years agoInsert object after being rewritten.
lain [Sat, 28 Apr 2018 14:10:24 +0000 (16:10 +0200)]
Insert object after being rewritten.

6 years agoMerge branch 'fix/blocked-user-boosts' into 'develop'
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

6 years agoAdded a test (written by @andrewzah) for the MR
Wim Vanderbauwhede [Sat, 28 Apr 2018 11:01:43 +0000 (12:01 +0100)]
Added a test (written by @andrewzah) for the MR

6 years agoMerge remote-tracking branch 'upstream/develop' into patch-bio
Wim Vanderbauwhede [Sat, 28 Apr 2018 10:59:01 +0000 (11:59 +0100)]
Merge remote-tracking branch 'upstream/develop' into patch-bio

6 years agoMerge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
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

6 years agoMerge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
lain [Thu, 26 Apr 2018 05:07:04 +0000 (07:07 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

6 years agoResurrect instance specific panel.
lain [Thu, 26 Apr 2018 05:06:32 +0000 (07:06 +0200)]
Resurrect instance specific panel.

6 years agoActivityPub MRF SimplePolicy: fix media stripping
William Pitcock [Wed, 25 Apr 2018 21:25:56 +0000 (21:25 +0000)]
ActivityPub MRF SimplePolicy: fix media stripping

6 years agoMerge branch 'patch-1' into 'develop'
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

6 years agoOptionally deactivate public timelines.
lain [Wed, 25 Apr 2018 14:10:18 +0000 (16:10 +0200)]
Optionally deactivate public timelines.

6 years agoAlign local bio limits to remote limit.
lain [Wed, 25 Apr 2018 13:41:59 +0000 (15:41 +0200)]
Align local bio limits to remote limit.

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 agoChanged to support \r\n and \n
Wim Vanderbauwhede [Tue, 24 Apr 2018 12:28:55 +0000 (13:28 +0100)]
Changed to support \r\n and \n

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 agoPatch to replace newlines with <br> tags in bio
Wim Vanderbauwhede [Tue, 24 Apr 2018 12:20:17 +0000 (13:20 +0100)]
Patch to replace newlines with <br> tags in bio

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