Commit graph

4457 commits

Author SHA1 Message Date
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
rinpatch
fe5145eeaa Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex 2019-04-01 12:25:53 +03:00
rinpatch
975482f091 insert object defaults for fake activities and make credo happy 2019-04-01 12:16:51 +03:00
rinpatch
d866b59eea oof 2019-04-01 11:58:08 +03:00
rinpatch
45ba10bf47 Fix the issue with HTML scrubber 2019-04-01 11:55:59 +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
rinpatch
cd387f8693 Add a fake option to lazy_put_actvity_defaults 2019-03-30 13:57:54 +03:00
rinpatch
42b779527c document fake option 2019-03-29 22:15:20 +03:00
rinpatch
1bb4d5d65b Implement fake status submit 2019-03-29 21:59:04 +03: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
lambda
c6ab5ebe7c Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
Mastodon 2.7.2 instance attributes (registrations, languages)

See merge request pleroma/pleroma!979
2019-03-26 16:01:52 +00:00
lain
10a7a4a868 AP UserView: Refactor banner / avatar display code, add test. 2019-03-26 16:59:28 +01:00
Ivan Tashkinov
47b49ab1a1 Test for MastoAPI /api/v1/instance response structure (formatting fix). 2019-03-26 18:18:36 +03:00
lambda
9e3899bf36 Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
Mastodon-based auth error messages. User#auth_active?/1 refactoring.

See merge request pleroma/pleroma!978
2019-03-26 15:13:55 +00:00
Ivan Tashkinov
caf0e9cf33 Test for MastoAPI /api/v1/instance response structure. 2019-03-26 18:13:24 +03:00
lambda
21ff78cd40 Merge branch 'replies-count' into 'develop'
Increment replies_count (MastoAPI)

Closes #756

See merge request pleroma/pleroma!974
2019-03-26 14:49:09 +00:00
lambda
3f44433ebd Merge branch 'refactor/remove-activity-representer' into 'develop'
Remove ActivityRepresenter

See merge request pleroma/pleroma!980
2019-03-26 14:46:01 +00:00