kaniini
f0516d9114
Merge branch 'ssh-fixes' into 'develop'
...
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
5 years ago
lain
f323031927
Mix: Only start sshd when needed, second try.
5 years ago
lain
f4cfcead88
Mix: Bring ecto-sql back to mainline.
5 years ago
lain
db9a82d168
Linting.
5 years ago
lain
b6cf62ddea
Mix: Don't start esshd application if we don't need it.
5 years ago
lain
67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
5 years ago
lain
718b59a263
Dependencies: Update ecto sql once more.
5 years ago
lambda
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
5 years ago
feld
f831acf912
Excoveralls for code coverage
5 years ago
lain
88cc423fa3
Dependencies: Update Ecto SQL.
5 years ago
William Pitcock
071f78733a
switch to pleroma/http_signatures library
5 years ago
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
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.
5 years ago
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
xse
c81b707030
Fix/ex_doc source links
5 years ago
lain
4c76f49e60
BBS: small fixes.
5 years ago
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
lain
a23206a4ae
Just have Benchee in all environments.
5 years ago
lain
a7709cc267
Mix: Also have benchee in test.
5 years ago
lain
0e37fddd5a
Search: Add fts index on objects table.
5 years ago
lain
81d1aa424d
Streamer: Stream out Conversations/Participations.
5 years ago
Egor Kislitsyn
04fd7cf817
Update `auto_linker`
5 years ago
William Pitcock
2bd880be88
mix: add bbcode dependency
5 years ago
rinpatch
37da03499e
Bump ex_doc
6 years ago
Haelwenn
050339c223
Merge branch 'docs/changelog' into 'develop'
...
Add a changelog
See merge request pleroma/pleroma!1053
6 years ago
rinpatch
3a805cc35c
Add a changelog
6 years ago
Egor
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
6 years ago
Ivan Tashkinov
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
Mark Felder
b395aebf24
Pin recon dependency to 2.4.0
6 years ago
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Mark Felder
66e7b03372
Merge branch 'develop' into feature/prometheus
6 years ago
feld
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
href
b655a8ea83
Add recon
6 years ago
Egor Kislitsyn
d313a0c49c
Update `auto_linker` dependency
6 years ago
Ivan Tashkinov
eadafc88b8
[ #923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
6 years ago
Ivan Tashkinov
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
lain
17ab9fa45b
BBS: Some more functionality.
6 years ago
Egor
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
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
6 years ago
Ivan Tashkinov
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
rinpatch
a32bcab04b
Merge branch 'fix/eldap-warnings' into 'develop'
...
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
6 years ago
Ivan Tashkinov
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
rinpatch
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
link0ff
40c58d3383
Ignore compilation warnings for undefined module :eldap
6 years ago
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
6 years ago
Haelwenn (lanodan) Monnier
f5b54acc81
Fix headers and add !929 docs to extras
...
[ci skip]
6 years ago
Ivan Tashkinov
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
Maxim Filippov
cc7b35e097
Add status text to notifications (mentions and reposts)
6 years ago
William Pitcock
e10ca35b3d
mix: update dependencies for cowboy 2.0
6 years ago
Egor
c3ac9424d2
AutoLinker
6 years ago