Ivan Tashkinov
|
2def3cbf41
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# mix.lock
|
2020-08-11 15:13:29 +03:00 |
|
lain
|
686002164a
|
Merge branch '204-fix' into 'develop'
Fix 500 errors when returning :no_content, fixes #2029
Closes #2029
See merge request pleroma/pleroma!2856
|
2020-08-11 09:18:56 +00:00 |
|
lain
|
9a9121805c
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-08-11 09:08:27 +00:00 |
|
feld
|
78484fe0ef
|
Merge branch 'admin-active-filter' into 'develop'
Admin API: Filter out unapproved users when the `active` filter is on
Closes #2037
See merge request pleroma/pleroma!2872
|
2020-08-10 17:16:38 +00:00 |
|
Egor Kislitsyn
|
249f21dcbb
|
Admin API: Filter out unapproved users when the active filter is on
|
2020-08-10 18:27:39 +04:00 |
|
lain
|
5c4548d5e7
|
Revert "Merge branch 'issue/1023' into 'develop'"
This reverts merge request !2763
|
2020-08-10 13:05:13 +00:00 |
|
lain
|
66122a11b5
|
AccountController: Build the correct update activity.
Will fix federation issues.
|
2020-08-10 10:33:05 +02:00 |
|
lain
|
d0fc48ea67
|
Merge branch 'develop' into 'feat/floki-fast-html-2'
# Conflicts:
# config/config.exs
|
2020-08-09 10:53:58 +00:00 |
|
Egor Kislitsyn
|
e5557bf8ba
|
Add mix task to add expiration to all local statuses
|
2020-08-08 16:29:40 +04:00 |
|
Mark Felder
|
54e2af8293
|
Merge branch 'develop' into fix/ldap-auth-issues
|
2020-08-07 14:55:22 -05:00 |
|
Alex Gleason
|
673e8e3ac1
|
Force 204 responses to be empty, fixes #2029
|
2020-08-07 13:02:39 -05:00 |
|
rinpatch
|
7e23a48d38
|
rel me test: fix HTML so broken browsers (and therefore
lexbor) refuse to parse it like mochiweb does
|
2020-08-07 16:45:33 +03:00 |
|
rinpatch
|
325c7c924b
|
Make Floki use fast_html
|
2020-08-07 16:45:33 +03:00 |
|
lain
|
34cbe9f44a
|
Merge branch 'features/poll-validation' into 'develop'
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
|
2020-08-07 10:44:06 +00:00 |
|
Ivan Tashkinov
|
56ddf20208
|
Removed unused alias.
|
2020-08-07 09:43:49 +03:00 |
|
Ivan Tashkinov
|
1298a2ea2c
|
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# mix.lock
|
2020-08-07 09:38:05 +03:00 |
|
lain
|
10b0e55acf
|
Merge branch 'whole-word-filter-hotfix' into 'develop'
Update filter_view.ex to return whole_word actual value
See merge request pleroma/pleroma!2851
|
2020-08-06 08:35:39 +00:00 |
|
Mary Kate
|
f785dba09b
|
changelog for filter whole_word fix
|
2020-08-05 15:41:35 -05:00 |
|
Mary Kate
|
d6ab9f2132
|
update test for whole_word in filter
|
2020-08-05 15:36:25 -05:00 |
|
Roman Chvanikov
|
4672b61106
|
Merge branch 'develop' into command-available-check
|
2020-08-05 19:16:48 +03:00 |
|
lain
|
7755f49e28
|
Merge branch 'migrate-legacy-tags' into 'develop'
Migrate legacy tags set by AdminFE to match TagPolicy, #2010
See merge request pleroma/pleroma!2836
|
2020-08-05 16:03:11 +00:00 |
|
lain
|
9c96fc052a
|
CommonValidations: Extract modification right checker
|
2020-08-05 17:26:53 +02:00 |
|
lain
|
2173945f90
|
MailerTest: Give it some time.
|
2020-08-05 17:26:03 +02:00 |
|
Roman Chvanikov
|
8c57a299b4
|
Handle non-list keys in Config.fetch/1
|
2020-08-05 18:23:12 +03:00 |
|
Roman Chvanikov
|
2299bfe4c1
|
Merge branch 'develop' into refactor/config-get
|
2020-08-05 17:46:24 +03:00 |
|
Roman Chvanikov
|
97b5701449
|
Update clear_config macro
|
2020-08-05 17:46:14 +03:00 |
|
Mark Felder
|
0f9aecbca4
|
Remove fallback to local database when LDAP is unavailable.
In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.
|
2020-08-05 08:18:16 -05:00 |
|
Mark Felder
|
f7146583e5
|
Remove LDAP mail attribute as a requirement for registering an account
|
2020-08-05 08:15:57 -05:00 |
|
Roman Chvanikov
|
6f60ac9f41
|
Refactor config
|
2020-08-05 13:00:49 +03:00 |
|
lain
|
19c108170e
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
|
2020-08-05 11:12:14 +02:00 |
|
lain
|
474aba984f
|
Merge branch 'unique-app-id' into 'develop'
Add unique index for apps.client_id, fixes #2022
Closes #2022
See merge request pleroma/pleroma!2844
|
2020-08-05 09:08:50 +00:00 |
|
rinpatch
|
b1b6a7dfa8
|
Merge branch 'deactivated-user-posts' into 'develop'
Deactivated user posts
Closes #2011
See merge request pleroma/pleroma!2845
|
2020-08-04 19:17:30 +00:00 |
|
Alex Gleason
|
184742af5e
|
Unique apps.client_id for new installations, fixes #2022
|
2020-08-04 13:31:40 -05:00 |
|
Egor Kislitsyn
|
91fbb5b21f
|
Fix ActivityExpirationPolicy
|
2020-08-04 18:26:37 +04:00 |
|
lain
|
878c7f3f30
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
|
2020-08-04 15:28:41 +02:00 |
|
lain
|
36aa34a1a8
|
MastodonAPITest: Do the needful
|
2020-08-04 15:08:51 +02:00 |
|
Haelwenn (lanodan) Monnier
|
0f088d8ce3
|
question_validator: Allow content to be an empty-string (blank)
|
2020-08-04 14:29:16 +02:00 |
|
lain
|
1a00713744
|
CommonValidations: Treat deactivated users as not present.
|
2020-08-04 14:17:03 +02:00 |
|
lain
|
0cfadcf2ca
|
TransmogrifierTest: Add test for deactivated users
|
2020-08-04 14:15:32 +02:00 |
|
lain
|
e92c040ad3
|
CommonAPITest: Add test that deactivated users can't post.
|
2020-08-04 14:08:12 +02:00 |
|
lain
|
953f71bcfa
|
App Test: Make more resilient
|
2020-08-04 13:38:30 +02:00 |
|
Roman Chvanikov
|
56e9bf3393
|
Unify Config.get behaviour for atom/list key param
|
2020-08-04 14:35:47 +03:00 |
|
lain
|
28584bb224
|
Merge branch 'email-blacklist' into 'develop'
Add email blacklist, fixes #1404
Closes #1404
See merge request pleroma/pleroma!2837
|
2020-08-04 11:00:30 +00:00 |
|
Alex Gleason
|
4f57e85ab9
|
Email blacklist: Update phrasing again
|
2020-08-03 22:20:49 -05:00 |
|
Alex Gleason
|
058daf498f
|
Email blacklist: Update response phrasing
|
2020-08-03 19:57:53 -05:00 |
|
lain
|
e3953923ac
|
Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop'
fixes 1957 Add option to send user chatmessage instead of dm
Closes #1957
See merge request pleroma/pleroma!2782
|
2020-08-03 21:01:56 +00:00 |
|
Ilja
|
cbf8bfc694
|
Improved WelcomeChatMessageTest
* Checks if message is the same using ==/2 instead of =~/2
|
2020-08-03 20:13:43 +02:00 |
|
lain
|
56b5b9aa27
|
Merge branch 'follower-mrf-again' into 'develop'
Follower mrf again
See merge request pleroma/pleroma!2833
|
2020-08-03 14:22:11 +00:00 |
|
lain
|
de3bdc63ad
|
AccountControllerTest: Add test for message returned.
|
2020-08-03 15:00:14 +02:00 |
|
lain
|
5876d5123c
|
Merge branch 'object-age-fix' into 'develop'
MRF Object Age Policy: Don't break on messages without cc/to
See merge request pleroma/pleroma!2840
|
2020-08-03 12:50:10 +00:00 |
|