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 |
|
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 |
|
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 |
|
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 |
|
Ivan Tashkinov
|
20e0f36605
|
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
|
2019-03-27 15:41:40 +03:00 |
|
lambda
|
21ff78cd40
|
Merge branch 'replies-count' into 'develop'
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
|
2019-03-26 14:49:09 +00:00 |
|
eugenijm
|
568e348588
|
Increment replies_count on replies (MastoAPI)
|
2019-03-26 15:27:04 +03:00 |
|
rinpatch
|
9725c93cea
|
Add an id index to notifications
|
2019-03-25 21:59:52 +03:00 |
|
rinpatch
|
e59cfa7cac
|
modify the migrations to use naive_datetime_usec
|
2019-03-20 16:16:29 +03:00 |
|
rinpatch
|
cbc4a76b43
|
Fix filter migration
|
2019-03-20 16:13:23 +03:00 |
|
Ivan Tashkinov
|
e17a9a1f66
|
[#923] Nickname & email selection for external registrations, option to connect to existing account.
|
2019-03-20 10:35:31 +03:00 |
|
Ivan Tashkinov
|
40e9a04c31
|
[#923] Registration validations & unique index on [:user_id, :provider].
|
2019-03-18 20:31:24 +03:00 |
|
Ivan Tashkinov
|
26b6354095
|
[#923] Support for multiple (external) registrations per user via Registration.
|
2019-03-18 17:23:38 +03:00 |
|
Ivan Tashkinov
|
aacbf0f570
|
[#923] OAuth: prototype of sign in / sign up with Twitter.
|
2019-03-15 17:08:03 +03:00 |
|
eugenijm
|
8a1e0c9bee
|
Added migration to update existing user note counters
|
2019-03-03 15:35:32 +03:00 |
|
eugenijm
|
85734c0d49
|
Added migration for setting default tags in existing users records
|
2019-03-01 14:02:25 +03:00 |
|
Ivan Tashkinov
|
b227ccab82
|
Fixed scopes of apps / authorizations / tokens from apps initially created with space-delimited scope.
|
2019-02-22 14:00:18 +03:00 |
|
Egor
|
bff9eb5ef7
|
Reports
|
2019-02-20 16:51:25 +00:00 |
|
Ivan Tashkinov
|
bc4f77b10b
|
[#468] Merged upstream/develop, resolved conflicts.
|
2019-02-17 14:07:04 +03:00 |
|
Ivan Tashkinov
|
949e35e26d
|
[#468] OAuth scopes-related data migration simplification.
|
2019-02-14 14:28:26 +03:00 |
|
Ivan Tashkinov
|
063baca5e4
|
[#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.
|
2019-02-14 00:29:29 +03:00 |
|
Karen Konou
|
ac72b578da
|
Merge branch 'develop' into feature/thread-muting
|
2019-02-11 12:10:49 +01:00 |
|
Karen Konou
|
6a150de3bd
|
Add unique index and unique constraint check, uniqueness test fails
|
2019-02-09 20:52:11 +01:00 |
|
Ivan Tashkinov
|
4ad843fb9d
|
[#468] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
|
2019-02-09 17:09:08 +03:00 |
|
Karen Konou
|
98ec578f4d
|
Merge branch 'develop' into feature/thread-muting
|
2019-02-08 12:44:02 +01:00 |
|
Karen Konou
|
c43f414a79
|
Somehow fixed the repo insert [skip-ci]
|
2019-02-07 23:44:49 +01:00 |
|
Karen Konou
|
77448de492
|
ugghhhh
|
2019-02-07 22:25:07 +01:00 |
|
Karen Konou
|
f4ff4ffba2
|
Migration and some boilerplate stuff
|
2019-02-07 17:36:14 +01:00 |
|