Commit Graph

158 Commits

Author SHA1 Message Date
TimWijma
abb93024a2 Merge pull request #7 from olinpin/ResponsiveCSS
Responsive css
2022-11-02 11:56:12 +01:00
Tim Wijma
221ae7631e responsive css 2022-11-02 11:55:42 +01:00
Tim Wijma
98d0cf2c74 Merge branch 'main' into ResponsiveCSS 2022-11-02 11:48:17 +01:00
Tim Wijma
e679b95913 Merge branch 'main' into ResponsiveCSS 2022-11-02 11:47:41 +01:00
jacktjong
c31d514753 Twitter Live Feed working (CONFLICT RESOLVED) 2022-11-02 11:47:10 +01:00
Tim Wijma
4dd754bc9f Merge branch 'main' into ResponsiveCSS 2022-11-02 11:43:16 +01:00
abb8c77e3f Changed the number of tweets stored in local memory 2022-11-02 11:42:29 +01:00
jacktjong
a576e76e8a Merge branch 'Jack-1' 2022-11-02 11:42:22 +01:00
4fa54fe1f1 Added filter function for filtering tweets 2022-11-02 11:42:11 +01:00
jacktjong
d539914212 Twitter Live Feed working 2022-11-02 11:38:17 +01:00
Tim Wijma
713c401ee6 css responsive 2022-11-02 11:38:04 +01:00
Drew
413895b8d5 Buttons 2022-11-01 17:41:21 +01:00
Drew
210642d1db Merge branch 'main' of github.com:olinpin/twitter-project 2022-11-01 17:00:17 +01:00
Drew
4acd8acc8f CSS Grid Headings 2022-11-01 16:59:48 +01:00
3ee60ecb3c Added function to put all in a single list 2022-11-01 16:35:33 +01:00
jacktjong
006e91e1a7 Random changes 2022-11-01 15:58:55 +01:00
youri.apell@gmail.com
4b8e10b8c0 Merge branch 'main' of https://github.com/olinpin/twitter-project 2022-11-01 15:08:52 +01:00
youri.apell@gmail.com
fbbb6c6c7a change time value to 0.1 2022-11-01 15:08:30 +01:00
TimWijma
2cdfeba290 Merge pull request #6 from olinpin/TweetCSS
Tweet css
2022-11-01 14:40:59 +01:00
Tim Wijma
bdbf25e241 Merge branch 'main' into TweetCSS 2022-11-01 14:40:02 +01:00
Tim Wijma
91c3a8f5a9 Merge branch 'main' of https://github.com/olinpin/twitter-project 2022-11-01 14:39:34 +01:00
Tim Wijma
199d769292 changed tweetcell function 2022-11-01 14:39:31 +01:00
470e85bd91 Deleted .vs 2022-11-01 14:33:53 +01:00
jacktjong
1d5b717637 Merge branch 'Jack-1' 2022-11-01 14:31:38 +01:00
Tim Wijma
fa47d5866f tweet css 2022-11-01 14:28:21 +01:00
jacktjong
4bb7b02a96 Update code.js
JS to generate Tweet HTML
2022-11-01 14:27:21 +01:00
e3ab3bdb25 Merged from feat/live-tweets 2022-11-01 14:25:53 +01:00
92de18a927 Working live tweets 2022-11-01 14:24:40 +01:00
bafa1ceead Kinda working 2022-11-01 13:38:17 +01:00
Drew
9ac9b48876 CSS Grid Headings 2022-11-01 13:36:10 +01:00
Drew
8e9d748210 CSS Grid Headings 2022-11-01 13:31:39 +01:00
TimWijma
5521913353 Merge pull request #5 from olinpin/FiltersSearch
Updated grid
2022-11-01 13:28:57 +01:00
Tim Wijma
8d40f8e372 Merge branch 'main' into FiltersSearch 2022-11-01 13:28:16 +01:00
Tim Wijma
186b6e4b3e search field 2022-11-01 13:03:02 +01:00
49c70b08b8 Merge pull request #4 from olinpin/cssgrid
Cssgrid
2022-11-01 12:37:11 +01:00
Drew
3cdf519031 Merge branch 'main' of github.com:olinpin/twitter-project into cssgrid 2022-11-01 12:24:35 +01:00
Drew
b67a5c2149 Made the CSS Grid Layout 2022-11-01 12:24:19 +01:00
139628dcde fixed .gitignore 2022-11-01 12:17:15 +01:00
198ce42848 Merge pull request #3 from olinpin/jack-testing
Added Tweet_Structure resource and made changes to code.js
2022-11-01 12:15:58 +01:00
94047470e6 Updated from main 2022-11-01 12:15:29 +01:00
jacktjong
7f1f1166aa f 2022-11-01 12:02:50 +01:00
jacktjong
08725aeb08 Added Tweet_Structure resource and made changes to code.js 2022-11-01 11:52:23 +01:00
696824dbcf Added favicon 2022-11-01 11:40:38 +01:00
de3f54cc23 Fixed .gitignore 2022-11-01 11:25:28 +01:00
jacktjong
aae0e9f206 no changes but gotta commit 2022-11-01 11:22:53 +01:00
TimWijma
9445a7f4cd Merge pull request #2 from olinpin/TweetLayout
tweet template for js
2022-10-31 21:13:34 +01:00
Tim Wijma
775b54ec2d tweet template for js 2022-10-31 21:11:38 +01:00
Tim Wijma
c6ffc8f3ff logo, sports bar, jquery event handler 2022-10-31 20:36:08 +01:00
TimWijma
dc14ab714e Merge pull request #1 from olinpin/MainLayout
main layout and template
2022-10-31 17:38:48 +01:00
Tim Wijma
da225e3d52 main layout and template 2022-10-31 17:37:59 +01:00