gf4/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-09-16 19:29:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,168 Commits 1,029 Branches 546 Tags 70 MiB
017ffd7ef9
Commit Graph

4168 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dull b
017ffd7ef9 Revert "Revert "Fix apub::activities::block"" 
This reverts commit 2ee206af7c.
 2023-07-04 03:07:49 +00:00
dull b
d74374b8fd Revert "Revert "Fix api_common::utils"" 
This reverts commit f740f115e5.
 2023-07-04 03:07:43 +00:00
dull b
f740f115e5 Revert "Fix api_common::utils" 
This reverts commit 7dc73de613.
 2023-07-04 02:56:54 +00:00
dull b
2ee206af7c Revert "Fix apub::activities::block" 
This reverts commit 3b02389abd.
 2023-07-04 02:56:30 +00:00
dull b
96ed8bf2e9 Revert "Fix apub::api::resolve_object" 
This reverts commit 3e4059aabb.
 2023-07-04 02:56:03 +00:00
dull b
0a8d1f8caf Revert "Fix some things" 
This reverts commit 2bf8574bc8.
 2023-07-04 02:54:33 +00:00
dull b
2bf8574bc8 Fix some things 2023-07-04 02:54:04 +00:00
dull b
3e4059aabb Fix apub::api::resolve_object 2023-07-04 02:18:49 +00:00
dull b
3b02389abd Fix apub::activities::block 2023-07-04 02:17:07 +00:00
dull b
7dc73de613 Fix api_common::utils 2023-07-04 02:11:01 +00:00
dull b
29b00d7ae8 Merge remote-tracking branch 'upstream/main' into db-traits-refactor 2023-07-03 23:16:52 +00:00
Dessalines
f0e487f18a
300 comment limit. (#3306) 
* 300 comment limit.

* Another fix.
 2023-07-03 18:02:57 -04:00
Dessalines
7a04971ecd Version 0.18.1-rc.9 2023-07-03 17:16:48 -04:00
dull b
350fba29a8 fix 2023-07-03 18:42:04 +00:00
dull b
50ab303c42 Merge remote-tracking branch 'upstream/main' into db-traits-refactor 2023-07-03 18:37:42 +00:00
dull b
2c47ac35a0 fix 2023-07-03 18:19:50 +00:00
JP Moresmau
bbca6ef6dc
Do not decrement comment score twice when removing then deleting. (#3196) 
Fixes #3004

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
 2023-07-03 14:13:53 -04:00
dull b
8f46003ebc Merge remote-tracking branch 'upstream/main' into db-traits-refactor 2023-07-03 18:02:53 +00:00
perillamint
696cca4ce4
Remove excessive content_type header configuration (#3470) 2023-07-03 13:43:45 -04:00
dull b
cf827b4d22 try to make ci start 2023-07-03 17:21:37 +00:00
dullbananas
243b777384
Merge branch 'main' into db-traits-refactor 2023-07-03 10:16:40 -07:00
Dessalines
935b0bf048
Adding rest of community sorts. Fixes #3374 (#3376) 
* Adding rest of community sorts. Fixes #3374

* Addressing PR comments.
 2023-07-03 13:09:15 -04:00
dullbananas
37bf1843c9
Merge branch 'main' into db-traits-refactor 2023-07-03 09:42:47 -07:00
Nutomic
e1494d4683
Dont compare db string errors (fixes #1393) (#3424) 
* Dont compare db string errors (fixes #1393)

* cargo fmt

---------

Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
 2023-07-03 11:59:49 -04:00
Simon Bordeyne
b8ee9315bc
Add Open links in new tab setting (#3318) 
* Add Open links in new tab setting

* reorder because it fixes tests ?
 2023-07-03 11:10:25 -04:00
David BELEY
efe98158c0
Fix awesome-lemmy owner (#3469) 2023-07-03 16:44:55 +02:00
David BELEY
050216eed9
Add awesome-lemmy to LemmyNet? (#3413) 
* Add LemmyNet/awesome-lemmy

* Delete other apps/projects from README.md
 2023-07-03 15:15:45 +02:00
Nutomic
cb91eedd24
Use serde(skip) instead of skip_serializing, add placeholder values (#3362) 
* Use serde(skip) instead of skip_serializing

The latter breaks lemmy_crawler as the field is not included in
the Lemmy API, but is required when attempting to parse API responses.
Should only use serde(skip) to avoid this problem

* use option

* add placeholders

* no unwrap
 2023-07-03 15:14:01 +02:00
Nutomic
6405761891
Mark follow as pending when subscribing to remote community (fixes #3384) (#3406) 2023-07-03 12:03:20 +02:00
Felix Ableitner
fc60b82f82 Fix formatting for latest nightly (#ref 3467) 2023-07-03 11:45:53 +02:00
Nutomic
3578dab67f
Remove PerformApub trait (#3423) 
* Remove PerformApub trait

This is completely useless now that websocket is gone. In the future
I also plan to remove Perform and PerformCrud traits, but it will be
difficult to do that while still compiling crates in parallel.

* params need to use query
 2023-07-03 11:01:41 +02:00
drumlinish
682ca55e0c
Fix quoting of max-file in docker-compose.yml (#3442) 2023-07-03 10:59:07 +02:00
dull b
41d7c72f41 Re-run CI 2023-07-01 05:00:11 +00:00
dull b
0957e2b319 Fix stuff 2023-07-01 04:11:27 +00:00
dull b
0d9db43b0a Remove more &mut * 2023-07-01 03:26:24 +00:00
dull b
5db6b556cc DbConn trait 2023-07-01 03:04:38 +00:00
dull b
6846210074 Merge remote-tracking branch 'upstream/main' into db-traits-refactor 2023-06-30 19:17:13 +00:00
dull b
106c315d47 Use DbConn for CaptchaAnswer methods 2023-06-30 18:55:33 +00:00
dull b
cc1a725c8a Revert "Get rid of repetitive &mut *context.conn().await?" 
This reverts commit d2c6263ea1.
 2023-06-30 18:24:06 +00:00
dull b
c1c17ab63b Revert "Add blank lines under each line with conn =" 
This reverts commit 773a6d3beb.
 2023-06-30 18:23:40 +00:00
dull b
3021e2c9b8 Revert "Fix style mistakes (partial)" 
This reverts commit 48a033b87f.
 2023-06-30 18:23:03 +00:00
dull b
48a033b87f Fix style mistakes (partial) 2023-06-30 18:21:10 +00:00
phiresky
cb28af508d
don't strip, log trace if requested (#3425) 2023-06-30 09:32:43 -04:00
Lemmus.org
810762762f
Update federated posts to not cache sensitive images if not allow by local site (#3253) 
* Update federated posts to not cache sensitive images if not allow by local site

* Refactor thumbnail match to simplify logic
 2023-06-30 12:42:42 +02:00
Dominic Mazzoni
fcc010b5dc
Fix concatenation of audio captcha wav files (#3350) 
* Fix concatenation of audio captcha wav files

* Log errors rather than crashing

* Return Result from captcha_as_wav_base64

* Change to return LemmyError

* Check for wav write error, format

* Remove unused import

* Rewrite to avoid clippy warnings
 2023-06-30 12:36:38 +02:00
dullbananas
7d3894d5dd
Automatically manage database when running scripts/test.sh (#3389) 
* Update .gitignore

* Create start-dev-db.sh

* Rename start-dev-db.sh to start_dev_db.sh

* Update .gitignore

* Update start_dev_db.sh

* Update start_dev_db.sh

* Update start_dev_db.sh

* Update start_dev_db.sh

* h

* Update test.sh

* Update start_dev_db.sh

* made it work

* Make test.sh work when run from scripts dir
 2023-06-30 09:50:30 +02:00
dull b
773a6d3beb Add blank lines under each line with conn = 2023-06-30 06:56:12 +00:00
dull b
d2c6263ea1 Get rid of repetitive &mut *context.conn().await? 2023-06-30 06:50:11 +00:00
dull b
9d54354af4 Fix stuff broken by merge 2023-06-30 05:13:56 +00:00
dull b
a6cbbee3c7 Merge branch 'db-traits-refactor' of https://github.com/dullbananas/lemmy into db-traits-refactor 2023-06-30 04:06:06 +00:00