Roman Chvanikov
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
Alexander Strizhakov
4e6e5d8042
reverse proxy tests
2019-07-09 16:54:13 +00:00
Roman Chvanikov
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
William Pitcock
481932309f
mix: update bbcode dependency to v0.1.1
2019-06-21 23:42:50 +00:00
rinpatch
f30a3241d2
Deps: Update auto_linker
2019-06-18 16:08:18 +03:00
Mark Felder
2ad5a8511d
Update Phoenix to 1.4.8
2019-06-15 07:03:26 -05:00
Egor Kislitsyn
bf22ed5fbd
Update auto_linker dependency
2019-06-12 15:53:33 +07:00
lain
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
Egor Kislitsyn
581d8d3035
Update plug dependency
2019-06-11 16:50:35 +07:00
Egor Kislitsyn
7c063a898d
Update ex_rated dependency
2019-06-11 16:25:47 +07:00
Roman Chvanikov
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
lain
f4cfcead88
Mix: Bring ecto-sql back to mainline.
2019-05-22 11:44:17 +02:00
lambda
e5b34f5e05
Merge branch 'ecto_sql_update' into 'develop'
...
Dependencies: Update Ecto SQL.
See merge request pleroma/pleroma!1160
2019-05-17 10:21:38 +00:00
lain
5743124c77
Dependencies: Update tzdata.
...
This fixes the bug that tz data could not be loaded. Closes #910 .
2019-05-17 11:51:50 +02:00
lain
67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
2019-05-17 11:33:04 +02:00
lain
718b59a263
Dependencies: Update ecto sql once more.
2019-05-17 11:19:30 +02:00
lambda
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
2019-05-15 15:37:31 +00:00
feld
f831acf912
Excoveralls for code coverage
2019-05-15 15:19:20 +00:00
lain
88cc423fa3
Dependencies: Update Ecto SQL.
2019-05-15 16:45:26 +02:00
William Pitcock
071f78733a
switch to pleroma/http_signatures library
2019-05-14 20:03:13 +00:00
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
Roman Chvanikov
f1f7a11222
Merge develop
2019-05-11 14:45:54 +07:00
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
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 d31bbb1cfe340ab3cb90
2018-10-05 20:49:34 +00:00
lain
c0e067c74e
Update Mix.lock
2018-09-05 22:00:41 +02: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
William Pitcock
0835cf9faa
update mix.lock
2018-08-16 23:27:09 +00:00
Tristan Mahé
2df0fd1462
mogrify mix.lock
2018-06-26 14:16:28 -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
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
lain
20982ab4d0
Update dependencies.
2018-03-27 15:22:09 +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
