Jason Denney
4d7634605c
Fixing search form for bikes updated to netzke 8.4
Updated Netzke 8.4, better search styling, case insensitive search, can search associations
Fixed mistake where bikes.condition_id was a string… durrrrrr needs to be integer
12 years ago
Jason Denney
cf922be1b1
Quick workflow short term fix
12 years ago
Jason Denney
d755f9971e
Update README.md
12 years ago
Jason Denney
52e67a1182
Adding Made in Bmore to Login
12 years ago
Jason Denney
7736ac5c34
Added credit tracking and stats
Added credit_conversions table so conversions can change over time
Added default credit conversion fixture
Added User#transaction_logs
Added User#total_credits (earned minus spent)
Added User#total_credits_spent (through transaction_logs)
Added User#total_earned_credits (complicated query which finds the conversion rate for a log depending on its created_at date)
12 years ago
Jason Denney
bccd5f10d7
Updated seeds.rb for PG
12 years ago
Jason Denney
f0ce8b7171
Switch DB from sqlite to Postgres
-Postgres for production
-Migrations don't translate well between sqlite and postgres, better to just develop using the same database as production.
-Fixed migrations to work with Postgres
-Updated Readme for PG install instructions
-database config moved to .example
12 years ago
Jason Denney
238a3af7d5
minor change to check for seeding admin
12 years ago
Jason Denney
fee421cabe
not optimal production config, but it works
12 years ago
Jason Denney
f713c6bacd
Forgot to remove nickname from registration form
12 years ago
Jason Denney
ac24711289
Rename User History to User Timesheet
12 years ago
Jason Denney
b89873d0e5
Updating schema file w/ removed user nick
12 years ago
Jason Denney
d431024f01
Adding bike_admin fixture, fixed seeds.rb
12 years ago
Jason Denney
ff60fdd67f
Removing nickname from user
12 years ago
Jason Denney
03abb963ac
Merging Master
12 years ago
Jason Denney
cd41735cee
Bug in User#completed_build_bikes query. inner
12 years ago
Jason Denney
0f89cf057a
Display User roles by username, then full name
Also set the default_fields_for_forms
12 years ago
Jason Denney
8172b04805
12 years ago
Jason Denney
9cb4ed42dc
Update README.md
12 years ago
Jason Denney
7c85e2901f
Changes needed to run in produciton
12 years ago
Jason Denney
2c548ff63c
User#completed_build_bikes method, and stats page list
12 years ago
Jason Denney
1defca3668
Fixing some bike logs permissions
12 years ago
Jason Denney
88d3160e29
Fixing logs add_in_form and search
12 years ago
Jason Denney
edff478204
Reordering Admin tab panel, putting logs last
12 years ago
Jason Denney
84ca3a6f96
Search form requires :field_label when overriding default_fields_for_forms
12 years ago
Jason Denney
51caa93afa
Some js wasn't getting loaded at login. and other fixes
12 years ago
jnm
7a935c250b
Merge pull request #27 from spacemunkay/denney-fix-some-cancan
Fixing some cancan permission issues… i think
12 years ago
Jason Denney
854c8efaa9
only admins can see checkins
12 years ago
Jason Denney
b450baa3dc
merging master
12 years ago
jnm
fa51dd25f3
Merge pull request #24 from spacemunkay/denney-reset-password
Denney reset password
12 years ago
Jason Denney
c9e94d8e30
Merge pull request #21 from spacemunkay/denney-new-user-form
Denney new user form
12 years ago
John N. Milner
c5b16139f5
Merge branch 'master' into denney-new-user-form
Conflicts:
db/schema.rb
12 years ago
Jason Denney
6d76385d11
Merge pull request #20 from spacemunkay/jnm-check-ins-view
New view to show the current day's check ins
12 years ago
Jason Denney
f6f932f63a
Fixing some cancan permission issues… i think
12 years ago
jnm
a18e34c8f1
Merge pull request #22 from spacemunkay/denney-color-picker
Denney color picker
12 years ago
John N. Milner
b25a4520f9
Correct log criteria for Check Ins view
12 years ago
John N. Milner
adeca0e08a
Corrected Check Ins view to show the checked-in user, not the user who logged the check in
12 years ago
Jason Denney
db1732f7bf
Bug in user_stats queries
12 years ago
Jason Denney
d5662284ab
Added link for users to update email/password
12 years ago
Jason Denney
0ef4e81474
Added reset password action column to users comp.
12 years ago
Jason Denney
761ab81b56
Added reset password api method
12 years ago
Jason Denney
687cb33974
Added color blocks to grid view
12 years ago
Jason Denney
7f029f2a83
Removing commented js
12 years ago
Jason Denney
c7974c52e8
Adding color picker for bikes view/forms
12 years ago
Jason Denney
8c864e2006
Measurements will be in inches for the time being
12 years ago
Jason Denney
6d2e7686d6
Remove unneeded if
12 years ago
Jason Denney
9021294c4b
Auth by username instead of email
Added username to User table/model
12 years ago
Jason Denney
a07d6345e8
Mildly better looking signup page w/ errors.
12 years ago
Jason Denney
db6b7ff7da
Adjusting how javascript is loaded
Now js is loaded per controller
12 years ago
Jason Denney
75734a075c
Moving new_user.js to devise/registrations.s
12 years ago