lemmy.git
3 years agoMerge branch 'main' into change_password_api
Dessalines [Tue, 6 Apr 2021 16:09:26 +0000 (12:09 -0400)]
Merge branch 'main' into change_password_api

3 years agoMerge pull request #1537 from LemmyNet/add_users_active_monthly_community_sort
Nutomic [Tue, 6 Apr 2021 12:03:11 +0000 (12:03 +0000)]
Merge pull request #1537 from LemmyNet/add_users_active_monthly_community_sort

Adding users active monthly for community sort. Fixes #1527

3 years agoMerge pull request #1536 from LemmyNet/change_preferred_to_display_name
Nutomic [Tue, 6 Apr 2021 12:02:50 +0000 (12:02 +0000)]
Merge pull request #1536 from LemmyNet/change_preferred_to_display_name

Changing preferred to display name. Fixes #1211

3 years agoMerge pull request #1535 from LemmyNet/rust_captcha_features
Nutomic [Tue, 6 Apr 2021 11:58:48 +0000 (11:58 +0000)]
Merge pull request #1535 from LemmyNet/rust_captcha_features

Rust captcha features

3 years agoMerge pull request #1529 from LemmyNet/show_score_setting
Nutomic [Tue, 6 Apr 2021 11:47:31 +0000 (11:47 +0000)]
Merge pull request #1529 from LemmyNet/show_score_setting

Adding a setting to show / hide scores. Fixes #1503

3 years agoUpdating releases.md
Dessalines [Mon, 5 Apr 2021 17:26:24 +0000 (13:26 -0400)]
Updating releases.md

3 years agoVersion 0.10.2
Dessalines [Mon, 5 Apr 2021 17:21:08 +0000 (13:21 -0400)]
Version 0.10.2

