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
98 Commits 10 Branches 0 Tags
Commit Graph

98 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Okechi Onyeje
91194cdb8e Merged branch Add-SupplierDistributor-Filters-To-Statistics into master 2017-07-21 16:18:52 -04:00
Okechi Onyeje
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
 2017-07-21 16:17:30 -04:00
Okechi Onyeje
a6dcc238cf second commit due to ide error 2017-07-07 17:38:00 -04:00
Okechi Onyeje
98f4ef1663 Suppliers and Distributors added 2017-07-07 17:29:48 -04:00
Okechi Onyeje
224e224886 Merged branch master into master 2017-05-16 07:42:43 -04:00
bmv root
e273a69c22 Fixed links to homepage' 2017-05-11 12:59:04 -04:00
bmv root
5f33e87dbd Add grade form validation 2017-05-05 15:30:11 -04:00
bmv root
dbdaec3f31 Included add grade form 2017-05-05 13:55:37 -04:00
bmv root
4fe4916ed3 New grade form added 2017-05-04 12:56:41 -04:00
bmv root
e75d593efb fix merge issues 2017-04-24 23:20:29 -04:00
bmv root
58259d5a83 Fixed routes 2017-04-24 23:19:05 -04:00
bmv root
87d4a4185f Fixed static pages 2017-04-24 22:44:30 -04:00
bmv root
d88d5998fd working on nav bar 2017-04-21 14:52:22 -04:00
bmv root
e007c1040b Merge branch 'Add-Static-Files' of https://github.com/oonyeje/Pearlception_Website_RoR into Add-Static-Files 2017-04-20 12:30:41 -04:00
Okechi Onyeje
86e1dace76 subdomain routing now working to route application to proper app. 
- This will need to revamped later on to potentially have a rack app serving the different rails applications and static website.
 2017-04-16 16:40:25 -04:00
bmv root
c1653e344c Merge branch 'Add-Static-Files' of https://github.com/oonyeje/Pearlception_Website_RoR into Add-Static-Files 2017-04-14 18:47:13 -04:00
bmv root
0413c127e1 fixed product pages 2017-04-14 18:47:07 -04:00
Okechi Onyeje
9c045d129f Fixed Images Being displayed on CDE tab and Services tab 
- Still need to connect application for pearlception through subdomain pearlception.domain.com
 2017-04-14 16:05:12 -04:00
bmv root
cfd5054df6 finish news and contact us 2017-04-14 14:34:08 -04:00
bmv root
3b09af772c Fix html 2017-04-14 14:18:53 -04:00
bmv root
e4d8fa4223 change dashboard controller 2017-04-14 13:22:48 -04:00
Okechi Onyeje
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
 2017-04-14 11:33:39 -04:00
Okechi Onyeje
0da74c1806 quick fix to alerts in sign up/login 2017-04-06 12:04:38 -04:00
cole m alban
099bd6b8c1 got date filtering js functionality working 2017-04-05 18:18:24 -04:00
cole m alban
13b4fdb59b Added date filtering 2017-04-05 16:57:57 -04:00
cole m alban
8e2d357c3d Started on date filtering for stats 2017-04-04 12:20:22 -04:00
cole m alban
0ffa44897a Add date filter bar to stats page 2017-03-31 16:09:16 -04:00
cole m alban
129eff3821 Fix merge conflict 2017-03-31 14:45:59 -04:00
cole m alban
d1c705846c Add flash code to registrations new view 2017-03-30 12:50:28 -04:00
Okechi Onyeje
730c399b71 adding a tab character 2017-03-30 12:32:36 -04:00
Okechi Onyeje
30dd4290c1 Merge remote-tracking branch 'refs/remotes/Pearlception_Website/master' 
Conflicts:
	Pearlception/app/controllers/registrations_controller.rb
 2017-03-30 12:28:20 -04:00
Okechi Onyeje
7f03001238 Added flash messages for company sign up 2017-03-30 12:18:07 -04:00
cole m alban
19d19b5908 Fix missing password sign up bug 2017-03-29 16:22:56 -04:00
cole m alban
9e9c471b35 Add exception handling in registrations#create method 2017-03-29 16:03:45 -04:00
cole m alban
b1bb0f69ad Sign in back to original 2017-03-28 13:06:17 -04:00
cole m alban
c92bac542d Fix error with double render 2017-03-28 13:05:17 -04:00
Okechi Onyeje
a7aa6b7768 vs code launcher config files 2017-03-17 14:01:37 -04:00
cole m alban
72b547dead Add grade insertion 2017-03-03 15:52:03 -05:00
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