moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,487 Commits 2 Branches 0 Tags 208 MiB
Commit Graph

4487 Commits

Author SHA1 Message Date
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
rinpatch aacdcac1be Credo is upset about me not remembering the alphabet 2019-03-26 17:35:45 +03:00
rinpatch 087662d4fb Fix formatting 2019-03-26 17:18:18 +03:00
rinpatch 406d19331f Remove ActivityRepresenter 2019-03-26 17:16:21 +03:00
Ivan Tashkinov eef1042b16 Mastodon 2.7.2 instance attributes (registrations, languages). 2019-03-26 16:27:17 +03:00
eugenijm 568e348588 Increment replies_count on replies (MastoAPI) 2019-03-26 15:27:04 +03:00
Ivan Tashkinov b0759f821b Comments split. 2019-03-26 15:24:29 +03:00
Ivan Tashkinov 263ca3dea2 Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`. 2019-03-26 15:09:06 +03:00
Mark Felder c410296120 Try sending an empty map 2019-03-25 19:00:35 -05:00
Mark Felder 6f090f981b Attempt to fix incorrect federation of default instance avatars 2019-03-25 18:47:04 -05:00
rinpatch 15aa94f40f Merge branch 'fix/notification-id-index' into 'develop' 
Add an `id desc nulls last` index to notifications

See merge request pleroma/pleroma!975
 2019-03-25 19:07:15 +00:00
rinpatch 9725c93cea Add an id index to notifications 2019-03-25 21:59:52 +03:00
rinpatch b028b0f97d Merge branch 'bugfix/missing-announces' into 'develop' 
fix up missing announcements with preloads

See merge request pleroma/pleroma!972
 2019-03-25 09:24:08 +00:00
William Pitcock 26b0c802c3 fix up missing announcements with preloads 2019-03-25 07:38:09 +00:00
kaniini bc14c98de1 Merge branch 'features/s3-uploader-digital-ocean' into 'develop' 
add overriding truncated_namespace condition for truncating paths for digital ocean

See merge request pleroma/pleroma!969
 2019-03-25 02:25:59 +00:00
kaniini 63ffa4842c Merge branch 'fix/mastoapi-liked' into 'develop' 
Serve non-public activities in /api/v1/favourites

Closes #648

See merge request pleroma/pleroma!970
 2019-03-25 02:24:27 +00:00
rinpatch a7f58b3c13 Serve non-public activities in /api/v1/favourites 
Fixes #648
 2019-03-25 02:15:45 +03:00
Austin Lanari 6c96d68f77 add overriding truncated_namespace condition for truncating paths for digital ocean 2019-03-24 11:32:09 -07:00
rinpatch 750de7d842 Merge branch 'features/mrf-keyword-nil-summary' into 'develop' 
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil

See merge request pleroma/pleroma!968
 2019-03-24 15:02:13 +00:00
Haelwenn (lanodan) Monnier eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil 2019-03-24 15:47:50 +01:00
rinpatch a32bcab04b Merge branch 'fix/eldap-warnings' into 'develop' 
Ignore compilation warnings for undefined module :eldap

See merge request pleroma/pleroma!956
 2019-03-24 11:17:40 +00:00