Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,582 Commits 1 Branch 0 Tags 222 MiB
a0d336a828
Commit Graph

392 Commits

Author SHA1 Message Date
rinpatch
a0d336a828 Fix the use of queries with a schema in a migration 2019-10-06 17:36:42 +03:00
rinpatch
c58da11182 Move local keys out of user.info 2019-10-06 17:36:24 +03:00
rinpatch
1e6aa10168 Remove in-db configuration references from 1.1 
It's still too unstable to be used.
 2019-10-04 16:17:27 +03:00
Ariadne Conill
979f66a99c update pleroma fe 2019-09-30 15:34:19 +00:00
Mark Felder
fe33084ea8 Update AdminFE for 1.1 branch 
Latest build of AdminFE with Settings disabled as the feature is not stable yet
 2019-09-18 13:52:11 -05:00
rinpatch
16e6be340d Update frontend bundle to e75ac9dd 2019-09-06 11:31:44 +03:00
Maxim Filippov
37dd3867bb Log admin/moderator actions 2019-08-25 19:39:37 +00:00
lain
cc6c0b4ba6 Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration 2019-08-24 15:48:33 +02:00
rinpatch
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.
 2019-08-23 03:17:20 +03:00
lain
560dbad538 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-14 15:30:40 +02:00
Mark Felder
24a731a9a6 Update AdminFE 
Now permits server configuration. Consider this ALPHA.
 2019-08-12 15:00:03 -05:00
lain
29807ef6a5 Merge branch 'feature/digest-email' into 'develop' 
Feature/digest email

See merge request pleroma/pleroma!1078
 2019-08-08 14:38:33 +00:00
lain
a2b98f6d58 Merge remote-tracking branch 'origin/develop' into pleroma-conversations 2019-08-08 16:04:20 +02:00
Hakaba Hitoyo
39c7bbe18f Remove longfox emoji set 2019-08-04 04:32:45 +00:00
lain
f88560accd Conversations: Add recipient list to conversation participation. 
This enables to address the same group of people every time.
 2019-08-02 11:55:41 +02:00
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.
 2019-07-24 13:14:52 +02:00
Roman Chvanikov
9bca70b10a Merge develop 2019-07-16 16:19:19 +03:00
Egor Kislitsyn
04f18a144b Add listMessage to to the JSON-LD context 2019-07-15 14:29:13 +07:00
Egor Kislitsyn
64a946643e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-07-15 14:11:54 +07:00
Roman Chvanikov
c729883936 Merge branch 'develop' into feature/digest-email 2019-07-14 21:43:30 +03:00
Alexander Strizhakov
e7c39b7ac8 Feature/1072 muting notifications 2019-07-14 13:29:31 +00:00
Roman Chvanikov
eae991b06a merge develop 2019-07-12 18:08:27 +03:00
Egor Kislitsyn
182f7bbb11 Merge branch 'develop' into feature/addressable-lists 2019-07-11 13:26:59 +07:00
Alex S
936050257d saving following_address for existing users 2019-07-10 17:42:18 +03:00
Alex S
f8786fa6f2 adding following_address field to user 2019-07-10 17:42:18 +03:00
Egor Kislitsyn
406efb3688 Add Russian translation 2019-07-10 18:10:09 +07:00
Egor Kislitsyn
5104f65b69 Wrap error messages into gettext helpers 2019-07-10 18:10:09 +07:00
Sachin Joshi
6d0ae264fc add listener port and ip option for 'pleroma.instance gen' and enable its test 2019-07-10 01:46:49 +05:45
Roman Chvanikov
371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
kaniini
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
Roman Chvanikov
efefee8241 Split alters rather than work with indexes 2019-07-03 14:56:02 +03:00
Egor Kislitsyn
4f42093220 Remove Uploaders.Swift 2019-07-03 14:11:04 +07:00
Roman Chvanikov
291d95dcc3 Fix migration 2019-07-03 01:14:40 +03:00
Maksim
85c7916c94 [#1033] Fix database migrations 2019-07-01 01:08:07 +00:00
Roman Chvanikov
657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
lain
efad26bbb9 Update frontend. 2019-06-28 14:29:26 +02:00
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
 2019-06-26 19:15:37 +00:00
Haelwenn (lanodan) Monnier
451931d36f
Update mastofe to bundle-2019-06-26 2019-06-26 21:06:28 +02:00
Mark Felder
7b9e21e8a2 Update adminFE to latest build 2019-06-23 18:36:20 -04:00
kaniini
8b7860f12f Merge branch 'admin-config' into 'develop' 
Admin config

See merge request pleroma/pleroma!1328
 2019-06-23 05:42:37 +00:00
Alex S
982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
rinpatch
3ac5ecbac1 Support RUM indexes in the config generator 2019-06-22 12:54:16 +03:00
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.
 2019-06-22 02:29:49 +03:00
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.
 2019-06-21 22:01:59 +03:00
rinpatch
e76115989a Move config templates to priv so they can be found in releases 2019-06-21 19:54:04 +03:00
rinpatch
431a41b459 Update bundled pleroma-fe to c4fcdc71 2019-06-19 00:04:00 +03:00
Alexander Strizhakov
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
Sergey Suprunenko
a7d956d383 Remove unused imports and aliases from migration 2019-06-10 13:20:37 +00:00
Roman Chvanikov
01fe5abad1 Resolve conflicts 2019-06-07 01:20:50 +03:00
Egor Kislitsyn
17004a0f1a Create index on activities.local 2019-06-05 16:37:43 +07:00