3 years agoFix test failure due to config loading error (#1547)
Nutomic [Mon, 5 Apr 2021 17:21:56 +0000 (17:21 +0000)]
Fix test failure due to config loading error (#1547)

* Crash if config fails to load

* fix previous commit

* Fix test failure due to config loading error

* Adding test fix to drone.

* Logging line.

* Trying to fix drone 2

* Fixing deploy script.

Co-authored-by: Dessalines <tyhou13@gmx.com>
3 years agoVersion 0.10.1
Dessalines [Mon, 5 Apr 2021 14:29:14 +0000 (10:29 -0400)]
Version 0.10.1

3 years agoCrash if config fails to load (#1545)
Nutomic [Mon, 5 Apr 2021 14:23:32 +0000 (14:23 +0000)]
Crash if config fails to load (#1545)

* Crash if config fails to load

* fix previous commit

3 years agoFix ansible deploy template. (#1544)
Dessalines [Mon, 5 Apr 2021 14:20:40 +0000 (10:20 -0400)]
Fix ansible deploy template. (#1544)

* Fix ansible deploy template.

* Add ansible comment.

* Changing tls to true

* Fixing comment line.

3 years agoUpdate releases.md
Dessalines [Mon, 5 Apr 2021 12:55:38 +0000 (08:55 -0400)]
Update releases.md

3 years agoVersion 0.10.0
Dessalines [Mon, 5 Apr 2021 12:53:28 +0000 (08:53 -0400)]
Version 0.10.0

3 years agoMoving ChangePassword to its own API action. Fixes #1471
Dessalines [Thu, 1 Apr 2021 21:39:01 +0000 (17:39 -0400)]
Moving ChangePassword to its own API action. Fixes #1471

3 years agoAdding users active monthly for community sort. Fixes #1527
Dessalines [Thu, 1 Apr 2021 18:34:27 +0000 (14:34 -0400)]
Adding users active monthly for community sort. Fixes #1527

3 years agoDon't allow zero-space char in display name. Fixes #1317
Dessalines [Thu, 1 Apr 2021 18:09:53 +0000 (14:09 -0400)]
Don't allow zero-space char in display name. Fixes #1317

3 years agoChanging preferred to display name. Fixes #1211
Dessalines [Thu, 1 Apr 2021 17:57:45 +0000 (13:57 -0400)]
Changing preferred to display name. Fixes #1211

3 years agoAdding more rust captcha features. Fixes #1248
Dessalines [Thu, 1 Apr 2021 17:30:24 +0000 (13:30 -0400)]
Adding more rust captcha features. Fixes #1248

3 years agoTranslated README.md to Spanish (#1525)
mickie [Wed, 31 Mar 2021 19:02:27 +0000 (13:02 -0600)]
Translated README.md to Spanish (#1525)

* Add menu bar for language selection

* Create README.es.md

* Update README.es.md

* fix minor issues

* Update README.md

* Update and rename README.es.md to readmes/README.es.md

* Update features section.

* Update README.md

* Update README.es.md

3 years agoAdding a setting to show / hide scores. Fixes #1503
Dessalines [Wed, 31 Mar 2021 10:54:46 +0000 (06:54 -0400)]
Adding a setting to show / hide scores. Fixes #1503

3 years agoMerge pull request 'Split lemmy_apub crate into two parts apub and apub_receive'...
dessalines [Wed, 31 Mar 2021 10:36:51 +0000 (10:36 +0000)]
Merge pull request 'Split lemmy_apub crate into two parts apub and apub_receive' (#190) from split-apub-crate into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/190

3 years agoSplit lemmy_apub crate into two parts apub and apub_receive
Felix Ableitner [Tue, 30 Mar 2021 20:23:50 +0000 (22:23 +0200)]
Split lemmy_apub crate into two parts apub and apub_receive

3 years agoVersion 0.10.0-rc.13
Dessalines [Mon, 29 Mar 2021 22:10:04 +0000 (18:10 -0400)]
Version 0.10.0-rc.13

3 years agoFix websocket location to /api/vX
Dessalines [Mon, 29 Mar 2021 21:48:37 +0000 (17:48 -0400)]
Fix websocket location to /api/vX

3 years agoMerge remote-tracking branch 'yerba/split-api-crate' into test_merge_api_crates_reorg
Dessalines [Mon, 29 Mar 2021 20:24:50 +0000 (16:24 -0400)]
Merge remote-tracking branch 'yerba/split-api-crate' into test_merge_api_crates_reorg

3 years agoFix API and clippy warnings
Felix Ableitner [Thu, 25 Mar 2021 19:30:15 +0000 (20:30 +0100)]
Fix API and clippy warnings

3 years agoRenaming to api/v3
Dessalines [Mon, 29 Mar 2021 15:26:15 +0000 (11:26 -0400)]
Renaming to api/v3

3 years agoVersion 0.10.0-rc.12
Dessalines [Thu, 25 Mar 2021 19:22:07 +0000 (15:22 -0400)]
Version 0.10.0-rc.12

3 years agoSplit api crate into api_structs and api
Felix Ableitner [Thu, 25 Mar 2021 19:19:40 +0000 (20:19 +0100)]
Split api crate into api_structs and api

3 years agoMerge pull request #1516 from LemmyNet/move_matrix_and_admin_to_person
Dessalines [Thu, 25 Mar 2021 15:41:37 +0000 (11:41 -0400)]
Merge pull request #1516 from LemmyNet/move_matrix_and_admin_to_person

Move matrix and admin to person

3 years agoMerge pull request #1522 from LemmyNet/move_matrix_and_admin_to_person_nutomic
Dessalines [Wed, 24 Mar 2021 19:38:57 +0000 (15:38 -0400)]
Merge pull request #1522 from LemmyNet/move_matrix_and_admin_to_person_nutomic

Federate Matrix ID (fixes #1438)

3 years agoFederate Matrix ID (fixes #1438)
Felix Ableitner [Wed, 24 Mar 2021 16:43:18 +0000 (17:43 +0100)]
Federate Matrix ID (fixes #1438)

3 years agoFixing image locations.
Dessalines [Wed, 24 Mar 2021 16:42:34 +0000 (12:42 -0400)]
Fixing image locations.

3 years agoMerge branch 'main' into move_matrix_and_admin_to_person
Dessalines [Wed, 24 Mar 2021 15:51:34 +0000 (11:51 -0400)]
Merge branch 'main' into move_matrix_and_admin_to_person

3 years agoMerge remote-tracking branch 'yerba/federated-moderation'
Dessalines [Wed, 24 Mar 2021 15:48:02 +0000 (11:48 -0400)]
Merge remote-tracking branch 'yerba/federated-moderation'

3 years agoFix federation tests
Felix Ableitner [Tue, 23 Mar 2021 16:03:14 +0000 (17:03 +0100)]
Fix federation tests

3 years agoVersion 0.10.0-rc.10
Dessalines [Tue, 23 Mar 2021 18:46:18 +0000 (14:46 -0400)]
Version 0.10.0-rc.10

3 years agoMerge branch 'remove_cargo_cache_v2' into move_matrix_and_admin_to_person
Dessalines [Tue, 23 Mar 2021 18:46:00 +0000 (14:46 -0400)]
Merge branch 'remove_cargo_cache_v2' into move_matrix_and_admin_to_person

3 years agoVersion 0.10.0-rc.9
Dessalines [Tue, 23 Mar 2021 18:17:44 +0000 (14:17 -0400)]
Version 0.10.0-rc.9

3 years agoMerge branch 'main' into move_matrix_and_admin_to_person
Dessalines [Tue, 23 Mar 2021 18:16:54 +0000 (14:16 -0400)]
Merge branch 'main' into move_matrix_and_admin_to_person

3 years agoMerge pull request #1517 from LemmyNet/add_saved_only_1
Dessalines [Mon, 22 Mar 2021 17:52:04 +0000 (13:52 -0400)]
Merge pull request #1517 from LemmyNet/add_saved_only_1

Adding saved_only to GetComments and GetPosts. Fixes #1513

3 years agoAdding saved_only to GetComments and GetPosts. Fixes #1513
Dessalines [Mon, 22 Mar 2021 14:39:54 +0000 (10:39 -0400)]
Adding saved_only to GetComments and GetPosts. Fixes #1513

3 years agoMerge branch 'main' into move_matrix_and_admin_to_person
Dessalines [Mon, 22 Mar 2021 14:29:10 +0000 (10:29 -0400)]
Merge branch 'main' into move_matrix_and_admin_to_person

3 years agoMoving admin to person table. Fixes #1515
Dessalines [Mon, 22 Mar 2021 14:28:00 +0000 (10:28 -0400)]
Moving admin to person table. Fixes #1515

3 years agoMake federation compatible with Lemmy v0.9.9
Felix Ableitner [Mon, 22 Mar 2021 14:08:06 +0000 (15:08 +0100)]
Make federation compatible with Lemmy v0.9.9

3 years agoAddress review comments
Felix Ableitner [Mon, 22 Mar 2021 12:52:00 +0000 (13:52 +0100)]
Address review comments

3 years agoMerge branch 'grishka_fix_ld_context'
Felix Ableitner [Mon, 22 Mar 2021 12:12:05 +0000 (13:12 +0100)]
Merge branch 'grishka_fix_ld_context'

3 years agoMake previous commit compile
Felix Ableitner [Mon, 22 Mar 2021 12:11:32 +0000 (13:11 +0100)]
Make previous commit compile

3 years agoMerge branch 'fix_ld_context' of https://yerbamate.ml/grishka/lemmy into grishka_fix_...
Felix Ableitner [Mon, 22 Mar 2021 12:08:07 +0000 (13:08 +0100)]
Merge branch 'fix_ld_context' of https://yerbamate.ml/grishka/lemmy into grishka_fix_ld_context

3 years agoMerge pull request #1509 from LemmyNet/fix_deploy_prod_script
Nutomic [Mon, 22 Mar 2021 12:02:41 +0000 (12:02 +0000)]
Merge pull request #1509 from LemmyNet/fix_deploy_prod_script

Fixing docker deploy script. Fixes #1507

3 years agouh
Grishka [Sun, 21 Mar 2021 01:03:53 +0000 (04:03 +0300)]
uh

3 years agoFix JSON-LD contexts
Grishka [Sun, 21 Mar 2021 01:00:32 +0000 (04:00 +0300)]
Fix JSON-LD contexts

3 years agoCreating default DB forms. Fixes #1511
Dessalines [Sat, 20 Mar 2021 20:59:07 +0000 (16:59 -0400)]
Creating default DB forms. Fixes #1511

3 years agoForgot to regenerate person_alias views
Dessalines [Sat, 20 Mar 2021 20:32:52 +0000 (16:32 -0400)]
Forgot to regenerate person_alias views

3 years agoMoving matrix_user_id to person table. #1438
Dessalines [Sat, 20 Mar 2021 19:21:51 +0000 (15:21 -0400)]
Moving matrix_user_id to person table. #1438

3 years agoFixing docker deploy script. Fixes #1507
Dessalines [Sat, 20 Mar 2021 18:49:07 +0000 (14:49 -0400)]
Fixing docker deploy script. Fixes #1507

3 years agoReverting docker versions until deploy.sh fix.
Dessalines [Sat, 20 Mar 2021 15:55:11 +0000 (11:55 -0400)]
Reverting docker versions until deploy.sh fix.

3 years agoVersion 0.10.0-rc.8
Dessalines [Fri, 19 Mar 2021 19:58:24 +0000 (15:58 -0400)]
Version 0.10.0-rc.8

3 years agoTry to remove cargo home changing to fix release.
Dessalines [Fri, 19 Mar 2021 19:57:56 +0000 (15:57 -0400)]
Try to remove cargo home changing to fix release.

3 years agoFix conflicts in docker-compose.yml
Felix Ableitner [Fri, 19 Mar 2021 17:09:05 +0000 (18:09 +0100)]
Fix conflicts in docker-compose.yml

3 years agoMerge branch 'main' into federated-moderation
Felix Ableitner [Fri, 19 Mar 2021 16:11:34 +0000 (17:11 +0100)]
Merge branch 'main' into federated-moderation

3 years agoVersion 0.10.0-rc.7
Dessalines [Fri, 19 Mar 2021 15:46:46 +0000 (11:46 -0400)]
Version 0.10.0-rc.7

3 years agoMerge pull request #1500 from LemmyNet/jwt_revocation_dess
Nutomic [Fri, 19 Mar 2021 15:43:47 +0000 (15:43 +0000)]
Merge pull request #1500 from LemmyNet/jwt_revocation_dess

Jwt revocation dess

3 years agoA few suggestion fixes.
Dessalines [Fri, 19 Mar 2021 14:02:58 +0000 (10:02 -0400)]
A few suggestion fixes.

3 years agoMerge pull request #1499 from LemmyNet/strictly_type_db_ids
Nutomic [Fri, 19 Mar 2021 13:41:22 +0000 (13:41 +0000)]
Merge pull request #1499 from LemmyNet/strictly_type_db_ids

Strictly type db ids

3 years agoMerge pull request #1428 from LemmyNet/split_user_table
Nutomic [Fri, 19 Mar 2021 13:20:23 +0000 (13:20 +0000)]
Merge pull request #1428 from LemmyNet/split_user_table

Split user table

3 years agoMerge branch 'Mart-Bogdan-1462-jwt-revocation-on-pwd-change' into jwt_revocation_dess
Dessalines [Fri, 19 Mar 2021 04:31:49 +0000 (00:31 -0400)]
Merge branch 'Mart-Bogdan-1462-jwt-revocation-on-pwd-change' into jwt_revocation_dess

3 years agoMerge branch '1462-jwt-revocation-on-pwd-change' of https://github.com/Mart-Bogdan...
Dessalines [Fri, 19 Mar 2021 01:41:00 +0000 (21:41 -0400)]
Merge branch '1462-jwt-revocation-on-pwd-change' of https://github.com/Mart-Bogdan/lemmy into Mart-Bogdan-1462-jwt-revocation-on-pwd-change

3 years agoMerge branch 'split_user_table' into strictly_type_db_ids
Dessalines [Thu, 18 Mar 2021 23:37:54 +0000 (19:37 -0400)]
Merge branch 'split_user_table' into strictly_type_db_ids

3 years agoMerge branch 'main' into split_user_table
Dessalines [Thu, 18 Mar 2021 23:36:48 +0000 (19:36 -0400)]
Merge branch 'main' into split_user_table

3 years agoSet CARGO_HOME for CI so deps arent redownloaded (#1497)
Nutomic [Thu, 18 Mar 2021 20:35:04 +0000 (20:35 +0000)]
Set CARGO_HOME for CI so deps arent redownloaded (#1497)

* Set CARGO_HOME for CI so deps arent redownloaded

* run find on x86

* fix path

* cleanup

* try again

* use mv

3 years agoMerge branch 'split_user_table' into strictly_type_db_ids
Dessalines [Thu, 18 Mar 2021 20:30:42 +0000 (16:30 -0400)]
Merge branch 'split_user_table' into strictly_type_db_ids

3 years agoMerge branch 'main' into split_user_table
Dessalines [Thu, 18 Mar 2021 20:30:29 +0000 (16:30 -0400)]
Merge branch 'main' into split_user_table

3 years agoStrictly typing DB id fields. Fixes #1498
Dessalines [Thu, 18 Mar 2021 20:25:21 +0000 (16:25 -0400)]
Strictly typing DB id fields. Fixes #1498

3 years agoFix three federation test cases
Felix Ableitner [Thu, 18 Mar 2021 13:24:29 +0000 (14:24 +0100)]
Fix three federation test cases

3 years agoAdding some comments to notifs.
Dessalines [Thu, 18 Mar 2021 14:59:17 +0000 (10:59 -0400)]
Adding some comments to notifs.

3 years agoMoving send email check inside function.
Dessalines [Thu, 18 Mar 2021 14:52:25 +0000 (10:52 -0400)]
Moving send email check inside function.

3 years agoRefactor activitypub code
Felix Ableitner [Wed, 17 Mar 2021 17:12:37 +0000 (18:12 +0100)]
Refactor activitypub code

3 years agoFor FromApub trait, use `is_mod_action: bool` instead
Felix Ableitner [Tue, 16 Mar 2021 17:26:19 +0000 (18:26 +0100)]
For FromApub trait, use `is_mod_action: bool` instead

3 years agoAllow remot moderators to do Remove/Post and Remove/Comment
Felix Ableitner [Tue, 16 Mar 2021 17:06:59 +0000 (18:06 +0100)]
Allow remot moderators to do Remove/Post and Remove/Comment

3 years agoMerge pull request 'Insert announced activities into DB for fetching (fixes #1494...
dessalines [Tue, 16 Mar 2021 13:47:32 +0000 (13:47 +0000)]
Merge pull request 'Insert announced activities into DB for fetching (fixes #1494)' (#187) from insert-local-announce into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/187

3 years agoRemoving some TODOS.
Dessalines [Mon, 15 Mar 2021 22:18:50 +0000 (18:18 -0400)]
Removing some TODOS.

3 years agoVersion 0.10.0-rc.5
Dessalines [Mon, 15 Mar 2021 18:50:50 +0000 (14:50 -0400)]
Version 0.10.0-rc.5

3 years agoSome changes
Dessalines [Mon, 15 Mar 2021 18:02:27 +0000 (14:02 -0400)]
Some changes

- Changing claim name to local_user_id to facilitate logout.
- Changing AddAdmin back to using person_id

3 years agoInsert announced activities into DB for fetching (fixes #1494)
Felix Ableitner [Mon, 15 Mar 2021 12:58:54 +0000 (13:58 +0100)]
Insert announced activities into DB for fetching (fixes #1494)

3 years agoMerge pull request #1491 from LemmyNet/upgrade_pictrs_3
Nutomic [Mon, 15 Mar 2021 12:14:31 +0000 (12:14 +0000)]
Merge pull request #1491 from LemmyNet/upgrade_pictrs_3

Upgrading pictrs.

3 years agomore correct tests
Bogdan Mart [Sat, 13 Mar 2021 20:36:40 +0000 (22:36 +0200)]
more correct tests

3 years agofix timestamp condition #1462
Bogdan Mart [Sat, 13 Mar 2021 20:18:26 +0000 (22:18 +0200)]
fix timestamp condition #1462

3 years agoMerge remote-tracking branch 'origin/main' into 1462-jwt-revocation-on-pwd-change
Bogdan Mart [Sat, 13 Mar 2021 18:19:55 +0000 (20:19 +0200)]
Merge remote-tracking branch 'origin/main' into 1462-jwt-revocation-on-pwd-change

* origin/main:
  revert Compose file version from 3.3 to 2.2
  Adding more mem limits
  bump memory limit of iframely
  Remove extra category_id s . Fixes #1429
  Fixing wrong user_ and community icon and banner urls.
  Remove category from activitypub context
  Adding a password length check to other API actions. (#1474)
  Update test script
  Use URL type in most outstanding struct fields (#1468)
  Forbid usage of unwrap
  Upgrade Rust version
  Rewrite settings implementation. Fixes #1270 (#1433)
  Rename `lemmy_structs` to `lemmy_api_structs`

# Conflicts:
# crates/db_schema/src/source/user.rs

3 years agoUser token revocation upon password change
Bogdan Mart [Sat, 13 Mar 2021 18:16:35 +0000 (20:16 +0200)]
User token revocation upon password change

Added DB column validator_time and chedking that is is less then token's "Issuead at time"
Wip on #1462

3 years agoOnly sending private message if its a local user.
Dessalines [Fri, 12 Mar 2021 20:18:03 +0000 (15:18 -0500)]
Only sending private message if its a local user.

3 years agoTrying to fix API tests.
Dessalines [Fri, 12 Mar 2021 19:09:03 +0000 (14:09 -0500)]
Trying to fix API tests.

3 years agoChange joinuser, sendusermessage to use local_user_id
Dessalines [Fri, 12 Mar 2021 15:54:47 +0000 (10:54 -0500)]
Change joinuser, sendusermessage to use local_user_id

3 years agoFix code to allow sticky/lock from remote moderators
Felix Ableitner [Fri, 12 Mar 2021 15:43:01 +0000 (16:43 +0100)]
Fix code to allow sticky/lock from remote moderators

3 years agoMerge pull request 'Add memory limit for pictrs' (#186) from nutomic-patch-1 into...
dessalines [Fri, 12 Mar 2021 15:16:49 +0000 (15:16 +0000)]
Merge pull request 'Add memory limit for pictrs' (#186) from nutomic-patch-1 into main

Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/186

3 years agoUpgrading pictrs.
Dessalines [Fri, 12 Mar 2021 15:13:20 +0000 (10:13 -0500)]
Upgrading pictrs.

3 years agoWIP: check that modifications are made by same user, add docs
Felix Ableitner [Fri, 12 Mar 2021 13:47:55 +0000 (14:47 +0100)]
WIP: check that modifications are made by same user, add docs

3 years ago2nd pass. JWT now uses local_user_id
Dessalines [Thu, 11 Mar 2021 22:47:44 +0000 (17:47 -0500)]
2nd pass. JWT now uses local_user_id

3 years agoFix clippy warning
Felix Ableitner [Thu, 11 Mar 2021 17:18:01 +0000 (18:18 +0100)]
Fix clippy warning

3 years agoAdd check so only mods can change stickied/locked state of posts
Felix Ableitner [Thu, 11 Mar 2021 17:11:59 +0000 (18:11 +0100)]
Add check so only mods can change stickied/locked state of posts