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 |
|
lain
|
6ad8ddfd29
|
Merge remote-tracking branch 'origin/develop' into feature/bbs
|
2019-05-04 15:00:45 +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
|
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 |
|
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
|
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 |
|
Ivan Tashkinov
|
20e0f36605
|
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
|
2019-03-27 15:41:40 +03:00 |
|
Ivan Tashkinov
|
2a95014b9d
|
[#923] OAuth consumer improvements, fixes, refactoring.
|
2019-03-27 15:39:35 +03: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 |
|
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 |
|
Mark Felder
|
bf562a6ecc
|
Upate meck to fix tests on MacOS
|
2019-02-22 17:26:47 +00:00 |
|
William Pitcock
|
1c87102d01
|
mix: add timex dependency
|
2019-02-21 00:19:49 +00:00 |
|
Ivan Tashkinov
|
063baca5e4
|
[#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.
|
2019-02-14 00:29:29 +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 |
|
lain
|
91afbbe4ea
|
Update Tesla and Hackney.
|
2019-01-01 13:49:48 +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 |
|
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 |
|
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 |
|
kaniini
|
4a019827b2
|
Revert "Merge branch 'chore/mix-lock-update' into 'develop'"
This reverts merge request !480
|
2018-11-27 23:19:30 +00:00 |
|
Maxim Filippov
|
0314f04c2a
|
Add ex_doc & makeup_elixir to mix.lock
|
2018-11-28 01:12:11 +03: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 |
|