squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,624 Commits 154 Branches 42 Tags 503 MiB
16f0d8ea71
Commit Graph

12624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ilja
16f0d8ea71 Merge branch 'simplePolicy_reasons_for_instance_specific_policies' of https://git.pleroma.social/ilja/pleroma into simplePolicy_reasons_for_instance_specific_policies 2020-12-13 22:34:44 +01:00
rinpatch
f687befb93 Merge branch 'fix/hackney-follow-redirects' into 'develop' 
Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix

Closes #2342

See merge request pleroma/pleroma!3199
 2020-12-13 12:16:41 +00:00
Mark Felder
dfde4af0fd Fixed Rich Media Previews 2020-12-12 13:23:51 -06:00
feld
1e3eb9e004 Merge branch 'fix/tracking-majic' into 'develop' 
Majic: specify commit so source users do not get surprise updates

See merge request pleroma/pleroma!3200
 2020-12-12 19:20:34 +00:00
Mark Felder
7d78c00049 Majic: specify commit so source users do not get surprise updates 2020-12-12 13:04:16 -06:00
Mark Felder
3299fea9e3 Switch to a fork of Hackney 1.15.2 for now so we can have our URL normalization bugfix 2020-12-12 13:01:30 -06:00
Haelwenn
f2bf2131b4 Merge branch 'weblate-pleroma-pleroma' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma!3195
 2020-12-11 15:01:08 +00:00
ZEN
2db42ac978 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/uk/
 2020-12-11 00:56:57 +00:00
Haelwenn
b8cda9d96e Merge branch 'weblate-pleroma-pleroma' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma!3194
 2020-12-10 22:39:38 +00:00
ZEN
98deed65b3 Added translation using Weblate (Ukrainian) 2020-12-10 16:09:45 +00:00
feld
45e1cf902a Merge branch 'oauth-entities-expiration-tweaks' into 'develop' 
Tweaks to OAuth entities expiration

See merge request pleroma/pleroma!3193
 2020-12-09 18:30:13 +00:00
Ivan Tashkinov
7fff9c1bee Tweaks to OAuth entities expiration: changed default to 30 days, removed hardcoded values usage, fixed OAuthView (expires_in). 2020-12-09 21:14:39 +03:00
feld
c308224aaf Merge branch 'oauth-token-30-days-expiration' into 'develop' 
Changed default OAuth token expiration time to 30 days

See merge request pleroma/pleroma!3192
 2020-12-09 17:10:09 +00:00
Ivan Tashkinov
7da0349d73 Changed default OAuth token expiration time to 30 days. 2020-12-09 19:59:46 +03:00
lain
477c6c8e55 Merge branch 'auth-improvements' into 'develop' 
Cookie auth rework / Auth subsystem refactoring and tweaks

Closes pleroma/secteam/pleroma#3

See merge request pleroma/pleroma!3112
 2020-12-09 15:55:45 +00:00
lain
1436a2fa2d Merge branch 'stream-follow-updates' into 'develop' 
Stream follow updates

Closes #2299

See merge request pleroma/pleroma!3183
 2020-12-09 15:52:31 +00:00
