Egor Kislitsyn
11143c542a
Remove httpoison from dependencies
2019-07-03 14:42:24 +07:00
rinpatch
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
lain
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
lain
da17bdd87e
BUMP OF CHICKEN
...
1.0
2019-06-28 17:15:44 +02:00
rinpatch
51760c84b9
Merge branch 'develop' into release-docs
2019-06-22 12:44:20 +03:00
rinpatch
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
William Pitcock
481932309f
mix: update bbcode dependency to v0.1.1
2019-06-21 23:42:50 +00:00
Ivan Tashkinov
259ffe0062
Fixed branch name substitutions for mix version (to comply to SemVer format).
2019-06-21 17:19:29 +03:00
rinpatch
267f6bedd8
Formatting
2019-06-21 05:57:46 +03:00
rinpatch
7e35bdbd3c
Copy the nginx config to the release directory
2019-06-21 05:46:47 +03:00
Ivan Tashkinov
f07003e218
Fixed mix version computed for underscore-containing branches to be of SemVer format.
2019-06-20 17:54:16 +03:00
rinpatch
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
rinpatch
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
Alexander Strizhakov
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
rinpatch
a0a1361888
Refactor pleroma_ctl copying to a generic function for copying files into the release dir
2019-06-19 03:52:03 +03:00
rinpatch
f30a3241d2
Deps: Update auto_linker
2019-06-18 16:08:18 +03:00
rinpatch
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
Alex S
451593f45e
no print version to the shell
2019-06-16 11:48:15 +08:00
Mark Felder
2ad5a8511d
Update Phoenix to 1.4.8
2019-06-15 07:03:26 -05:00
Alex S
e02f22d779
bugfix
2019-06-15 16:36:13 +08:00
Alex S
501705438f
little fix
2019-06-15 16:24:49 +08:00
Alex S
baf58c1234
version generation
2019-06-15 12:02:21 +08:00
lain
315f090f59
Prometheus: Remove flaky process collection NIF.
2019-06-13 20:30:04 +02: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
2e5affce61
Add RateLimiter
2019-06-11 14:27:41 +07:00
rinpatch
c47dc0de2c
Load ex_syslog and copy pleroma_ctl
2019-06-08 17:17:10 +03:00
lain
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
Ivan Tashkinov
83663caa81
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification.
2019-06-02 17:45:32 +03:00
kaniini
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
lain
f323031927
Mix: Only start sshd when needed, second try.
2019-05-22 12:57:20 +02:00
lain
f4cfcead88
Mix: Bring ecto-sql back to mainline.
2019-05-22 11:44:17 +02:00
lain
db9a82d168
Linting.
2019-05-22 10:40:15 +02:00
lain
b6cf62ddea
Mix: Don't start esshd application if we don't need it.
2019-05-22 10:28: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
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
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
xse
c81b707030
Fix/ex_doc source links
2019-05-07 00:32:07 +00:00
lain
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
lain
a23206a4ae
Just have Benchee in all environments.
2019-05-03 20:28:06 +02:00
lain
a7709cc267
Mix: Also have benchee in test.
2019-05-03 19:42:49 +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
