Commit graph

102 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
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
William Pitcock 2bd880be88 mix: add bbcode dependency 2019-04-26 22:34:59 +00: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