rinpatch
948d0d3b0b
mixfile: bump version to 1.1.3
2019-10-25 18:49:21 +03:00
rinpatch
1a063c92ab
Bump version to 1.1.2 in mix.exs
2019-10-19 00:40:23 +03:00
rinpatch
4123c9db07
Bump the version in mix.exs
2019-10-18 14:53:13 +03:00
rinpatch
0733da3205
Fix hiding branch name logic
2019-10-14 22:13:18 +03:00
rinpatch
8ef4afcc3b
Final 1.1 release preparations
2019-10-14 21:20:29 +03:00
rinpatch
2b6cd10b68
Correct version parser branch name detection
2019-10-14 19:34:38 +03:00
rinpatch
3d3c166e59
Preparations for renaming `master` to `stable`
2019-10-14 19:33:57 +03:00
Ariadne Conill
c5b7d2ef26
Pleroma 1.0.91 (aka 1.1 RC2).
2019-10-07 12:10:57 +00:00
Egor Kislitsyn
67d772dd73
Replace `Pleroma.FlakeId` with `flake_id` hex package
2019-10-04 21:59:17 +00:00
Egor Kislitsyn
7d5f20b50f
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd33126
, reversing
changes made to 4fabf83ad0
.
2019-10-04 16:01:31 +00:00
Ariadne Conill
5bfd4006ae
Pleroma 1.0.90 (aka 1.1 RC1).
2019-09-30 16:39:20 +00:00
feld
f339ec3939
Merge branch 'deps/update-tesla' into 'develop'
...
Update Tesla to 1.3
Closes #1262
See merge request pleroma/pleroma!1684
(cherry picked from commit 764931fc9f
)
8d812c28
Update Tesla to 1.3
2019-09-17 19:38:57 +00:00
rinpatch
ea1867f48e
Merge branch 'config-changes' into 'develop'
...
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
(cherry picked from commit 9c64a25713
)
69faec03
markdown generation to the new file
c625fe6f
config.md back
4da0da9a
don't track generated_config.md
2019-09-14 17:27:08 +00:00
Alex S
6b0e8b73df
bump ex_doc version
2019-09-11 09:25:33 +03:00
Alex S
511d93fa54
mix docs generates config.md
2019-09-11 09:25:33 +03:00
rinpatch
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.
2019-08-14 17:05:21 +03:00
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