oonyeje/Pearlception_Website_RoR
1
0
Fork 0
mirror of https://github.com/oonyeje/Pearlception_Website_RoR.git synced 2025-12-25 03:37:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
60 Commits 10 Branches 0 Tags
Commit Graph

60 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cole m alban
5d35e732fc change setup scripts 2017-03-03 11:43:30 -05:00
cole m alban
3efa49e6f3 Basic stats 2017-03-03 11:26:00 -05:00
cole m alban
e7bee7002c Config basic stats view 2017-03-03 10:52:04 -05:00
cole m alban
2c15b6290e Merge branch 'master' into stats 2017-03-03 09:57:44 -05:00
cole m alban
6c2d6f4918 Merge branch 'master' of https://github.com/oonyeje/Pearlception_Website_RoR 2017-03-03 09:57:31 -05:00
cole m alban
e9e19fc037 Setup changed for db 2017-03-03 09:57:22 -05:00
cole m alban
c3e32ee7ba Add migrate runs script 2017-03-01 17:19:38 -05:00
cole alban
4f1715023b Add initial admin setup 2017-02-24 15:38:21 -05:00
cole alban
da0d2a215d Finish part 1 of db 2017-02-24 15:14:15 -05:00
bmv root
edbcd9a0e6 merge conflicts 2017-02-24 14:56:31 -05:00
bmv root
9726f8529e Pre merge 2017-02-24 14:48:43 -05:00
bmv root
b3a80da10f Changes to local 2017-02-24 14:48:07 -05:00
cole alban
c0b2c96d11 fix mysql 2017-02-24 14:46:28 -05:00
Okechi Onyeje
66dfc7d12c Merged branch Admin-Display-All-Company-Runs into master 2017-02-24 14:39:20 -05:00
Okechi Onyeje
c2e780ddf5 Admin Global Data view Implemented 2017-02-24 14:37:43 -05:00
Okechi Onyeje
4c141c7a2c Added admin global company lookup for result data 
- currently a bug that is not displaying data
 2017-02-23 17:09:58 -05:00
cole m alban
cbba4fe384 setups script 2017-02-23 13:26:27 -05:00
Okechi Onyeje
eab7216058 Add auto switch to default db for admin user 2017-02-23 12:18:44 -05:00
cole m alban
fefd17ae74 Add stats page base 2017-02-23 12:17:45 -05:00
cole m alban
4783f37dcc Removed dead code from apartment config file 2017-02-23 12:03:59 -05:00
cole m alban
80d4df4b34 Add migration script for aws->local server data migration 2017-02-22 16:22:05 -05:00
Okechi Onyeje
a2d7d91615 Merged branch Create-Grades-Tab-For-Company-Users into master 2017-02-16 16:10:37 -05:00
Okechi Onyeje
15492253da Grades Tab implemented for Company Users 2017-02-16 16:10:22 -05:00
Okechi Onyeje
1156f37b26 Merged branch Schema-Redirect-By-Company into master 2017-02-16 12:38:43 -05:00
Okechi Onyeje
f06c2ca057 Mutltiple database pattern for companies integrated 
- When creating a new company as an admin, a new database containing models for Runs, Grades, Results, Machines, and Oysters is migrated and created
- When a user registers, they are automatically switched to their company's db in the server
- When a user signs in they are also automatically swithched
 2017-02-16 12:34:29 -05:00
Okechi Onyeje
ac0ab198cb Merged branch User-Sign-In-Sign-Up into master 2017-02-09 14:09:42 -05:00
Okechi Onyeje
af447f1493 schema fix 2017-02-09 14:09:35 -05:00
Okechi Onyeje
3f5c53d49a Company Driven login and registration implemented 
- Admins identified by serial key they register with
- User's register under a company
 2017-02-09 13:28:37 -05:00
bmv root
72fe53bff2 Db config 2017-02-02 12:19:28 -05:00
Okechi Onyeje
64b26077d2 Merged branch master into User-Sign-In-Sign-Up 2017-02-02 11:46:21 -05:00
Okechi Onyeje
f76c3a9e2c Merged branch Result-Show-Route into master 2017-01-20 11:48:50 -05:00
Okechi Onyeje
3f62c9f03c forgotten files for previous commit 2017-01-20 11:48:10 -05:00
Okechi Onyeje
384033bfe6 Added Index Route to Show Result Oysters 
- set up index route to show osyters of a specific result
- set up index view, controller method, and route
- commented out debug console
 2017-01-20 11:47:52 -05:00
Okechi Onyeje
36c641d236 Merged branch master into User-Sign-In-Sign-Up 2017-01-20 02:47:16 -05:00
Okechi Onyeje
e127b930a2 Merged branch Companies into master 2017-01-20 02:40:59 -05:00
Okechi Onyeje
7c6cf0f38d Create implemented Company 
- Create route and view implemented with minimal info
- index implemented and shows number of registered companies
 2017-01-20 02:40:43 -05:00
Okechi Onyeje
ace1290a76 Changed Index title of dashboard for admins 2017-01-20 02:16:45 -05:00
Okechi Onyeje
82876d7e4d Merged branch master into Companies 2017-01-20 01:53:30 -05:00
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