kaniini
519a294d0f
Merge branch 'reports/fix-remote-reporting-emails' into 'develop'
...
reports: fix up email generation for remote reports
See merge request pleroma/pleroma!962
2019-03-22 01:35:54 +00:00
William Pitcock
27e03a2177
reports: fix up email generation for remote reports
2019-03-22 01:17:14 +00:00
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
kaniini
b548181b52
Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'
...
Mastodon API: add conversation_id extension
See merge request pleroma/pleroma!961
2019-03-22 00:25:35 +00:00
William Pitcock
a223e65f35
tests: fixup
2019-03-21 23:56:57 +00:00
William Pitcock
ae8fa5d0aa
docs: document conversation_id
extension
2019-03-21 23:27:42 +00:00
William Pitcock
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
2019-03-21 23:25:41 +00:00
William Pitcock
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
kaniini
bf8b29e080
Merge branch 'feature/move-search-to-db' into 'develop'
...
Move gluing search results from application to database and get mutuals a higher score multiplier
See merge request pleroma/pleroma!960
2019-03-21 21:41:04 +00:00
rinpatch
88096c65a5
Move gluing search results from application to database and get mutuals
...
a higher score multiplier
2019-03-21 23:16:32 +03:00
rinpatch
b48fddef5f
Merge branch 'feature/gopher-dstport' into 'develop'
...
Add a gopher url port config option
See merge request pleroma/pleroma!959
2019-03-21 17:08:40 +00:00
Quentin Rameau
80bc9ed2ba
Add a gopher url port config option
...
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
2019-03-21 19:59:43 +03:00
rinpatch
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
lain
bf27190f7f
UtilController: Return state of safe dm mentions.
2019-03-21 16:20:58 +01:00
link0ff
f858df819b
Skip tests in LDAPAuthorizationTest if :eldap module is unavailable
2019-03-21 12:31:16 +02:00
kaniini
b68fb3dc17
Merge branch 'imageoptim' into 'develop'
...
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
2019-03-21 00:59:24 +00:00
lain
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
Ivan Tashkinov
81bf6d9e6a
[ #923 ] Typo fix.
2019-03-20 20:29:08 +03:00
Ivan Tashkinov
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
2019-03-20 20:25:48 +03:00
rinpatch
e59cfa7cac
modify the migrations to use naive_datetime_usec
2019-03-20 16:16:29 +03:00
rinpatch
cbc4a76b43
Fix filter migration
2019-03-20 16:13:23 +03:00
rinpatch
19a19bdd81
Fix migration timestamp type
2019-03-20 16:04:59 +03:00
rinpatch
9a7b817c9a
Ecto 3.0.5 migration
...
kms
2019-03-20 15:59:54 +03:00
link0ff
40c58d3383
Ignore compilation warnings for undefined module :eldap
2019-03-20 13:28:06 +02:00
lambda
0d14def0ca
Merge branch '2019-03-20-update-frontend' into 'develop'
...
Update frontend
See merge request pleroma/pleroma!955
2019-03-20 08:07:25 +00:00
lain
41511d1926
Update frontend
2019-03-20 08:58:25 +01:00
Ivan Tashkinov
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
2019-03-20 10:35:31 +03:00
kaniini
606766b010
Merge branch 'fix/search-users-for-admin' into 'develop'
...
Rework users search
Closes admin-fe#12
See merge request pleroma/pleroma!954
2019-03-20 00:37:20 +00:00
Maxim Filippov
7ac9fff437
Format
2019-03-20 01:40:50 +03:00
Maxim Filippov
ed8a2935f5
Use ILIKE to search users
2019-03-20 01:37:40 +03:00
kaniini
9b80203ea5
Merge branch 'bugfix/activitypub-public' into 'develop'
...
activitypub addressing improvements
Closes #730 and #739
See merge request pleroma/pleroma!953
2019-03-19 21:36:20 +00:00
William Pitcock
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
2019-03-19 18:39:33 +00:00
William Pitcock
67ff8d9311
user: properly cope with actors which do not declare a followers collection
2019-03-19 18:23:06 +00:00
William Pitcock
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
2019-03-19 18:04:57 +00:00
William Pitcock
455bb526f6
test: add test for list sanitization
2019-03-19 17:53:40 +00:00
William Pitcock
fd0aa58ee0
tests: add test for as:Public issues
2019-03-19 17:49:29 +00:00
William Pitcock
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
2019-03-19 17:30:25 +00:00
William Pitcock
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
2019-03-19 17:27:42 +00:00
optikfluffel
00c5d7248f
fix UploadTest to use new image_tmp.jpg
2019-03-19 10:10:48 +01:00
optikfluffel
a907522690
used imageOptim to reduce size of image files
2019-03-19 10:10:48 +01:00
kaniini
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
2019-03-18 23:08:31 +00:00
kaniini
a5675c965a
Merge branch 'doc/mastodon-api-accounts-extension' into 'develop'
...
Document additional pleroma changes to /api/v1/accounts/:id
See merge request pleroma/pleroma!952
2019-03-18 20:32:24 +00:00
Mark Felder
325c106cb5
Document additional pleroma changes to /api/v1/accounts/:id
2019-03-18 19:48:56 +00:00
kaniini
aba4c27120
Merge branch 'masto-api-notifications' into 'develop'
...
Add support for exclude_types, limit and min_id in Mastodon notifications
See merge request pleroma/pleroma!949
2019-03-18 19:17:36 +00:00
rinpatch
d0eb25a3da
Merge branch 'fix-initial-posts' into 'develop'
...
Check if the user has indeed not been federated with before fetching initial posts
See merge request pleroma/pleroma!951
2019-03-18 17:57:19 +00:00
Ivan Tashkinov
40e9a04c31
[ #923 ] Registration validations & unique index on [:user_id, :provider].
2019-03-18 20:31:24 +03:00
Ekaterina Vaartis
a1aacc08a4
Check if the user has indeed not been federated with
...
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
2019-03-18 20:16:31 +03:00
Ivan Tashkinov
8d21859717
[ #923 ] External User registration refactoring, password randomization.
2019-03-18 18:09:53 +03:00
Zachary Dunn
97b35e00b0
Fix with expression always matching
2019-03-18 14:59:52 +00:00
Zachary Dunn
e572786dad
Run
2019-03-18 14:53:30 +00:00