Commit Graph

  • 91194cdb8e Merged branch Add-SupplierDistributor-Filters-To-Statistics into master master Okechi Onyeje 2017-07-21 16:18:52 -04:00
  • 44f716b568 Added Distributor and Supplier Filters: Remaing Bugs: - @Bug: With trying to select a different filter for supplier or distributor dropdown filtermenu popup closes. - @Bug: When filtering statistics, original chart appears as underlay to new filtered chart - @Bug: When logging out of the dashboard, the user is told there account was cancelled when they werent Add-SupplierDistributor-Filters-To-Statistics Okechi Onyeje 2017-07-21 16:17:30 -04:00
  • a6dcc238cf second commit due to ide error Okechi Onyeje 2017-07-07 17:38:00 -04:00
  • 98f4ef1663 Suppliers and Distributors added Okechi Onyeje 2017-07-07 17:29:48 -04:00
  • 224e224886 Merged branch master into master Okechi Onyeje 2017-05-16 07:42:43 -04:00
  • e273a69c22 Fixed links to homepage' bmv root 2017-05-11 12:59:04 -04:00
  • 1d2cf04806 Minor changes to static pages' colesFixesStatic cole alban 2017-05-11 12:34:08 -04:00
  • 5f33e87dbd Add grade form validation bmv root 2017-05-05 15:30:11 -04:00
  • dbdaec3f31 Included add grade form bmv root 2017-05-05 13:55:37 -04:00
  • 4fe4916ed3 New grade form added bmv root 2017-05-04 12:56:41 -04:00
  • e75d593efb fix merge issues bmv root 2017-04-24 23:20:29 -04:00
  • 58259d5a83 Fixed routes bmv root 2017-04-24 23:19:05 -04:00
  • 87d4a4185f Fixed static pages bmv root 2017-04-24 22:44:30 -04:00
  • d88d5998fd working on nav bar bmv root 2017-04-21 14:52:22 -04:00
  • e007c1040b Merge branch 'Add-Static-Files' of https://github.com/oonyeje/Pearlception_Website_RoR into Add-Static-Files bmv root 2017-04-20 12:30:41 -04:00
  • 86e1dace76 subdomain routing now working to route application to proper app. Add-Static-Files Okechi Onyeje 2017-04-16 16:40:25 -04:00
  • c1653e344c Merge branch 'Add-Static-Files' of https://github.com/oonyeje/Pearlception_Website_RoR into Add-Static-Files bmv root 2017-04-14 18:47:13 -04:00
  • 0413c127e1 fixed product pages bmv root 2017-04-14 18:47:07 -04:00
  • 9c045d129f Fixed Images Being displayed on CDE tab and Services tab Okechi Onyeje 2017-04-14 16:05:12 -04:00
  • cfd5054df6 finish news and contact us bmv root 2017-04-14 14:34:08 -04:00
  • 3b09af772c Fix html bmv root 2017-04-14 14:18:53 -04:00
  • e4d8fa4223 change dashboard controller bmv root 2017-04-14 13:22:48 -04:00
  • 36a0a11771 All static pages included: - Having some trouble including all images - main application for the statistics dashboard still needs a link from static website integrated Okechi Onyeje 2017-04-14 11:33:39 -04:00
  • 0da74c1806 quick fix to alerts in sign up/login Okechi Onyeje 2017-04-06 12:04:38 -04:00
  • 099bd6b8c1 got date filtering js functionality working stats cole m alban 2017-04-05 18:18:24 -04:00
  • 13b4fdb59b Added date filtering cole m alban 2017-04-05 16:57:57 -04:00
  • 8e2d357c3d Started on date filtering for stats cole m alban 2017-04-04 12:20:22 -04:00
  • 0ffa44897a Add date filter bar to stats page cole m alban 2017-03-31 16:09:16 -04:00
  • 129eff3821 Fix merge conflict cole m alban 2017-03-31 14:45:59 -04:00
  • d1c705846c Add flash code to registrations new view cole m alban 2017-03-30 12:50:28 -04:00
  • 730c399b71 adding a tab character Okechi Onyeje 2017-03-30 12:32:36 -04:00
  • 30dd4290c1 Merge remote-tracking branch 'refs/remotes/Pearlception_Website/master' Okechi Onyeje 2017-03-30 12:28:20 -04:00
  • 7f03001238 Added flash messages for company sign up Okechi Onyeje 2017-03-30 12:18:07 -04:00
  • 19d19b5908 Fix missing password sign up bug cole m alban 2017-03-29 16:22:56 -04:00
  • 9e9c471b35 Add exception handling in registrations#create method cole m alban 2017-03-29 16:03:45 -04:00
  • b1bb0f69ad Sign in back to original cole m alban 2017-03-28 13:06:17 -04:00
  • c92bac542d Fix error with double render cole m alban 2017-03-28 13:05:17 -04:00
  • a7aa6b7768 vs code launcher config files Okechi Onyeje 2017-03-17 14:01:37 -04:00
  • 72b547dead Add grade insertion cole m alban 2017-03-03 15:52:03 -05:00
  • 5d35e732fc change setup scripts cole m alban 2017-03-03 11:43:30 -05:00
  • 3efa49e6f3 Basic stats cole m alban 2017-03-03 11:26:00 -05:00
  • e7bee7002c Config basic stats view cole m alban 2017-03-03 10:52:04 -05:00
  • 2c15b6290e Merge branch 'master' into stats cole m alban 2017-03-03 09:57:44 -05:00
  • 6c2d6f4918 Merge branch 'master' of https://github.com/oonyeje/Pearlception_Website_RoR cole m alban 2017-03-03 09:57:31 -05:00
  • e9e19fc037 Setup changed for db cole m alban 2017-03-03 09:57:22 -05:00
  • c3e32ee7ba Add migrate runs script cole m alban 2017-03-01 17:19:38 -05:00
  • 4f1715023b Add initial admin setup cole alban 2017-02-24 15:38:21 -05:00
  • da0d2a215d Finish part 1 of db cole alban 2017-02-24 15:14:15 -05:00
  • edbcd9a0e6 merge conflicts bmv root 2017-02-24 14:56:31 -05:00
  • 9726f8529e Pre merge bmv root 2017-02-24 14:48:43 -05:00
  • b3a80da10f Changes to local bmv root 2017-02-24 14:48:07 -05:00
  • c0b2c96d11 fix mysql cole alban 2017-02-24 14:46:28 -05:00
  • 66dfc7d12c Merged branch Admin-Display-All-Company-Runs into master Okechi Onyeje 2017-02-24 14:39:20 -05:00
  • c2e780ddf5 Admin Global Data view Implemented Admin-Display-All-Company-Runs Okechi Onyeje 2017-02-24 14:37:43 -05:00
  • 4c141c7a2c Added admin global company lookup for result data Okechi Onyeje 2017-02-23 17:09:58 -05:00
  • cbba4fe384 setups script cole m alban 2017-02-23 13:26:27 -05:00
  • eab7216058 Add auto switch to default db for admin user Okechi Onyeje 2017-02-23 12:18:44 -05:00
  • fefd17ae74 Add stats page base cole m alban 2017-02-23 12:17:45 -05:00
  • 4783f37dcc Removed dead code from apartment config file cole m alban 2017-02-23 12:03:59 -05:00
  • 80d4df4b34 Add migration script for aws->local server data migration cole m alban 2017-02-22 16:22:05 -05:00
  • a2d7d91615 Merged branch Create-Grades-Tab-For-Company-Users into master Okechi Onyeje 2017-02-16 16:10:37 -05:00
  • 15492253da Grades Tab implemented for Company Users Okechi Onyeje 2017-02-16 16:10:22 -05:00
  • 1156f37b26 Merged branch Schema-Redirect-By-Company into master Okechi Onyeje 2017-02-16 12:38:43 -05:00
  • f06c2ca057 Mutltiple database pattern for companies integrated Okechi Onyeje 2017-02-16 12:34:29 -05:00
  • ac0ab198cb Merged branch User-Sign-In-Sign-Up into master Okechi Onyeje 2017-02-09 14:09:42 -05:00
  • af447f1493 schema fix Okechi Onyeje 2017-02-09 14:09:35 -05:00
  • 3f5c53d49a Company Driven login and registration implemented User-Sign-In-Sign-Up Okechi Onyeje 2017-02-09 13:28:37 -05:00
  • 72fe53bff2 Db config bmv root 2017-02-02 12:19:28 -05:00
  • 7fe0230c24 update Authentication-Integration-With-DashBoard cole alban 2017-02-02 12:16:48 -05:00
  • 64b26077d2 Merged branch master into User-Sign-In-Sign-Up Okechi Onyeje 2017-02-02 11:46:21 -05:00
  • f76c3a9e2c Merged branch Result-Show-Route into master Okechi Onyeje 2017-01-20 11:48:50 -05:00
  • 3f62c9f03c forgotten files for previous commit Okechi Onyeje 2017-01-20 11:48:10 -05:00
  • 384033bfe6 Added Index Route to Show Result Oysters Okechi Onyeje 2017-01-20 11:47:52 -05:00
  • 36c641d236 Merged branch master into User-Sign-In-Sign-Up Okechi Onyeje 2017-01-20 02:47:16 -05:00
  • e127b930a2 Merged branch Companies into master Okechi Onyeje 2017-01-20 02:40:59 -05:00
  • 7c6cf0f38d Create implemented Company Okechi Onyeje 2017-01-20 02:40:43 -05:00
  • ace1290a76 Changed Index title of dashboard for admins Okechi Onyeje 2017-01-20 02:16:45 -05:00
  • 82876d7e4d Merged branch master into Companies Okechi Onyeje 2017-01-20 01:53:30 -05:00
  • 55b88fabe8 Merged branch Overview-Results-Index into master Okechi Onyeje 2017-01-20 01:51:31 -05:00
  • 2b6452716b Results Index route implemented Okechi Onyeje 2017-01-20 01:51:13 -05:00
  • f2d8ca0338 Companies Views and Controllers somewhat implemented Okechi Onyeje 2017-01-20 01:03:06 -05:00
  • a0177563f3 Merged branch Authentication-Integration-With-DashBoard into master Okechi Onyeje 2017-01-20 00:55:45 -05:00
  • c0564fff14 Added Dashboard Integration and Authentication Okechi Onyeje 2017-01-20 00:51:06 -05:00
  • 9d17166e8f Dashboard integrated but with errors Okechi Onyeje 2017-01-19 15:42:49 -05:00
  • edfee4bc8a Merge remote-tracking branch 'refs/remotes/Pearlception_Website/addViewForViewData' Okechi Onyeje 2017-01-19 09:31:30 -05:00
  • 529a5930d1 Add dashboard view addViewForViewData cole m alban 2017-01-12 16:15:37 -05:00
  • ae1db56380 Merge branch 'master' Okechi Onyeje 2017-01-10 16:52:37 -05:00
  • 6bd9c5416a Fixed issue with JS running twice cole alban 2017-01-09 17:24:17 -05:00
  • 7b5503b5d3 merge master into this branch cole alban 2017-01-09 16:13:12 -05:00
  • 06ff938237 Change db config to use ENV vars cole alban 2017-01-09 15:52:38 -05:00
  • 4ee7e125b0 Merge branch 'master' Okechi Onyeje 2017-01-09 13:50:25 -05:00
  • 14778da673 set up devise for sign up and login Okechi Onyeje 2017-01-09 13:46:23 -05:00
  • 0a79b9515c Add ajax to table view cole m alban 2017-01-06 17:26:33 -05:00
  • 42794a71b8 Update tests remoteDB Cole A 2017-01-04 16:48:33 -05:00
  • c8a1989c11 add env vars support in config Cole A 2017-01-04 16:37:33 -05:00
  • 92b58aa680 Connect remote dbs Cole A 2017-01-04 16:12:58 -05:00
  • 6b68be2b17 Fix db Cole A 2017-01-04 15:13:48 -05:00
  • 9bd32acc3d Update config for remote db Cole A 2017-01-03 17:03:05 -05:00
  • 0dc095aa3f initial rails setup Okechi Onyeje 2017-01-03 15:41:29 -05:00
  • 4f088ec279 Initial commit Okechi Onyeje 2017-01-03 15:31:14 -05:00