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

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

Osmin #7

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions Procfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: node app.js
16 changes: 0 additions & 16 deletions README.md
View file
Open in desktop

This file was deleted.

Loading