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

4670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Horsemans
10a9682596 ssl_trusted_certificate should point to chain.pem if we're demonstrating LetsEncrypt: https://community.letsencrypt.org/t/howto-ocsp-stapling-for-nginx/13611/5 2019-03-31 16:58:28 +00: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
Haelwenn (lanodan) Monnier
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id 2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id 2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier
e83ad12c57
pagination.ex: Drop atom keys in params 
Atom keys could also have been transformed to string, or the other
way around but this one is more efficient and what we actually
expect with the current param_types in Pagination
 2019-03-28 17:18:59 +01:00
Haelwenn (lanodan) Monnier
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers 2019-03-28 17:18:59 +01:00
eugenijm
cd90695a34 Add PUT /api/pleroma/notification_settings endpoint 2019-03-28 18:55:16 +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
55d086b520 Notification controls 
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
 2019-03-28 07:52:07 +03:00
eugenijm
10c81fc902 Add user show endpoint for Pleroma admin API 2019-03-27 21:44:15 +03:00
Alex S
3ca6c4f443 password reset page labels align 2019-03-27 22:37:20 +06:30
Ivan Tashkinov
642075b1a9 [#923] Enabled binding of multiple OAuth provider accounts to single user. 2019-03-27 16:20:50 +03:00
Ivan Tashkinov
20e0f36605 Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth 2019-03-27 15:41:40 +03:00
Ivan Tashkinov
2a95014b9d [#923] OAuth consumer improvements, fixes, refactoring. 2019-03-27 15:39:35 +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