sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,411 Commits 1 Branch 0 Tags 184 MiB
11c2d6bdc4
Commit Graph

4411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Karen Konou
41f02e87a1 Link to docs page instead of to clients.md 2019-04-01 18:13:42 +02:00
Karen Konou
3c9abf5dee Fix dead links and add note about new docs site 2019-04-01 18:02:58 +02: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
Mark Felder
d5a1e08bf1 Add default mail adapter settings to config 2019-03-31 17:46:17 -05: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
rinpatch
d0026761b7 cringe 2019-03-28 20:13:22 +03:00
rinpatch
dfae0050af Move out of Gitlab Wiki 
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-28 19:46:30 +03:00
lambda
a71831d1c2 Merge branch 'admin-api-user-show' into 'develop' 
Admin API user show

Closes #766

See merge request pleroma/pleroma!987
 2019-03-28 12:19:44 +00:00
eugenijm
10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
lambda
926bf114b7 Merge branch 'feature/more-user-filters' into 'develop' 
Add more user filters + move search to its own module

See merge request pleroma/pleroma!982
 2019-03-27 11:33:13 +00:00
lambda
a5f141d9d5 Merge branch 'fix-reblog-tests' into 'develop' 
Fix muting reblogs tests

See merge request pleroma/pleroma!984
 2019-03-27 11:30:07 +00:00
rinpatch
776bb5137f Fix muting reblogs tests 2019-03-27 13:43:43 +03:00
rinpatch
6da1999fc8 Merge branch 'hotfix/missing-announce-mastoapi' into 'develop' 
Fix missing announces in MastoAPI home timeline

Closes #762

See merge request pleroma/pleroma!983
 2019-03-27 09:37:08 +00:00
rinpatch
ce6d64bbd8 Fix missing announces in MastoAPI home timeline 
Closes #762
 2019-03-27 12:28:53 +03:00
lambda
b2e163ec57 Merge branch 'apps-verify-credentials' into 'develop' 
MastodonAPI: Add GET /api/v1/apps/verify_credentials

See merge request pleroma/pleroma!981
 2019-03-27 09:16:00 +00:00
Maxim Filippov
3cf7539bca Add more user filters + move search to its own module 2019-03-27 03:51:59 +05:00
eugenijm
a4ab60ac54 Add vapid_key to the POST /api/v1/apps response 2019-03-26 23:27:37 +03:00
eugenijm
691d1208b5 Add GET /api/v1/apps/verify_credentials 2019-03-26 21:53:28 +03:00
lambda
ff3b09f6b3 Merge branch 'fix/ap-icon' into 'develop' 
Do not federate instance avatar

Closes #759

See merge request pleroma/pleroma!977
 2019-03-26 16:12:50 +00:00