lain
a4598b5e8b
Visibility: Make it more resilient.
2019-05-08 18:08:50 +02:00
lain
920bd47055
ActivityPub: Remove leftover printf debugging.
2019-05-08 17:40:24 +02:00
lain
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
2019-05-08 17:37:00 +02:00
kaniini
c2efc689d1
Merge branch 'feature/761-add-users-filtration' into 'develop'
...
Feature/761 add users filtration
Closes #761
See merge request pleroma/pleroma!1117
2019-05-08 14:34:36 +00:00
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
2019-05-08 14:34:36 +00:00
lambda
289b8224ac
Merge branch 'fix/851-emoji-redirect-follow' into 'develop'
...
emoji dowload follow redirects
Closes #851
See merge request pleroma/pleroma!1126
2019-05-08 13:13:59 +00:00
Alex S
a76e2622ca
emoji dowload follow redirects
2019-05-08 19:05:25 +07:00
lambda
aa8a6e7bec
Merge branch 'refactor/oauth_scopes' into 'develop'
...
Refactoring functions for dealing with oauth scopes.
See merge request pleroma/pleroma!1125
2019-05-08 10:52:14 +00:00
Maksim
799e1f48b5
Refactoring functions for dealing with oauth scopes.
2019-05-08 10:52:13 +00:00
kaniini
14deed7f7d
Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'
...
Optimize bookmarks by preloading them with activities
Closes #861
See merge request pleroma/pleroma!1121
2019-05-07 19:37:41 +00:00
William Pitcock
d64c3b604e
twitterapi: use order constraint to force descending order
2019-05-07 19:33:25 +00:00
William Pitcock
6020ff3fb6
activitypub: add optional order constraint to timeline query builder
2019-05-07 19:33:22 +00:00
rinpatch
4c5125dedc
Remove bookmarks assoc and add a fake bookmark assoc instead
2019-05-07 19:33:22 +00:00
rinpatch
be067ec2ab
Use with_preloaded_bookmark in create_by_object_ap_id_with_object
2019-05-07 19:33:22 +00:00
rinpatch
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
2019-05-07 19:33:22 +00:00
rinpatch
f841eb7cdb
Preload bookmarks wherever the object is preloaded
2019-05-07 19:33:22 +00:00
rinpatch
06947c9147
Remove bookmarks assoc
2019-05-07 19:33:22 +00:00
kaniini
a1a0df19c4
Merge branch 'docs/MRF-modules' into 'develop'
...
Documentation: MRF Modules
See merge request pleroma/pleroma!1122
2019-05-07 16:15:27 +00:00
William Pitcock
e71ddf23ba
containment: remove pointless moduledoc line
2019-05-07 16:11:22 +00: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
rinpatch
6518644db1
Merge branch 'unused-config-parameter' into 'develop'
...
unused config paramater
See merge request pleroma/pleroma!1124
2019-05-07 02:35:31 +00:00
Alex S
f46295faa7
unused config paramater
2019-05-07 09:07:06 +07:00
rinpatch
d26998c2ac
Merge branch 'fix/ex_doc-source-links' into 'develop'
...
Fix/ex_doc source links
See merge request pleroma/pleroma!1123
2019-05-07 00:32:07 +00:00
xse
c81b707030
Fix/ex_doc source links
2019-05-07 00:32:07 +00:00
lambda
6b79be4a06
Merge branch 'issue_800' into 'develop'
...
[#800 ] added ability renew access_token by refresh_token
See merge request pleroma/pleroma!1045
2019-05-06 17:51:03 +00:00
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06 17:51:03 +00:00
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
2019-05-06 17:17:03 +00:00
lambda
4dabf64af4
Merge branch 'feature/845-improve-status-deletion' into 'develop'
...
Improve status deletion
Closes #845
See merge request pleroma/pleroma!1104
2019-05-06 16:45:22 +00:00
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
2019-05-06 16:45:22 +00:00
Haelwenn (lanodan) Monnier
69a5074893
Remove H1 in @moduledoc
2019-05-06 04:53:12 +02:00
Haelwenn (lanodan) Monnier
e41a2f98d5
mrf/tag_policy.ex: Add some documentation
...
mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one?
2019-05-06 04:53:11 +02:00
Haelwenn (lanodan) Monnier
af62ace954
Add short documentation on every MRF Policy
2019-05-06 04:49:50 +02:00
lain
eb0fb73ddb
BBS: Credo fixes.
2019-05-04 15:47:50 +02:00
lain
c58fd4c038
BBS: Fix tests.
2019-05-04 15:36:48 +02:00
lain
c9d1cb2dce
BBS: Use cached user fetcher.
2019-05-04 15:08:07 +02:00
lain
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
rinpatch
d089ff2460
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
...
Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118
2019-05-03 20:36:13 +00:00
rinpatch
9907e974ca
Merge branch 'fix-search-speed' into 'develop'
...
Search: Add fts index on objects table.
See merge request pleroma/pleroma!1120
2019-05-03 18:35:02 +00:00
lain
a23206a4ae
Just have Benchee in all environments.
2019-05-03 20:28:06 +02:00
lain
a7709cc267
Mix: Also have benchee in test.
2019-05-03 19:42:49 +02:00
lambda
4948a73e37
Merge branch 'bugfix/emoji-size' into 'develop'
...
Bugfix: emoji size in profile
Closes #269
See merge request pleroma/pleroma!792
2019-05-03 17:26:39 +00:00
lain
0e37fddd5a
Search: Add fts index on objects table.
2019-05-03 19:21:09 +02:00
Haelwenn (lanodan) Monnier
b5ad1715b2
MastoAPI: profile update with emoji_map
2019-05-03 16:41:23 +02:00
Haelwenn (lanodan) Monnier
46bbf9e1cf
TwitterAPI: profile update with emoji_map
2019-05-03 16:30:24 +02:00
Haelwenn (lanodan) Monnier
85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
2019-05-03 16:27:51 +02:00
Haelwenn (lanodan) Monnier
2f76a40d02
formatter.ex: Add get_emoji_map/1
2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio
2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier
85b5c60694
Pleroma.Formatter: width/height to class=emoji
2019-05-03 16:25:58 +02:00
