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.

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

Develop #13

Open
wants to merge 91 commits into
base: develop
Choose a base branch
from
Open

Develop #13

wants to merge 91 commits into from

Conversation

11090000449
Copy link
Collaborator

added tagger component

raugustin93 and others added 30 commits June 18, 2019 11:44
@raugustin93
added first and last name fields, signing up to server
defa0b5
@raugustin93
removed unneccessary p tag
f8bd5df
dashboard
a6def76
Merge branch 'master' of https://github.com/tdillman-taxslayer/ts-emp…
458e083 
…loyee-training-dashboard
@raugustin93
working on Login component and committing before pulling from master
8d41fc9
@raugustin93
after pulling master and fixing conflicts
b17c756
@raugustin93
Merge branch 'develop' of https://github.com/tdillman-taxslayer/ts-em…
98b23ec 
…ployee-training-dashboard into dev-master
@raugustin93
Login component is logging in
55d3809
@raugustin93
Sidebar just needed to be inside curly's
ec2e818
@raugustin93
Login receives session token
dddd11f
@raugustin93
receives sessions and saves to localstorage
6ec65c8
@raugustin93
sessions authenticating function outline
b0794f5
@raugustin93
Sends token to server and gets it back to auth private-route
1bcff9b
@raugustin93
removed psuedo code
1e28840
@raugustin93
pulling from develop branch
342e815
@raugustin93
routes -> privateroutes
efd5c9c
@raugustin93
init parse-client
80b2a5d
@raugustin93
working on parse client code
07cedcc
@raugustin93
localstorage for login and parse functionality
80587e1
@raugustin93
finally getting the image url back
486f1b5
@raugustin93
added localsession objectId
4975d29
@raugustin93
parse initiLIZING
0cec673
@raugustin93
Merge pull request #7 from tdillman-taxslayer/features-parse
8a9464a 
Features parse
@raugustin93
tags
fea0e60
@raugustin93
tag functionality outline
0f15d7f
@raugustin93
Merge pull request #8 from tdillman-taxslayer/features-parse
2e873d3 
Features parse
@raugustin93
Merge pull request #9 from tdillman-taxslayer/parse-client
5d34d71 
Parse client
major adjustments
5a49ac4
login
9c4bf2a
create account
2074f78
John Barrett and others added 30 commits July 25, 2019 08:27
added/commented out drag and drop feature
63dc2c0
css
11dd2c0
init
fe603b0
Merge branch 'develop' of https://github.com/danm9/ts-employee-traini…
badae1d 
…ng-dashboard into library
@ebonyesmith
Merge pull request #6 from danm9/library
7beda6f 
Library
forgot page
5e543bc
@ebonyesmith
Merge pull request #7 from danm9/library
08060a1 
forgot page
drag and
de9d409
activities card
1b3c0ea
added card abiliities
0456965
notes
4c0b012
init
b2330b0
@raugustin93
card adds to db
0cb1af4
fixing columns of activities page
972d38a
GETS INFO FROM SERVER TO CADS
7de5d69
updating to database
3f04b0b
@raugustin93
made todo a default card position
1e90039
@raugustin93
changed to lowern case in if statements, position is lowercase in db
14ba21f
@raugustin93
removed console logs
fe7579c
@raugustin93
Merge branch 'develop' of https://github.com/danm9/ts-employee-traini…
6e2efc0 
…ng-dashboard into parse/Activities-Card
@ebonyesmith
Merge pull request #8 from danm9/parse/Activities-Card
5659953 
Parse/activities card
dashboard
9e9ebb3
conflict resolution
e5dcf0d
fixed if statements
f62a0a7
@raugustin93
Merge pull request #9 from danm9/parse/Activities-Card
a52d897 
fixed if statements
updates state for cards
c1fbd96
css
abef497
@ebonyesmith
Merge pull request #10 from danm9/parse/Activities-Card
baf08ca 
updates state for cards
last minute edits
e14d265
card deletes
ebfb1d5
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.
3 participants
@11090000449 @raugustin93 @ebonyesmith