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

3156 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dessalines
6ee76e9280
Merge pull request #1516 from LemmyNet/move_matrix_and_admin_to_person 
Move matrix and admin to person
 2021-03-25 11:41:37 -04:00
Dessalines
0b5438d3fd
Merge pull request #1522 from LemmyNet/move_matrix_and_admin_to_person_nutomic 
Federate Matrix ID (fixes #1438)
 2021-03-24 15:38:57 -04:00
Felix Ableitner
34bdf4c7c5 Federate Matrix ID (fixes #1438) 2021-03-24 17:56:13 +01:00
Dessalines
af2f84805a Fixing image locations. 2021-03-24 12:42:34 -04:00
Dessalines
3ca2453fc6 Merge branch 'main' into move_matrix_and_admin_to_person 2021-03-24 11:51:34 -04:00
Dessalines
8a10a9079f Merge remote-tracking branch 'yerba/federated-moderation' 2021-03-24 11:48:02 -04:00
Felix Ableitner
c7524d924b Fix federation tests 2021-03-24 16:33:04 +01:00
Dessalines
7051207495 Version 0.10.0-rc.10 2021-03-23 14:46:18 -04:00
Dessalines
8543092b9f Merge branch 'remove_cargo_cache_v2' into move_matrix_and_admin_to_person 2021-03-23 14:46:00 -04:00
Dessalines
6758922a63 Version 0.10.0-rc.9 2021-03-23 14:17:44 -04:00
Dessalines
baab2e88a5 Merge branch 'main' into move_matrix_and_admin_to_person 2021-03-23 14:16:54 -04:00
Dessalines
3949b35360
Merge pull request #1517 from LemmyNet/add_saved_only_1 
Adding saved_only to GetComments and GetPosts. Fixes #1513
 2021-03-22 13:52:04 -04:00
Dessalines
b4276341af Adding saved_only to GetComments and GetPosts. Fixes #1513 2021-03-22 10:39:54 -04:00
Dessalines
e4ead96d3a Merge branch 'main' into move_matrix_and_admin_to_person 2021-03-22 10:29:10 -04:00
Dessalines
eb45bf2d0a Moving admin to person table. Fixes #1515 2021-03-22 10:28:00 -04:00
Felix Ableitner
d6bd072ea1 Make federation compatible with Lemmy v0.9.9 2021-03-22 15:08:06 +01:00
Felix Ableitner
a5a0d90349 Address review comments 2021-03-22 13:52:00 +01:00
Felix Ableitner
e726d1e184 Merge branch 'grishka_fix_ld_context' 2021-03-22 13:12:05 +01:00
Felix Ableitner
459b95bc7e Make previous commit compile 2021-03-22 13:11:32 +01:00
Felix Ableitner
6b5354fb11 Merge branch 'fix_ld_context' of https://yerbamate.ml/grishka/lemmy into grishka_fix_ld_context 2021-03-22 13:08:07 +01:00
Nutomic
8b2b3eef73
Merge pull request #1509 from LemmyNet/fix_deploy_prod_script 
Fixing docker deploy script. Fixes #1507
 2021-03-22 12:02:41 +00:00
Grishka
115b986edc uh 2021-03-21 04:03:53 +03:00
Grishka
c14a505456 Fix JSON-LD contexts 2021-03-21 04:00:32 +03:00
Dessalines
c884510173 Creating default DB forms. Fixes #1511 2021-03-20 16:59:07 -04:00
Dessalines
53ea383b4e Forgot to regenerate person_alias views 2021-03-20 16:32:52 -04:00
Dessalines
1745b64ceb Moving matrix_user_id to person table. #1438 2021-03-20 15:21:51 -04:00
Dessalines
77f8dc9675 Fixing docker deploy script. Fixes #1507 2021-03-20 14:49:07 -04:00
Dessalines
4b92e35edc Reverting docker versions until deploy.sh fix. 2021-03-20 11:55:11 -04:00
Dessalines
e9eca35816 Version 0.10.0-rc.8 2021-03-19 15:58:24 -04:00
Dessalines
ae635c752a Try to remove cargo home changing to fix release. 2021-03-19 15:57:56 -04:00
Felix Ableitner
05b07b8cbb Fix conflicts in docker-compose.yml 2021-03-19 18:09:05 +01:00
Felix Ableitner
4f54108a9c Merge branch 'main' into federated-moderation 2021-03-19 17:11:34 +01: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
Felix Ableitner
4f7dca7c2b Fix three federation test cases 2021-03-18 17:02:15 +01: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
Felix Ableitner
b3a5b4eb82 Refactor activitypub code 2021-03-17 18:12:37 +01:00
Felix Ableitner
71067a8cb5 For FromApub trait, use is_mod_action: bool instead 2021-03-16 18:26:19 +01:00