knova/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
14494 commits 9 branches 75 tags 292 MiB
Commit graph

457 commits

Author SHA1 Message Date
feld
c953ae8c3d Initial bundle of basic AdminFE 
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
 2019-05-11 01:34:17 +00:00
Roman Chvanikov
b6b5b16ba4 Merge develop 2019-05-08 17:08:06 +07:00
lambda
238dd72fad Merge branch 'conversations_three' into 'develop' 
Conversations once more.

See merge request pleroma/pleroma!1119
 2019-05-07 14:43:21 +00:00
xse
c81b707030 Fix/ex_doc source links 2019-05-07 00:32:07 +00:00
lain
4c76f49e60 BBS: small fixes. 2019-05-04 15:06:18 +02:00
lain
6ad8ddfd29 Merge remote-tracking branch 'origin/develop' into feature/bbs 2019-05-04 15:00:45 +02:00
lain
a23206a4ae Just have Benchee in all environments. 2019-05-03 20:28:06 +02:00
lain
a7709cc267 Mix: Also have benchee in test. 2019-05-03 19:42:49 +02:00
lain
0e37fddd5a Search: Add fts index on objects table. 2019-05-03 19:21:09 +02:00
lain
81d1aa424d Streamer: Stream out Conversations/Participations. 2019-05-03 13:39:14 +02:00
Egor Kislitsyn
04fd7cf817 Update auto_linker 2019-05-01 15:18:12 +07:00
Roman Chvanikov
0f0cc2703b Merge develop 2019-04-30 20:17:52 +07:00
William Pitcock
2bd880be88 mix: add bbcode dependency 2019-04-26 22:34:59 +00:00
Roman Chvanikov
724311e151 Fix Credo warnings 2019-04-20 19:57:43 +07:00
Roman Chvanikov
64a2c6a041 Digest emails 2019-04-20 19:42:19 +07:00
Roman Chvanikov
2f0203a4a1 Resolve conflicts 2019-04-17 16:59:05 +07:00
rinpatch
37da03499e Bump ex_doc 2019-04-16 14:53:17 +03:00
Haelwenn
050339c223 Merge branch 'docs/changelog' into 'develop' 
Add a changelog

See merge request pleroma/pleroma!1053
 2019-04-13 20:29:05 +00:00
rinpatch
3a805cc35c Add a changelog 2019-04-13 00:31:18 +03:00
Egor
f9af90c5aa Revert "simplify mentions escape" 
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
 2019-04-12 19:25:53 +00:00
Ivan Tashkinov
bffddf5e31 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	docs/config.md
#	test/support/factory.ex
 2019-04-08 12:20:26 +03:00
Mark Felder
b395aebf24 Pin recon dependency to 2.4.0 2019-04-06 09:30:36 -05:00
Ivan Tashkinov
45765918c3 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	mix.exs
 2019-04-04 23:43:08 +03:00
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
Ivan Tashkinov
eadafc88b8 [#923] Deps config adjustment (no override for httpoison), code analysis issues fixes. 2019-04-01 09:28:56 +03:00
Ivan Tashkinov
baffdcc480 [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	mix.exs
 2019-04-01 08:49:32 +03:00
lain
17ab9fa45b BBS: Some more functionality. 2019-03-31 18:01:16 +02: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
Ivan Tashkinov
20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +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
Ivan Tashkinov
af68a42ef7 [#923] Support for multiple OAuth consumer strategies. 2019-03-20 20:25:48 +03: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
Ivan Tashkinov
2a96283efb [#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth 
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/auth/pleroma_authenticator.ex
 2019-03-18 10:26:41 +03:00
Haelwenn (lanodan) Monnier
f5b54acc81
Fix headers and add !929 docs to extras 
[ci skip]
 2019-03-15 10:58:15 +01:00
Ivan Tashkinov
63ab61ed3f Sign in via Twitter (WIP). 2019-03-11 20:37:26 +03: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
lambda
58539e1357 Revert "Merge branch 'feature/rich-text' into 'develop'" 
This reverts merge request !309
 2018-08-31 09:51:20 +00:00
William Pitcock
6aa65b68b8 common api: add support for formatting messages outside of twitter-style plain text 2018-08-31 03:13:59 +00:00
William Pitcock
4e4b1016ab mix: add ex_aws and ex_aws_s3 dependencies 2018-08-27 23:24:35 +00:00
kaniini
05738e7643 fix compile 2018-08-16 15:37:58 +00:00
kaniini
f2fa09c50f Merge branch 'develop' into 'patch-2' 
# Conflicts:
#   mix.exs
 2018-08-16 15:23:04 +00:00
Artik Banana
718882b326 Update mix.exs 2018-06-27 19:35:38 +00:00
Tristan Mahé
cb21bf5fc2 filter exif data #187 2018-06-26 13:45:47 -07:00
Thog
e55c6f311b
Migrate to comeonin 4 and Cachex 3 
Also fix some warning in the code and add a missing alias
 2018-05-20 20:08:40 +02:00
Mark Felder
366138fa72 Update httpoison to get the latest hackney. 
Works on my computer ^TM
 2018-04-11 13:55:54 +00:00
lain
4e4a3e5e13 Add mock. 2018-04-02 13:12:47 +02:00
lain
4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
lain
86058c9a88 Return version in instance endpoint, set version to 0.9.0. 2018-03-27 20:09:01 +02:00
lain
fbc187ac15 Switch to Jason for json handling. 
It's twice as fast and will be the standard in the coming ecto.
 2018-03-27 16:09:08 +02:00
Roger Braun
890503ca1e Remove mix test.watch 
It recompiled too often and tested too long.
 2017-09-09 12:00:03 +02:00
Roger Braun
4e785df984 Update Phoenix, add Phoenix.HTML. 2017-09-06 19:05:35 +02:00
Roger Braun
6ee0ca21e2 Some salmon debug fixes. 
Plus httpoison update.
 2017-06-23 16:22:19 +02:00
Roger Braun
36ec998dd7 Update html_sanitize_ex. 2017-05-18 17:18:33 +02:00
dtluna
6cf7c13228 Refactor code to comply with credo suggestions 2017-04-27 16:18:50 +03:00
Roger Braun
424e0e7779 Add Websub verification. 2017-04-21 03:59:11 +02:00
Roger Braun
6bfd521974 Switch cache implementation for size limiting. 2017-04-17 11:36:17 +02:00
Roger Braun
03ddaead7e Add basic user caching. 
Expires after 5 seconds.
 2017-04-14 17:13:51 +02:00
Roger Braun
4cac385411 Add factories for testing. 2017-04-13 15:49:24 +02:00
Roger Braun
d2bf099ae6 Fix twitter api date. 2017-04-12 19:34:58 +02:00
Roger Braun
2e88cc4cbd Add HTML sanitization library. 2017-04-03 18:28:00 +02:00
Roger Braun
e4de0ddc77 Add single status fetching to TwAPI. 2017-03-24 01:16:28 +01:00
Roger Braun
e32dbfc9a5 Add basic auth. 2017-03-20 17:56:45 +01:00
Roger Braun
a93f3421a7 Phoenix skeleton 2017-03-17 17:09:58 +01:00