itepechi/akkoma
1
0
Fork 0
Code Issues Pull requests Releases Activity
5587 commits 3 branches 2 tags 277 MiB
Commit graph

5587 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
lain
58c4d5312b Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'"" 
This reverts commit b6af80f769.
 2019-06-22 15:12:57 +02:00
rinpatch
3ac5ecbac1 Support RUM indexes in the config generator 2019-06-22 12:54:16 +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
rinpatch
53c73cd1a3 Merge branch 'fix/ecto-tasks-release' into 'develop' 
Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything

See merge request pleroma/pleroma!1322
 2019-06-22 09:19:10 +00:00
rinpatch
4b791afd60 Merge branch 'bugfix/simple-notifications-for-non-create-activities' into 'develop' 
notifications: fix notification generation for non-create activities

See merge request pleroma/pleroma!1323
 2019-06-22 06:55:32 +00:00
William Pitcock
6426301407 notifications: fix notification generation for non-create activities 
in 300d94c62, an Object.normalize() call was introduced.  calling Object.normalize()
on an activity with a non-object URI (say, a user) causes Really Bad Things to happen.
so don't do that.
 2019-06-22 06:44:47 +00:00
Alex S
f0fccb7578 fix for int and modules 2019-06-22 09:01:30 +03:00
rinpatch
19f16e829d Load the application before executing the create task 2019-06-22 04:33:46 +03:00
rinpatch
ebee9f59d8 Ecto tasks: Resolve relative path using the application directory 
instead of cwd and load the application before doing anything

In OTP releases cwd != app directory and the configuration is read
only if the application is loaded
 2019-06-22 04:17:04 +03:00
kaniini
ddd04d1c52 Merge branch 'chore/update-bbcode' into 'develop' 
mix: update bbcode dependency to v0.1.1

See merge request pleroma/pleroma!1321
 2019-06-21 23:54:37 +00:00
rinpatch
cf94b813e5 Merge branch 'fix/fallback-config' into 'develop' 
Fallback to Config if Mix.Config does not exist, even if Config does not exist either

See merge request pleroma/pleroma!1320
 2019-06-21 23:43:14 +00:00
William Pitcock
481932309f mix: update bbcode dependency to v0.1.1 2019-06-21 23:42:50 +00:00
rinpatch
f4009b6706 Fallback to Config if Mix.Config does not exist, even if Config does not 
exist either

For some weird reason Code.ensure_loaded?(Config) is false on OTP
releases even though `use Config` from config files works just fine.
 2019-06-22 02:29:49 +03:00
kaniini
55742d978d Merge branch 'feature/mrf-anti-link-spam' into 'develop' 
implement anti link spam MRF

See merge request pleroma/pleroma!1307
 2019-06-21 22:56:54 +00:00
rinpatch
89fa14f558 Merge branch 'fix/use-config-when-possible' into 'develop' 
use Config in generated config when available

See merge request pleroma/pleroma!1319
 2019-06-21 22:43:39 +00:00
kaniini
e3534f5b3c Merge branch 'oauth_secure_redirect' into 'develop' 
OAuth security improvements (`redirect_uri` listing enforcement)

See merge request pleroma/pleroma!1302
 2019-06-21 22:31:12 +00:00
kaniini
720412bf24 Merge branch 'revert-6f5a0cc1' into 'develop' 
Revert "Merge branch 'fix/ogp-title' into 'develop'"

See merge request pleroma/pleroma!1317
 2019-06-21 22:28:46 +00:00
William Pitcock
127a5a7d65 change the anti-link-spam MRF implementation to use old_user? instead of the previous name 2019-06-21 22:27:14 +00:00