kPherox
|
363e76d4da
|
Fix duplicate recipients
|
2019-10-30 15:40:25 +09:00 |
|
rinpatch
|
ae59b38203
|
Rip out the rest of htmlsanitizeex
|
2019-10-30 09:20:13 +03:00 |
|
rinpatch
|
77cfb08b8c
|
Remove commented-out code
|
2019-10-29 20:58:54 +03:00 |
|
rinpatch
|
61400d7eb7
|
Fix XSS emoji test
|
2019-10-29 20:49:32 +03:00 |
|
rinpatch
|
eba8acff09
|
Merge branch 'fix/migrations-same-module-name' into 'develop'
Fix two migrations sharing the same module name
See merge request pleroma/pleroma!1919
|
2019-10-29 14:17:09 +00:00 |
|
rinpatch
|
7358cf1f20
|
Bump fast_sanitize dependency
|
2019-10-29 17:00:03 +03:00 |
|
rinpatch
|
3e09b7c5ae
|
Fix two migrations sharing the same module name
This makes ecto execute only the latter one.
|
2019-10-29 16:56:24 +03:00 |
|
sadposter
|
bea4a82d1e
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-29 13:12:38 +00:00 |
|
rinpatch
|
07c7f16356
|
Merge branch 'fix-follow-requests' into 'develop'
FIx follow requests
Closes #1357
See merge request pleroma/pleroma!1918
|
2019-10-29 11:24:07 +00:00 |
|
sadposter
|
e50d018bfe
|
fe
|
2019-10-29 11:01:50 +00:00 |
|
sadposter
|
55ce1daeaf
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-29 10:47:37 +00:00 |
|
kPherox
|
5334190056
|
Migrate missing follow requests
|
2019-10-29 19:22:34 +09:00 |
|
rinpatch
|
41c23251f1
|
Bump fast_sanitize version
|
2019-10-29 13:05:20 +03:00 |
|
kPherox
|
c2f2d7bcf6
|
Add test follow activity for locked account
|
2019-10-29 18:46:22 +09:00 |
|
kPherox
|
0c361eeb25
|
Add pending to handle incoming for Follow activity
|
2019-10-29 17:12:49 +09:00 |
|
rinpatch
|
9cde3321a3
|
Add fast_sanitize to dependencies
|
2019-10-29 01:21:00 +03:00 |
|
rinpatch
|
08f6837065
|
Switch from HtmlSanitizeEx to FastSanitize
|
2019-10-29 01:18:08 +03:00 |
|
rinpatch
|
2453928b57
|
Ensure myhtmlex is started before swarm
Otherwise swarm is going to attempt resizing the cluster and timeout
|
2019-10-29 01:16:57 +03:00 |
|
rinpatch
|
9434e151a9
|
Blacklist myhtmlex nodes from swarm
|
2019-10-29 01:16:22 +03:00 |
|
rinpatch
|
05d111b622
|
Use the default scrubber before mediaproxy transformation
|
2019-10-29 01:15:28 +03:00 |
|
stwf
|
56e42602b0
|
capture where errors are expected
|
2019-10-28 12:51:58 -04:00 |
|
Roman Chvanikov
|
435d220700
|
Move setDefaultsToTables to past to run before notNull migrations
|
2019-10-28 19:17:50 +03:00 |
|
Roman Chvanikov
|
4b0893631f
|
Complete defaults
|
2019-10-28 19:16:19 +03:00 |
|
lain
|
e80f90e9db
|
Merge branch 'fix/migration' into 'develop'
Fix `SetNotNullForUsers` migration
See merge request pleroma/pleroma!1913
|
2019-10-28 08:05:14 +00:00 |
|
Egor Kislitsyn
|
3c86a0ab24
|
Fix SetNotNullForUsers migration
|
2019-10-28 14:45:50 +07:00 |
|
lain
|
2480200759
|
Merge branch 'refactor/following-relationships' into 'develop'
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
|
2019-10-28 07:27:45 +00:00 |
|
Roman Chvanikov
|
0be9cb086b
|
Add migration
|
2019-10-27 19:29:35 +03:00 |
|
Maxim Filippov
|
d56bc62275
|
Fix report parsing
|
2019-10-27 16:33:58 +03:00 |
|
Maxim Filippov
|
8282b6ac3d
|
Make sure incoming flags are updated with status data
|
2019-10-27 16:17:37 +03:00 |
|
Maxim Filippov
|
791bcfd90f
|
Merge branch 'develop' into feature/store-statuses-data-inside-flag
|
2019-10-27 16:11:25 +03:00 |
|
Maxim Filippov
|
8eff05d4c6
|
Strip status data from Flag (when federating or closing/resolving report)
|
2019-10-27 16:05:32 +03:00 |
|
kaniini
|
060adfd762
|
Merge branch 'improve-user-info-migration' into 'develop'
User info migration improvements
See merge request pleroma/pleroma!1887
|
2019-10-27 05:33:41 +00:00 |
|
kaniini
|
fbadd36cc0
|
Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'
Add NOT NULL constraints for users table
See merge request pleroma/pleroma!1910
|
2019-10-27 05:32:01 +00:00 |
|
kaniini
|
a9cadf3905
|
Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop'
Add NOT NULL constraints for user_invite_tokens table
See merge request pleroma/pleroma!1909
|
2019-10-27 05:31:52 +00:00 |
|
kaniini
|
4a72d39ca6
|
Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop'
Add NOT NULL constraints for thread_mutes table
See merge request pleroma/pleroma!1908
|
2019-10-27 05:31:41 +00:00 |
|
kaniini
|
e94144669a
|
Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop'
Add NOT NULL constraints for scheduled_activities table
See merge request pleroma/pleroma!1907
|
2019-10-27 05:31:31 +00:00 |
|
kaniini
|
9e084771c6
|
Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'
Add NOT NULL constraints for registrations table
See merge request pleroma/pleroma!1906
|
2019-10-27 05:31:21 +00:00 |
|
kaniini
|
3ac6160299
|
Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop'
Add NOT NULL constraints for push_subscriptions table
See merge request pleroma/pleroma!1905
|
2019-10-27 05:31:09 +00:00 |
|
kaniini
|
26daaa9f04
|
Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop'
Add NOT NULL constraints for password_reset_tokens table
See merge request pleroma/pleroma!1904
|
2019-10-27 05:30:59 +00:00 |
|
kaniini
|
1fc591fcfc
|
Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'
Add NOT NULL constraints for objects table
See merge request pleroma/pleroma!1903
|
2019-10-27 05:30:47 +00:00 |
|
kaniini
|
8b204b4d71
|
Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop'
Add NOT NULL constraints for oauth_authorizations table
See merge request pleroma/pleroma!1902
|
2019-10-27 05:30:36 +00:00 |
|
kaniini
|
fe97493d91
|
Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop'
Add NOT NULL constraints for oauth_tokens table
See merge request pleroma/pleroma!1901
|
2019-10-27 05:30:25 +00:00 |
|
kaniini
|
84e992d85b
|
Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'
Add NOT NULL constraints for notifications table
See merge request pleroma/pleroma!1900
|
2019-10-27 05:30:09 +00:00 |
|
kaniini
|
19a625459b
|
Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop'
Add NOT NULL constraints for moderation_log table
See merge request pleroma/pleroma!1899
|
2019-10-27 05:29:56 +00:00 |
|
kaniini
|
79702b54b6
|
Merge branch 'refactor/db-not-null-constraints-for-markers' into 'develop'
Add NOT NULL constraints for markers table
See merge request pleroma/pleroma!1898
|
2019-10-27 05:29:45 +00:00 |
|
kaniini
|
2e7e43c853
|
Merge branch 'refactor/db-not-null-constraints-for-lists' into 'develop'
Add NOT NULL constraints for lists table
See merge request pleroma/pleroma!1897
|
2019-10-27 05:29:33 +00:00 |
|
kaniini
|
75dab79183
|
Merge branch 'refactor/db-not-null-constraints-for-instances' into 'develop'
Add NOT NULL constraints for instances table
See merge request pleroma/pleroma!1896
|
2019-10-27 05:29:18 +00:00 |
|
kaniini
|
24699b991a
|
Merge branch 'refactor/db-not-null-constraints-for-filters' into 'develop'
Add NOT NULL constraints for filters table
See merge request pleroma/pleroma!1895
|
2019-10-27 05:29:05 +00:00 |
|
kaniini
|
3ac8eb4046
|
Merge branch 'refactor/db-not-null-constraints-for-conversation_participations' into 'develop'
Add NOT NULL constraints for conversation_participations table
See merge request pleroma/pleroma!1894
|
2019-10-27 05:28:45 +00:00 |
|
kaniini
|
6be16b8617
|
Merge branch 'refactor/db-not-null-constraints-for-conversation_participation_recipient_ships' into 'develop'
Add NOT NULL constraints for conversation_participation_recipient_ships table
See merge request pleroma/pleroma!1893
|
2019-10-27 05:28:32 +00:00 |
|