Commit graph

4426 commits

Author SHA1 Message Date
lambda
bd961a3bad Merge branch 'features/pleroma-tan' into 'develop'
priv/static/images: Add pleroma-tan

See merge request pleroma/pleroma!913
2019-04-02 11:54:04 +00:00
lambda
091baf9316 Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
MastoAPI 2.6.0 `force_login` option

Closes #734

See merge request pleroma/pleroma!999
2019-04-02 10:57:38 +00:00
lambda
26d509cc86 Merge branch 'get_by_id' into 'develop'
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible

See merge request pleroma/pleroma!1009
2019-04-02 10:52:29 +00:00
lambda
b5d486d9ac Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'
Fix account lookup for nicknames beginning with numbers

See merge request pleroma/pleroma!1003
2019-04-02 10:51:33 +00:00
cascode
95c92c49c9 Fix account lookup for nicknames beginning with numbers 2019-04-02 10:51:33 +00:00
Ivan Tashkinov
15ce710460 Added "GET /oauth/authorize" tests. 2019-04-02 13:43:33 +03:00
Egor Kislitsyn
11c2d6bdc4 change Repo.get(Activity, id) => Activity.get_by_id(id) in tests 2019-04-02 17:08:03 +07:00
Egor Kislitsyn
1b3d921921 change Repo.get(User, id) => User.get_by_id(id) 2019-04-02 17:01:26 +07:00
Egor Kislitsyn
4212527928 change Repo.get(Activity, id) => Activity.get_by_id(id) 2019-04-02 16:50:31 +07:00
lambda
9305e241cb Merge branch 'ci-speedup-2-electric-boogalo' into 'develop'
CI speedup: split into proper stages to benefit from parallel execution

See merge request pleroma/pleroma!1007
2019-04-02 08:50:47 +00:00
rinpatch
8c71ea5a1a remove reduntant services in docs deploy and change job names to kebab case 2019-04-02 09:13:34 +03:00
rinpatch
5ee54d8183 what the fuck 2019-04-02 09:07:58 +03:00
rinpatch
7827b929fc huh 2019-04-02 09:02:21 +03:00
rinpatch
4861558b93 Separate CI jobs to 3 stages to allow them to be executed in parallel 2019-04-02 08:58:09 +03:00
rinpatch
f8aa917eef Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop'
router: Add fake identity proof endpoint

See merge request pleroma/pleroma!1006
2019-04-02 05:31:41 +00:00
Haelwenn (lanodan) Monnier
f56eef8d8c
router: Add fake identity proof endpoint 2019-04-02 01:53:38 +02:00
lambda
fd7dd8f9a2 Merge branch 'fix/default-mail-adapter' into 'develop'
Add default mail adapter settings to config

See merge request pleroma/pleroma!994
2019-04-01 21:47:40 +00:00
lambda
fc2bef5ac3 Merge branch 'documentation-improvements' into 'develop'
Small documentation improvements

See merge request pleroma/pleroma!1001
2019-04-01 21:20:11 +00:00
Haelwenn (lanodan) Monnier
66e7d4966d
COPYING: Wording
[ci skip]
2019-04-01 18:34:53 +02:00
rinpatch
5373077501 update mastodon api link in README to point to a non-outdated docs 2019-04-01 19:27:40 +03:00
rinpatch
d976cc5df7 Merge branch 'update-readme' into 'develop'
Fix dead links in README.md and add note about new docs site

