summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-03-22reports: fix up email generation for remote reportsWilliam Pitcock
2019-03-22Merge branch 'safe-mentions' into 'develop'kaniini
Add safe dm mode option. See merge request pleroma/pleroma!958
2019-03-22Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'kaniini
Mastodon API: add conversation_id extension See merge request pleroma/pleroma!961
2019-03-21tests: fixupWilliam Pitcock
2019-03-21docs: document `conversation_id` extensionWilliam Pitcock
2019-03-21mastodon api: add conversation_id extension (ref #674)William Pitcock
2019-03-21common api: move context functions from twitterapiWilliam Pitcock
2019-03-21Merge branch 'feature/move-search-to-db' into 'develop'kaniini
Move gluing search results from application to database and get mutuals a higher score multiplier See merge request pleroma/pleroma!960
2019-03-21Move gluing search results from application to database and get mutualsrinpatch
a higher score multiplier
2019-03-21Merge branch 'feature/gopher-dstport' into 'develop'rinpatch
Add a gopher url port config option See merge request pleroma/pleroma!959
2019-03-21Add a gopher url port config optionQuentin Rameau
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-21Merge branch 'ecto-3-migration' into 'develop'rinpatch
Ecto 3.0.7 (ecto_sql 3.0.5) migration See merge request pleroma/pleroma!957
2019-03-21UtilController: Return state of safe dm mentions.lain
2019-03-21Skip tests in LDAPAuthorizationTest if :eldap module is unavailablelink0ff
2019-03-21Merge branch 'imageoptim' into 'develop'kaniini
used imageOptim to reduce size of image files See merge request pleroma/pleroma!944
2019-03-20Add safe dm mode option.lain
2019-03-20[#923] Typo fix.Ivan Tashkinov
2019-03-20[#923] Support for multiple OAuth consumer strategies.Ivan Tashkinov
2019-03-20modify the migrations to use naive_datetime_usecrinpatch
2019-03-20Fix filter migrationrinpatch
2019-03-20Fix migration timestamp typerinpatch
2019-03-20Ecto 3.0.5 migrationrinpatch
kms
2019-03-20Ignore compilation warnings for undefined module :eldaplink0ff
2019-03-20Merge branch '2019-03-20-update-frontend' into 'develop'lambda
Update frontend See merge request pleroma/pleroma!955
2019-03-20Update frontendlain
2019-03-20[#923] Nickname & email selection for external registrations, option to ↵Ivan Tashkinov
connect to existing account.
2019-03-20Merge branch 'fix/search-users-for-admin' into 'develop'kaniini
Rework users search Closes admin-fe#12 See merge request pleroma/pleroma!954
2019-03-20FormatMaxim Filippov
2019-03-20Use ILIKE to search usersMaxim Filippov
2019-03-19Merge branch 'bugfix/activitypub-public' into 'develop'kaniini
activitypub addressing improvements Closes #730 and #739 See merge request pleroma/pleroma!953
2019-03-19transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we ↵William Pitcock
always use the fake collection
2019-03-19user: properly cope with actors which do not declare a followers collectionWilliam Pitcock
2019-03-19transmogrifier: when determining followers collection URI, we may need to ↵William Pitcock
fetch the actor
2019-03-19test: add test for list sanitizationWilliam Pitcock
2019-03-19tests: add test for as:Public issuesWilliam Pitcock
2019-03-19activitypub: transmogrifier: do not allow missing lists to be interpreted as nilWilliam Pitcock
2019-03-19activitypub: transmogrifier: ensure as:Public activities are delivered to ↵William Pitcock
followers
2019-03-19fix UploadTest to use new image_tmp.jpgoptikfluffel
2019-03-19used imageOptim to reduce size of image filesoptikfluffel
2019-03-18Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'kaniini
Order users by nickname See merge request pleroma/pleroma!945
2019-03-18Merge branch 'doc/mastodon-api-accounts-extension' into 'develop'kaniini
Document additional pleroma changes to /api/v1/accounts/:id See merge request pleroma/pleroma!952
2019-03-18Document additional pleroma changes to /api/v1/accounts/:idMark Felder
2019-03-18Merge branch 'masto-api-notifications' into 'develop'kaniini
Add support for exclude_types, limit and min_id in Mastodon notifications See merge request pleroma/pleroma!949
2019-03-18Merge branch 'fix-initial-posts' into 'develop'rinpatch
Check if the user has indeed not been federated with before fetching initial posts See merge request pleroma/pleroma!951
2019-03-18[#923] Registration validations & unique index on [:user_id, :provider].Ivan Tashkinov
2019-03-18Check if the user has indeed not been federated withEkaterina Vaartis
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[#923] External User registration refactoring, password randomization.Ivan Tashkinov
2019-03-18[#923] Support for multiple (external) registrations per user via Registration.Ivan Tashkinov
2019-03-18Merge branch 'add-is-seen-mastodon-api-doc' into 'develop'rinpatch
Added documentation for Pleroma-specific is_seen in Mastodon API See merge request pleroma/pleroma!948
2019-03-18Added support for exclude_types, limit, and min_id in Mastodoneugenijm
notifications. Unify Mastodon-compatible pagination logic.