summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-02[#923] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
twitter_oauth # Conflicts: # mix.exs
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-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-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-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-01Fix dead links and add note about new docs siteKaren Konou
2019-04-01restart makes no sense here as we instructed to stop the service beforerinpatch
2019-04-01Instruct to stop the service only after git pulling and getting deps to ↵rinpatch
minimize downtimes
2019-04-01change bold text to be proper geadings in introduction.mdrinpatch
2019-04-01Fix backup/restore page to have proper headingsrinpatch
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-31Add default mail adapter settings to configMark Felder
2019-03-29Merge branch 'fix/job-queue-doc' into 'develop'lambda
Improve PleromaJobQeue config documentation See merge request pleroma/pleroma!993
2019-03-29qsrinpatch
2019-03-29Improve PleromaJobQeue config documentationrinpatch
2019-03-29Merge branch 'pleroma_job_queue' into 'develop'lambda
Replace Pleroma.Jobs with `pleroma_job_queue` See merge request pleroma/pleroma!992
2019-03-29Replace Pleroma.Jobs with `pleroma_job_queue`Egor
2019-03-29Merge branch 'sayonara-gitlab-wiki' into 'develop'lambda
Move out of Gitlab Wiki See merge request pleroma/pleroma!990
2019-03-29Merge branch 'feature/deploy-docs' into 'develop'lambda
Add automatic documentation build and deploy for master and develop branches Closes #478 See merge request pleroma/pleroma!965
2019-03-29Merge branch 'bugfix/migration-less_replies_count' into 'develop'kaniini
Revert awfully long migration from 568e34858 See merge request pleroma/pleroma!991
2019-03-29Revert awfully long migration from 568e34858Haelwenn (lanodan) Monnier
2019-03-28Remove duplicated header from i2p.mdrinpatch
2019-03-28did it really take me 4 commits to fix this?rinpatch
2019-03-28Remove duplicated header from admin_api.mdrinpatch
2019-03-28remove admin tasks as they have their page in mix tasks category alreadyrinpatch
2019-03-28cringerinpatch
2019-03-28Move out of Gitlab Wikirinpatch
I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just * Gets everything from gitlab wiki * Removes some specific gitlab hacks * Formats all documentation file names to be in snake case so they look the same way as our code does
2019-03-28Merge branch 'admin-api-user-show' into 'develop'lambda
Admin API user show Closes #766 See merge request pleroma/pleroma!987
2019-03-27Add user show endpoint for Pleroma admin APIeugenijm
2019-03-27[#923] Enabled binding of multiple OAuth provider accounts to single user.Ivan Tashkinov
2019-03-27Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauthIvan Tashkinov
2019-03-27[#923] OAuth consumer improvements, fixes, refactoring.Ivan Tashkinov
2019-03-27Merge branch 'feature/more-user-filters' into 'develop'lambda
Add more user filters + move search to its own module See merge request pleroma/pleroma!982
2019-03-27Merge branch 'fix-reblog-tests' into 'develop'lambda
Fix muting reblogs tests See merge request pleroma/pleroma!984
2019-03-27Fix muting reblogs testsrinpatch
2019-03-27Merge branch 'hotfix/missing-announce-mastoapi' into 'develop'rinpatch
Fix missing announces in MastoAPI home timeline Closes #762 See merge request pleroma/pleroma!983
2019-03-27Fix missing announces in MastoAPI home timelinerinpatch
Closes #762
2019-03-27Merge branch 'apps-verify-credentials' into 'develop'lambda
MastodonAPI: Add GET /api/v1/apps/verify_credentials See merge request pleroma/pleroma!981
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-30 19:19:23 +0000