summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-04-02Merge branch 'features/pleroma-tan' into 'develop'lambda
priv/static/images: Add pleroma-tan See merge request pleroma/pleroma!913
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-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-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-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
2019-04-01Fixed local MastoFE authentication / `force_login` option.Ivan Tashkinov
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-01Added `force_login` authentication option (previously applied by default).Ivan Tashkinov
2019-04-01COPYING: Add copyright notice for the finmojisHaelwenn (lanodan) Monnier
[ci skip]
2019-03-31Add default mail adapter settings to configMark Felder
2019-04-01COPYING: Add copyright notice for the whole repositoryHaelwenn (lanodan) Monnier
[ci skip]
2019-04-01LICENSE → AGPL-3Haelwenn (lanodan) Monnier
[ci skip]
2019-04-01CC-BY-SA-4.0: Add a copy of the CC-BY-SA-4.0 licenseHaelwenn (lanodan) Monnier
[ci skip]
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