lambda
|
238dd72fad
|
Merge branch 'conversations_three' into 'develop'
Conversations once more.
See merge request pleroma/pleroma!1119
|
5 years ago |
lain
|
6ad8ddfd29
|
Merge remote-tracking branch 'origin/develop' into feature/bbs
|
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 |
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
|
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 |
Ivan Tashkinov
|
20e0f36605
|
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
|
6 years ago |
Ivan Tashkinov
|
2a95014b9d
|
[#923] OAuth consumer improvements, fixes, refactoring.
|
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 |
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 |
Mark Felder
|
bf562a6ecc
|
Upate meck to fix tests on MacOS
|
6 years ago |
William Pitcock
|
1c87102d01
|
mix: add timex dependency
|
6 years ago |
Ivan Tashkinov
|
063baca5e4
|
[#468] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
|
6 years ago |
Haelwenn (lanodan) Monnier
|
5bcea0deca
|
Install ex_syslogger
|
6 years ago |
Maxim Filippov
|
2aab4e03c3
|
Add OGP parser
|
6 years ago |
lain
|
91afbbe4ea
|
Update Tesla and Hackney.
|
6 years ago |
href
|
ba9ef77b6a
|
Switch to phoenixframework/phoenix as the needed change is merged.
|
6 years ago |
href
|
b12a904911
|
Integration tests for mastodon websocket
|
6 years ago |
href
|
f672555ad3
|
Upgrade to Phoenix 1.4
|
6 years ago |
Maksim Pechnikov
|
baead4ea4b
|
fix markdown formatting
|
6 years ago |
Ivan Tashkinov
|
10c156d98f
|
[#114] SMTP deps and config.
|
6 years ago |
Egor Kislitsyn
|
4944498133
|
Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
|
6 years ago |
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
|
6 years ago |
Egor Kislitsyn
|
04a48286e6
|
Add web push support
|
6 years ago |
Maksim Pechnikov
|
3ce16e5a56
|
init tesla and updated the http requests in Pleroma.Web.Websub
|
6 years ago |
kaniini
|
4a019827b2
|
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
This reverts merge request !480
|
6 years ago |
Maxim Filippov
|
0314f04c2a
|
Add ex_doc & makeup_elixir to mix.lock
|
6 years ago |
Haelwenn (lanodan) Monnier
|
8221c56c48
|
Add ex_doc
|
6 years ago |
lain
|
e954cfcc2c
|
Add CORSPlug to make web-based OAuth easier.
|
6 years ago |
William Pitcock
|
b1be9415ef
|
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
This reverts commit d31bbb1cfe , reversing
changes made to 340ab3cb90 .
|
6 years ago |
lain
|
c0e067c74e
|
Update Mix.lock
|
6 years ago |
lambda
|
58539e1357
|
Revert "Merge branch 'feature/rich-text' into 'develop'"
This reverts merge request !309
|
6 years ago |
William Pitcock
|
6aa65b68b8
|
common api: add support for formatting messages outside of twitter-style plain text
|
6 years ago |
William Pitcock
|
4e4b1016ab
|
mix: add ex_aws and ex_aws_s3 dependencies
|
6 years ago |