tim/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
6225 commits 3 branches 74 tags 292 MiB
Commit graph

172 commits

Author SHA1 Message Date
Maksim
bb9c539580 Uploader.S3 added support stream uploads 2019-08-10 11:27:59 +00:00
Roman Chvanikov
9d4f34fbcb Merge branch 'develop' into feature/digest-email 2019-08-02 18:16:04 +03:00
rinpatch
81412240e6 Fix Invalid SemVer version generation 
when the current branch does not have commits ahead of tag/checked out on a tag
 2019-08-01 14:15:18 +03:00
Ariadne Conill
9d78b3b281 mix: add ex_const dependency 2019-07-29 02:12:35 +00:00
Roman Chvanikov
d2da3d30f3 Merge branch 'develop' into feature/digest-email 2019-07-24 16:37:52 +03:00
oncletom
2e697f87f4 Update prometheus_phoenix to v1.3 in order to support phoenix@1.4. 2019-07-23 15:16:47 +00:00
Roman Chvanikov
afc7708dbe Fix pleroma_job_queue version 2019-07-21 00:01:58 +03:00
Roman Chvanikov
36049f08ef Merge develop 2019-07-20 01:03:25 +03:00
Ariadne Conill
cdf0038d0f mix: update http signatures dependency 2019-07-18 15:53:01 +00:00
Ariadne Conill
1e3aff6ef1 mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989 2019-07-17 19:00:26 +00:00
Roman Chvanikov
e7c175c943 Use PleromaJobQueue for scheduling 2019-07-16 16:49:50 +03:00
Roman Chvanikov
9bca70b10a Merge develop 2019-07-16 16:19:19 +03:00
lain
d302fcaa61 Dependencies: Update tzdata and related packages. 2019-07-15 16:47:39 +09:00
Maksim
fa17879c20 added tests for Web.MediaProxy 2019-07-14 21:01:32 +00:00
Roman Chvanikov
eae991b06a merge develop 2019-07-12 18:08:27 +03:00
Maksim
12b1454245 [#1062] added option to disable send email 2019-07-10 05:34:21 +00:00
Roman Chvanikov
371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
kaniini
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
Alexander Strizhakov
4e6e5d8042 reverse proxy tests 2019-07-09 16:54:13 +00:00
Egor Kislitsyn
11143c542a Remove httpoison from dependencies 2019-07-03 14:42:24 +07:00
Ivan Tashkinov
a02f52d12a [#1048] Resolved violations of SemVer version format. Refactoring. 2019-07-02 09:04:59 +03: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
Roman Chvanikov
657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +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
Roman Chvanikov
b1b1a270e8 Fix conflict 2019-06-05 02:45:21 +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