764931fc9f
Merge branch 'deps/update-tesla' into 'develop'
...
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
5 years ago
228bfd8a70
Bump elixir version to ~> 1.8
5 years ago
d201eec45c
fixed ecto version
5 years ago
8d812c28a7
Update Tesla to 1.3
...
This version includes a couple of fixes, adds Gun and Mint adapters and
removes 0.x -> 1.0 config migrator, which for some reason fails under
certain conditions. I had to set `override: true` because Quack pins
Tesla to `1.2.0`, but I have looked through the source code and verified
that updating Tesla doesn't break anything there.
5 years ago
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
d1a84ceec8
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
...
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
5 years ago
b4cf74c106
added prepare html for RichMedia.Parser
5 years ago
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
69faec031d
markdown generation to the new file
5 years ago
6b0e8b73df
bump ex_doc version
5 years ago
511d93fa54
mix docs generates config.md
5 years ago
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
6a101f0361
Switch to pre-1.8 version of tzdata.
...
tzdata 1.0.0 requires Elixir 1.8.0, but we target 1.7. Fortunately
tzdata issues bugfix releases for pre-1.8.0 version.
5 years ago
bb9c539580
Uploader.S3 added support stream uploads
5 years ago
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
5 years ago
81412240e6
Fix Invalid SemVer version generation
...
when the current branch does not have commits ahead of tag/checked out on a tag
5 years ago
9d78b3b281
mix: add ex_const dependency
5 years ago
d2da3d30f3
Merge branch 'develop' into feature/digest-email
5 years ago
2e697f87f4
Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.
5 years ago
afc7708dbe
Fix pleroma_job_queue version
5 years ago
36049f08ef
Merge develop
5 years ago
cdf0038d0f
mix: update http signatures dependency
5 years ago
1e3aff6ef1
mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989
5 years ago
e7c175c943
Use PleromaJobQueue for scheduling
5 years ago
9bca70b10a
Merge develop
5 years ago
d302fcaa61
Dependencies: Update tzdata and related packages.
5 years ago
fa17879c20
added tests for Web.MediaProxy
5 years ago
eae991b06a
merge develop
5 years ago
12b1454245
[ #1062 ] added option to disable send email
5 years ago
371d39e160
Merge develop
5 years ago
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
5 years ago
4e6e5d8042
reverse proxy tests
5 years ago
11143c542a
Remove `httpoison` from dependencies
5 years ago
a02f52d12a
[ #1048 ] Resolved violations of SemVer version format. Refactoring.
5 years ago
bdc1592377
Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs
...
This is needed because if we run with MIX_ENV=dev we will get a "+dev"
suffix to the version in the docs, but if we run with MIX_ENV=prod the
docs build will fail because ex_doc is dev-only dependency.
5 years ago
657277ffc0
Resolve conflicts
5 years ago
456668b490
Merge branch 'release/1.0' into 'develop'
...
1.0 Release
See merge request pleroma/pleroma!1348
5 years ago
da17bdd87e
BUMP OF CHICKEN
...
1.0
5 years ago
51760c84b9
Merge branch 'develop' into release-docs
5 years ago
8dbcff2fed
Merge branch 'mix_sem_ver_version_fix' into 'develop'
...
Fixed mix version computed for underscore-containing branches
See merge request pleroma/pleroma!1314
5 years ago
481932309f
mix: update bbcode dependency to v0.1.1
5 years ago
259ffe0062
Fixed branch name substitutions for mix version (to comply to SemVer format).
5 years ago
267f6bedd8
Formatting
5 years ago
7e35bdbd3c
Copy the nginx config to the release directory
5 years ago
f07003e218
Fixed mix version computed for underscore-containing branches to be of SemVer format.
5 years ago
ba584364e9
Merge branch 'feature/release-update-script' into 'develop'
...
pleroma_ctl: add an update command
Closes #1004 and #988
See merge request pleroma/pleroma!1305
5 years ago
a6e3169cfc
Make possible to override the branch name via a env variable
...
This is useful for the CI builds because they have a detached HEAD or
for emulating a feature that is availible only on a particular branch
(e.g pleroma_ctl downloads CI artifacts only for develop and master)
5 years ago
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
5 years ago
a0a1361888
Refactor pleroma_ctl copying to a generic function for copying files into the release dir
5 years ago
f30a3241d2
Deps: Update auto_linker
5 years ago
57d54a9f09
Merge branch 'fix/991-version-generation' into 'develop'
...
version generation
Closes #991
See merge request pleroma/pleroma!1291
5 years ago
451593f45e
no print version to the shell
5 years ago
2ad5a8511d
Update Phoenix to 1.4.8
5 years ago
e02f22d779
bugfix
5 years ago
501705438f
little fix
5 years ago
baf58c1234
version generation
5 years ago
315f090f59
Prometheus: Remove flaky process collection NIF.
5 years ago
bf22ed5fbd
Update `auto_linker` dependency
5 years ago
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
5 years ago
2e5affce61
Add RateLimiter
5 years ago
c47dc0de2c
Load ex_syslog and copy pleroma_ctl
5 years ago
b1b1a270e8
Fix conflict
5 years ago
b5e3b1e58a
Mix: Swallow git error messages during version number handling.
...
Otherwise sometimes a 'fatal' message will be printed, confusing users.
5 years ago
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
5 years ago
ce47017c89
Merge develop
5 years ago
f0516d9114
Merge branch 'ssh-fixes' into 'develop'
...
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
5 years ago
f323031927
Mix: Only start sshd when needed, second try.
5 years ago
f4cfcead88
Mix: Bring ecto-sql back to mainline.
5 years ago
db9a82d168
Linting.
5 years ago
b6cf62ddea
Mix: Don't start esshd application if we don't need it.
5 years ago
67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
5 years ago
718b59a263
Dependencies: Update ecto sql once more.
5 years ago
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
5 years ago
f831acf912
Excoveralls for code coverage
5 years ago
88cc423fa3
Dependencies: Update Ecto SQL.
5 years ago
071f78733a
switch to pleroma/http_signatures library
5 years ago
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
5 years ago
f1f7a11222
Merge develop
5 years ago
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
b6b5b16ba4
Merge develop
5 years ago
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
c81b707030
Fix/ex_doc source links
5 years ago
4c76f49e60
BBS: small fixes.
5 years ago
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
5 years ago
a23206a4ae
Just have Benchee in all environments.
5 years ago
a7709cc267
Mix: Also have benchee in test.
5 years ago
0e37fddd5a
Search: Add fts index on objects table.
5 years ago
81d1aa424d
Streamer: Stream out Conversations/Participations.
5 years ago
04fd7cf817
Update `auto_linker`
5 years ago
0f0cc2703b
Merge develop
5 years ago
2bd880be88
mix: add bbcode dependency
5 years ago
724311e151
Fix Credo warnings
6 years ago
64a2c6a041
Digest emails
6 years ago
2f0203a4a1
Resolve conflicts
6 years ago
37da03499e
Bump ex_doc
6 years ago
050339c223
Merge branch 'docs/changelog' into 'develop'
...
Add a changelog
See merge request pleroma/pleroma!1053
6 years ago
3a805cc35c
Add a changelog
6 years ago
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
6 years ago
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
b395aebf24
Pin recon dependency to 2.4.0
6 years ago
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
66e7b03372
Merge branch 'develop' into feature/prometheus
6 years ago
3b12eeda19
Add ability to ship logs to a Slack channel
6 years ago
b655a8ea83
Add recon
6 years ago
d313a0c49c
Update `auto_linker` dependency
6 years ago
eadafc88b8
[ #923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
6 years ago
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
17ab9fa45b
BBS: Some more functionality.
6 years ago
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
6 years ago
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
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
a32bcab04b
Merge branch 'fix/eldap-warnings' into 'develop'
...
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
6 years ago
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
6 years ago
9a7b817c9a
Ecto 3.0.5 migration
...
kms
6 years ago
40c58d3383
Ignore compilation warnings for undefined module :eldap
6 years ago
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
f5b54acc81
Fix headers and add !929 docs to extras
...
[ci skip]
6 years ago
63ab61ed3f
Sign in via Twitter (WIP).
6 years ago
cc7b35e097
Add status text to notifications (mentions and reposts)
6 years ago
e10ca35b3d
mix: update dependencies for cowboy 2.0
6 years ago
c3ac9424d2
AutoLinker
6 years ago
1c87102d01
mix: add timex dependency
6 years ago
a2f4fc49fe
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
...
# Conflicts:
# mix.exs
6 years ago
ccd30a1875
Fix formating
6 years ago
006bec8c6a
Add differences in MastoAPI responses to mix.exs extras
6 years ago
25ab90edea
mix.exs: Add docs/Clients.md to docs.extras
...
[ci skip]
6 years ago
e4dc3f71ae
Resolve merge conflict
6 years ago
5bcea0deca
Install ex_syslogger
6 years ago
2aab4e03c3
Add OGP parser
6 years ago
286632dfa2
Add docs/Admin-API.md
...
[ci skip]
6 years ago
d8fd6a1055
[ #396 ] Updated `ex_doc` version spec. Updated README to reflect Elixir version.
6 years ago
58b12c09db
[ Fixes #396 ] Required Elixir ~> 1.7.
6 years ago
6adea5a7b2
Move to docs
6 years ago
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
08b6294f47
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
6 years ago
ba9ef77b6a
Switch to phoenixframework/phoenix as the needed change is merged.
6 years ago
b12a904911
Integration tests for mastodon websocket
6 years ago
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
7281ab0b3c
Merge branch 'tests-warning-as-errors' into 'develop'
...
Enable warnings_as_errors for tests
See merge request pleroma/pleroma!548
6 years ago
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
6 years ago
0ee51992a8
Enable warning_as_errors for tests
6 years ago
feld