fp-ManasiDanke-CarlaDuarte-AmandaEzeobiejesi-SylviaLin - #52

Open

ciduarte wants to merge 105 commits into

cs4241-19a:masterfrom

eos7l:final-submission

Commits on Sep 30, 2019

Added team members
amandaeze97
authored
7acd613
Update README.md
mmdanke
authored
81277d6
Carla test
Carla Duarte
committed
35d6d27
Update and rename README.md to proposal.md
mmdanke
authored
67ee575
Update proposal.md
mmdanke
authored
94031ff
Create README.md
mmdanke
authored
7bbe229

Commits on Oct 1, 2019

Server methods
Carla Duarte
committed
5c96baa

Commits on Oct 2, 2019

implement login.html
eos7l
committed
010ec40

Commits on Oct 3, 2019

implemented login
eos7l
committed
525f4ee
Merge pull request #1 from eos7l/stylingInit-Sylvia
eos7l
authored
6dbca60
fixed login
eos7l
committed
c504793
Merge pull request #2 from eos7l/stylingInit-Sylvia
eos7l
authored
61fdf2f
Availability table
Carla Duarte
committed
ef48109
Merge pull request #3 from eos7l/ciduarte/table
Carla Duarte
authored
aff2946
Table in template
Carla Duarte
committed
29ff941

Commits on Oct 4, 2019

Edited Names of Buttons
mmdanke
authored
313a07b
Edited HTML References
mmdanke
authored
b57221d
Update reference.html
mmdanke
authored
6c03f4b
Created register.html
mmdanke
authored
d918166
changed css for title
mmdanke
authored
eaef12f
Omitted logo, changed css for title
mmdanke
authored
895a486
Update register.html
mmdanke
authored
0f2ca61

Commits on Oct 5, 2019

Commits on Oct 6, 2019

Fixed login
Carla Duarte
committed
e85318d
Table styling changes
eos7l
committed
b209d13

Commits on Oct 7, 2019

Bootstrap 4, integrate form
Carla Duarte
committed
60c7649
Merge pull request #4 from eos7l/tableStyling-Sylvia
Carla Duarte
authored
d12e433
update register.html
mmdanke
authored
1afc55b
update register.js
mmdanke
authored
1eeabd3
Update register.js
mmdanke
authored
5e3c594
Merge pull request #5 from eos7l/mmdanke/registration
Carla Duarte
authored
90e2bdf
update form styling
eos7l
committed
3ef2326
Merge remote-tracking branch 'origin/tableStyling-Sylvia' into tableStyling-Sylvia
Carla Duarte
committed
8e7f4f5
Merge header changes
Carla Duarte
committed
1889b5d
Merge pull request #6 from eos7l/tableStyling-Sylvia
Carla Duarte
authored
e2ba7f5
added room field
eos7l
committed
31ad204
Availability array
Carla Duarte
committed
dd850cb
Merge branch 'master' of https://github.com/eos7l/fp
Carla Duarte
committed
0683a43
Form updates
Carla Duarte
committed
948af27
Merge pull request #7 from eos7l/ciduarte/separate-form-js
Carla Duarte
authored
22b2d74

Commits on Oct 8, 2019

Added email
Carla Duarte
committed
7f338ec
🌧🐩 Checkpoint
Glitch (eos7l-fp-5)
committed
45137fa
🌿💸 Checkpoint
Glitch (eos7l-fp-5)
committed
8fe4349
🛍💇 Checkpoint
Glitch (eos7l-fp-5)
committed
390118a
🚨🛀 Checkpoint
Glitch (eos7l-fp-5)
committed
c287ccd
🐘🗽 Checkpoint
Glitch (eos7l-fp-5)
committed
0dddf23
👘📙 Checkpoint
Glitch (eos7l-fp-5)
committed
bbc0da3
📙🐸 Checkpoint
Glitch (eos7l-fp-5)
committed
6c0bbb3
🛀🐾 Checkpoint
Glitch (eos7l-fp-5)
committed
b44fe38
👗🚝 Checkpoint
Glitch (eos7l-fp-5)
committed
44db371
✂️🌊 Checkpoint
Glitch (eos7l-fp-5)
committed
b37e231
📒🙈 Checkpoint
Glitch (eos7l-fp-5)
committed
d007ed4
Delete .glitch-assets
mmdanke
authored
989e1e1
Update db.json
amandaeze97
authored
d62590c
Quick Fixes
Carla Duarte
committed
9754fc1
Email functionality
Carla Duarte
committed
e8399db
Fix header
Carla Duarte
committed
a6396fc
input field no longer clears
eos7l
committed
dd5c594

Commits on Oct 9, 2019

Valid room availability
Carla Duarte
committed
79778bc
Merge pull request #8 from eos7l/ciduarte/availability-validation
Carla Duarte
authored
823ff53
update email form
eos7l
committed
e820c3d
Merge branch 'master' of https://github.com/eos7l/fp into updatedEmail
eos7l
committed
3a4d273
Merge pull request #9 from eos7l/updatedEmail
Carla Duarte
authored
3189d4f
Create meetingsDisplay.html
amandaeze97
authored
6a9616d
Added meetings button
amandaeze97
authored
31a2797
Update dashboard.html
amandaeze97
authored
f13eda8
Update meetingsDisplay.html
amandaeze97
authored
fea6b28
Updating General Layout of README
mmdanke
authored
607140a
Made 17:30 to show up for startTime
amandaeze97
authored
9a10c5c
Quick Fixes
Carla Duarte
committed
df3b3a8
Update proposal.md
mmdanke
authored
f3cc6b4
Update README.md
mmdanke
authored
95e9c4b
Update README.md
mmdanke
authored
d192151
Update README.md
mmdanke
authored
682ff6a
Update README.md
mmdanke
authored
be6b7f6
Update README.md
mmdanke
authored
2aeae43
Update README.md
mmdanke
authored
bc6cf4f
Update README.md
mmdanke
authored
1744b25
View meeting feature
Carla Duarte
committed
b5f7839
Register styling
Carla Duarte
committed
c19e86f
Updated README
Carla Duarte
committed
5cb29a1
Update README.md
eos7l
authored
d97e1f1
Merge pull request #10 from eos7l/amandaeze97-patch-1
Carla Duarte
authored
1e34c79
Roominder logo and favicon
amandaeze97
authored
fda36c7
Update README.md
amandaeze97
authored
e94172c
Added logo and favicon
amandaeze97
authored
1f8ea2a
Added logo and favicon
amandaeze97
authored
6e14c10
Added logo and favicon
amandaeze97
authored
0a93fef
Added logo and favicon
amandaeze97
authored
3ee4fb6

Commits on Oct 10, 2019

Made 17:30 to show up for startTime

amandaeze97
authored and
Carla Duarte
committed
df08b03
Logo
Carla Duarte
committed
e2340c9
Merge pull request #11 from eos7l/final-submission
Carla Duarte
authored
964b5c6
Update logo
Carla Duarte
committed
66010c3
Merge pull request #12 from eos7l/final-submission
Carla Duarte
authored
c6fa1bf
Update README.md
mmdanke
authored
9b8f7f9
Update README.md
mmdanke
authored
7018a47
Update README.md
mmdanke
authored
d3bb097
Update README.md
mmdanke
authored
f82cb20
Update README.md
amandaeze97
authored
6d15f1c
Minor fixes
amandaeze97
authored
9de8705
Update README.md
amandaeze97
authored
4710a54