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
lambda
16cb9e5f1c
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
...
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
See merge request pleroma/pleroma!1139
2019-05-13 15:52:05 +00:00
Haelwenn (lanodan) Monnier
566a968ab3
pleroma-fox-tan-shy.png: Add another version of pleroma-tan
...
Commissioned by https://shitposter.club/users/moonman and
drawn by https://shpposter.club/users/Nightingalle
Intended to be used when mastofe crashes out and allows to report a bug
among other things.
Should require a bit of modification on mastofe to use the image as it's more
of a vanilla flavour thing.
2019-05-12 05:09:15 +02:00
lain
01c45ddc9e
Search: Use RUM index.
2019-05-11 11:26:46 +02:00
Roman Chvanikov
f1f7a11222
Merge develop
2019-05-11 14:45:54 +07:00
c953ae8c3d
Initial bundle of basic AdminFE
...
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
2019-05-11 01:34:17 +00: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
William Pitcock
52bdfced32
update pleroma frontend
2019-04-27 07:34:59 +00: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
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
Roman Chvanikov
2359ee38b3
Set digest emails to false by default
2019-04-21 16:36:25 +07:00
Ekaterina Vaartis
c26724cc55
Remove finmoji and add a way to download emojis in packs
...
These packs are stored in a git repo on pleroma gitlab
2019-04-20 11:17:17 +03: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
Haelwenn (lanodan) Monnier
51c97d71af
Update Mastodon Frontend to 2019-04-11 bundle
...
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-04-11
[ci skip]
2019-04-11 07:29:03 +02: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
lambda
bd961a3bad
Merge branch 'features/pleroma-tan' into 'develop'
...
priv/static/images: Add pleroma-tan
See merge request pleroma/pleroma!913
2019-04-02 11:54:04 +00: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
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
kaniini
b68fb3dc17
Merge branch 'imageoptim' into 'develop'
...
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
2019-03-21 00:59:24 +00: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
lain
41511d1926
Update frontend
2019-03-20 08:58:25 +01: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
optikfluffel
a907522690
used imageOptim to reduce size of image files
2019-03-19 10:10:48 +01: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
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
2019-03-15 17:11:00 +03:00
Ivan Tashkinov
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
2019-03-15 17:08:03 +03:00
William Pearson
3dadaa4432
robots.txt
...
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
2019-03-15 02:28:18 +00:00
Haelwenn (lanodan) Monnier
bae96206d0
priv/static/images: Add pleroma-tan
...
Source: https://shitposter.club/objects/9be7c3f4-5a29-45a9-ac40-301312578a02
pleroma-fox-tan-smol.png is pleroma-fox-tan.png but the width
got divided by two in The GIMP.
All the pleroma*.png got optimised with mat2 and optipng/pngcrush,
depending on their best results.
[ci skip]
2019-03-08 07:51:05 +01:00
Haelwenn (lanodan) Monnier
05cad042ba
Update Mastodon Frontend to 2019-03-07 bundle
...
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-03-07
[ci skip]
2019-03-08 00:28:40 +01:00
William Pitcock
3a097bd770
update pleroma frontend
2019-03-07 13:31:03 +00:00
Egor Kislitsyn
eb84de0143
allow users to disable their own account
2019-03-04 19:55:11 +07: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
lain
553ce57d42
update frontend
2019-02-21 09:04:35 +01: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
William Pitcock
dd989962e6
litepub schema: add oauthRegistrationEndpoint [ci skip]
2019-02-13 19:34:43 +00:00
ac72b578da
Merge branch 'develop' into feature/thread-muting
2019-02-11 12:10:49 +01:00
Haelwenn (lanodan) Monnier
fcd8a2d0d6
Update Mastodon Frontend to 2019-02-10 bundle
...
See: https://git.pleroma.social/pleroma/mastofe/tags/bundle-2019-02-10
[ci skip]
2019-02-10 19:55:22 +01:00
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
98ec578f4d
Merge branch 'develop' into feature/thread-muting
2019-02-08 12:44:02 +01:00
c43f414a79
Somehow fixed the repo insert [skip-ci]
2019-02-07 23:44:49 +01:00
77448de492
ugghhhh
2019-02-07 22:25:07 +01:00
f4ff4ffba2
Migration and some boilerplate stuff
2019-02-07 17:36:14 +01:00
Maxim Filippov
f1b72bfb70
Split hide_networ only for local users
2019-02-06 13:41:36 +03:00
lain
78a51f4dd4
update frontend
2019-02-06 10:40:01 +01:00
kaniini
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
2019-02-05 20:27:31 +00:00
Maxim Filippov
c48aba3c2a
Fix SQL
2019-02-05 10:22:31 +03:00
lain
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
2019-02-04 23:47:29 +01:00
Maxim Filippov
cd6606b7f6
Initialize hide_network with false
2019-02-04 22:23:09 +03:00
Maxim Filippov
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
2019-02-03 21:55:04 +03:00
kaniini
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
2019-02-01 20:22:58 +00:00
kaniini
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
2019-02-01 17:05:29 +00:00
