sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
11861 commits 2 branches 40 tags 290 MiB
Commit graph

11861 commits

This branch
This branch
All branches
Author SHA1 Message Date
feld
1672d8b37c Merge branch 'feature/bulk-confirmation' into 'develop' 
Bulk account confirmation actions

Closes #2085

See merge request pleroma/pleroma!2975
 2020-09-25 16:15:01 +00:00
Mark Felder
8b84ca4901 Simplify the value comparison 2020-09-25 10:37:59 -05:00
rinpatch
5cd71208d9 Merge branch 'search-even-more' into 'develop' 
More user search improvements

See merge request pleroma/pleroma!3032
 2020-09-25 12:56:21 +00:00
rinpatch
f67c967c4a Merge branch 'features/incoming-create-exists' into 'develop' 
transmogrifier: Drop incoming create early if it already exists

See merge request pleroma/pleroma!3026
 2020-09-25 12:44:33 +00:00
lain
05b5241314 Linter fixes 2020-09-25 09:12:48 +02:00
lain
1e0f3f8514 User search: Make uri matches case insensitive. 2020-09-25 08:56:58 +02:00
lain
a8c17ea25a User Search: Also find user by uri 2020-09-25 08:46:14 +02:00
Mark Felder
81faf540b3 Add some user feedback 2020-09-24 18:35:20 -05:00
Mark Felder
3bf3db39f5 Validate emails are sent to the appropriate unconfirmed actors 2020-09-24 18:24:44 -05:00
Mark Felder
e33360fdb9 Cannot use batches with User.try_send_confirmation_email/1 2020-09-24 18:23:47 -05:00
Mark Felder
935ef21b02 Use the import 2020-09-24 16:47:34 -05:00
rinpatch
c788593f7f Merge branch '2182-profile-search-improvements' into 'develop' 
Resolve "Profile search by URL doesn't work correctly"

Closes #2182

See merge request pleroma/pleroma!3030
 2020-09-24 18:27:55 +00:00
lain
defca4a8b1 Changelog: Add info about user search. 2020-09-24 15:56:17 +02:00
lain
d0078bc404 User Search: Boost resolved results and exact ap_id matches. 2020-09-24 15:54:55 +02:00
rinpatch
151df9fc17 Merge branch 'fix/test-fix' into 'develop' 
Fix for test on mac

See merge request pleroma/pleroma!3027
 2020-09-24 09:50:39 +00:00
lain
47cd59342f Merge branch 'smol-test' into 'develop' 
CommonAPI test: Add test for polls

See merge request pleroma/pleroma!3028
 2020-09-24 09:41:28 +00:00
lain
35d62a4a56 CommonAPI test: Add test for polls 2020-09-24 11:12:03 +02:00
Alexander Strizhakov
165961f56d
don't run in async mode 2020-09-24 12:00:39 +03:00
Alexander Strizhakov
aa1f97a5b6
fix for test on mac 2020-09-24 10:46:09 +03:00
Mark Felder
8af8eb5ce7 Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_stream 2020-09-23 12:32:47 -05:00
Mark Felder
f3a1f9c3bb Merge branch 'develop' into feature/bulk-confirmation 2020-09-23 11:56:22 -05:00
lain
e02101e15c Merge branch 'issue/2115' into 'develop' 
[#2115] added paginate links to headers for  /chats/:id/messages

See merge request pleroma/pleroma!2981
 2020-09-23 12:09:38 +00:00
lain
4dadb7c433 Merge branch 'user-query/filter-out-internal' into 'develop' 
Filter out internal users by default

Closes #2147

See merge request pleroma/pleroma!3024
 2020-09-23 11:51:04 +00:00
lain
436d1a3c41 Merge branch 'develop' into 'issue/2115' 
# Conflicts:
#   CHANGELOG.md
 2020-09-23 11:49:19 +00:00
Haelwenn (lanodan) Monnier
5e86a2809e
transmogrifier: Drop incoming create early if it already exists 2020-09-23 13:40:45 +02:00
lain
a5e1c400e4 Merge branch 'issue/1975' into 'develop' 
[#1975] import emoji from a zip archive

Closes admin-fe#130

See merge request pleroma/pleroma!2911
 2020-09-23 10:49:29 +00:00
lain
a6c14041c4 Merge branch 'develop' into 'issue/1975' 
# Conflicts:
#   CHANGELOG.md
 2020-09-23 09:16:00 +00:00
lain
34235bc02a Merge branch 'email-fix-develop' into 'develop' 
Allow emails to be sent again (develop)

Closes #2172

See merge request pleroma/pleroma!3025
 2020-09-23 09:05:52 +00:00
lain
518c0f2962 Changelog: Add info about emoji zip import feature 2020-09-23 10:57:53 +02:00
lain
9d6415de15 Changelog: Info about email fix. 2020-09-23 10:54:24 +02:00
Maksim Pechnikov
8e4f043ac7 finland-emojis.zip -> emojis.zip 2020-09-22 21:58:30 +03:00
Maksim Pechnikov
72d2b34d3b Merge branch 'develop' into issue/1975 2020-09-22 21:42:10 +03:00
Alex Gleason
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop 2020-09-22 13:37:02 -05:00
lain
df1eb5cf7e Changelog: Add info about chat pagination fix. 2020-09-22 17:17:19 +02:00
lain
c95859e45b Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115 2020-09-22 17:13:46 +02:00
Egor Kislitsyn
0e0ece251a
Filter out internal users by default 2020-09-22 16:56:11 +04:00
feld
02f12ec625 Merge branch 'chore/missing-link' into 'develop' 
Add FreeBSD and alpha sort

See merge request pleroma/pleroma!3023
 2020-09-22 12:42:03 +00:00
Mark Felder
3174804f3c Add FreeBSD and alpha sort 2020-09-22 07:26:31 -05:00
feld
d65e6e152a Merge branch 'docs/nginx-config-fedsockets' into 'develop' 
Docs/nginx config fedsockets

See merge request pleroma/pleroma!3020
 2020-09-21 21:52:34 +00:00
Mark Felder
8906f30ba1 Use an upstream for reverse proxy so future modifications are simplified 2020-09-21 16:19:08 -05:00
feld
637ce939d9 Merge branch 'chore/autolinker-rename' into 'develop' 
Chase the Autolinker rename from !2677

Closes #2155

See merge request pleroma/pleroma!3019
 2020-09-21 21:19:02 +00:00
Mark Felder
ade7fede71 Most proxy settings can be global 2020-09-21 16:13:45 -05:00
Mark Felder
2b553b8f8e Remove duplicate setting 2020-09-21 16:11:01 -05:00
Mark Felder
75f6e5e8b7 Add FedSockets config 2020-09-21 16:10:31 -05:00
feld
a5c34e3123 Merge branch 'fix/fedsocket-useragent' into 'develop' 
Minor Fedsocket improvements

See merge request pleroma/pleroma!3012
 2020-09-21 21:06:32 +00:00
Alex Gleason
bf181ca968
Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response() 2020-09-21 16:03:22 -05:00
Mark Felder
7b2bf381e9 Chase the Autolinker rename from !2677 2020-09-21 16:02:57 -05:00
Alex Gleason
0b728ccc44
Pass hackney tls config into email tests, #2101 2020-09-21 15:26:10 -05:00
Alex Gleason
23d5d7cf59
Fix #2172 HTTP error on password reset 2020-09-21 14:09:26 -05:00
Alex Gleason
8b6ac45f3c
Allow emails to be sent again, #2101 #2172 
https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707
 2020-09-21 13:28:02 -05:00