Mark Felder
|
6ef145b4fc
|
Merge branch 'develop' into feature/digest-email
|
2019-06-03 15:29:53 -05:00 |
|
rinpatch
|
cfc3c62b2f
|
Add missing tag index on objects
The previous activity index is useless because objects are not embedded
anymore and instead a joined object is queried.
|
2019-06-03 20:42:13 +03:00 |
|
Roman Chvanikov
|
ce47017c89
|
Merge develop
|
2019-05-29 18:18:22 +03:00 |
|
William Pitcock
|
5fbbc57c1b
|
add migration to add notification settings to user accounts
|
2019-05-25 07:25:13 +00:00 |
|
lain
|
022e6e4b44
|
RUM: Remove vacuum analyze from migration
Can't be run in a trnasaction.
|
2019-05-17 14:59:01 +02:00 |
|
lain
|
412a3d8a0f
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
|
2019-05-17 12:26:59 +02:00 |
|
Sergey Suprunenko
|
e2b3a27204
|
Add Reports to Admin API
|
2019-05-16 19:09:18 +00:00 |
|
William Pitcock
|
f3971cbde3
|
thread visibility function: fix use of no longer used author variable
|
2019-05-15 17:02:40 +00:00 |
|
William Pitcock
|
71fa7eeb6f
|
thread visibility function: significantly improve efficiency
|
2019-05-15 16:54:14 +00:00 |
|
William Pitcock
|
12f45e2a89
|
update migration
|
2019-05-15 16:22:52 +00:00 |
|
William Pitcock
|
75ce6adcff
|
migration: only care about Create activities
|
2019-05-15 15:54:10 +00:00 |
|
William Pitcock
|
958b4cfde9
|
migrations: add function to see if a thread can be satisfied
|
2019-05-15 15:53:06 +00:00 |
|
lain
|
f1e67bdc31
|
Search: Add optional rum indexing / searching.
|
2019-05-15 15:28:01 +02:00 |
|
Egor Kislitsyn
|
5e2b491276
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
2019-05-14 18:15:56 +07:00 |
|
Sachin Joshi
|
7701a4c841
|
Make irreversible field default to false in filters
|
2019-05-14 00:13:15 +05:45 |
|
lain
|
01c45ddc9e
|
Search: Use RUM index.
|
2019-05-11 11:26:46 +02:00 |
|
Roman Chvanikov
|
b6b5b16ba4
|
Merge develop
|
2019-05-08 17:08:06 +07:00 |
|
lambda
|
238dd72fad
|
Merge branch 'conversations_three' into 'develop'
Conversations once more.
See merge request pleroma/pleroma!1119
|
2019-05-07 14:43:21 +00:00 |
|
Egor Kislitsyn
|
1557b99beb
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
2019-05-07 16:51:11 +07:00 |
|
Maksim
|
1040caf096
|
fix format
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
|
2019-05-06 17:51:03 +00:00 |
|
lain
|
0e37fddd5a
|
Search: Add fts index on objects table.
|
2019-05-03 19:21:09 +02:00 |
|
lain
|
45f790becc
|
Merge remote-tracking branch 'origin/develop' into conversations_three
|
2019-05-01 18:40:41 +02:00 |
|
Roman Chvanikov
|
0f0cc2703b
|
Merge develop
|
2019-04-30 20:17:52 +07:00 |
|
rinpatch
|
f8f6af4cc1
|
Fix MigrateOldBookmarks migration crashing on deleted activities
|
2019-04-29 21:25:30 +03:00 |
|
Alex S
|
229ce6abbc
|
migration without using old field name
removing old field from db, after bookmarks migration
|
2019-04-25 13:42:10 +07:00 |
|
Alex S
|
58711a79d0
|
removing useless transaction
|
2019-04-25 13:40:12 +07:00 |
|
Alex S
|
6322c1e123
|
migration optimization
changelog wording
|
2019-04-25 13:40:12 +07:00 |
|
Alex S
|
324c9c8ab5
|
migrate user.bookmarks to separate table
|
2019-04-25 13:38:24 +07:00 |
|
Alex S
|
73d01857e3
|
bookmarks in separate table
|
2019-04-25 13:38:24 +07:00 |
|
Roman Chvanikov
|
2359ee38b3
|
Set digest emails to false by default
|
2019-04-21 16:36:25 +07:00 |
|
Roman Chvanikov
|
8add119444
|
Add User.list_inactive_users_query/1
|
2019-04-19 22:19:00 +07:00 |
|
Roman Chvanikov
|
371a4aed2c
|
Add User.Info.email_notifications
|
2019-04-13 17:40:42 +07:00 |
|
Egor Kislitsyn
|
db4badc6aa
|
move user disable into deactivation
|
2019-04-11 17:22:42 +07:00 |
|
Egor Kislitsyn
|
0f2f7d2cec
|
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
|
2019-04-11 15:51:52 +07:00 |
|
lain
|
de57094fca
|
Participations: Add sort index.
|
2019-04-10 17:30:25 +02:00 |
|
lain
|
280172f6f6
|
Conversations: Create or bump on inserting a dm.
|
2019-04-10 16:33:45 +02:00 |
|
lain
|
d1da6b155a
|
Conversation: Add Conversations and Participations.
|
2019-04-10 15:01:42 +02:00 |
|
lambda
|
e5d553aa45
|
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
|
2019-04-10 10:10:08 +00:00 |
|
Sadposter
|
be8350baa2
|
Merge branch 'develop' into feature/user-status-subscriptions
|
2019-04-10 10:44:54 +01:00 |
|
Ivan Tashkinov
|
bffddf5e31
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# docs/config.md
# test/support/factory.ex
|
2019-04-08 12:20:26 +03:00 |
|
Alex S
|
012bb5dcc9
|
renaming expire_at -> expires_at
keyword style change
|
2019-04-08 16:01:28 +07:00 |
|
eugenijm
|
fc92a0fd8d
|
Added limits and media attachments for scheduled activities.
|
2019-04-06 23:55:58 +03:00 |
|
eugenijm
|
7bf622ce73
|
Add scheduled activities
|
2019-04-06 23:55:58 +03:00 |
|
Alex S
|
47b07cec49
|
token -> invite renaming
|
2019-04-06 20:24:22 +07:00 |
|
Alex S
|
0484f3a8b1
|
generating tokens with mix
|
2019-04-06 16:58:22 +07:00 |
|
Sadposter
|
ffac2593ea
|
Add index on subscribers
|
2019-04-05 17:30:54 +01:00 |
|
Ivan Tashkinov
|
45765918c3
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-04 23:43:08 +03:00 |
|
Alex S
|
86f90c0a54
|
adding indexes to oauth_tokens table
|
2019-04-03 20:51:09 +07:00 |
|
Haelwenn (lanodan) Monnier
|
b2f3a40e53
|
Revert awfully long migration from 568e34858
|
2019-03-29 01:57:02 +01:00 |
|
Ivan Tashkinov
|
642075b1a9
|
[#923] Enabled binding of multiple OAuth provider accounts to single user.
|
2019-03-27 16:20:50 +03:00 |
|