mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-12-14 20:16:32 +00:00
Code Issues Projects Releases Wiki Activity
4822 commits 1077 branches 561 tags 50 MiB
Commit graph

4822 commits

This branch
This branch
All branches
Author SHA1 Message Date
SleeplessOne1917
13b20b0502 Address PR feedback 2023-09-25 06:37:45 -04:00
SleeplessOne1917
ed8dae99f1 Merge branch 'main' into bearer-token 2023-09-24 17:47:17 -04:00
SleeplessOne1917
e181f4f41d
Merge pull request #3965 from SleeplessOne1917/comment-fix 
Display deleted or removed comments when they have children
 2023-09-24 18:29:40 +00:00
SleeplessOne1917
6387ac07b3 Merge branch 'bearer-token' of https://github.com/SleeplessOne1917/lemmy into bearer-token 2023-09-22 21:48:47 -04:00
SleeplessOne1917
3a76a10931 chore: Run rust format 2023-09-22 21:48:27 -04:00
SleeplessOne1917
37655f0f18 chore: Run rust format 2023-09-22 21:39:03 -04:00
SleeplessOne1917
519e800b33 feat: Replace ad hoc auth header with internet standard bearer token 
auth header
 2023-09-22 21:26:27 -04:00
Dessalines
b16661a17d
Merge branch 'main' into comment-fix 2023-09-21 11:20:49 -04:00
phiresky
24c98a726a
Merge pull request #3960 from LemmyNet/add_federation_worker_index 
Fixing high CPU usage on federation worker recheck + fix federation tests. Fixes #3958
 2023-09-21 16:40:04 +02:00
phiresky
9bcadadede fix after merge 2023-09-21 12:52:10 +00:00
phiresky
fe40adfc39 fix after merge 2023-09-21 12:32:41 +00:00
phiresky
31f3677270 fix after merge 2023-09-21 12:01:22 +00:00
phiresky
5941dc2924 Merge remote-tracking branch 'origin/main' into add_federation_worker_index 2023-09-21 11:57:13 +00:00
phiresky
07ffdc3d53 Revert "Revert "re-remove lemmy logs"" 
This reverts commit 459d5a3726.
 2023-09-21 11:45:43 +00:00
phiresky
2c283d90ca Revert "Revert "re-remove debug comments"" 
This reverts commit 6d519ef376.
 2023-09-21 11:45:33 +00:00
phiresky
dec25f9ee8 ensure overlap 2023-09-21 11:11:54 +00:00
phiresky
6d519ef376 Revert "re-remove debug comments" 
This reverts commit ae37ca0137.
 2023-09-21 11:07:36 +00:00
phiresky
459d5a3726 Revert "re-remove lemmy logs" 
This reverts commit ac0c0c8856.
 2023-09-21 11:07:20 +00:00
Nutomic
f858d8cbce
Remove explicit auth params (#3946) 
* Remove explicit auth params (ref #3725)

Only take auth via header or cookie. This requires a new version
of lemmy-js-client for api tests to pass.

* rework api_crud

* remove remaining auth params, move logic to session middleware

* fmt, fix test

* update js client

* remove auth param from api tests

* Pass auth as header

* add !

* url vars, setHeader

* cleanup

* fmt

* update

* Updating for new lemmy-js-client.

---------

Co-authored-by: Dessalines <tyhou13@gmx.com>
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
 2023-09-21 06:42:28 -04:00
phiresky
7e8b973128 empty 2023-09-20 21:21:23 +00:00
phiresky
f16aa9228d community fix 2023-09-20 21:00:30 +00:00
phiresky
1b7ab96887 wait until ban post removed 2023-09-20 20:26:00 +00:00
SleeplessOne1917
bb552d7659
Merge branch 'main' into comment-fix 2023-09-20 17:38:47 +00:00
phiresky
ac0c0c8856 re-remove lemmy logs 2023-09-20 16:07:01 +00:00
phiresky
2dbaf67b7c
Merge branch 'main' into add_federation_worker_index 2023-09-20 18:06:44 +02:00
phiresky
ae37ca0137 re-remove debug comments 2023-09-20 15:33:09 +00:00
phiresky
a808d3208a use max(id) instead of seq max value to prevent uncommitted transactions from causing skipped activities 2023-09-20 14:57:18 +00:00
Nutomic
22608ae983
Rework the way 2FA is enabled/disabled (fixes #3309) (#3959) 
* Rework the way 2FA is enabled/disabled (fixes #3309)

* postgres format

* change algo to sha1 for better compat

* review comments

* review

* clippy

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
 2023-09-20 10:49:54 -04:00
phiresky
3d649e1d3e remove synchronous federation flag 2023-09-20 14:22:17 +00:00
phiresky
1a0c866b51 logging temporary 2023-09-20 13:37:18 +00:00
Dessalines
77b2d236b9
Forgot to add ts export to pagination cursor. (#3971) 2023-09-20 15:28:56 +02:00
SleeplessOne1917
a866b3424d
Make local federated instances use comnpose file for build (#3968) 
* Make local federated instances use comnpose file for build

* Remove commented out part of script
 2023-09-20 09:14:51 -04:00
phiresky
a61d564732 fix delete test 2023-09-20 13:07:36 +00:00
phiresky
a59a94492d more debug log 2023-09-20 12:30:38 +00:00
phiresky
78a8a7b8b7 clippy 2023-09-20 11:41:34 +00:00
phiresky
c792f46c59 more wait for 2023-09-20 11:38:12 +00:00
phiresky
ae3b8f4f76 fix 2023-09-20 11:23:02 +00:00
phiresky
2e7d2d1956 wait for post api test function, better announce activity id 2023-09-20 11:23:02 +00:00
Nutomic
50f81cf157
User can block instances (fixes #2397) (#3869) 
* User can block instances (fixes #2397)

* update comments

* review comments

* use route

* update

* add api test

* update tests

* fix

* fix test

* ci

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
 2023-09-20 11:56:13 +02:00
Dessalines
89b7c981f5
Fixing GetPostsResponse serialization. (#3967) 2023-09-20 11:49:26 +02:00
SleeplessOne1917
a57b116431 Merge branch 'comment-fix' of https://github.com/SleeplessOne1917/lemmy into comment-fix 2023-09-18 22:10:07 -04:00
SleeplessOne1917
553c5bda88 Update versions to correct version 2023-09-18 22:07:31 -04:00
Dessalines
3812c8bf81 Force update 2 2023-09-18 21:20:06 -04:00
Dessalines
dc6dee61b9 Force update 2023-09-18 21:19:08 -04:00
SleeplessOne1917
671676d7e4 Remove unused import 2023-09-18 19:40:01 -04:00
SleeplessOne1917
c471692949
Merge branch 'main' into comment-fix 2023-09-18 19:31:46 -04:00
SleeplessOne1917
be961075c7 Do not filter removed and deleted comments on the backend 2023-09-18 19:31:12 -04:00
Dessalines
c25734e4ca
Merge branch 'main' into add_federation_worker_index 2023-09-18 19:19:24 -04:00
Dessalines
8c419103b2 Fixing formatting. 2023-09-18 19:19:13 -04:00
Dessalines
4f85adc393
Merge branch 'main' into add_federation_worker_index 2023-09-18 19:16:49 -04:00