sadposter
357b1eac0f
theme
2019-07-09 21:08:03 +01: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
sadposter
ed709aec2c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-07-06 18:41:06 +01: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
sadposter
4d8f97453b
Add activity get mix task
2019-07-01 17:58:51 +01: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
sadposter
87ba9d1bab
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-28 18:55:01 +01:00
lain
efad26bbb9
Update frontend.
2019-06-28 14:29:26 +02:00
sadposter
8050baf7bf
Update pleroma FE
2019-06-27 02:25:30 +01:00
sadposter
0843f3e0b6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-27 02:17:32 +01: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
sadposter
3a71016699
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-25 12:40:02 +01: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
sadposter
6f380ee337
merge
2019-06-19 14:20:26 +01:00
rinpatch
431a41b459
Update bundled pleroma-fe to c4fcdc71
2019-06-19 00:04:00 +03:00
sadposter
f0fc2da964
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-16 17:43:10 +01: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
sadposter
4cda6ed358
change panel
2019-06-12 15:34:27 +01:00
sadposter
922c25d9c7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-12 13:19:24 +01: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
sadposter
ee7459ec8c
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-06 15:54:38 +01:00
sadposter
febd2fdfd3
add emojo
2019-06-06 15:54:32 +01:00
Egor Kislitsyn
17004a0f1a
Create index on activities.local
2019-06-05 16:37:43 +07:00
sadposter
9bc0f51e51
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-05 01:25:52 +01:00
Roman Chvanikov
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
Egor Kislitsyn
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
kaniini
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
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
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.
2019-06-03 20:42:13 +03:00
rinpatch
be56801dda
Add index on inReplyTo for objects
...
Fixes the performance of `get_existing_votes`
2019-06-03 19:26:43 +03:00
sadposter
c4151feb48
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-06-03 13:29:35 +01:00
sadposter
d19b99009b
add instance resources
2019-05-30 12:11:56 +01:00
Roman Chvanikov
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
William Pitcock
5fbbc57c1b
add migration to add notification settings to user accounts
2019-05-25 07:25:13 +00:00
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-24 21:05:57 +07:00
sadposter
3357780ea8
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-20 19:36:57 +01:00
lain
022e6e4b44
RUM: Remove vacuum analyze from migration
...
Can't be run in a trnasaction.
2019-05-17 14:59:01 +02:00
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-17 19:57:14 +07:00
Egor Kislitsyn
f2936e0a07
Add ap_id
to List
2019-05-17 19:56:37 +07:00
lain
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
2019-05-17 12:26:59 +02:00
sadposter
c0b7bc2927
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-16 20:24:43 +01:00
sadposter
7f40b66d51
add emojo
2019-05-16 20:24:29 +01: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
sadposter
cf2741e067
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-13 12:09:35 +01: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
sadposter
4c11429520
Add mayushii
2019-05-12 00:51:01 +01: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
sadposter
db0fefc167
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-05-06 20:40:42 +01: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
Sadposter
fa632f9c37
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-04-29 12:56:53 +01:00
Sadposter
4b521119dc
Add compressed background
2019-04-29 12:56:08 +01: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
Sadposter
c02d52c9f7
Update instance panel
2019-04-14 19:01:01 +01:00
Sadposter
b134bd83ca
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-04-14 19:00:50 +01: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
Sadposter
d5e5e87d01
Update emojo
2019-04-11 10:52:44 +01: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