Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Garry the stormtrooper #2

Open
wants to merge 135 commits into
base: master
Choose a base branch
from
Open
Changes from 3 commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
940a664
Initial version of NYCEtube generated by [email protected]
ycho62 Apr 26, 2022
280459c
Add files via upload
nmneha Apr 26, 2022
51f5b63
Uploaded first rough draft with wireframe.
clyderick3 Apr 26, 2022
77ae6db
jdl import
ycho62 Apr 26, 2022
ea0f0a2
Merge branch 'master' of github.com:NYCEtube/NYCEtube.FullStackMicroW…
ycho62 Apr 27, 2022
6ce00d5
deleted
ycho62 Apr 27, 2022
44f36f7
deleted
nmneha Apr 27, 2022
c99fcca
cleaned up interface
ycho62 Apr 27, 2022
da085b1
jdl added
ycho62 Apr 30, 2022
7f888eb
Starting point before starting over.
clyderick3 Apr 30, 2022
9422135
VIDEOS?????
nmneha May 2, 2022
c9abdb3
Merge pull request #1 from nmneha/master
ycho62 May 2, 2022
25d8f5d
Merge branch 'NYCEtube:master' into master
clyderick3 May 2, 2022
7d712be
files added?
nmneha May 2, 2022
d2752fe
Merge pull request #2 from nmneha/master
ycho62 May 2, 2022
68d4737
Merge branch 'NYCEtube:master' into master
clyderick3 May 2, 2022
9c2809f
video player working
nmneha May 2, 2022
71dacdd
Merge pull request #3 from nmneha/master
nmneha May 2, 2022
ccbc785
Merge branch 'NYCEtube:master' into master
clyderick3 May 2, 2022
895c5b2
Converted mp4 to text files for format.
clyderick3 May 2, 2022
1433e34
Test.
clyderick3 May 2, 2022
4794db4
nothing
May 2, 2022
1313824
changes
May 2, 2022
115df3b
changes our saved
May 2, 2022
65d41e9
added videos by user
ycho62 May 5, 2022
ae5396f
video is playing
nmneha May 5, 2022
22f66e7
small changes
nmneha May 5, 2022
ad764d0
WORKING VIDEO
nmneha May 6, 2022
3f2eea5
changed video expiration
nmneha May 6, 2022
c7492ed
Merge pull request #4 from nmneha/master
ycho62 May 6, 2022
046aa21
Merge branch 'NYCEtube:master' into master
ycho62 May 6, 2022
8c7d423
Merge branch 'master' into master
clyderick3 May 6, 2022
9db995f
Merge pull request #5 from ycho62/master
ycho62 May 6, 2022
1b48ffb
Merge pull request #1 from NYCEtube/master
nmneha May 6, 2022
2c08c12
Merge branch 'NYCEtube:master' into master
EthanMaiorini May 6, 2022
11683cb
Merge pull request #6 from nmneha/master
nmneha May 6, 2022
b638dca
working fix
ycho62 May 6, 2022
363e4e3
Merge pull request #7 from ycho62/master
ycho62 May 6, 2022
5e1fee7
Merge pull request #2 from NYCEtube/master
nmneha May 6, 2022
a728866
Merge branch 'NYCEtube:master' into master
EthanMaiorini May 6, 2022
208347b
Something
May 6, 2022
da4aa64
Merge pull request #8 from EthanMaiorini/master
EthanMaiorini May 6, 2022
2b577ce
Merge pull request #3 from NYCEtube/master
nmneha May 6, 2022
0dd9023
Added Clyde the Glide file online.
clyderick3 May 6, 2022
d526888
Update.
clyderick3 May 6, 2022
61ee66b
Updated env and app yml for outsiders.
clyderick3 May 7, 2022
65e2549
Merge pull request #9 from clyderick3/master
clyderick3 May 7, 2022
176243a
Merge pull request #4 from NYCEtube/master
nmneha May 7, 2022
d74c4ab
Not Sure
May 7, 2022
f62cc25
Merge branch 'master' of github.com:EthanMaiorini/NYCEtube.FullStackM…
May 7, 2022
310d255
Updated video player.
clyderick3 May 7, 2022
cac7cc7
Merge pull request #11 from clyderick3/master
clyderick3 May 7, 2022
ed78132
Merge branch 'NYCEtube:master' into master
EthanMaiorini May 7, 2022
88f67e2
Merge pull request #5 from NYCEtube/master
nmneha May 7, 2022
85e5e2d
changed colors to homepage
ycho62 May 7, 2022
46c16ed
Merge pull request #13 from ycho62/master
ycho62 May 7, 2022
b78dae0
nothing really
May 7, 2022
3f68dec
Merge branch 'NYCEtube:master' into master
EthanMaiorini May 7, 2022
1ddea33
Merge branch 'master' of github.com:EthanMaiorini/NYCEtube.FullStackM…
May 7, 2022
d641a14
Added formatting to center all of page.
clyderick3 May 7, 2022
1e1151e
Uploaded newer logo.
clyderick3 May 7, 2022
aa46a6e
Added image.
clyderick3 May 8, 2022
23b4f16
Added temp logo.
clyderick3 May 8, 2022
e94cc5a
Ready for push for back end work.
clyderick3 May 8, 2022
906388b
Master push.
clyderick3 May 8, 2022
cb94075
Merge pull request #14 from clyderick3/master
clyderick3 May 8, 2022
93b3917
Merge pull request #6 from NYCEtube/master
nmneha May 8, 2022
b695543
home changes
nmneha May 8, 2022
3829c78
merged
nmneha May 8, 2022
446375a
Merge pull request #15 from nmneha/master
nmneha May 8, 2022
0473f4f
changed header modified logo and font
nmneha May 8, 2022
96b955b
Merge pull request #16 from nmneha/master
nmneha May 8, 2022
6b048f0
logo
nmneha May 8, 2022
dbafde6
Merge pull request #17 from nmneha/master
nmneha May 8, 2022
0d79826
Merge branch 'NYCEtube:master' into master
EthanMaiorini May 8, 2022
4e3cf1a
Merge branch 'master' of github.com:EthanMaiorini/NYCEtube.FullStackM…
May 8, 2022
db4eb3c
new link update
ycho62 May 8, 2022
5a2042d
Merge pull request #18 from ycho62/master
ycho62 May 8, 2022
49b53e8
Merge pull request #7 from NYCEtube/master
nmneha May 8, 2022
c7ad197
Merge branch 'NYCEtube:master' into master
EthanMaiorini May 8, 2022
a96d2d5
made bucket service a function
May 8, 2022
a4b54fb
made bucket service a function
May 8, 2022
ae0177b
made bucket service a function
May 8, 2022
1b15de8
Merge pull request #19 from EthanMaiorini/master
EthanMaiorini May 8, 2022
c491450
Merge pull request #8 from NYCEtube/master
nmneha May 8, 2022
6be6de9
Merge pull request #20 from nmneha/master
nmneha May 8, 2022
c3b5f5a
Merge pull request #9 from NYCEtube/master
nmneha May 8, 2022
478b356
added grid
ycho62 May 8, 2022
4edb308
Merge branch 'master' into master
ycho62 May 8, 2022
21faf9f
Merge pull request #1 from NYCEtube/master
ycho62 May 8, 2022
5b28b35
Merge pull request #21 from ycho62/master
ycho62 May 8, 2022
afb6f9e
took out unused code
May 8, 2022
fed2b8f
Merge pull request #22 from EthanMaiorini/master
EthanMaiorini May 8, 2022
6325a5e
jdl changed
ycho62 May 9, 2022
d763d98
Merge pull request #23 from ycho62/master
ycho62 May 9, 2022
d858057
changes made
ycho62 May 9, 2022
86e49ed
Merge pull request #24 from ycho62/master
ycho62 May 9, 2022
11ac0cd
Added a variable
May 10, 2022
1f6bfcc
Merge pull request #25 from EthanMaiorini/master
EthanMaiorini May 10, 2022
97b8b29
Added a variable
May 10, 2022
b9772c3
Merge pull request #26 from EthanMaiorini/master
EthanMaiorini May 10, 2022
abfd8d4
Added a variable
May 10, 2022
8254e50
Merge pull request #27 from EthanMaiorini/master
EthanMaiorini May 10, 2022
479dd17
Merge pull request #10 from NYCEtube/master
nmneha May 10, 2022
b5f3a08
Merge pull request #28 from nmneha/master
nmneha May 10, 2022
d2ea625
helooo
nmneha May 10, 2022
7fe3b27
done
nmneha May 10, 2022
bb63721
Merge pull request #11 from NYCEtube/master
nmneha May 10, 2022
25457aa
jdl changed
ycho62 May 10, 2022
065b70a
Merge pull request #29 from ycho62/master
ycho62 May 10, 2022
a022182
Merge pull request #12 from NYCEtube/master
nmneha May 10, 2022
77bfd0f
added view function
ycho62 May 10, 2022
9bc81dc
added view function
ycho62 May 10, 2022
0b46759
Merge pull request #30 from ycho62/master
ycho62 May 10, 2022
f392f3a
working on post
ycho62 May 10, 2022
7de2900
Merge pull request #31 from ycho62/master
ycho62 May 10, 2022
a8a396c
Merge pull request #13 from NYCEtube/master
nmneha May 10, 2022
509d33d
changed view button
ycho62 May 11, 2022
f1c1bfb
Merge pull request #32 from ycho62/master
ycho62 May 11, 2022
c91486d
Merge pull request #14 from NYCEtube/master
nmneha May 11, 2022
5da23c4
added photos
ycho62 May 11, 2022
93410a4
Merge pull request #33 from ycho62/master
ycho62 May 11, 2022
fc475dd
Merge pull request #15 from NYCEtube/master
nmneha May 11, 2022
08741ef
Merge pull request #34 from nmneha/master
nmneha May 11, 2022
9be42ad
added videos to home
ycho62 May 11, 2022
0efa9fe
Merge pull request #35 from ycho62/master
ycho62 May 11, 2022
63f616c
Merge pull request #1 from NYCEtube/master
nmneha May 11, 2022
cae6769
homepage changes;
nmneha May 11, 2022
b011422
Merge pull request #36 from nmneha/master
nmneha May 11, 2022
30b756c
fixed video playing on first time
ycho62 May 11, 2022
339e995
Merge pull request #37 from ycho62/master
ycho62 May 11, 2022
70c6b20
final push up
ycho62 May 12, 2022
d5643d8
Merge pull request #38 from ycho62/master
ycho62 May 12, 2022
cf1f66c
final
ycho62 May 12, 2022
bb63fb4
Merge pull request #39 from ycho62/master
ycho62 May 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.