nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4474 commits 2 branches 0 tags 272 MiB
Commit graph

77 commits

Author SHA1 Message Date
Mark Felder 66e7b03372 Merge branch 'develop' into feature/prometheus 2019-04-04 15:39:42 -05:00
feld 3b12eeda19 Add ability to ship logs to a Slack channel 2019-04-04 19:52:22 +00:00
href b655a8ea83 Add recon 2019-04-04 11:22:30 -05:00
Egor Kislitsyn d313a0c49c Update auto_linker dependency 2019-04-03 19:41:15 +07:00
Egor 9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00:00
rinpatch dfae0050af Move out of Gitlab Wiki 
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does
 2019-03-28 19:46:30 +03:00
rinpatch a32bcab04b Merge branch 'fix/eldap-warnings' into 'develop' 
Ignore compilation warnings for undefined module :eldap

See merge request pleroma/pleroma!956
 2019-03-24 11:17:40 +00:00
rinpatch 9a7b817c9a Ecto 3.0.5 migration 
kms
 2019-03-20 15:59:54 +03:00
link0ff 40c58d3383 Ignore compilation warnings for undefined module :eldap 2019-03-20 13:28:06 +02:00
Haelwenn (lanodan) Monnier f5b54acc81
Fix headers and add !929 docs to extras 
[ci skip]
 2019-03-15 10:58:15 +01:00
Maxim Filippov cc7b35e097 Add status text to notifications (mentions and reposts) 2019-03-04 20:47:34 +03:00
William Pitcock e10ca35b3d mix: update dependencies for cowboy 2.0 2019-02-28 15:44:07 +00:00
Egor c3ac9424d2 AutoLinker 2019-02-26 23:32:26 +00:00
William Pitcock 1c87102d01 mix: add timex dependency 2019-02-21 00:19:49 +00:00
lambda a2f4fc49fe Merge branch 'develop' into 'docs/add-clients-to-ex_doc' 
# Conflicts:
#   mix.exs
 2019-02-17 17:39:45 +00:00
rinpatch ccd30a1875 Fix formating 2019-02-17 12:07:49 +03:00
rinpatch 006bec8c6a Add differences in MastoAPI responses to mix.exs extras 2019-02-17 10:34:00 +03:00
Haelwenn (lanodan) Monnier 25ab90edea
mix.exs: Add docs/Clients.md to docs.extras 
[ci skip]
 2019-02-16 19:39:03 +01:00
rinpatch e4dc3f71ae Resolve merge conflict 2019-01-13 13:38:28 +03:00
Haelwenn (lanodan) Monnier 5bcea0deca
Install ex_syslogger 2019-01-06 01:11:52 +01:00
Maxim Filippov 2aab4e03c3 Add OGP parser 2019-01-01 23:26:40 +03:00
Haelwenn (lanodan) Monnier 286632dfa2
Add docs/Admin-API.md 
[ci skip]
 2018-12-31 12:27:46 +01:00
Ivan Tashkinov d8fd6a1055 [#396] Updated ex_doc version spec. Updated README to reflect Elixir version. 2018-12-27 16:32:47 +03:00
Ivan Tashkinov 58b12c09db [Fixes #396] Required Elixir ~> 1.7. 2018-12-27 16:12:33 +03:00
Haelwenn (lanodan) Monnier 6adea5a7b2
Move to docs 2018-12-18 17:16:26 +01:00
Haelwenn (lanodan) Monnier a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex 2018-12-18 17:05:36 +01:00
raeno a300336459 Merge branch 'develop' into oembed_provider 2018-12-18 14:59:32 +01:00
Haelwenn (lanodan) Monnier 08b6294f47
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints 2018-12-18 13:58:34 +01:00
href ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged. 2018-12-17 17:28:03 +01:00
href b12a904911
Integration tests for mastodon websocket 2018-12-17 17:09:06 +01:00
href f672555ad3
Upgrade to Phoenix 1.4 2018-12-16 17:15:07 +01:00
lambda 7281ab0b3c Merge branch 'tests-warning-as-errors' into 'develop' 
Enable warnings_as_errors for tests

See merge request pleroma/pleroma!548
 2018-12-15 15:22:59 +00:00
raeno b0c3211984 Scrub html from activity.content or user.bio for opengraph meta 2018-12-14 21:07:06 +01:00
href 0ee51992a8
Enable warning_as_errors for tests 2018-12-14 18:14:40 +01:00
Maksim Pechnikov baead4ea4b fix markdown formatting 2018-12-14 16:03:58 +03:00
Ivan Tashkinov 10c156d98f [#114] SMTP deps and config. 2018-12-12 17:01:34 +03:00
lain b621ebb7a6 Format. 2018-12-10 19:19:40 +01:00
lain c81c74d847 Treat warnings as errors outside of tests. 2018-12-10 19:13:53 +01:00
Egor Kislitsyn 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions 
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex
 2018-12-06 20:15:16 +07:00
Egor Kislitsyn 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions 
# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock
 2018-12-06 19:55:58 +07:00
Egor Kislitsyn 04a48286e6 Add web push support 2018-12-06 19:29:04 +07:00
Maksim Pechnikov 3ce16e5a56 init tesla and updated the http requests in Pleroma.Web.Websub 2018-12-04 14:03:32 +03:00
href f70b20e499
version string: force git abbrev size to 8 chars 
Fixes #389

Older git versions defaults to 7 chars.
 2018-11-24 14:38:34 +01:00
href bc5cf2c192
Improved version string 2018-11-20 17:55:03 +01:00
Haelwenn (lanodan) Monnier ee41dbeca5
config/config.md: Create 2018-11-10 13:09:37 +01:00
Haelwenn (lanodan) Monnier 8221c56c48
Add ex_doc 2018-11-10 13:09:37 +01:00
lain e954cfcc2c Add CORSPlug to make web-based OAuth easier. 2018-11-03 13:38:01 +01:00
William Pitcock b1be9415ef Revert "Merge branch 'revert-a26d5e6b' into 'develop'" 
This reverts commit d31bbb1cfe, reversing
changes made to 340ab3cb90.
 2018-10-05 20:49:34 +00:00
Moon Man 75bc68dbc1 pinned crypt dependency to specific commit 2018-09-05 02:29:19 -04:00
Moon Man 1a8bc26e52 auth against sha512-crypt password hashes, upgrade to pbkdf2 2018-09-05 00:21:44 -04:00