moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,910 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

11910 Commits

Author SHA1 Message Date
Farhan Khan f6686a64af Updated ssl and domain name updates 
Removed the reference to niaa
 2020-08-13 18:59:14 -04:00
Farhan Khan da5aca27a8 Minor reorganization 2020-08-13 18:59:13 -04:00
Farhan Khan 07376bd21a Adding installation documentation for FreeBSD + rc.d script 2020-08-13 18:59:13 -04:00
feld 014f91c1c3 Merge branch 'issue/2036-part-2' into 'develop' 
[#2036] fixed cron worker

See merge request pleroma/pleroma!2886
 2020-08-13 21:35:40 +00:00
Maksim Pechnikov 9b055f7211 fix cron wroker 2020-08-13 21:03:15 +03:00
Maksim Pechnikov 3515cb5c3a fix Cron.PurgeExpiredActivitiesWorker 2020-08-13 21:01:21 +03:00
feld 14a06e63f6 Merge branch 'fix/activity-expirations-again' into 'develop' 
Fix activity expirations again

See merge request pleroma/pleroma!2866
 2020-08-13 17:38:19 +00:00
Haelwenn fbc220d09c Merge branch 'nitfix/side-effects-typo' into 'develop' 
side_effects: Fix typo on notification

See merge request pleroma/pleroma!2885
 2020-08-13 16:11:06 +00:00
Haelwenn (lanodan) Monnier 4f3c955f26
side_effects: Fix typo on notification 2020-08-13 18:10:43 +02:00
Haelwenn f99b8a25eb Merge branch 'reject' into 'develop' 
Move Accepts and Rejects to the Pipeline

See merge request pleroma/pleroma!2878
 2020-08-13 16:04:43 +00:00
lain 8d5f9d4b28 Merge branch 'ci-fix-2' into 'develop' 
CI: Add cmake to build

See merge request pleroma/pleroma!2884
 2020-08-13 14:40:31 +00:00
lain 035c44dd7b CI: Add cmake to build 2020-08-13 16:38:04 +02:00
lain 06e435c959 Merge branch 'update-frontend-2020-08-13' into 'develop' 
Update frontend

See merge request pleroma/pleroma!2883
 2020-08-13 14:07:01 +00:00
lain 5bcf15d553 Update frontend 2020-08-13 16:04:34 +02:00
lain 88ec5c2de5 Merge branch 'cmake' into 'develop' 
Build files: Add cmake

See merge request pleroma/pleroma!2882
 2020-08-13 12:28:10 +00:00
lain a47406d577 Build files: Add cmake 2020-08-13 14:12:45 +02:00
lain 2bc2b321b6 Merge branch 'fix/users_ap_id_not_null' into 'develop' 
Ensure ap_id column in users table cannot be null

See merge request pleroma/pleroma!2875
 2020-08-13 11:01:03 +00:00
lain aaf7bd89a7 Migrations: Fix Logger requirements. 2020-08-13 12:32:05 +02:00
lain 5be25b3e38 Merge branch '1152-deletion' into 'develop' 
User deletion issue exploration

See merge request pleroma/pleroma!2879
 2020-08-13 09:06:33 +00:00
Maksim Pechnikov 56470647de Merge branch 'develop' into issue/1936 2020-08-13 09:00:25 +03:00
Alexander Strizhakov 29a7bcd5bb
reverting pinned posts in filtering 2020-08-12 20:01:21 +03:00
Alexander Strizhakov 3ab83f837e
don't load pinned activities in due_expirations 2020-08-12 19:46:47 +03:00
feld a94210c70b Merge branch 'docs_improve_static_dir_documentation' into 'develop' 
Improve static_dir documentation

See merge request pleroma/pleroma!2864
 2020-08-12 16:39:19 +00:00
feld 3aa7969ff9 Update robots_txt.md 2020-08-12 16:19:34 +00:00
feld dfc56de167 Merge branch 'feature/update-welcome-setting-in-description' into 'develop' 
Update :welcome settings in description.exs

Closes #2024

See merge request pleroma/pleroma!2843
 2020-08-12 16:18:40 +00:00
Mark Felder b89fc1f227 Add warning to the migration 2020-08-12 11:13:24 -05:00
Mark Felder 091da10832 Add the ActivityExpirationPolicy MRF to docs and clarify post expiration criteria. 2020-08-12 11:00:01 -05:00
Mark Felder 98058bd06e Merge branch 'develop' into fix/activity-expirations-again 2020-08-12 09:42:28 -05:00
lain 05ff666f99 AdminApiControllerTest: Add test that `deleted` users get deactivated. 2020-08-12 16:31:00 +02:00
Ivan Tashkinov f50c653c8d Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 2020-08-12 17:13:01 +03:00
lain 2e347e8286 ActivityPub: Remove `reject`, move everything to the Pipeline. 2020-08-12 15:07:46 +02:00
lain 7224bf309e Transmogrifier: Move Rejects to the Pipeline 2020-08-12 14:48:51 +02:00
Alexander Strizhakov eec1ba232c
don't expire pinned posts 2020-08-12 15:15:17 +03:00
lain 62f7cca9a1 Transmogrifier Tests: Extract rejections. 2020-08-12 13:39:54 +02:00
lain bb92ad44a6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject 2020-08-12 12:53:04 +02:00
Alexander Strizhakov 57b455de5a
leave expirations with Create and Note types 2020-08-12 12:41:47 +03:00
Maksim Pechnikov 644effc63b update docs 2020-08-12 08:51:09 +03:00
rinpatch 86c18e4165 Merge branch 'issue/2036-job-monitor' into 'develop' 
[#2036] fix job monitor

See merge request pleroma/pleroma!2877
 2020-08-12 03:30:01 +00:00
Maksim Pechnikov 76462efbfa fix job monitor 2020-08-11 22:06:33 +03:00
lain 500576dcb6 Linting fixes. 2020-08-11 19:22:14 +02:00
Mark Felder 724ed354f2 Ensure only Note objects are set to expire 2020-08-11 11:28:22 -05:00
lain 0589e9156a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again 2020-08-11 17:49:24 +02:00
lain 25bfee0d12 ActivityPub: Remove ActivityPub.accept 
Switch to the pipeline in CommonAPI and SideEffects
 2020-08-11 17:43:16 +02:00
Mark Felder ff4e282aad Ensure ap_id column in users table cannot be null 2020-08-11 10:27:07 -05:00
lain f988d82e46 Transmogrifier: Handle accepts with the pipeline 2020-08-11 17:26:01 +02:00
lain 9dda13bfa1 Transmogrifier Test: Remove mastodon hack test. 2020-08-11 16:22:15 +02:00
lain 3f6d50111e Linter fixes. 2020-08-11 16:07:42 +02:00
lain c66f6bd0ad Merge branch 'set-approval-pending-default-to-false' into 'develop' 
Set `users.approval_pending` default to `false`

See merge request pleroma/pleroma!2874
 2020-08-11 13:59:17 +00:00
lain da3f9b9988 Transmogrifier: Remove handling of orphaned accepts 
This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.
 2020-08-11 15:41:19 +02:00
lain 8b1e8bec2f AcceptValidation: Codify accept rules. 2020-08-11 15:32:52 +02:00