eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
936050257d
saving following_address for existing users
2019-07-10 17:42:18 +03:00
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
406efb3688
Add Russian translation
2019-07-10 18:10:09 +07:00
5104f65b69
Wrap error messages into gettext helpers
2019-07-10 18:10:09 +07:00
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
2019-07-10 01:46:49 +05:45
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
2019-07-09 16:54:32 +00:00
efefee8241
Split alters rather than work with indexes
2019-07-03 14:56:02 +03:00
4f42093220
Remove Uploaders.Swift
2019-07-03 14:11:04 +07:00
291d95dcc3
Fix migration
2019-07-03 01:14:40 +03:00
85c7916c94
[ #1033 ] Fix database migrations
2019-07-01 01:08:07 +00:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
efad26bbb9
Update frontend.
2019-06-28 14:29:26 +02:00
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
2019-06-26 19:15:37 +00:00
451931d36f
Update mastofe to bundle-2019-06-26
2019-06-26 21:06:28 +02:00
7b9e21e8a2
Update adminFE to latest build
2019-06-23 18:36:20 -04:00
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
2019-06-23 05:42:37 +00:00
982cad0268
support for config groups
2019-06-23 08:16:16 +03:00
3ac5ecbac1
Support RUM indexes in the config generator
2019-06-22 12:54:16 +03:00
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.
2019-06-22 02:29:49 +03:00
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.
2019-06-21 22:01:59 +03:00
e76115989a
Move config templates to priv so they can be found in releases
2019-06-21 19:54:04 +03:00
431a41b459
Update bundled pleroma-fe to c4fcdc71
2019-06-19 00:04:00 +03:00
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
a7d956d383
Remove unused imports and aliases from migration
2019-06-10 13:20:37 +00:00
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
17004a0f1a
Create index on `activities.local`
2019-06-05 16:37:43 +07:00
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
94d12a79c4
Merge branch 'hotfix/add-in_reply_to_index' into 'develop'
...
Add index on inReplyTo for objects
See merge request pleroma/pleroma!1240
2019-06-04 05:38:13 +00:00
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
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
be56801dda
Add index on inReplyTo for objects
...
Fixes the performance of `get_existing_votes`
2019-06-03 19:26:43 +03:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
5fbbc57c1b
add migration to add notification settings to user accounts
2019-05-25 07:25:13 +00:00
022e6e4b44
RUM: Remove vacuum analyze from migration
...
Can't be run in a trnasaction.
2019-05-17 14:59:01 +02:00
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
2019-05-17 12:26:59 +02:00
e2b3a27204
Add Reports to Admin API
2019-05-16 19:09:18 +00:00
f3971cbde3
thread visibility function: fix use of no longer used author variable
2019-05-15 17:02:40 +00:00
71fa7eeb6f
thread visibility function: significantly improve efficiency
2019-05-15 16:54:14 +00:00
12f45e2a89
update migration
2019-05-15 16:22:52 +00:00
75ce6adcff
migration: only care about Create activities
2019-05-15 15:54:10 +00:00
958b4cfde9
migrations: add function to see if a thread can be satisfied
2019-05-15 15:53:06 +00:00
f1e67bdc31
Search: Add optional rum indexing / searching.
2019-05-15 15:28:01 +02:00
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
7701a4c841
Make irreversible field default to false in filters
2019-05-14 00:13:15 +05:45
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
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
01c45ddc9e
Search: Use RUM index.
2019-05-11 11:26:46 +02:00
f1f7a11222
Merge develop
2019-05-11 14:45:54 +07:00
Roman Chvanikov