summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-02second level of headertext change in docAlex S
2019-04-02syntax highlightingAlex 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-02Merge branch 'features/pleroma-tan' into 'develop'lambda
priv/static/images: Add pleroma-tan See merge request pleroma/pleroma!913
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-02replace `Repo.get_by(User, nickname: nickname)` with ↵Egor Kislitsyn
`User.get_by_nickname(nickname)` in tests
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-02Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'lambda
Fix account lookup for nicknames beginning with numbers See merge request pleroma/pleroma!1003
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, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`Egor Kislitsyn
2019-04-02replace `Repo.get_by(User, nickname: nickname)` with ↵Egor Kislitsyn
`User.get_by_nickname(nickname)`
2019-04-02Added "GET /oauth/authorize" tests.Ivan Tashkinov
2019-04-02change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in testsEgor Kislitsyn
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-02test fixAlex S
2019-04-02little changes and typosAlex S
2019-04-02updating custom_emoji docsAlex S
2019-04-02Merge branch 'ci-speedup-2-electric-boogalo' into 'develop'lambda
CI speedup: split into proper stages to benefit from parallel execution See merge request pleroma/pleroma!1007
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-02remove reduntant services in docs deploy and change job names to kebab caserinpatch
2019-04-02what the fuckrinpatch
2019-04-02huhrinpatch
2019-04-02Separate CI jobs to 3 stages to allow them to be executed in parallelrinpatch
2019-04-02Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop'rinpatch
router: Add fake identity proof endpoint See merge request pleroma/pleroma!1006
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-01Merge branch 'fix/default-mail-adapter' into 'develop'lambda
Add default mail adapter settings to config See merge request pleroma/pleroma!994
2019-04-01Merge branch 'documentation-improvements' into 'develop'lambda
Small documentation improvements See merge request pleroma/pleroma!1001
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-01COPYING: WordingHaelwenn (lanodan) Monnier
[ci skip]
2019-04-01update mastodon api link in README to point to a non-outdated docsrinpatch
2019-04-01Merge branch 'update-readme' into 'develop'rinpatch
Fix dead links in README.md and add note about new docs site See merge request pleroma/pleroma!1000
2019-04-01Make only important note bold rather than the whole paragraph because it ↵rinpatch
looks better that way
2019-04-01Remove outdated howto change config and port and move it to config.md insteadrinpatch
2019-04-01Link to docs page instead of to clients.mdKaren Konou
2019-04-01COPYING: wrap to 79, city.jpg Unsplash, wordingHaelwenn (lanodan) Monnier
[ci skip]
2019-04-01Fix dead links and add note about new docs siteKaren Konou
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-23 07:39:44 +0000