mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-26 19:31:05 +00:00
Code Issues Projects Releases Wiki Activity
3110 commits 1067 branches 559 tags 67 MiB
Commit graph

3110 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dessalines
4b92e35edc Reverting docker versions until deploy.sh fix. 2021-03-20 11:55:11 -04:00
Dessalines
f55ef1d7ef Version 0.10.0-rc.7 2021-03-19 11:46:46 -04:00
Nutomic
14bc9f0946
Merge pull request #1500 from LemmyNet/jwt_revocation_dess 
Jwt revocation dess
 2021-03-19 15:43:47 +00:00
Dessalines
493598c1ba A few suggestion fixes. 2021-03-19 10:02:58 -04:00
Nutomic
96efe302ce
Merge pull request #1499 from LemmyNet/strictly_type_db_ids 
Strictly type db ids
 2021-03-19 13:41:22 +00:00
Nutomic
e25bcb35d7
Merge pull request #1428 from LemmyNet/split_user_table 
Split user table
 2021-03-19 13:20:23 +00:00
Dessalines
05b485b678 Merge branch 'Mart-Bogdan-1462-jwt-revocation-on-pwd-change' into jwt_revocation_dess 2021-03-19 00:31:49 -04:00
Dessalines
360d4ea8d1 Merge branch '1462-jwt-revocation-on-pwd-change' of https://github.com/Mart-Bogdan/lemmy into Mart-Bogdan-1462-jwt-revocation-on-pwd-change 2021-03-18 21:41:00 -04:00
Dessalines
c06d612432 Merge branch 'split_user_table' into strictly_type_db_ids 2021-03-18 19:37:54 -04:00
Dessalines
c88722983e Merge branch 'main' into split_user_table 2021-03-18 19:36:48 -04:00
Nutomic
33a326854a
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
 2021-03-18 16:35:04 -04:00
Dessalines
9930c7288a Merge branch 'split_user_table' into strictly_type_db_ids 2021-03-18 16:30:42 -04:00
Dessalines
8d9fab0389 Merge branch 'main' into split_user_table 2021-03-18 16:30:29 -04:00
Dessalines
c3efb9f7cf Strictly typing DB id fields. Fixes #1498 2021-03-18 16:25:21 -04:00
Dessalines
5899b89ef2 Adding some comments to notifs. 2021-03-18 10:59:17 -04:00
Dessalines
99e5a4d1c3 Moving send email check inside function. 2021-03-18 10:52:25 -04:00
dessalines
db4fe8031c 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
 2021-03-16 13:47:32 +00:00
Dessalines
270ce539bf Removing some TODOS. 2021-03-15 18:18:50 -04:00
Dessalines
b9f483bc27 Version 0.10.0-rc.5 2021-03-15 14:50:50 -04:00
Dessalines
8ee624a542 Some changes 
- Changing claim name to local_user_id to facilitate logout.
- Changing AddAdmin back to using person_id
 2021-03-15 14:02:27 -04:00
Felix Ableitner
621355b6ef Insert announced activities into DB for fetching (fixes #1494) 2021-03-15 13:58:54 +01:00
Nutomic
72b5e0cab5
Merge pull request #1491 from LemmyNet/upgrade_pictrs_3 
Upgrading pictrs.
 2021-03-15 12:14:31 +00:00
Bogdan Mart
74272ed754 more correct tests 2021-03-13 22:36:40 +02:00
Bogdan Mart
4426c3176d fix timestamp condition #1462 2021-03-13 22:18:26 +02:00
Bogdan Mart
7b0a09e84e 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
 2021-03-13 20:19:55 +02:00
Bogdan Mart
ab947f1f08 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
 2021-03-13 20:16:35 +02:00
Dessalines
5998c83b2a Only sending private message if its a local user. 2021-03-12 15:18:03 -05:00
Dessalines
434fb53dd1 Trying to fix API tests. 2021-03-12 14:09:03 -05:00
Dessalines
75a95acf04 Change joinuser, sendusermessage to use local_user_id 2021-03-12 10:54:47 -05:00
dessalines
931a132161 Merge pull request 'Add memory limit for pictrs' (#186) from nutomic-patch-1 into main 
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/186
 2021-03-12 15:16:49 +00:00
Dessalines
0a7271a185 Upgrading pictrs. 2021-03-12 10:13:20 -05:00
Dessalines
7c039340ed 2nd pass. JWT now uses local_user_id 2021-03-11 17:47:44 -05:00
Dessalines
7d04f371a5 fixing tests 3 2021-03-11 12:08:30 -05:00
Dessalines
5d8ccbafe4 Fixing some tests 2 2021-03-11 11:54:03 -05:00
Dessalines
1a4c8c08ee Fixing some tests 2021-03-11 11:41:04 -05:00
Dessalines
9cb4dad4b4 A first pass. 2021-03-10 23:43:11 -05:00
Dessalines
ddf4a667b1 ~80% done 2021-03-10 17:33:55 -05:00
nutomic
fc74bfeb23 Add memory limit for pictrs 2021-03-10 18:38:00 +00:00
Nutomic
8f6b8895f4
Merge pull request #1485 from PatMulligan/fix-docker-compose-yaml 
revert Compose file version from 3.3 to 2.2
 2021-03-08 15:41:17 +00:00
Patrick Mulligan
a650312858 revert Compose file version from 3.3 to 2.2 2021-03-08 09:23:50 -06:00
Dessalines
ff2c71a74a Adding more mem limits 2021-03-04 22:41:08 -05:00
Avery Pierce
126c6a23bb bump memory limit of iframely 2021-03-04 08:58:03 -06:00
Nutomic
e0c61c1334
Merge pull request #1478 from LemmyNet/fix_wrong_urls 
Fixing wrong user_ and community icon and banner urls.
 2021-03-04 12:18:30 +00:00
Nutomic
f7aa97d45e
Merge pull request #1479 from LemmyNet/fix_extra_categories 
Remove extra category_id s . Fixes #1429
 2021-03-04 12:14:25 +00:00
Dessalines
a1c7584875 Remove extra category_id s . Fixes #1429 2021-03-03 23:44:07 -05:00
Dessalines
817b4ff08e Fixing wrong user_ and community icon and banner urls. 
- Fixes #1477
 2021-03-03 23:40:00 -05:00
Dessalines
ca3c1269f5 Merge branch 'main' of https://github.com/lemmynet/lemmy 2021-03-02 11:52:46 -05:00
dessalines
0a52396706 Merge pull request 'Forbid usage of unwrap' (#179) from clippy-unwrap into main 
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/179
 2021-03-02 16:49:19 +00:00
dessalines
7c4969c92b Merge pull request 'Remove category from activitypub context' (#183) from context-remove-category into main 
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/183
 2021-03-02 16:48:24 +00:00
dessalines
45a94203f2 Merge pull request 'Update test script' (#182) from update-test-script into main 
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/182
 2021-03-02 16:47:58 +00:00