summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-04-02Merge branch 'get_by_id' into 'develop'lambda
Replace `Repo.get_by` with existing functions See merge request pleroma/pleroma!1010
2019-04-02Merge develop into feature/770-add-emoji-tagsAlex S
2019-04-02Rename fake param to preview and make the tests check that the object was ↵rinpatch
not inserted to the db
2019-04-02Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauthIvan Tashkinov
# Conflicts: # lib/pleroma/web/oauth/oauth_controller.ex # lib/pleroma/web/router.ex
2019-04-02Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'lambda
MastoAPI 2.6.0 `force_login` option Closes #734 See merge request pleroma/pleroma!999
2019-04-02Merge branch 'get_by_id' into 'develop'lambda
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible See merge request pleroma/pleroma!1009
2019-04-02Fix account lookup for nicknames beginning with numberscascode
2019-04-02[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-04-02replace `Repo.get_by(User, nickname: nickname)` with ↵Egor Kislitsyn
`User.get_by_nickname(nickname)`
2019-04-02change `Repo.get(User, id)` => `User.get_by_id(id)`Egor Kislitsyn
2019-04-02change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`Egor Kislitsyn
2019-04-02Ignore dates in wrong formatsSergey Suprunenko
2019-04-02add `user delete_activities` mix taskEgor Kislitsyn
2019-04-02little changes and typosAlex S
2019-04-02refactoring of emoji tags config to use groupsAlex S
2019-04-02Merge remote-tracking branch 'pleroma/develop' into remove-user-activitiesEgor Kislitsyn
2019-04-02add support for all status type (ostatus) and replase case with ifSachin Joshi
2019-04-02Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
features/mastoapi/2.6.0-conversations
2019-04-02fetch url for OStatus to know if it is a/c or statusSachin Joshi
2019-04-02router: Add fake identity proof endpointHaelwenn (lanodan) Monnier
2019-04-01Handle dates in the Unix timestamp format (Fixes #763)Sergey Suprunenko
2019-04-01[OStatus] adds status to pleroma instance if the url given is a statusSachin Joshi
2019-04-01Fixed local MastoFE authentication / `force_login` option.Ivan Tashkinov
2019-04-01Added `force_login` authentication option (previously applied by default).Ivan Tashkinov
2019-04-01code styleAlex S
little fix
2019-04-01Adding tag to emoji ets tableAlex S
changes in apis
2019-04-01Move putting fake attribute to lib/pleroma/web/activity_pub/utils.exrinpatch
2019-04-01insert object defaults for fake activities and make credo happyrinpatch
2019-04-01oofrinpatch
2019-04-01Fix the issue with HTML scrubberrinpatch
2019-04-01[#923] Minor code readability fix.Ivan Tashkinov
2019-04-01[#923] Deps config adjustment (no `override` for `httpoison`), code analysis ↵Ivan Tashkinov
issues fixes.
2019-04-01[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
2019-03-31BBS: Some fixes.lain
2019-03-31Add replying.lain
2019-03-31BBS: Tests and formatting.lain
2019-03-31BBS: Some more functionality.lain
2019-03-31Basic SSH daemon.lain
2019-03-30Add a fake option to lazy_put_actvity_defaultsrinpatch
2019-03-29Implement fake status submitrinpatch
2019-03-29Replace Pleroma.Jobs with `pleroma_job_queue`Egor
2019-03-28mastodon_api_controller.ex: fallback to first for min_idHaelwenn (lanodan) Monnier
2019-03-28mastodon_api_controller.ex: Use min_id in link header instead of since_idHaelwenn (lanodan) Monnier
2019-03-28pagination.ex: Drop atom keys in paramsHaelwenn (lanodan) Monnier
Atom keys could also have been transformed to string, or the other way around but this one is more efficient and what we actually expect with the current param_types in Pagination
2019-03-28activity_pub.ex: Move limit/max_id restrictions to Pagination helpersHaelwenn (lanodan) Monnier
2019-03-28Add PUT /api/pleroma/notification_settings endpointeugenijm
2019-03-28Notification controlseugenijm
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
2019-03-27Add user show endpoint for Pleroma admin APIeugenijm
2019-03-27password reset page labels alignAlex S
2019-03-27Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauthIvan Tashkinov