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
|
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 |
|
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 |
|
Mark Felder
|
657002e738
|
Answer new prompt interactively
|
2020-12-04 12:07:23 -06:00 |
|
|
|
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 |
|
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 |
|
lain
|
fa0d0b602f
|
Emoji: Also accept regional indicators
|
2020-12-03 16:17:39 +01:00 |
|
Haelwenn
|
05879a3b3e
|
Merge branch '2339-local-remote-mixup' into 'develop'
User: Don't allow local users in remote changesets
Closes #2339
See merge request pleroma/pleroma!3185
|
2020-12-03 01:28:54 +00:00 |
|
Mark Felder
|
e379ab8277
|
Add --force flag for delete and reset commands
Bunch of reorganization and consolidation
|
2020-12-02 16:24:32 -06:00 |
|
Mark Felder
|
13947999ad
|
Use a callback strategy to short circuit the functions and print a nice error
|
2020-12-02 12:33:34 -06:00 |
|
Mark Felder
|
3e6d9187a7
|
Add tests for config dumping
|
2020-12-02 10:43:22 -06:00 |
|
Mark Felder
|
126d236455
|
We no longer expect mentions to link if they are prefixed with too many @'s
|
2020-12-02 10:27:55 -06:00 |
|
lain
|
8fb259e739
|
Emoji: Only accept RGI emoji.
"recommended for general interchange"
|
2020-12-02 16:46:19 +01:00 |
|
lain
|
3b3cf63118
|
Emoji: Add test for ZWJ sequence emoji
|
2020-12-02 16:18:08 +01:00 |
|
lain
|
1adee08321
|
Emoji: Update to Unicode 13.1, switch base file, allow multichar.
|
2020-12-02 16:15:03 +01:00 |
|
lain
|
5d15486098
|
SideEffects: fix test
|
2020-12-02 14:48:11 +01:00 |
|
lain
|
222312900e
|
User: Don't allow local users in remote changesets
|
2020-12-02 12:18:43 +01:00 |
|
rinpatch
|
fc9ebe5073
|
Search tests: Use on_exit for restoring persistent_term state
Otherwise if the assertion failed, the code below which resets the
state would never be reached
|
2020-12-01 19:45:25 +03:00 |
|
Ivan Tashkinov
|
d50a3345ae
|
[#3112] Allowed revoking same-user token from any apps. Added tests.
|
2020-11-30 21:55:48 +03:00 |
|
Ivan Tashkinov
|
50e47a215f
|
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
|
2020-11-28 21:51:27 +03:00 |
|
Ivan Tashkinov
|
f1b07a2b2b
|
OAuth form user remembering feature. Local MastoFE login / logout fixes.
|
2020-11-28 21:51:06 +03:00 |
|
Alexander Strizhakov
|
6aadb1cb40
|
digest algorithm is taken from header
|
2020-11-27 08:10:52 +03:00 |
|
Maksim Pechnikov
|
fb72f2034a
|
fix spec
|
2020-11-25 22:44:27 +03:00 |
|
Ivan Tashkinov
|
62993db499
|
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
|
2020-11-25 21:48:18 +03:00 |
|
Ivan Tashkinov
|
12a5981cc3
|
Session token setting on token exchange. Auth-related refactoring.
|
2020-11-25 21:47:23 +03:00 |
|
Mark Felder
|
54df44d380
|
Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters
|
2020-11-23 14:48:14 -06:00 |
|
Mark Felder
|
3283d0805f
|
Use Jason instead of Poison in tests
|
2020-11-23 13:28:55 -06:00 |
|
lain
|
67b15cc033
|
Search: Save detected pg version in a persistent term.
|
2020-11-23 15:29:55 +01:00 |
|
lain
|
f9a4cf2097
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
|
2020-11-23 15:18:19 +01:00 |
|
Ivan Tashkinov
|
489b12cde4
|
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
|
2020-11-21 19:47:46 +03:00 |
|
Ivan Tashkinov
|
ccc2cf0e87
|
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
|
2020-11-21 19:47:25 +03:00 |
|
|
|
ecd1ef8cb5
|
Merge branch 'fix/2302-report-duplicates' into 'develop'
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
|
2020-11-20 18:40:15 +00:00 |
|
lain
|
8532325d65
|
SearchController Test: Fix test.
|
2020-11-20 16:29:11 +01:00 |
|
lain
|
9a1e5f5d48
|
Search: Change search method based on detected pg version
|
2020-11-20 16:26:43 +01:00 |
|
|
|
79a509ee61
|
Merge branch '2301-users-search-discoverability-fix' into 'develop'
[#2301] Proper handling of User.is_discoverable
Closes #2301
See merge request pleroma/pleroma!3162
|
2020-11-19 20:33:52 +00:00 |
|
|
|
cd1b4155d5
|
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
|
2020-11-19 20:32:32 +00:00 |
|
Maksim Pechnikov
|
66f411fba0
|
added subject actor to moderation log
|
2020-11-19 22:13:45 +03:00 |
|
Ivan Tashkinov
|
b27d8f7437
|
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
# Conflicts:
# CHANGELOG.md
|
2020-11-19 19:35:44 +03:00 |
|
lain
|
5e04f4156c
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
|
2020-11-19 17:32:57 +01:00 |
|
Ivan Tashkinov
|
e164c37139
|
[#2301] Proper handling of User.is_discoverable: users appear in in-service search but are hidden from external services like search bots.
|
2020-11-19 19:30:02 +03:00 |
|
Haelwenn
|
c8d11c3064
|
Merge branch '2317-old-reset-tokens' into 'develop'
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
|
2020-11-19 16:22:14 +00:00 |
|
lain
|
783fa797bb
|
SearchController Test: Fix test
|
2020-11-19 16:53:26 +01:00 |
|
lain
|
81b6f02a5e
|
Search Test: linting
|
2020-11-19 16:48:51 +01:00 |
|
lain
|
a60242464e
|
Search: Add option to search with the websearch function
|
2020-11-19 16:12:01 +01:00 |
|
Ivan Tashkinov
|
fcad3e716a
|
[#2301] Quick fix: users with is_discoverable == false (default!) are included in search results.
|
2020-11-19 18:08:22 +03:00 |
|
Alexander Strizhakov
|
46dab37351
|
little fix
|
2020-11-19 15:29:26 +03:00 |
|
lain
|
11e0d5f9ac
|
Password Resets: Don't accept tokens above a certain age.
By default, one day
|
2020-11-19 12:27:06 +01:00 |
|
