Mark Felder
|
f510dc30b4
|
Update AdminFE bundle for 2.1.0 release
|
2020-08-14 12:48:49 -05:00 |
|
|
lain
|
33e508d7c6
|
Merge branch '1806-mogrifun' into 'develop'
Mogrifun: Add a line about the purpose of the module.
Closes #1806
See merge request pleroma/pleroma!2888
|
2020-08-14 17:15:59 +00:00 |
|
|
lain
|
76ce3a1c9e
|
Mogrifun: Add a line about the purpose of the module.
|
2020-08-14 18:27:18 +02:00 |
|
|
Farhan Khan
|
e8c20c42cd
|
minor changes
|
2020-08-14 00:21:42 -04:00 |
|
|
Farhan Khan
|
a5144f05c2
|
Removed a trailing comment
|
2020-08-13 22:49:50 -04:00 |
|
|
Farhan Khan
|
816c04abdc
|
Updates
|
2020-08-13 22:38:23 -04:00 |
|
|
Farhan Khan
|
b0c456d18d
|
more acme.sh updates
|
2020-08-13 22:18:33 -04:00 |
|
|
Farhan Khan
|
f2665547f5
|
acme updates
|
2020-08-13 21:24:08 -04:00 |
|
|
Farhan Khan
|
24eb917dbc
|
Rearranging acme
|
2020-08-13 20:58:46 -04:00 |
|
|
Farhan Khan
|
cba9f368af
|
Added comment
|
2020-08-13 19:34:04 -04:00 |
|
|
Farhan Khan
|
b5f48275c5
|
Minor patch update
|
2020-08-13 19:08:13 -04:00 |
|
|
Farhan Khan
|
33ea430f3b
|
acme.sh and netbsd to freebsd updates
|
2020-08-13 18:59:14 -04:00 |
|
|
Farhan Khan
|
53c4215ef1
|
Updated some more instruction specifics.
|
2020-08-13 18:59:14 -04:00 |
|
|
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 |
|
|
sadposter
|
735ceb2115
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2020-08-13 20:03:33 +01: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 |
|
|
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 |
|