61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
a562cb2c34
Update AdminFE bundle
5 years ago
28be12b38e
update admin fe
5 years ago
0aef18bcf4
Litepub Context: Add EmojiReaction.
5 years ago
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
5 years ago
1fba66178d
Merge branch 'develop' into cleanup/drop-subscription-table-if-exists
5 years ago
81b4243173
Remove subscription_notifications table if it existed
...
Followup to !1741
5 years ago
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
5 years ago
b4b147000c
Merge develop
5 years ago
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
5820dc40fc
litepub-0.1.jsonld: Add uploadMedia
5 years ago
646bf01608
Update AdminFE bundle
5 years ago
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
5 years ago
76c3e290fc
Merge develop
5 years ago
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
5 years ago
ac4a748fad
Disallow NULLs in deliveries
5 years ago
0bd2b85edb
Separate Subscription Notifications from regular Notifications
5 years ago
769fb778d4
Track object/create activity fetches
5 years ago
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
16e6be340d
Update frontend bundle to e75ac9dd
5 years ago
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
37dd3867bb
Log admin/moderator actions
5 years ago
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
05e7d0a438
Add an index on object likes
...
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
5 years ago
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
5 years ago
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
24a731a9a6
Update AdminFE
...
Now permits server configuration. Consider this ALPHA.
5 years ago
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
39c7bbe18f
Remove longfox emoji set
5 years ago
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
5 years ago
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
5 years ago
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
9bca70b10a
Merge develop
5 years ago
04f18a144b
Add `listMessage` to to the JSON-LD context
5 years ago
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
eae991b06a
merge develop
5 years ago
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
5 years ago
936050257d
saving following_address for existing users
5 years ago
f8786fa6f2
adding following_address field to user
5 years ago
406efb3688
Add Russian translation
5 years ago
5104f65b69
Wrap error messages into gettext helpers
5 years ago
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
5 years ago
371d39e160
Merge develop
5 years ago
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
5 years ago
efefee8241
Split alters rather than work with indexes
5 years ago
4f42093220
Remove Uploaders.Swift
5 years ago
291d95dcc3
Fix migration
5 years ago
85c7916c94
[ #1033 ] Fix database migrations
5 years ago
657277ffc0
Resolve conflicts
5 years ago
efad26bbb9
Update frontend.
5 years ago
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
451931d36f
Update mastofe to bundle-2019-06-26
5 years ago
7b9e21e8a2
Update adminFE to latest build
5 years ago
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
5 years ago
982cad0268
support for config groups
5 years ago
3ac5ecbac1
Support RUM indexes in the config generator
5 years ago
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
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
e76115989a
Move config templates to priv so they can be found in releases
5 years ago
431a41b459
Update bundled pleroma-fe to c4fcdc71
5 years ago
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
5 years ago
a7d956d383
Remove unused imports and aliases from migration
5 years ago
01fe5abad1
Resolve conflicts
5 years ago
17004a0f1a
Create index on `activities.local`
5 years ago
b1b1a270e8
Fix conflict
5 years ago
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
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
6ef145b4fc
Merge branch 'develop' into feature/digest-email
5 years ago
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
be56801dda
Add index on inReplyTo for objects
...
Fixes the performance of `get_existing_votes`
5 years ago
ce47017c89
Merge develop
5 years ago
5fbbc57c1b
add migration to add notification settings to user accounts
5 years ago
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
022e6e4b44
RUM: Remove vacuum analyze from migration
...
Can't be run in a trnasaction.
5 years ago
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
f2936e0a07
Add `ap_id` to List
5 years ago
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
5 years ago
e2b3a27204
Add Reports to Admin API
5 years ago
f3971cbde3
thread visibility function: fix use of no longer used author variable
5 years ago
71fa7eeb6f
thread visibility function: significantly improve efficiency
5 years ago
12f45e2a89
update migration
5 years ago
75ce6adcff
migration: only care about Create activities
5 years ago
958b4cfde9
migrations: add function to see if a thread can be satisfied
5 years ago
f1e67bdc31
Search: Add optional rum indexing / searching.
5 years ago
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
7701a4c841
Make irreversible field default to false in filters
5 years ago
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
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
01c45ddc9e
Search: Use RUM index.
5 years ago
f1f7a11222
Merge develop
5 years ago
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
b6b5b16ba4
Merge develop
5 years ago
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
5 years ago
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
5 years ago
0e37fddd5a
Search: Add fts index on objects table.
5 years ago
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
5 years ago
0f0cc2703b
Merge develop
5 years ago
f8f6af4cc1
Fix MigrateOldBookmarks migration crashing on deleted activities
5 years ago
52bdfced32
update pleroma frontend
5 years ago
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
5 years ago
58711a79d0
removing useless transaction
5 years ago
6322c1e123
migration optimization
...
changelog wording
5 years ago
324c9c8ab5
migrate user.bookmarks to separate table
5 years ago
73d01857e3
bookmarks in separate table
5 years ago
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
5 years ago
2359ee38b3
Set digest emails to false by default
5 years ago
c26724cc55
Remove finmoji and add a way to download emojis in packs
...
These packs are stored in a git repo on pleroma gitlab
5 years ago
8add119444
Add User.list_inactive_users_query/1
6 years ago
371a4aed2c
Add User.Info.email_notifications
6 years ago
db4badc6aa
move user disable into deactivation
6 years ago
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
6 years ago
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
de57094fca
Participations: Add sort index.
6 years ago
280172f6f6
Conversations: Create or bump on inserting a dm.
6 years ago
d1da6b155a
Conversation: Add Conversations and Participations.
6 years ago
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
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
6 years ago
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
6 years ago
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
6 years ago
fc92a0fd8d
Added limits and media attachments for scheduled activities.
6 years ago
7bf622ce73
Add scheduled activities
6 years ago
47b07cec49
token -> invite renaming
6 years ago
0484f3a8b1
generating tokens with mix
6 years ago
ffac2593ea
Add index on subscribers
6 years ago
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
6 years ago
86f90c0a54
adding indexes to oauth_tokens table
6 years ago
bd961a3bad
Merge branch 'features/pleroma-tan' into 'develop'
...
priv/static/images: Add pleroma-tan
See merge request pleroma/pleroma!913
6 years ago
b2f3a40e53
Revert awfully long migration from 568e34858
6 years ago
642075b1a9
[ #923 ] Enabled binding of multiple OAuth provider accounts to single user.
6 years ago
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
6 years ago
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
6 years ago
568e348588
Increment replies_count on replies (MastoAPI)
6 years ago
9725c93cea
Add an id index to notifications
6 years ago
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
b68fb3dc17
Merge branch 'imageoptim' into 'develop'
...
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
6 years ago
e59cfa7cac
modify the migrations to use naive_datetime_usec
6 years ago
cbc4a76b43
Fix filter migration
6 years ago
41511d1926
Update frontend
6 years ago
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
6 years ago
a907522690
used imageOptim to reduce size of image files
6 years ago
40e9a04c31
[ #923 ] Registration validations & unique index on [:user_id, :provider].
6 years ago
lain