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 |
|
kaniini
|
d80859731e
|
Merge branch 'issues/184' into 'develop'
[#184] small refactoring reset password
See merge request pleroma/pleroma!1301
|
2019-06-24 19:01:56 +00:00 |
|
Maksim
|
a0c4ebb4d7
|
[#184] small refactoring reset password
|
2019-06-24 19:01:56 +00:00 |
|
kaniini
|
1ab8a9e4fe
|
Merge branch 'feature/rework-user-deletion' into 'develop'
Rework user deletion
Closes #846
See merge request pleroma/pleroma!1308
|
2019-06-24 18:59:12 +00:00 |
|
Sergey Suprunenko
|
2c63c67512
|
Rework user deletion
|
2019-06-24 18:59:12 +00:00 |
|
rinpatch
|
687f0aee51
|
Basic skeleton of "Switching a from-source install to OTP releases"
|
2019-06-24 11:51:02 +03:00 |
|
kaniini
|
0f07bcc9e3
|
Merge branch 'conversation-update-on-dm-delete' into 'develop'
Broadcast conversation update when DM is deleted
Closes #1001
See merge request pleroma/pleroma!1311
|
2019-06-24 07:14:04 +00:00 |
|
Eugenij
|
f2c03425b0
|
Broadcast conversation update when DM is deleted
|
2019-06-24 07:14:04 +00:00 |
|
rinpatch
|
5b76c3141f
|
Use supervise-daemon(8) for the alpine service
|
2019-06-24 10:08:33 +03:00 |
|
rinpatch
|
58d567ddc5
|
Merge branch 'modify-config.md-for-S3' into 'develop'
Modify config.md for s3
See merge request pleroma/pleroma!1331
|
2019-06-24 05:32:03 +00:00 |
|
aries
|
550302c041
|
Apply suggestion to docs/config.md
|
2019-06-24 01:09:28 +00:00 |
|
rinpatch
|
7fc226e0fe
|
Remove the warning about alpine as the issue is now solved
|
2019-06-24 02:50:28 +03:00 |
|
feld
|
826d0424c1
|
Merge branch 'update/adminfe' into 'develop'
Update adminFE to latest build
See merge request pleroma/pleroma!1333
|
2019-06-23 22:46:21 +00:00 |
|
Mark Felder
|
7b9e21e8a2
|
Update adminFE to latest build
|
2019-06-23 18:36:20 -04:00 |
|
aries
|
7daaaf84f1
|
Fix markdown mistakes
|
2019-06-24 01:28:01 +09:00 |
|
aries
|
4bac13966b
|
modify config.md for S3
|
2019-06-24 01:10:55 +09:00 |
|
kaniini
|
48174dc290
|
Merge branch 'bind-to-localhost' into 'develop'
Bind to 127.0.0.1 instead of 0.0.0.0 by default
See merge request pleroma/pleroma!1329
|
2019-06-23 06:53:38 +00:00 |
|
rinpatch
|
875100de01
|
Bind to 127.0.0.1 instead of 0.0.0.0 by default
|
2019-06-23 09:31:39 +03:00 |
|
kaniini
|
27b9605de0
|
Merge branch 'rich_media_titles_two' into 'develop'
Rich media titles two
See merge request pleroma/pleroma!1325
|
2019-06-23 05:43:11 +00:00 |
|
kaniini
|
8b7860f12f
|
Merge branch 'admin-config' into 'develop'
Admin config
See merge request pleroma/pleroma!1328
|
2019-06-23 05:42:37 +00:00 |
|
rinpatch
|
40a62839ff
|
Use build-base instead of individual packages
|
2019-06-23 08:35:35 +03:00 |
|
Alex S
|
b37ede5df3
|
log capturing
|
2019-06-23 08:16:28 +03:00 |
|
Alex S
|
982cad0268
|
support for config groups
|
2019-06-23 08:16:16 +03:00 |
|
rinpatch
|
1d3c5e434d
|
releases_en.md -> otp_en.md
|
2019-06-23 07:44:10 +03:00 |
|
rinpatch
|
66e92dc0ca
|
Add a Further Reading section to the OTP install guide
|
2019-06-23 07:43:45 +03:00 |
|
rinpatch
|
997e766929
|
Remove sudo in the nginx config command example
|
2019-06-23 07:39:23 +03:00 |
|
rinpatch
|
299cefa2bd
|
Add a section on executing mix tasks
|
2019-06-23 03:05:02 +03:00 |
|
rinpatch
|
18eabca978
|
Add a section about updating
|
2019-06-23 02:55:43 +03:00 |
|
rinpatch
|
9d487ba579
|
Add docs about SSL certificate auto-renew
|
2019-06-23 02:42:53 +03:00 |
|
rinpatch
|
7a4c4518b8
|
Remove a note about needing to add RUM to config manually, as it is now
in the config generator
|
2019-06-22 21:18:34 +03:00 |
|
Haelwenn
|
72f365df07
|
Merge branch 'docs/remove-tootdon' into 'develop'
docs/clients.md: Remove tootdon
See merge request pleroma/pleroma!1326
|
2019-06-22 17:44:06 +00:00 |
|
Haelwenn
|
066f4622d6
|
Merge branch 'feature/rum-config-generator' into 'develop'
Support RUM indexes in the config generator
See merge request pleroma/pleroma!1324
|
2019-06-22 17:38:04 +00:00 |
|
Haelwenn (lanodan) Monnier
|
ab79a18b77
|
docs/clients.md: Remove tootdon
Of course a proprietary client would send the messages home :D
|
2019-06-22 19:34:30 +02:00 |
|
rinpatch
|
c013d3f3c8
|
Fix the webroot method in the nginx config
|
2019-06-22 20:26:59 +03:00 |
|
Alex S
|
410add1c30
|
support for tuples with more than 2 values
|
2019-06-22 17:30:53 +03:00 |
|
lain
|
0e415921cd
|
Rich Media Parser: Do not return just a title if nothing else is there.
|
2019-06-22 16:22:59 +02:00 |
|