Commit graph

1841 commits

Author SHA1 Message Date
Dessalines
4b741c3759 Adding a better switching for activity kinds for the shared inbox. 2020-04-27 19:21:41 -04:00
Dessalines
59852d6899 Merge branch 'nyu-ossd-s20-link_images' 2020-04-27 18:22:10 -04:00
Dessalines
2f47ea2228 Merge branch 'link_images' of https://github.com/nyu-ossd-s20/lemmy into nyu-ossd-s20-link_images 2020-04-27 18:20:58 -04:00
Dessalines
70060c27b2 Adding activity table inserts. 2020-04-27 18:17:02 -04:00
niniack
09d4bf1d7a swap imgur links for github links 2020-04-27 16:22:56 -04:00
Dessalines
9c30b37d57 Merge branch 'federation' into shared_inbox_1 2020-04-27 13:01:45 -04:00
Dessalines
10877fd45f Merge pull request #663 from LemmyNet/federation_changes_1
Federation changes.
2020-04-27 13:00:21 -04:00
Dessalines
22abbebd41 Lots of additions to federation.
- Added a shared inbox.
- Added federated comments, comment updates, and tests.
- Abstracted ap object sends into a common trait.
2020-04-27 12:57:00 -04:00
Dessalines
66134823bf Version v0.6.55 2020-04-27 09:07:31 -04:00
Dessalines
72433b37c4 Adding a sponsor. 2020-04-27 08:55:31 -04:00
Dessalines
82941001e8 Fixing sponsor issue. 2020-04-26 19:09:47 -04:00
Dessalines
3ce0618362 Making a trait function for follow and accept. 2020-04-26 13:20:42 -04:00
Dessalines
92e4edf9b7 Version v0.6.54 2020-04-26 10:57:27 -04:00
Dessalines
f4b5c1f27b Adding sponsor. 2020-04-26 10:56:53 -04:00
Dessalines
610cce4162 Hide online counts for now. #664 2020-04-26 10:51:59 -04:00
Nishant Aswani
674e221335 added main_screen and chat_screen (#665) 2020-04-26 10:01:21 -04:00
Dessalines
079ac091eb Adding back in post fetching. 2020-04-25 11:49:15 -04:00
Dessalines
b5a5b307a0 Adding get_public_key_ext() to ActorType trait. 2020-04-24 22:34:51 -04:00
Dessalines
df9135f410 Removing run-tests TODO. 2020-04-24 22:02:12 -04:00
Dessalines
8a25f0f816 Use an associated type instead of Generic. 2020-04-24 17:30:27 -04:00
Dessalines
33c5c21a57 Merge remote-tracking branch 'yerba/federation' into federation_changes_1 2020-04-24 15:57:48 -04:00
Dessalines
d846740839 Some more cleanup. 2020-04-24 15:55:54 -04:00
Felix
c3ac1649f2 Implement integration test for federation 2020-04-24 18:30:31 +02:00
Dessalines
66a2c4a2c3 Some fed fixes. 2020-04-24 10:04:36 -04:00
Dessalines
e5497edd5c Adding some more API testing examples. 2020-04-23 14:13:22 -04:00
Dessalines
ce800f75ad Adding a test bed for API testing. #658 2020-04-23 11:34:32 -04:00
Felix
b8aaf5c1f1 Also use correct header in fetcher.rs 2020-04-23 13:42:09 +02:00
Dessalines
28ca7a727c Merge branch 'master' of https://github.com/dessalines/lemmy 2020-04-22 16:52:50 -04:00
Dessalines
d448bc6f9a Adding code mirror section to readme. 2020-04-22 16:52:24 -04:00
Nishant Aswani
d0fa235e84 Updated ranking algorithm graph in docs (#654)
* Regraphed ranking algorithm demo with seaborn plot

* use imgur mirror for ranking algo image
2020-04-22 15:38:51 -04:00
Felix
70816a4779 Fix header guard for apub responses 2020-04-22 20:56:31 +02:00
Dessalines
c22090c602 Version v0.6.53 2020-04-22 00:30:43 -04:00
Dessalines
313d023eef Changing wait to spawn in websocket. 2020-04-22 00:29:25 -04:00
Dessalines
b2a89cd217 Version v0.6.52 2020-04-21 20:43:38 -04:00
Dessalines
b92b8a9e15 Merge remote-tracking branch 'weblate/master' 2020-04-21 20:43:35 -04:00
Dessalines
92e30311ce Merge branch 'federation' of https://yerbamate.dev/LemmyNet/lemmy into federation 2020-04-21 20:41:50 -04:00
Dessalines
0425e8b114 Fixing nodeinfo error type. 2020-04-21 20:34:37 -04:00
Dessalines
18e570b021 Merge branch 'master' into merge_master_2 2020-04-21 20:29:52 -04:00
Dessalines
4abca69328 Merge branch 'routes_web_block' 2020-04-21 20:28:44 -04:00
Dessalines
6b58080067 Adding websocket blocking. 2020-04-21 17:57:20 -04:00
Dessalines
809cc1049e Fixing closures. 2020-04-21 16:48:54 -04:00
Felix
957e4a2611 Change apub IDs to be consistent with html urls 2020-04-21 22:45:01 +02:00
Dessalines
01b7ac5fb9 Merge branch 'master' into routes_web_block 2020-04-21 16:41:07 -04:00
Dessalines
d98c936295 Adding web::blocks to routes. 2020-04-21 16:40:03 -04:00
Felix
4e80543edb Update test_deploy.sh, supporting different branches 2020-04-21 19:19:10 +02:00
Felix Ableitner
a90b16a72c Merge pull request #649 from LemmyNet/federation_merge_from_master_1
Federation merge from master 1
2020-04-21 16:29:30 +00:00
Dessalines
f0026065f5 Merge branch 'master' into federation_merge_from_master_1 2020-04-21 10:25:29 -04:00
Dessalines
2f4b3a4f83 Merge branch 'remove_username_lower_unique' into federation 2020-04-21 09:25:02 -04:00
Dessalines
697c62fb64 Change local unique username constraints. 2020-04-21 09:21:29 -04:00
Felix
1e7c3841b2 Update federation dev instructions 2020-04-21 13:24:08 +02:00