9d78b3b281
mix: add ex_const dependency
2019-07-29 02:12:35 +00:00
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
2e697f87f4
Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.
2019-07-23 15:16:47 +00:00
afc7708dbe
Fix pleroma_job_queue version
2019-07-21 00:01:58 +03:00
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
cdf0038d0f
mix: update http signatures dependency
2019-07-18 15:53:01 +00:00
1e3aff6ef1
mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989
2019-07-17 19:00:26 +00:00
e7c175c943
Use PleromaJobQueue for scheduling
2019-07-16 16:49:50 +03:00
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
d302fcaa61
Dependencies: Update tzdata and related packages.
2019-07-15 16:47:39 +09:00
fa17879c20
added tests for Web.MediaProxy
2019-07-14 21:01:32 +00:00
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
2019-07-09 16:54:32 +00:00
4e6e5d8042
reverse proxy tests
2019-07-09 16:54:13 +00:00
11143c542a
Remove `httpoison` from dependencies
2019-07-03 14:42:24 +07:00
a02f52d12a
[ #1048 ] Resolved violations of SemVer version format. Refactoring.
2019-07-02 09:04:59 +03:00
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.
2019-06-29 14:28:26 +03:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
456668b490
Merge branch 'release/1.0' into 'develop'
...
1.0 Release
See merge request pleroma/pleroma!1348
2019-06-28 15:29:44 +00:00
da17bdd87e
BUMP OF CHICKEN
...
1.0
2019-06-28 17:15:44 +02:00
51760c84b9
Merge branch 'develop' into release-docs
2019-06-22 12:44:20 +03:00
8dbcff2fed
Merge branch 'mix_sem_ver_version_fix' into 'develop'
...
Fixed mix version computed for underscore-containing branches
See merge request pleroma/pleroma!1314
2019-06-22 09:20:11 +00:00
481932309f
mix: update bbcode dependency to v0.1.1
2019-06-21 23:42:50 +00:00
259ffe0062
Fixed branch name substitutions for mix version (to comply to SemVer format).
2019-06-21 17:19:29 +03:00
267f6bedd8
Formatting
2019-06-21 05:57:46 +03:00
7e35bdbd3c
Copy the nginx config to the release directory
2019-06-21 05:46:47 +03:00
f07003e218
Fixed mix version computed for underscore-containing branches to be of SemVer format.
2019-06-20 17:54:16 +03:00
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
2019-06-20 08:50:26 +00:00
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)
2019-06-19 14:40:39 +03:00
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
a0a1361888
Refactor pleroma_ctl copying to a generic function for copying files into the release dir
2019-06-19 03:52:03 +03:00
f30a3241d2
Deps: Update auto_linker
2019-06-18 16:08:18 +03:00
57d54a9f09
Merge branch 'fix/991-version-generation' into 'develop'
...
version generation
Closes #991
See merge request pleroma/pleroma!1291
2019-06-16 10:18:47 +00:00
451593f45e
no print version to the shell
2019-06-16 11:48:15 +08:00
2ad5a8511d
Update Phoenix to 1.4.8
2019-06-15 07:03:26 -05:00
e02f22d779
bugfix
2019-06-15 16:36:13 +08:00
501705438f
little fix
2019-06-15 16:24:49 +08:00
baf58c1234
version generation
2019-06-15 12:02:21 +08:00
315f090f59
Prometheus: Remove flaky process collection NIF.
2019-06-13 20:30:04 +02:00
bf22ed5fbd
Update `auto_linker` dependency
2019-06-12 15:53:33 +07:00
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
2e5affce61
Add RateLimiter
2019-06-11 14:27:41 +07:00
c47dc0de2c
Load ex_syslog and copy pleroma_ctl
2019-06-08 17:17:10 +03:00
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
b5e3b1e58a
Mix: Swallow git error messages during version number handling.
...
Otherwise sometimes a 'fatal' message will be printed, confusing users.
2019-06-04 16:58:40 +02:00
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
2019-06-02 17:45:32 +03:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
f0516d9114
Merge branch 'ssh-fixes' into 'develop'
...
Ssh fixes
Closes #869 and #925
See merge request pleroma/pleroma!1191
2019-05-22 18:57:34 +00:00
f323031927
Mix: Only start sshd when needed, second try.
2019-05-22 12:57:20 +02:00
f4cfcead88
Mix: Bring ecto-sql back to mainline.
2019-05-22 11:44:17 +02:00
db9a82d168
Linting.
2019-05-22 10:40:15 +02:00
b6cf62ddea
Mix: Don't start esshd application if we don't need it.
2019-05-22 10:28:50 +02:00
67af50ec71
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ecto_sql_update
2019-05-17 11:33:04 +02:00
718b59a263
Dependencies: Update ecto sql once more.
2019-05-17 11:19:30 +02:00
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
f831acf912
Excoveralls for code coverage
2019-05-15 15:19:20 +00:00
88cc423fa3
Dependencies: Update Ecto SQL.
2019-05-15 16:45:26 +02:00
071f78733a
switch to pleroma/http_signatures library
2019-05-14 20:03:13 +00:00
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
f1f7a11222
Merge develop
2019-05-11 14:45:54 +07:00
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
b6b5b16ba4
Merge develop
2019-05-08 17:08:06 +07:00
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
c81b707030
Fix/ex_doc source links
2019-05-07 00:32:07 +00:00
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
a23206a4ae
Just have Benchee in all environments.
2019-05-03 20:28:06 +02:00
a7709cc267
Mix: Also have benchee in test.
2019-05-03 19:42:49 +02:00
0e37fddd5a
Search: Add fts index on objects table.
2019-05-03 19:21:09 +02:00
81d1aa424d
Streamer: Stream out Conversations/Participations.
2019-05-03 13:39:14 +02:00
04fd7cf817
Update `auto_linker`
2019-05-01 15:18:12 +07:00
0f0cc2703b
Merge develop
2019-04-30 20:17:52 +07:00
2bd880be88
mix: add bbcode dependency
2019-04-26 22:34:59 +00:00
724311e151
Fix Credo warnings
2019-04-20 19:57:43 +07:00
64a2c6a041
Digest emails
2019-04-20 19:42:19 +07:00
2f0203a4a1
Resolve conflicts
2019-04-17 16:59:05 +07:00
37da03499e
Bump ex_doc
2019-04-16 14:53:17 +03:00
050339c223
Merge branch 'docs/changelog' into 'develop'
...
Add a changelog
See merge request pleroma/pleroma!1053
2019-04-13 20:29:05 +00:00
3a805cc35c
Add a changelog
2019-04-13 00:31:18 +03:00
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12 19:25:53 +00:00
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
b395aebf24
Pin recon dependency to 2.4.0
2019-04-06 09:30:36 -05:00
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-04 23:43:08 +03:00
66e7b03372
Merge branch 'develop' into feature/prometheus
2019-04-04 15:39:42 -05:00
3b12eeda19
Add ability to ship logs to a Slack channel
2019-04-04 19:52:22 +00:00
b655a8ea83
Add recon
2019-04-04 11:22:30 -05:00
d313a0c49c
Update `auto_linker` dependency
2019-04-03 19:41:15 +07:00
eadafc88b8
[ #923 ] Deps config adjustment (no `override` for `httpoison`), code analysis issues fixes.
2019-04-01 09:28:56 +03:00
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-01 08:49:32 +03:00
17ab9fa45b
BBS: Some more functionality.
2019-03-31 18:01:16 +02:00
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
2019-03-29 12:46:05 +00:00
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
2019-03-28 19:46:30 +03:00
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
2019-03-27 15:41:40 +03:00
a32bcab04b
Merge branch 'fix/eldap-warnings' into 'develop'
...
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
2019-03-24 11:17:40 +00:00
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
2019-03-20 20:25:48 +03:00
9a7b817c9a
Ecto 3.0.5 migration
...
kms
2019-03-20 15:59:54 +03:00
40c58d3383
Ignore compilation warnings for undefined module :eldap
2019-03-20 13:28:06 +02:00
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18 10:26:41 +03:00
Ariadne Conill