Angelina Filippova
|
f21b6ebd5d
|
Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description
|
2020-08-07 21:05:44 +03:00 |
|
Angelina Filippova
|
8e1f7a3eff
|
Add new image type to settings whose values are image urls
|
2020-08-07 21:04:13 +03:00 |
|
Maksim Pechnikov
|
8e90cc58e7
|
Merge branch 'develop' into feature/update-welcome-setting-in-description
|
2020-08-07 09:48:34 +03:00 |
|
Maksim Pechnikov
|
6e6276b4f8
|
added test
|
2020-08-07 09:47:05 +03:00 |
|
lain
|
b9ebb55d2a
|
Merge branch '2025-oauth-login-default-to-all-scopes' into 'develop'
[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes
Closes #2025
See merge request pleroma/pleroma!2855
|
2020-08-06 16:54:32 +00:00 |
|
Ivan Tashkinov
|
135ae4e35a
|
[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
|
2020-08-06 16:00:00 +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 |
|
lain
|
4b47d9c5b6
|
Merge branch 'command-available-check' into 'develop'
#1939 Check command availability for exiftool and git
See merge request pleroma/pleroma!2753
|
2020-08-06 08:27:10 +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
|
7569f225f1
|
Move checks to application startup
|
2020-08-05 19:38:55 +03: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
|
9688e332d0
|
Merge branch 'refactor/config-get' into 'develop'
Refactor Pleroma.Config.get to return consistent results for nil values
Closes #2001
See merge request pleroma/pleroma!2853
|
2020-08-05 15:59:30 +00: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 |
|
Roman Chvanikov
|
6f60ac9f41
|
Refactor config
|
2020-08-05 13:00:49 +03: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 |
|
lain
|
e8d10237da
|
Merge branch 'fix/incorrect-expirations' into 'develop'
Add a migration to clean up activity_expirations table
See merge request pleroma/pleroma!2848
|
2020-08-05 08:55:39 +00:00 |
|
lain
|
bd157b7369
|
Merge branch 'fix-link-color' into 'develop'
templates/layout/app.html.eex: fix link color
See merge request pleroma/pleroma!2850
|
2020-08-05 08:11:58 +00:00 |
|
MK Fain
|
f341a8e142
|
Update filter_view.ex to return whole_word actual value
|
2020-08-05 02:01:27 +00:00 |
|
Karol Kosek
|
577b11167c
|
templates/layout/app.html.eex: fix link color
|
2020-08-05 00:01:30 +02:00 |
|
Mark Felder
|
079e410d6e
|
Add a migration to clean up activity_expirations table
|
2020-08-04 14:58:42 -05: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 |
|
rinpatch
|
fede37e4c6
|
Merge branch 'chore/consolidate-rich-media-http' into 'develop'
Consolidate construction of Rich Media Parser HTTP requests
See merge request pleroma/pleroma!2827
|
2020-08-04 19:16:38 +00:00 |
|
Alex Gleason
|
184742af5e
|
Unique apps.client_id for new installations, fixes #2022
|
2020-08-04 13:31:40 -05:00 |
|
lain
|
917aa090f0
|
Merge branch 'fix/activity-expiration-policy' into 'develop'
Fix ActivityExpirationPolicy
Closes #2019
See merge request pleroma/pleroma!2847
|
2020-08-04 16:30:09 +00:00 |
|
Egor Kislitsyn
|
91fbb5b21f
|
Fix ActivityExpirationPolicy
|
2020-08-04 18:26:37 +04:00 |
|
lain
|
b55e26e816
|
Merge branch 'chore/credo-alias' into 'develop'
Add a simple credo mix alias to run the same checks we use in CI
See merge request pleroma/pleroma!2846
|
2020-08-04 14:09:23 +00:00 |
|
Mark Felder
|
697e3db01c
|
Add analyze mix alias to run the same credo checks we use in CI
|
2020-08-04 08:55:40 -05:00 |
|
lain
|
36aa34a1a8
|
MastodonAPITest: Do the needful
|
2020-08-04 15:08:51 +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 |
|
Angelina Filippova
|
8bb5441547
|
Update descriptions in :frontends group
|
2020-08-04 15:10:44 +03:00 |
|
lain
|
e92c040ad3
|
CommonAPITest: Add test that deactivated users can't post.
|
2020-08-04 14:08:12 +02:00 |
|
lain
|
988ca4ab6a
|
Test Config: Don't have any MRFs by default
|
2020-08-04 14:07:10 +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 |
|
lain
|
2f4289d455
|
Changelog: Add info about email blacklist
|
2020-08-04 12:49:56 +02: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 |
|
Angelina Filippova
|
63b1ca6a07
|
Add label to :restrict_unauthenticated setting, fix typos
|
2020-08-04 02:21:25 +03:00 |
|
Angelina Filippova
|
ae95472dcc
|
Update :welcome settings description
|
2020-08-04 02:04:29 +03:00 |
|
Angelina Filippova
|
1489c2ae5f
|
Fix :args settings description in Upload.Filter.Mogrify group
|
2020-08-04 01:45:18 +03: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 |
|
Mark Felder
|
016d8d6c56
|
Consolidate construction of Rich Media Parser HTTP requests
|
2020-08-03 12:37:31 -05:00 |
|
Ilja
|
13e5540c2c
|
Apply 1 suggestion(s) to 1 file(s)
|
2020-08-03 16:44:56 +00:00 |
|