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 |
William Pitcock
|
1c87102d01
|
mix: add timex dependency
|
6 years ago |
lambda
|
a2f4fc49fe
|
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts:
# mix.exs
|
6 years ago |
rinpatch
|
ccd30a1875
|
Fix formating
|
6 years ago |
rinpatch
|
006bec8c6a
|
Add differences in MastoAPI responses to mix.exs extras
|
6 years ago |
Haelwenn (lanodan) Monnier
|
25ab90edea
|
mix.exs: Add docs/Clients.md to docs.extras
[ci skip]
|
6 years ago |
rinpatch
|
e4dc3f71ae
|
Resolve merge conflict
|
6 years ago |
Haelwenn (lanodan) Monnier
|
5bcea0deca
|
Install ex_syslogger
|
6 years ago |
Maxim Filippov
|
2aab4e03c3
|
Add OGP parser
|
6 years ago |
Haelwenn (lanodan) Monnier
|
286632dfa2
|
Add docs/Admin-API.md
[ci skip]
|
6 years ago |
Ivan Tashkinov
|
d8fd6a1055
|
[#396] Updated `ex_doc` version spec. Updated README to reflect Elixir version.
|
6 years ago |
Ivan Tashkinov
|
58b12c09db
|
[Fixes #396] Required Elixir ~> 1.7.
|
6 years ago |
Haelwenn (lanodan) Monnier
|
6adea5a7b2
|
Move to docs
|
6 years ago |
Haelwenn (lanodan) Monnier
|
a6dfe1fc6b
|
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
|
6 years ago |
raeno
|
a300336459
|
Merge branch 'develop' into oembed_provider
|
6 years ago |
Haelwenn (lanodan) Monnier
|
08b6294f47
|
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
|
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 |
lambda
|
7281ab0b3c
|
Merge branch 'tests-warning-as-errors' into 'develop'
Enable warnings_as_errors for tests
See merge request pleroma/pleroma!548
|
6 years ago |
raeno
|
b0c3211984
|
Scrub html from activity.content or user.bio for opengraph meta
|
6 years ago |
href
|
0ee51992a8
|
Enable warning_as_errors for tests
|
6 years ago |
Maksim Pechnikov
|
baead4ea4b
|
fix markdown formatting
|
6 years ago |
Ivan Tashkinov
|
10c156d98f
|
[#114] SMTP deps and config.
|
6 years ago |
lain
|
b621ebb7a6
|
Format.
|
6 years ago |
lain
|
c81c74d847
|
Treat warnings as errors outside of tests.
|
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 |
href
|
f70b20e499
|
version string: force git abbrev size to 8 chars
Fixes #389
Older git versions defaults to 7 chars.
|
6 years ago |
href
|
bc5cf2c192
|
Improved version string
|
6 years ago |
Haelwenn (lanodan) Monnier
|
ee41dbeca5
|
config/config.md: Create
|
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 |
Moon Man
|
75bc68dbc1
|
pinned crypt dependency to specific commit
|
6 years ago |
Moon Man
|
1a8bc26e52
|
auth against sha512-crypt password hashes, upgrade to pbkdf2
|
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 |
kaniini
|
05738e7643
|
fix compile
|
6 years ago |
kaniini
|
f2fa09c50f
|
Merge branch 'develop' into 'patch-2'
# Conflicts:
# mix.exs
|
6 years ago |
Artik Banana
|
718882b326
|
Update mix.exs
|
6 years ago |
Tristan Mahé
|
cb21bf5fc2
|
filter exif data #187
|
6 years ago |
Thog
|
e55c6f311b
|
Migrate to comeonin 4 and Cachex 3
Also fix some warning in the code and add a missing alias
|
6 years ago |
Mark Felder
|
366138fa72
|
Update httpoison to get the latest hackney.
Works on my computer ^TM
|
7 years ago |
lain
|
4e4a3e5e13
|
Add mock.
|
7 years ago |
lain
|
4afbef39f4
|
Format the code.
|
7 years ago |
lain
|
86058c9a88
|
Return version in instance endpoint, set version to 0.9.0.
|
7 years ago |
lain
|
fbc187ac15
|
Switch to Jason for json handling.
It's twice as fast and will be the standard in the coming ecto.
|
7 years ago |
Roger Braun
|
890503ca1e
|
Remove mix test.watch
It recompiled too often and tested too long.
|
7 years ago |
Roger Braun
|
4e785df984
|
Update Phoenix, add Phoenix.HTML.
|
7 years ago |
Roger Braun
|
6ee0ca21e2
|
Some salmon debug fixes.
Plus httpoison update.
|
7 years ago |
Roger Braun
|
36ec998dd7
|
Update html_sanitize_ex.
|
7 years ago |
dtluna
|
6cf7c13228
|
Refactor code to comply with credo suggestions
|
8 years ago |
Roger Braun
|
424e0e7779
|
Add Websub verification.
|
8 years ago |
Roger Braun
|
6bfd521974
|
Switch cache implementation for size limiting.
|
8 years ago |
Roger Braun
|
03ddaead7e
|
Add basic user caching.
Expires after 5 seconds.
|
8 years ago |
Roger Braun
|
4cac385411
|
Add factories for testing.
|
8 years ago |
Roger Braun
|
d2bf099ae6
|
Fix twitter api date.
|
8 years ago |
Roger Braun
|
2e88cc4cbd
|
Add HTML sanitization library.
|
8 years ago |
Roger Braun
|
e4de0ddc77
|
Add single status fetching to TwAPI.
|
8 years ago |
Roger Braun
|
e32dbfc9a5
|
Add basic auth.
|
8 years ago |
Roger Braun
|
a93f3421a7
|
Phoenix skeleton
|
8 years ago |