72 Commits

Author SHA1 Message Date
Okechi Onyeje
55b88fabe8 Merged branch Overview-Results-Index into master 2017-01-20 01:51:31 -05:00
Okechi Onyeje
2b6452716b Results Index route implemented
- Dashboard overview is the results index
- No filtering based on companies yet
2017-01-20 01:51:13 -05:00
Okechi Onyeje
f2d8ca0338 Companies Views and Controllers somewhat implemented
- Company index route & new route implemented with views
- Company create route has issues
- Company route only accessible to admins
2017-01-20 01:03:06 -05:00
Okechi Onyeje
a0177563f3 Merged branch Authentication-Integration-With-DashBoard into master 2017-01-20 00:55:45 -05:00
Okechi Onyeje
c0564fff14 Added Dashboard Integration and Authentication
- Signin and Signup views still not being shown and defaulting to default
2017-01-20 00:51:06 -05:00
Okechi Onyeje
9d17166e8f Dashboard integrated but with errors
- authentication routes are glitchy
- custom devise views are not being displayed properly
- routing issues and custom fields for devise routes and models
2017-01-19 15:42:49 -05:00
Okechi Onyeje
edfee4bc8a Merge remote-tracking branch 'refs/remotes/Pearlception_Website/addViewForViewData'
Conflicts:
	Pearlception/app/views/layouts/application.html.erb
	Pearlception/config/routes.rb
2017-01-19 09:31:30 -05:00
cole m alban
529a5930d1 Add dashboard view 2017-01-12 16:15:37 -05:00
Okechi Onyeje
ae1db56380 Merge branch 'master'
Conflicts:
	Pearlception/config/routes.rb
2017-01-10 16:52:37 -05:00
cole alban
6bd9c5416a Fixed issue with JS running twice 2017-01-09 17:24:17 -05:00
cole alban
7b5503b5d3 merge master into this branch 2017-01-09 16:13:12 -05:00
cole alban
06ff938237 Change db config to use ENV vars 2017-01-09 15:52:38 -05:00
Okechi Onyeje
4ee7e125b0 Merge branch 'master'
Conflicts:
	Pearlception/db/schema.rb
2017-01-09 13:50:25 -05:00
Okechi Onyeje
14778da673 set up devise for sign up and login
- currently working to add company_id field
2017-01-09 13:46:23 -05:00
cole m alban
0a79b9515c Add ajax to table view 2017-01-06 17:26:33 -05:00
Cole A
42794a71b8 Update tests 2017-01-04 16:48:33 -05:00
Cole A
c8a1989c11 add env vars support in config 2017-01-04 16:37:33 -05:00
Cole A
92b58aa680 Connect remote dbs 2017-01-04 16:12:58 -05:00
Cole A
6b68be2b17 Fix db 2017-01-04 15:13:48 -05:00
Cole A
9bd32acc3d Update config for remote db 2017-01-03 17:03:05 -05:00
Okechi Onyeje
0dc095aa3f initial rails setup 2017-01-03 15:41:29 -05:00
Okechi Onyeje
4f088ec279 Initial commit 2017-01-03 15:31:14 -05:00