See merge request pleroma/pleroma!1000
2019-04-01 16:25:02 +00:00
rinpatch
e2b94d8f33 Make only important note bold rather than the whole paragraph because it looks better that way 2019-04-01 19:24:50 +03:00
rinpatch
a309b49c2d Remove outdated howto change config and port and move it to config.md instead 2019-04-01 19:19:06 +03:00
41f02e87a1 Link to docs page instead of to clients.md 2019-04-01 18:13:42 +02:00
Haelwenn (lanodan) Monnier
715a31c1ed
COPYING: wrap to 79, city.jpg Unsplash, wording
[ci skip]
2019-04-01 18:13:13 +02:00
3c9abf5dee Fix dead links and add note about new docs site 2019-04-01 18:02:58 +02:00
Ivan Tashkinov
6910fb371b Fixed local MastoFE authentication / force_login option. 2019-04-01 17:25:25 +03:00
rinpatch
949cfde065 restart makes no sense here as we instructed to stop the service before 2019-04-01 16:26:46 +03:00
rinpatch
bff8cde0cf Instruct to stop the service only after git pulling and getting deps to minimize downtimes 2019-04-01 16:23:32 +03:00
rinpatch
7c69c6f624 change bold text to be proper geadings in introduction.md 2019-04-01 16:22:12 +03:00
rinpatch
b46e6f0949 Fix backup/restore page to have proper headings 2019-04-01 16:10:47 +03:00
Ivan Tashkinov
cbe09d94d1 Added force_login authentication option (previously applied by default). 2019-04-01 14:46:50 +03:00
Haelwenn (lanodan) Monnier
0bab2661ae
COPYING: Add copyright notice for the finmojis
[ci skip]
2019-04-01 02:15:14 +02:00
Mark Felder
d5a1e08bf1 Add default mail adapter settings to config 2019-03-31 17:46:17 -05:00
Haelwenn (lanodan) Monnier
8ae4837abd
COPYING: Add copyright notice for the whole repository
[ci skip]
2019-04-01 00:32:00 +02:00
Haelwenn (lanodan) Monnier
362603c723
LICENSE → AGPL-3
[ci skip]
2019-04-01 00:31:21 +02:00
Haelwenn (lanodan) Monnier
32e843f033
CC-BY-SA-4.0: Add a copy of the CC-BY-SA-4.0 license
[ci skip]
2019-04-01 00:30:21 +02:00
lambda
dc39d8d3fb Merge branch 'fix/job-queue-doc' into 'develop'
Improve PleromaJobQeue config documentation

See merge request pleroma/pleroma!993
2019-03-29 13:43:07 +00:00
rinpatch
afbc905a1c qs 2019-03-29 16:38:18 +03:00
rinpatch
11584488d1 Improve PleromaJobQeue config documentation 2019-03-29 16:11:22 +03:00
lambda
a5edc4da62 Merge branch 'pleroma_job_queue' into 'develop'
Replace Pleroma.Jobs with `pleroma_job_queue`

See merge request pleroma/pleroma!992
2019-03-29 12:46:05 +00:00
Egor
9a39d1d846 Replace Pleroma.Jobs with pleroma_job_queue 2019-03-29 12:46:05 +00:00
lambda
749d53e2b2 Merge branch 'sayonara-gitlab-wiki' into 'develop'
Move out of Gitlab Wiki

See merge request pleroma/pleroma!990
2019-03-29 10:24:52 +00:00
lambda
52bec238c3 Merge branch 'feature/deploy-docs' into 'develop'
Add automatic documentation build and deploy for master and develop branches

Closes #478

See merge request pleroma/pleroma!965
2019-03-29 09:57:15 +00:00
kaniini
ef3c23d40e Merge branch 'bugfix/migration-less_replies_count' into 'develop'
Revert awfully long migration from 568e34858

See merge request pleroma/pleroma!991
2019-03-29 07:32:24 +00:00
Haelwenn (lanodan) Monnier
b2f3a40e53
Revert awfully long migration from 568e34858 2019-03-29 01:57:02 +01:00
rinpatch
634e09e1a8 Remove duplicated header from i2p.md 2019-03-28 20:29:46 +03:00
rinpatch
9bd80e6044 did it really take me 4 commits to fix this? 2019-03-28 20:27:01 +03:00
rinpatch
d16e2a2e04 Remove duplicated header from admin_api.md 2019-03-28 20:16:59 +03:00
rinpatch
e4601b2c1d remove admin tasks as they have their page in mix tasks category already 2019-03-28 20:16:14 +03:00