Ivan Tashkinov
055a306380 [#3112] .gitattributes fix. 2020-12-09 18:43:20 +03:00
Egor Kislitsyn
97068196a9
Update CHANGELOG 2020-12-09 19:40:40 +04:00
lain
e73d878b38 Merge branch 'feat/warn-large-pool-size' into 'develop' 
Add a startup error for modified Repo pool_size

See merge request pleroma/pleroma!3190
 2020-12-08 16:36:51 +00:00
lain
50d16a9e27 ApplicationRequirements: Add test, more text for pool size. 2020-12-08 17:30:10 +01:00
lain
5b9b7b4888 Apply 1 suggestion(s) to 1 file(s) 2020-12-08 16:16:43 +00:00
feld
9d0839504e Merge branch 'features/favicon-unreachable-instance' into 'develop' 
instance: Do not fetch unreachable instances

Closes #2346

See merge request pleroma/pleroma!3189
 2020-12-07 22:49:45 +00:00
Mark Felder
fb3fd692c6 Add a startup error for modified Repo pool_size 2020-12-07 16:44:55 -06:00
Haelwenn (lanodan) Monnier
1403798820
instance.reachable?: Limit to binary input 2020-12-07 21:20:44 +01:00
Haelwenn (lanodan) Monnier
e1a2e8b17c
instance: Do not fetch unreachable instances 
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2346
 2020-12-07 20:11:47 +01:00
Ivan Tashkinov
36ce45a28c [#3112] Changelog entry. 2020-12-07 21:50:32 +03:00
Ivan Tashkinov
c8e7ace812 Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements 
# Conflicts:
#	CHANGELOG.md
 2020-12-07 21:45:04 +03:00
lain
ed76323776 Merge branch 'feature/configdb-mix-tasks' into 'develop' 
Add mix tasks to give additional ConfigDB recovery and debugging options

See merge request pleroma/pleroma!3174
 2020-12-07 18:06:06 +00:00
Mark Felder
93428d7c11 Print out settings that will be removed when specifying the group and key for consistency 
Fix error message when specified key doesn't exist
 2020-12-07 11:45:56 -06:00
Mark Felder
61494b5245 Formatting 2020-12-07 11:22:07 -06:00
Mark Felder
e3dd0d45b7 Slip in a test to ensure we can use the atom syntax in mix task arguments 2020-12-07 11:21:06 -06:00
feld
d817bae802 Apply 1 suggestion(s) to 1 file(s) 2020-12-07 17:13:29 +00:00
feld
ca90843d13 Merge branch 'feature/configdb-mix-tasks-refactoring' into 'feature/configdb-mix-tasks' 
[#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests.

See merge request pleroma/pleroma!3187
 2020-12-07 17:12:47 +00:00
Ivan Tashkinov
e00c667145 [#3174] Refactoring: ConfigDB fetching functions, ConfigDB tests. 
Minor fixes.
 2020-12-06 18:02:30 +03:00
Ivan Tashkinov
a010c5b16a Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements 2020-12-06 13:59:35 +03:00
Ivan Tashkinov
e9859b68fc [#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions. 2020-12-06 13:59:10 +03:00
Egor Kislitsyn
49717f3dcd
Fix typo 2020-12-05 23:48:13 +04:00
Mark Felder
24673b6ca3 Add entry announcing new ConfigDB mix tasks 2020-12-05 08:44:02 -06:00
feld
b3ee618e0d Merge branch 'fix/mix-task-yn-prompt' into 'develop' 
Remove Mix.Pleroma.shell_yes?/1

See merge request pleroma/pleroma!3179
 2020-12-04 18:17:35 +00:00
Mark Felder
657002e738 Answer new prompt interactively 2020-12-04 12:07:23 -06:00
Mark Felder
50aadc3d5c shell_yes?/1 was not showing the correct message and always defaults to yes which is dangerous 2020-12-04 11:49:56 -06:00
feld
6adad96c79 Merge branch 'issue/2256' into 'develop' 
[#2256] added subject actor to moderation log

See merge request pleroma/pleroma!3164
 2020-12-04 17:49:05 +00:00
Mark Felder
9dfda37821 More compact representation 2020-12-04 11:37:49 -06:00
Mark Felder
3bf5c5b015 Ensure deleting entire group prints out settings that will be removed before actually removing them 2020-12-04 11:30:48 -06:00
Mark Felder
696d39c3dc Fix deleting an entire group. Also utilize Pleroma.ConfigDB.delete/1 2020-12-04 11:19:58 -06:00
Mark Felder
685e5c8509 Use Pleroma.ConfigDB.delete/1 instead of rolling our own 2020-12-04 11:09:13 -06:00
Mark Felder
4aad066091 Use Enum.any? to ensure we return true if there are results 2020-12-04 11:04:53 -06:00
rinpatch
1d04bd0894 Merge branch 'supported-emojos' into 'develop' 
Update Emoji support to unicode 13.1, support all RGI emoji.

See merge request pleroma/pleroma!3186
 2020-12-03 18:29:42 +00:00
Alexander Strizhakov
a02eb88396
config_db search methods 2020-12-03 19:34:23 +03:00
Mark Felder
7fd4f4908b dump_key/2 no longer used 2020-12-03 10:03:44 -06:00