lain
|
0d5d1c62ef
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-07-27 12:24:41 +00:00 |
|
Maksim Pechnikov
|
61ef1fca4b
|
remove duplicate module
|
2020-07-24 08:35:06 +03:00 |
|
Maksim Pechnikov
|
67ab9a7928
|
Merge branch 'develop' into issue/1934-welcome-email
|
2020-07-23 16:36:27 +03:00 |
|
Maksim Pechnikov
|
7991ddad58
|
added warning to use old keys
|
2020-07-23 09:01:37 +03:00 |
|
lain
|
5b1eeb06d8
|
Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"
This reverts merge request !2784
|
2020-07-21 22:18:17 +00:00 |
|
lain
|
696c13ce54
|
Revert "Merge branch 'linkify' into 'develop'"
This reverts merge request !2677
|
2020-07-21 22:17:34 +00:00 |
|
Maksim Pechnikov
|
3edaecae96
|
added welcome email
|
2020-07-21 09:25:53 +03:00 |
|
Alex Gleason
|
204dddcfaa
|
Pleroma.Formatter can have partial updates
|
2020-07-20 13:45:05 -05:00 |
|
Alex Gleason
|
38425ebdbf
|
Merge remote-tracking branch 'upstream/develop' into linkify
|
2020-07-16 14:51:36 -05:00 |
|
Alexander Strizhakov
|
b376442325
|
MediaProxy whitelist setting now supports hosts with scheme
added deprecation warning about using bare domains
|
2020-07-12 12:41:40 +03:00 |
|
Alexander Strizhakov
|
b28cc15459
|
don't restart pleroma in mix tasks
|
2020-07-08 15:58:47 +03:00 |
|
Alexander Strizhakov
|
480dfafa83
|
don't save tesla settings into db
|
2020-07-06 08:48:20 +03:00 |
|
Alex Gleason
|
8daacc9114
|
AutoLinker --> Linkify, update to latest version
https://git.pleroma.social/pleroma/elixir-libraries/linkify
|
2020-06-30 16:39:15 -05:00 |
|
Haelwenn
|
c7d69e9256
|
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
|
2020-06-23 16:38:27 +00:00 |
|
Alexander Strizhakov
|
b66e6eb521
|
fixes for tests
|
2020-06-16 19:03:45 +03:00 |
|
Alexander Strizhakov
|
ed189568f3
|
moving mrf settings from instance to separate group
|
2020-06-16 18:32:18 +03:00 |
|
Alexander Strizhakov
|
3c2cee33ad
|
moving custom ecto types in context folders
|
2020-06-16 17:50:33 +03:00 |
|
Alexander Strizhakov
|
32c6576b60
|
naming
|
2020-06-16 15:54:22 +03:00 |
|
Alexander Strizhakov
|
e1603ac8fe
|
fix attemps to merge map
|
2020-06-16 15:54:22 +03:00 |
|
Alexander Strizhakov
|
9a4fde9766
|
Mogrify args as custom tuples
|
2020-06-16 15:53:28 +03:00 |
|
href
|
cb7be6eef2
|
Remove use of atoms in MRF.UserAllowListPolicy
|
2020-06-13 12:08:46 +03:00 |
|
Alexander Strizhakov
|
3c29f4f957
|
returning partial chain
|
2020-05-15 16:16:02 +03:00 |
|
Alexander Strizhakov
|
6cda360fea
|
don't restart postgrex
|
2020-04-17 12:45:13 +03:00 |
|
Alexander Strizhakov
|
304ea09f4c
|
fix for logger configuration
|
2020-04-17 08:42:48 +03:00 |
|
Alexander Strizhakov
|
a050f3e015
|
fix for logger configuration through admin-fe
|
2020-04-13 08:56:28 +03:00 |
|
Alexander Strizhakov
|
39ed608b13
|
Merge branch 'develop' into gun
|
2020-03-12 18:31:10 +03:00 |
|
Alexander Strizhakov
|
1306b92997
|
clean up
|
2020-03-12 18:29:07 +03:00 |
|
Alexander Strizhakov
|
fce090c1de
|
using Pleroma.Config instead of ets
|
2020-03-11 17:22:50 +03:00 |
|
Alexander Strizhakov
|
193d67cde5
|
compile fix
|
2020-03-11 16:43:58 +03:00 |
|
Alexander Strizhakov
|
282a93554f
|
merging release default config on app start
|
2020-03-11 16:25:53 +03:00 |
|
Alexander Strizhakov
|
426f5ee48a
|
tesla adapter can't be changed in adminFE
|
2020-03-10 15:31:44 +03:00 |
|
Alexander Strizhakov
|
b2eb1124d1
|
Merge branch 'develop' into gun
|
2020-03-07 12:41:37 +03:00 |
|
rinpatch
|
6d797b9928
|
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225
|
2020-03-07 09:32:29 +00:00 |
|
Mark Felder
|
4427161ca3
|
Merge branch 'develop' into gun
|
2020-03-03 17:15:49 -06:00 |
|
Mark Felder
|
05da5f5cca
|
Update Copyrights
|
2020-03-03 16:44:49 -06:00 |
|
Alexander Strizhakov
|
509c81e4b1
|
Merge branch 'develop' into gun
|
2020-03-03 10:08:07 +03:00 |
|
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
2020-03-02 06:08:45 +01:00 |
|
Alexander Strizhakov
|
400fbc7629
|
wait in mix task while pleroma is rebooted
|
2020-03-01 12:36:09 +03:00 |
|
Mark Felder
|
cf94349287
|
Merge branch 'develop' into gun
|
2020-02-18 09:06:27 -06:00 |
|
Alexander Strizhakov
|
514c899275
|
adding gun adapter
|
2020-02-18 08:19:01 +03:00 |
|
Alexander Strizhakov
|
dad23e3766
|
need_reboot flag
|
2020-02-08 13:00:02 +03:00 |
|
Alexander Strizhakov
|
e93cc561cd
|
restarting pleroma from outside application
|
2020-01-25 18:42:04 +03:00 |
|
Alexander Strizhakov
|
6a0f0ac4a2
|
fix for non existing atom
|
2020-01-24 12:22:26 +03:00 |
|
Alexander Strizhakov
|
6cd2e851d9
|
parsing Swoosh modules
|
2020-01-23 18:21:29 +03:00 |
|
Alexander Strizhakov
|
d5f8a88a37
|
support for updating env after settings deletion
|
2020-01-22 15:14:11 +03:00 |
|
Alexander Strizhakov
|
f01ab6cd29
|
some refactor and tests
|
2020-01-21 18:42:00 +03:00 |
|
Alexander Strizhakov
|
dcae5914d1
|
fix for db key
|
2020-01-21 10:14:48 +03:00 |
|
Alexander Strizhakov
|
8023fa48db
|
merge fix
|
2020-01-20 18:25:00 +03:00 |
|
Alexander Strizhakov
|
efb8ef5abe
|
releases support
|
2020-01-18 17:14:50 +03:00 |
|
Alexander Strizhakov
|
e699861690
|
full update for some subkeys
|
2020-01-18 12:25:56 +03:00 |