Ariadne Conill
|
73a3dbe31e
|
remove CC-BY-NC-ND license.
we moved branding assets (mascot etc) to CC-BY-SA a while back.
|
2019-07-14 19:28:32 +00:00 |
|
rinpatch
|
9504544d5b
|
Merge branch 'revert/tags-releases' into 'master'
Revert "Build releases only on tags or develop"
See merge request pleroma/pleroma!1356
|
2019-06-29 10:35:32 +00:00 |
|
rinpatch
|
5bc9e6e0f3
|
Revert "Build releases only on tags or develop"
This reverts commit 54d2873770. It breaks
getting the latest artifact for the master branch.
|
2019-06-29 13:24:26 +03:00 |
|
rinpatch
|
e9426d15d8
|
Merge branch 'rebase/docs-master' into 'master'
Cherry-pick documentation fixes to master
See merge request pleroma/pleroma!1354
|
2019-06-29 09:49:38 +00:00 |
|
rinpatch
|
54d2873770
|
Build releases only on tags or develop
Needed so we could push documentation updates to master without
triggering a rebuild
|
2019-06-29 12:42:19 +03:00 |
|
rinpatch
|
9b014eae68
|
Add a warning about service files assuming installation paths
|
2019-06-29 12:13:52 +03:00 |
|
Yuji Nakao
|
69585a3218
|
Move all upload contents despite upload folder itself.
|
2019-06-29 12:13:45 +03:00 |
|
Yuji Nakao
|
d9f8230d2c
|
Update migrating_from_source_otp_en.md: Replace reload-daemon with daemon-reload.
|
2019-06-29 12:13:32 +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
|
2286f62a36
|
Merge branch 'release-docs' into 'develop'
Docs on OTP releases
See merge request pleroma/pleroma!1315
|
2019-06-28 15:26:09 +00:00 |
|
lain
|
da17bdd87e
|
BUMP OF CHICKEN
1.0
|
2019-06-28 17:15:44 +02:00 |
|
lain
|
f5b015b998
|
Merge branch '2019-06-29-pleromafe' into 'develop'
Update frontend.
See merge request pleroma/pleroma!1347
|
2019-06-28 12:39:51 +00:00 |
|
lain
|
efad26bbb9
|
Update frontend.
|
2019-06-28 14:29:26 +02:00 |
|
rinpatch
|
eeb419e3a0
|
Add a note about the develop branch
|
2019-06-28 09:42:45 +03:00 |
|
kaniini
|
ad249f6f5f
|
Merge branch 'fix/syslog-tag' into 'develop'
lowercase syslog tag
See merge request pleroma/pleroma!1344
|
2019-06-27 21:30:54 +00:00 |
|
Mark Felder
|
e64c758cea
|
Add changelog entry for syslog tag change
|
2019-06-27 16:25:55 -05:00 |
|
Mark Felder
|
f8ec3e129f
|
In my experience syslog tags are usually lowercase
|
2019-06-27 13:00:22 -05:00 |
|
rinpatch
|
e91f09cfe6
|
Add a note about OS/Distro packages in the readme
|
2019-06-27 10:01:04 +03:00 |
|
rinpatch
|
ceebe95c27
|
Add a deprecation warning to the readme
|
2019-06-27 09:51:53 +03:00 |
|
rinpatch
|
4f44732100
|
Add a note on what OTP releases are
|
2019-06-27 09:45:13 +03:00 |
|
kaniini
|
0369a5db16
|
Merge branch 'idempotency-plug' into 'develop'
Add IdempotencyPlug and use it in all of the api
Closes #1003
See merge request pleroma/pleroma!1339
|
2019-06-27 04:20:17 +00:00 |
|
kaniini
|
6587e2358c
|
Merge branch 'fix/admin-configure' into 'develop'
don't delete config settings on admin update
See merge request pleroma/pleroma!1340
|
2019-06-27 04:19:44 +00:00 |
|
Alexander Strizhakov
|
c6705144a2
|
don't delete config settings on admin update
|
2019-06-27 04:19:44 +00:00 |
|
rinpatch
|
cfb5be3ced
|
Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'
Update mastofe to bundle-2019-06-26
See merge request pleroma/pleroma!1341
|
2019-06-26 19:15:37 +00:00 |
|
Haelwenn (lanodan) Monnier
|
451931d36f
|
Update mastofe to bundle-2019-06-26
|
2019-06-26 21:06:28 +02:00 |
|
Egor Kislitsyn
|
889a9c3a3f
|
Polish IdempotencyPlug
|
2019-06-27 01:53:58 +07:00 |
|
rinpatch
|
f5f1bb35c3
|
Instructions on getting the flavour
|
2019-06-26 15:24:06 +03:00 |
|
rinpatch
|
877f91c0c4
|
Do not assume ~pleroma == /opt/pleroma
|
2019-06-26 15:20:22 +03:00 |
|
Egor Kislitsyn
|
159630b21c
|
Fix credo warning
|
2019-06-26 19:19:07 +07:00 |
|
Egor Kislitsyn
|
0b8aeac0f3
|
Remove previous idempotency implementation from post_status
|
2019-06-26 18:49:14 +07:00 |
|
Egor Kislitsyn
|
74132e3715
|
Enable IdempotencyPlug for the all API
|
2019-06-26 18:42:49 +07:00 |
|
Egor Kislitsyn
|
825077a5b0
|
Add Idempotency plug
|
2019-06-26 18:36:58 +07:00 |
|
Haelwenn
|
145bcf3eb9
|
Merge branch 'fix/handle-wrong-visibility-error' into 'develop'
Return correct response when reply to a direct message is not direct itself
Closes #1010
See merge request pleroma/pleroma!1336
|
2019-06-26 10:59:28 +00:00 |
|
Sergey Suprunenko
|
d53fb55bb7
|
Return correct response when reply to a direct message is not direct itself
|
2019-06-26 10:59:27 +00:00 |
|
rinpatch
|
e404335af8
|
Add all the remaining sections to Switching to OTP releases
|
2019-06-26 11:34:58 +03:00 |
|
kaniini
|
24bcc209f9
|
Merge branch 'refactoring/fix_render_view' into 'develop'
Fix Controller.render/4 deprecation
See merge request pleroma/pleroma!1337
|
2019-06-26 05:34:26 +00:00 |
|
kaniini
|
9f8e645dce
|
Merge branch 'feature/configurable-pack-extensions' into 'develop'
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
|
2019-06-26 05:34:02 +00:00 |
|
rinpatch
|
e6f036b9ad
|
Merge branch 'issues/1016' into 'develop'
[#1016] add clear formatted text/ removes links with private ip
See merge request pleroma/pleroma!1335
|
2019-06-26 03:55:20 +00:00 |
|
Maksim Pechnikov
|
437fd6046d
|
update changelog
|
2019-06-26 06:49:20 +03:00 |
|
rinpatch
|
41e4752950
|
Make default pack extensions configurable and default to png and gif
|
2019-06-26 06:48:59 +03:00 |
|
Maksim
|
f1817fe94b
|
Apply suggestion to CHANGELOG.md
|
2019-06-26 03:43:53 +00:00 |
|
Maksim Pechnikov
|
7d6a543eca
|
update changelog
|
2019-06-26 06:39:50 +03:00 |
|
Maksim Pechnikov
|
5c0f646cef
|
fix validate_page_url
|
2019-06-26 06:27:17 +03:00 |
|
Maksim
|
ec01b7c934
|
Apply suggestion to docs/config.md
|
2019-06-26 03:23:26 +00:00 |
|
Roman Chvanikov
|
a7a54068f9
|
Fix Controller.render/4 deprecation
|
2019-06-26 03:28:02 +03:00 |
|
Maksim Pechnikov
|
4ad15ad2a9
|
add ignore hosts and TLDs for rich_media
|
2019-06-25 22:25:37 +03:00 |
|
Maksim Pechnikov
|
0cb8e710fb
|
add test
|
2019-06-25 18:06:08 +03:00 |
|
Maksim Pechnikov
|
0276cf5a02
|
fix validate_url for private ip
|
2019-06-25 17:44:24 +03:00 |
|
rinpatch
|
44aa895b78
|
Add a note that OTP releases don't contain revision history
|
2019-06-25 05:50:25 +03:00 |
|
rinpatch
|
57d18b06ab
|
Remove the useless specification of test size and make the main points bold
|
2019-06-25 04:55:41 +03:00 |
|