Commit Graph

111 Commits

Author SHA1 Message Date
Tim Wijma
1ce4a56849 Merge branch 'main' into filterFee 2022-11-03 17:17:09 +01:00
Tim Wijma
615b8c1780 filters feed 2022-11-03 17:15:58 +01:00
7c8d3e3d70 Merge branch 'main' into fix/sort 2022-11-03 17:00:41 +01:00
8fb0b7d8f7 Fixed sort 2022-11-03 17:00:16 +01:00
c8caf730ee merged from main 2022-11-03 16:56:16 +01:00
21064b3d24 maybe working sort 2022-11-03 16:55:45 +01:00
youri.apell@gmail.com
12879bdbff Merge branch 'main' of https://github.com/olinpin/twitter-project into youri 2022-11-03 16:47:15 +01:00
7448cc944e merged from master 2022-11-03 16:42:19 +01:00
youri.apell@gmail.com
18d4afdcf0 Merge branch 'main' of https://github.com/olinpin/twitter-project into youri 2022-11-03 16:38:27 +01:00
1793dd4175 Added checking if filtered tweets has changed 2022-11-03 16:35:06 +01:00
youri.apell@gmail.com
52b51e828e made the tweet text link to the original tweet 2022-11-03 16:34:38 +01:00
Tim Wijma
dd357e8060 Merge branch 'main' into sortby 2022-11-03 15:55:40 +01:00
Tim Wijma
25254cd2fc sort by 2022-11-03 15:54:23 +01:00
6bcdaf7d8c Added if statement 2022-11-03 15:14:03 +01:00
8143421190 Nothing really, it's working here 2022-11-03 15:10:30 +01:00
Tim Wijma
9c92763060 Merge branch 'main' of https://github.com/olinpin/twitter-project 2022-11-03 14:59:39 +01:00
Tim Wijma
670194eb88 responsive 2022-11-03 14:59:28 +01:00
youri.apell@gmail.com
160f5634aa Merge branch 'main' of https://github.com/olinpin/twitter-project into youri 2022-11-03 14:44:45 +01:00
youri.apell@gmail.com
02c171ae02 Adding the chicken/rooster sounds 2022-11-03 14:41:30 +01:00
Tim Wijma
71fea5aef9 flexbpox 2022-11-03 14:37:31 +01:00
84ec397531 Deleted console.log 2022-11-03 14:35:27 +01:00
6c3990fefb Merged from main 2022-11-03 14:32:24 +01:00
msoliman3
a6e3a12761 twitter hour help me lol 2022-11-03 14:23:49 +01:00
2e159291c6 Merged from main 2022-11-03 14:19:46 +01:00
1932afe5f8 Working live tweets and filtering tweets 2022-11-03 14:17:50 +01:00
jacktjong
d896c1d6dd All ordering implemented (I think) 2022-11-03 14:10:01 +01:00
jacktjong
d1bcb2be83 Search/banned/sort fields now functional 2022-11-03 13:25:13 +01:00
youri.apell@gmail.com
ffab12eeef Merge branch 'main' of https://github.com/olinpin/twitter-project into youri 2022-11-03 13:20:08 +01:00
15f3910843 Merged from main 2022-11-03 12:54:08 +01:00
d445036c1a FINALY WORKING FILTERED FEED, kinda 2022-11-03 12:51:15 +01:00
msoliman3
20e70ae032 Merge branch 'main' of https://github.com/olinpin/twitter-project into branch 2022-11-03 12:44:07 +01:00
msoliman3
85beae6554 light/dark mode pt.3 2022-11-03 12:43:57 +01:00
Tim Wijma
876cd1569d ORDER ARROW 2022-11-03 12:38:54 +01:00
1309809045 Merge branch 'main' into feat/filter-feed 2022-11-03 12:15:10 +01:00
9ec0a27677 Live feed finaly working 2022-11-03 12:09:09 +01:00
f908e86e48 Filter still not done 2022-11-03 12:03:32 +01:00
a4031cbb54 Filter not done 2022-11-03 11:34:13 +01:00
msoliman3
65a7e8676b Merge branch 'main' of https://github.com/olinpin/twitter-project into branch 2022-11-02 19:19:58 +01:00
msoliman3
6145aaafac dark light mode pt.2 2022-11-02 19:18:26 +01:00
Tim Wijma
8c5fb5619f Merge branch 'main' of https://github.com/olinpin/twitter-project into CSS 2022-11-02 17:19:28 +01:00
Tim Wijma
b33d051ced margin under tweets 2022-11-02 17:18:51 +01:00
youri.apell@gmail.com
a8075fd98f merge from main 2022-11-02 16:07:49 +01:00
youri.apell@gmail.com
4ed7c84140 added pie chart 2022-11-02 16:05:25 +01:00
decffdfc98 Merge pull request #19 from olinpin/branch
dark/light mode implementation pt.1
2022-11-02 16:02:11 +01:00
msoliman3
963fab87b2 dark/light mode implementation pt.1 2022-11-02 15:59:23 +01:00
Tim Wijma
25fa70c2f0 filter to chart 2022-11-02 15:50:48 +01:00
Tim Wijma
0bc9bd9c14 light 2022-11-02 15:41:23 +01:00
Tim Wijma
68a19ce52a Merge branch 'main' of https://github.com/olinpin/twitter-project into Filters 2022-11-02 15:38:08 +01:00
Tim Wijma
2aefeb2075 css variables 2022-11-02 15:36:49 +01:00
41af3b37b5 Added graph 2022-11-02 15:32:44 +01:00