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

Dev #16

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

Dev #16

wants to merge 162 commits into from

Conversation

Jdelpizz
Copy link

This is our master branch with a functioning schedule parser prototype.

grimwolf007 and others added 30 commits February 25, 2020 11:17
@grimwolf007
Fixed Yarn Issue
4d58bd9
@grimwolf007
Added the stuff from database
2a1ed20
@grimwolf007
Got Hello World
dbb1fca 
Mail thing not working
/app/views/layouts/application.html.erb
@grimwolf007
Created login page, create user is broken
98ba3f5
@grimwolf007
Athorization works, Forgot to add bcrypt to the gemfile.
a7af91e
@grimwolf007
Changed the Welcome page a bit
1d9d8bf
@grimwolf007
Making new branch
457d2b7
@grimwolf007
reverted, and opened a new branch
80dd26f
@grimwolf007
Not quite working correctly yet
1712043
migration file added
a417e3b
@grimwolf007
Made the login a bit prettier
293d737 
Removed the guard folder for the users, sessions framework from the walk through
@grimwolf007
Added Background image to welcome page.
d53a997
@grimwolf007
Created the stylesheet, fixed the user/create view in the controller
455f04b
@grimwolf007
fixed root
38c4430
@grimwolf007
Added the background
e133daa
@Scogent
configured db tables
acce8d7
@Scogent
Merge branch 'DBcreate' of https://github.com/jdelpizz/guard-app into…
1e1b8b4 
… DBcreate
attempted to set the relationships between the entities in the db, th…
0c20ccb 
…en realized things needed to be changed in the design.
Merge branch 'DBcreate' of https://github.com/Jdelpizz/guard-app into…
279b6e6 
… DBcreate
@Scogent
updated
01fa198
Created spreadsheet branch
72bf2c1
created temporary spreadsheet and view
9cb531a
@Scogent
Merge branch 'DBcreate' of https://github.com/jdelpizz/guard-app into…
2026807 
… DBcreate
@blipscom
Merge pull request #1 from Jdelpizz/database
5160f96 
migrated DB to Spreadsheet
@grimwolf007
Merge branch 'index' into login_design
30c1fcd
@Scogent
Fixed up db tables
928e271
@gwilkening
Merge pull request #3 from Jdelpizz/login_design
8af3890 
Login design
@Scogent
added in foreign key section
843f753
@blipscom
Merge branch 'spreadsheet' into master
6089dc6
@blipscom
Merge pull request #4 from Jdelpizz/master
c231bd9 
Testing merge w/ Master
grimwolf007 and others added 30 commits April 14, 2020 22:39
@grimwolf007
Made test, and fixed
c3778c4
Removed text boxes, added empty dropdown menus
2b5d431
@grimwolf007
All tests work, 83% coverage
d42e3fe
@grimwolf007
fixed the rank table, and added it to cadet
e64300c
@grimwolf007
limited input on some fields
629b160
@mafcontrer
Merge pull request #11 from Jdelpizz/case_insensitive_login
af0e98d 
Made test, and fixed
The User profile now inputs the cadet schedule into the cadets table.
d5a8157
@grimwolf007
added some skeleton tests for adding profile
8b056a8
@grimwolf007
Merge branch 'scheduleParser' of https://github.com/jdelpizz/guard-app …
479fa35 
…into scheduleParser
@grimwolf007
Fixed schedule parser so lesesne and cas save in the same format (hhm…
441fbaa 
…m-hhmm)
@citadeljst
Added user roles and permissions, wrote part of the README
90d475d
@grimwolf007
replaced some flashes with vars
d3bdc4f
@grimwolf007
made create cadet test
77f0750
@grimwolf007
Added rspec expectations, created test to check if things are in db, …
26bb723 
…increased coverage and removed unnessesary code
@grimwolf007
removed the base_cadets in db/seeds, adding new test
140e309
@grimwolf007
finished add_schedule.feature, adding to cadet_action_steps.rb
1c1c0d0
@grimwolf007
added test for the classes table
fcbcd9c
@grimwolf007
the test for checking for classes and enrollments in the database is …
a8d2e7d 
…complete
@grimwolf007
removed the "the db should have my schedule step"
1516ce8
@blipscom
Merge branch 'master' into buglemaster
6218558
@Scogent
Fixed cadets controller
24542be
@Domahawx
Merge pull request #13 from Jdelpizz/buglemaster
8859970 
Buglemaster
@Domahawx
Merge branch 'master' into UserCreate
346cfbc
@Domahawx
Merge pull request #12 from Jdelpizz/UserCreate
6b51753 
User create
@grimwolf007
Fixed typo
16226cd
@grimwolf007
changed username flash to @username
1a15b20
fixed gemlock
33c4be2
adding classes and enrollments
e159691
@grimwolf007
adding spec
fc2030d
@grimwolf007
Merge branch 'master' into dev and reverted some of schedule parser
69937a8
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.
8 participants
@Jdelpizz @Scogent @grimwolf007 @blipscom @gwilkening @mafcontrer @citadeljst @Domahawx