Skip to content

Osmin #7

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.

Sign up for GitHub

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

Jump to bottom
Open
osanabria wants to merge 60 commits into
base: master
Choose a base branch
from
Open

Osmin #7

osanabria wants to merge 60 commits into from

Conversation

@osanabria
Copy link

@osanabria osanabria commented Apr 24, 2020

tryna merge

jtm029 and others added 30 commits February 18, 2020 14:42
@jtm029
Added the employee/active users models w/ some starter code
411f27e
@unchecked9
fixed ts lint error
a7d1e6b
@unchecked9
baseline for main menu view
25026c0
@Farreola
Creating command directory and objects
ee518ba
@thebluewagon
Started employee detail view.
ee1efe0
adding login and signup files.
4eabcd4
@Farreola
initial commit
ad58a79
@Farreola
completing saveEmployeeRequest functionality
fa9a4bb
@unchecked9
fix casing
de09f2e
@Farreola
Finishing employeeCreateCommand functionality
a484d45
@Farreola
Merge branch 'Task-12' of https://github.com/csce3513-superteam/Regis…
b175706 
…terApp-NodeJS into Task-12
@osanabria
adding routes
db9982d
@osanabria
Merge remote-tracking branch 'origin/Task-12' into Osmin
4c49e6c
@Farreola
adding validition to employeeCreateCommand
60d8bfd
@osanabria
broken code 2-29
aad420c
@Farreola
adding employeeQuery functionality
6fe60dc
@unchecked9
main menu view
e97090a
@Farreola
Adding employeeQuery functionality. Adding strange file appearing as …
5f737e4 
…an untracked file to .gitignore
@Farreola
Adding employeeUpdate functionality
a8acba1
@Farreola
Fixing formatting issues
69eec63
Revert "adding routes"
c2ec801 
This reverts commit db9982d.
umm
9d36dc4
should be working need functionallity
b77b73e
@unchecked9
mainmenu view and some logic
30d086a
@unchecked9
finish merge
15c1b28
@thebluewagon
finished view amd started on client side
c9fd952
@osanabria
Merge remote-tracking branch 'origin/Task-12' into Osmin
d10cc14
@unchecked9
server side routing done
4c2d857
@osanabria
broken code last day AHHH
0859026
@jtm029
Merge pull request #1 from csce3513-superteam/blake-main-menu-view
3709c8d 
Blake main menu view
unchecked9 and others added 30 commits March 5, 2020 19:56
@unchecked9
Merge pull request #2 from csce3513-superteam/Task-12
fe67272 
Task 12
@thebluewagon
Merge remote-tracking branch 'origin/Task-12' into brayden-employee-view
c40ed28
@thebluewagon
employee detail
2bc2b3a
@jtm029
show buttons based on elevated user
9f3f14f
@jtm029
Merge branch 'master'
737a388
@jtm029
changed this by mistake
929f4f7
@thebluewagon
merge
57cd93a
@thebluewagon
Merge branch 'master' into brayden-employee-view
777ef51
@thebluewagon
Merge branch 'master' into brayden-employee-view
d1b5013
@unchecked9
Merge pull request #3 from csce3513-superteam/details&listUpdates
81604cc 
show buttons based on elevated user
@thebluewagon
View done
003309c
@unchecked9
Merge pull request #4 from csce3513-superteam/brayden-employee-view
d2ab831 
Brayden employee view
Server code written
1e51171
@unchecked9
Merge branch 'master' into Osmin
e338d73
@unchecked9
Merge pull request #5 from csce3513-superteam/Osmin
c9c6168 
Osmin
@jtm029
fix sprint 2 routing
b6d1de1
@unchecked9
Update mainMenuRouteController.ts
1c7fe9f
@unchecked9
Merge pull request #6 from csce3513-superteam/sprint2-temp-changes
7855795 
fix sprint 2 routing
@unchecked9
fixes for project to run
c5156cd
@jtm029
Merge pull request #7 from csce3513-superteam/sprint2-fixes
4eed158 
fixes for project to run
@jtm029
working new changes
513b0e4
@unchecked9
Merge pull request #9 from csce3513-superteam/mergingSprint2Solution
014cea2 
Professor sprint2 solution
@jtm029
fix500?
20b0a2b
@jtm029
fixed deployment
3dface8
@jtm029
Merge branch 'master' of https://github.com/csce3513-superteam/Regist…
801e51e 
…erApp-NodeJS into mergingSprint2Solution
@jtm029
sprint 4 transaction models
a70358e
@jtm029
Merge pull request #11 from csce3513-superteam/Sprint4/transactionModels
f89b933 
Sprint4- transaction models
adding the ejs for the cart view
02d1354
rewritting app
31389e1
adding heroku config
5d0ad15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@osanabria @jtm029 @unchecked9 @Farreola @thebluewagon