Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Mark Felder
24a731a9a6
Update AdminFE
...
Now permits server configuration. Consider this ALPHA.
5 years ago
Ivan Tashkinov
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
lain
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Hakaba Hitoyo
39c7bbe18f
Remove longfox emoji set
5 years ago
lain
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
5 years ago
Ivan Tashkinov
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
5 years ago
Mike Verdone
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
5 years ago
Roman Chvanikov
9bca70b10a
Merge develop
5 years ago
Egor Kislitsyn
04f18a144b
Add `listMessage` to to the JSON-LD context
5 years ago
Egor Kislitsyn
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
Alexander Strizhakov
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
Roman Chvanikov
eae991b06a
merge develop
5 years ago
Egor Kislitsyn
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
5 years ago
Alex S
936050257d
saving following_address for existing users
5 years ago
Alex S
f8786fa6f2
adding following_address field to user
5 years ago
Egor Kislitsyn
406efb3688
Add Russian translation
5 years ago
Egor Kislitsyn
5104f65b69
Wrap error messages into gettext helpers
5 years ago
Sachin Joshi
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
5 years ago
Roman Chvanikov
371d39e160
Merge develop
5 years ago
kaniini
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
5 years ago
Roman Chvanikov
efefee8241
Split alters rather than work with indexes
5 years ago
Egor Kislitsyn
4f42093220
Remove Uploaders.Swift
5 years ago
Roman Chvanikov
291d95dcc3
Fix migration
5 years ago
Maksim
85c7916c94
[ #1033 ] Fix database migrations
5 years ago
Roman Chvanikov
657277ffc0
Resolve conflicts
5 years ago
lain
efad26bbb9
Update frontend.
5 years ago
rinpatch
cfb5be3ced
Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'
...
Update mastofe to bundle-2019-06-26
See merge request pleroma/pleroma!1341
5 years ago
Haelwenn (lanodan) Monnier
451931d36f
Update mastofe to bundle-2019-06-26
5 years ago
Mark Felder
7b9e21e8a2
Update adminFE to latest build
5 years ago
kaniini
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
5 years ago
Alex S
982cad0268
support for config groups
5 years ago
rinpatch
3ac5ecbac1
Support RUM indexes in the config generator
5 years ago
rinpatch
f4009b6706
Fallback to Config if Mix.Config does not exist, even if Config does not
...
exist either
For some weird reason Code.ensure_loaded?(Config) is false on OTP
releases even though `use Config` from config files works just fine.
5 years ago
rinpatch
960d6b54e8
use Config in generated config when available
...
Mix.Config is deprecated and does not work on OTP releases. However
we can't fully switch to Config because it is not present in
Elixir < 1.9. I tried to evaluate if Config is available at runtime,
but for some weird reason OTP releases crash if I do that.
5 years ago
rinpatch
e76115989a
Move config templates to priv so they can be found in releases
5 years ago
rinpatch
431a41b459
Update bundled pleroma-fe to c4fcdc71
5 years ago
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
Sergey Suprunenko
a7d956d383
Remove unused imports and aliases from migration
5 years ago
Roman Chvanikov
01fe5abad1
Resolve conflicts
5 years ago
Egor Kislitsyn
17004a0f1a
Create index on `activities.local`
5 years ago
Roman Chvanikov
b1b1a270e8
Fix conflict
5 years ago
Egor Kislitsyn
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
kaniini
94d12a79c4
Merge branch 'hotfix/add-in_reply_to_index' into 'develop'
...
Add index on inReplyTo for objects
See merge request pleroma/pleroma!1240
5 years ago
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
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.
5 years ago
rinpatch
be56801dda
Add index on inReplyTo for objects
...
Fixes the performance of `get_existing_votes`
5 years ago
Roman Chvanikov
ce47017c89
Merge develop
5 years ago
William Pitcock
5fbbc57c1b
add migration to add notification settings to user accounts
5 years ago
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
lain
022e6e4b44
RUM: Remove vacuum analyze from migration
...
Can't be run in a trnasaction.
5 years ago
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
Egor Kislitsyn
f2936e0a07
Add `ap_id` to List
5 years ago
lain
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
Sergey Suprunenko
e2b3a27204
Add Reports to Admin API
5 years ago
William Pitcock
f3971cbde3
thread visibility function: fix use of no longer used author variable
5 years ago
William Pitcock
71fa7eeb6f
thread visibility function: significantly improve efficiency
5 years ago
William Pitcock
12f45e2a89
update migration
5 years ago
William Pitcock
75ce6adcff
migration: only care about Create activities
5 years ago
William Pitcock
958b4cfde9
migrations: add function to see if a thread can be satisfied
5 years ago
lain
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Sachin Joshi
7701a4c841
Make irreversible field default to false in filters
5 years ago
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
5 years ago
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.
5 years ago
lain
01c45ddc9e
Search: Use RUM index.
5 years ago
Roman Chvanikov
f1f7a11222
Merge develop
5 years ago
feld
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.
5 years ago
Roman Chvanikov
b6b5b16ba4
Merge develop
5 years ago
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
lain
0e37fddd5a
Search: Add fts index on objects table.
5 years ago
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
Roman Chvanikov
0f0cc2703b
Merge develop
5 years ago
rinpatch
f8f6af4cc1
Fix MigrateOldBookmarks migration crashing on deleted activities
5 years ago
William Pitcock
52bdfced32
update pleroma frontend
5 years ago
Alex S
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
6 years ago
Alex S
58711a79d0
removing useless transaction
6 years ago
Alex S
6322c1e123
migration optimization
...
changelog wording
6 years ago
Alex S
324c9c8ab5
migrate user.bookmarks to separate table
6 years ago
Alex S
73d01857e3
bookmarks in separate table
6 years ago
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
Roman Chvanikov
2359ee38b3
Set digest emails to false by default
6 years ago
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
6 years ago
Roman Chvanikov
8add119444
Add User.list_inactive_users_query/1
6 years ago
Roman Chvanikov
371a4aed2c
Add User.Info.email_notifications
6 years ago
Egor Kislitsyn
db4badc6aa
move user disable into deactivation
6 years ago
Egor Kislitsyn
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
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]
6 years ago
lain
de57094fca
Participations: Add sort index.
6 years ago
lain
280172f6f6
Conversations: Create or bump on inserting a dm.
6 years ago
lain
d1da6b155a
Conversation: Add Conversations and Participations.
6 years ago
lambda
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
6 years ago
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
Ivan Tashkinov
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
Alex S
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
eugenijm
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
eugenijm
7bf622ce73
Add scheduled activities
6 years ago
Alex S
47b07cec49
token -> invite renaming
6 years ago
Alex S
0484f3a8b1
generating tokens with mix
6 years ago
Sadposter
ffac2593ea
Add index on subscribers
6 years ago
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
Alex S
86f90c0a54
adding indexes to oauth_tokens table
6 years ago
lambda
bd961a3bad
Merge branch 'features/pleroma-tan' into 'develop'
...
priv/static/images: Add pleroma-tan
See merge request pleroma/pleroma!913
6 years ago
Haelwenn (lanodan) Monnier
b2f3a40e53
Revert awfully long migration from 568e34858
6 years ago
Ivan Tashkinov
642075b1a9
[ #923 ] Enabled binding of multiple OAuth provider accounts to single user.
6 years ago
Ivan Tashkinov
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
lambda
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
6 years ago
eugenijm
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
rinpatch
9725c93cea
Add an id index to notifications
6 years ago
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
6 years ago
kaniini
b68fb3dc17
Merge branch 'imageoptim' into 'develop'
...
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
6 years ago
rinpatch
e59cfa7cac
modify the migrations to use naive_datetime_usec
6 years ago
rinpatch
cbc4a76b43
Fix filter migration
6 years ago
lain
41511d1926
Update frontend
6 years ago
Ivan Tashkinov
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
optikfluffel
a907522690
used imageOptim to reduce size of image files
6 years ago
Ivan Tashkinov
40e9a04c31
[ #923 ] Registration validations & unique index on [:user_id, :provider].
6 years ago
Ivan Tashkinov
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
6 years ago
Ivan Tashkinov
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
6 years ago
Ivan Tashkinov
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
6 years ago
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.
6 years ago
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]
6 years ago
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]
6 years ago
William Pitcock
3a097bd770
update pleroma frontend
6 years ago
Egor Kislitsyn
eb84de0143
allow users to disable their own account
6 years ago
eugenijm
8a1e0c9bee
Added migration to update existing user note counters
6 years ago
eugenijm
85734c0d49
Added migration for setting default tags in existing users records
6 years ago
Ivan Tashkinov
b227ccab82
Fixed `scopes` of apps / authorizations / tokens from apps initially created with space-delimited `scope`.
6 years ago
lain
553ce57d42
update frontend
6 years ago
Egor
bff9eb5ef7
Reports
6 years ago
Ivan Tashkinov
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
Ivan Tashkinov
949e35e26d
[ #468 ] OAuth scopes-related data migration simplification.
6 years ago
Ivan Tashkinov
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
William Pitcock
dd989962e6
litepub schema: add oauthRegistrationEndpoint [ci skip]
6 years ago
Karen Konou
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
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]
6 years ago
Karen Konou
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
6 years ago
Ivan Tashkinov
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
6 years ago
Karen Konou
98ec578f4d
Merge branch 'develop' into feature/thread-muting
6 years ago
Karen Konou
c43f414a79
Somehow fixed the repo insert [skip-ci]
6 years ago
Karen Konou
77448de492
ugghhhh
6 years ago
Karen Konou
f4ff4ffba2
Migration and some boilerplate stuff
6 years ago
Maxim Filippov
f1b72bfb70
Split hide_networ only for local users
6 years ago
lain
78a51f4dd4
update frontend
6 years ago
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
6 years ago
Maxim Filippov
c48aba3c2a
Fix SQL
6 years ago
lain
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
6 years ago
Maxim Filippov
cd6606b7f6
Initialize hide_network with false
6 years ago
Maxim Filippov
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
kaniini
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
kaniini
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
6 years ago
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
lambda
a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
6 years ago
kaniini
4d3655c479
Merge branch 'spc-fix-3' into 'develop'
...
Spc fix 3
See merge request pleroma/pleroma!682
6 years ago
Haelwenn
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
Haelwenn (lanodan) Monnier
de0c1c641a
[MastodonFE] Update Frontend (glitch)
6 years ago
lain
88a40308d3
update frontend
6 years ago
kaniini
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
Maxim Filippov
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
lain
39b2457734
Change default bg image in new config.
6 years ago
Ivan Tashkinov
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
6 years ago
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
William Pitcock
15d12a69a4
add activities likes index, fixes favorites API call
6 years ago
href
4a13bb75bd
Change webpush endpoint to unlimited varchar
...
Fixes #552
6 years ago
William Pitcock
57c3f8214c
update pleroma frontend (summary_html hotfix)
6 years ago
kaniini
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
6 years ago
William Pitcock
4b76f14da1
update pleroma frontend
6 years ago
href
a3ba72d978
Fix clippy with one/five lines
6 years ago
href
e02b19d1d7
Fix postgres activity_visibility when running in autovacuum
6 years ago
Ivan Tashkinov
f161a92cb1
[ #534 ] Initial implementation of unreachable federation targets retirement.
6 years ago
lain
ab03f81219
Fix info ids.
...
The previous migration actually created values for the key "id", including the
quotes. This one should fill out all missing ids.
Closes #511
6 years ago
href
9ba6e1fabe
FlakeId: chain alter statements
6 years ago
href
e67bd93d90
Flake: migrate pinned_activities in jsonb
6 years ago
href
a92c43bc4b
Clippy!
6 years ago
href
465fb4327d
Lock activities/users table during flake migration.
6 years ago
href
28d77e373c
Flake Ids for Users and Activities
6 years ago
Michael Loftis
98cbeae49c
slightly changes definition so that autovacuum works paralell safe too
6 years ago
lambda
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
6 years ago
lambda
2020f26040
Merge branch '2019-1-20-update-frontend' into 'develop'
...
update frontend
See merge request pleroma/pleroma!686
6 years ago
lain
deeda94513
update frontend
6 years ago
William Pitcock
75bb663749
litepub schema: add litepub:directMessage flag
6 years ago
lain
b108aeee08
Make use of the indices.
...
Indices in postgresql rely on operators, so they won't be used if you use only functions.
6 years ago
lain
bd6c12592e
Add migration to fix spc users.
6 years ago
Ivan Tashkinov
79e44042bc
[ #477 ] User trigram index adjustment.
6 years ago
Ivan Tashkinov
fc965f982c
[ #477 ] Added FTS index for `users`. Fixed failing test.
6 years ago
lain
04735db193
Build the index concurrently.
6 years ago
lain
5027f82cde
Add activity visibility index.
6 years ago
lain
1dd0e0ed4c
update frontend
6 years ago
lain
e1227d812c
update frontend
6 years ago
lain
9c4344e16c
update frontend
6 years ago
lain
3e1816fcd5
update frontend
6 years ago
lain
72945b5b32
update frontend
6 years ago
lain
8682be29a5
update frontend
6 years ago
lambda
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago