summaryrefslogtreecommitdiff
path: root/lib
AgeCommit message (Collapse)Author
2019-04-02Merge branch 'bugfix/wrong-date-format' into 'develop'lambda
Support activities with dates in the Unix timestamp format Closes #763 See merge request pleroma/pleroma!1004
2019-04-02Merge branch 'feature/fake-statuses' into 'develop'lambda
Add fake status submit See merge request pleroma/pleroma!995
2019-04-02Merge remote-tracking branch 'origin/develop' into fix-slow-relationshipslain
2019-04-02ActivityPub Utils: Greatly speed up the follow / block activity fetching.lain
2019-04-02Merging develop into feature/770-add-emoji-tagsAlex S
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02second level of headertext change in docAlex S
2019-04-02Merge branch 'bugfix/share-mastodon' into 'develop'lambda
[OStatus] adds status to pleroma instance if the url given is a status See merge request pleroma/pleroma!1002
2019-04-02Merge branch 'remove-user-activities' into 'develop'lambda
[#757] Add mix task to delete user's activities See merge request pleroma/pleroma!1008
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