Jason Denney
dc60630d2d
On second thought, don't want to default this one.
2013-10-19 18:08:32 -04:00
Ron Warholic
83bdaf5973
Removed errant whitespace
2013-10-19 12:53:28 -04:00
Ron Warholic
d94d747373
Merge branch 'master' of https://github.com/spacemunkay/velocipede
2013-10-19 12:51:10 -04:00
Ron Warholic
da176e00ba
Added default values for most add-item forms
2013-10-19 12:50:38 -04:00
Jason Denney
f17c168d1d
Merge pull request #72 from spacemunkay/sorting-and-shop-id-fix-68-63
...
Sorting and shop id fix 68 63
2013-10-19 07:12:57 -07:00
Jason Denney
3faa19bc0c
Adding min chars to forms
2013-10-19 00:32:08 -04:00
Jason Denney
bbba67d7d5
remove trailing whitespace
2013-10-19 00:31:36 -04:00
Ron Warholic
86ada003d6
Fixed default sort and added migration for shop_id => Integer
2013-10-18 23:44:12 -04:00
Jason Denney
ec5db646a0
Use models to sort data when possible
2013-09-02 18:24:34 -04:00
Jason Denney
67c51068cc
Make user signup easier to read & enter
2013-09-02 18:08:05 -04:00
Jason Denney
8c6513099d
Merge pull request #61 from spacemunkay/denney-move-model-to-bike
...
Moving bike model to the bikes table
2013-09-02 14:28:06 -07:00
Jason Denney
47f616b7b0
Moving bike model to the bikes table
...
Leaving the bike_models table and bikes.bike_model_id column as a backup.
2013-09-02 17:26:07 -04:00
Jason Denney
087325c444
Whoops, only create once… not for every update...
2013-09-02 16:23:58 -04:00
Jason Denney
69c01b8225
Bike log events are instanteous, remove end_date
2013-09-02 15:26:08 -04:00
Jason Denney
e491c0530c
Set default sort order on users, bikes, userroles
2013-09-02 14:16:39 -04:00
Jason Denney
cecb3b1a32
Changing bike_status to bike_purporse
2013-09-02 14:02:18 -04:00
Jason Denney
5e80c8866a
set username to read only
2013-09-02 12:22:26 -04:00
Jason Denney
4d008163e1
Changing min_chars for autocomplete to 1 char
2013-08-28 23:01:29 -04:00
Jason Denney
a9fb3487a1
Remove unique constraint on bike_serial
...
bike serial index was already removed.
2013-08-18 00:51:45 -04:00
Jason Denney
cd4f891c95
User roles added by full name instead of username
2013-08-18 00:00:53 -04:00
Jason Denney
f1214ab7e6
remove hours, created_at, updated_at in bike logs
2013-08-17 23:38:07 -04:00
Jason Denney
4a7751959c
Added end date to user timesheet, removed created & updated
2013-08-17 23:22:07 -04:00
Jason Denney
cf922be1b1
Quick workflow short term fix
2013-07-28 15:24:02 -04:00
Jason Denney
52e67a1182
Adding Made in Bmore to Login
2013-06-29 17:18:51 -04:00
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)
2013-06-29 15:19:38 -04:00
Jason Denney
f713c6bacd
Forgot to remove nickname from registration form
2013-06-25 22:06:43 -04:00
Jason Denney
ac24711289
Rename User History to User Timesheet
2013-06-13 21:14:42 -04:00
Jason Denney
ff60fdd67f
Removing nickname from user
2013-06-13 20:59:01 -04:00
Jason Denney
cd41735cee
Bug in User#completed_build_bikes query. inner
2013-06-11 00:35:15 -04:00
Jason Denney
0f89cf057a
Display User roles by username, then full name
...
Also set the default_fields_for_forms
2013-06-11 00:34:45 -04:00
Jason Denney
8172b04805
2013-06-11 00:34:01 -04:00
Jason Denney
2c548ff63c
User#completed_build_bikes method, and stats page list
2013-06-01 17:11:57 -04:00
Jason Denney
1defca3668
Fixing some bike logs permissions
2013-06-01 16:32:33 -04:00
Jason Denney
88d3160e29
Fixing logs add_in_form and search
2013-06-01 14:47:20 -04:00
Jason Denney
edff478204
Reordering Admin tab panel, putting logs last
2013-06-01 14:46:59 -04:00
Jason Denney
84ca3a6f96
Search form requires :field_label when overriding default_fields_for_forms
2013-06-01 14:10:18 -04:00
Jason Denney
51caa93afa
Some js wasn't getting loaded at login. and other fixes
2013-06-01 11:39:42 -04:00
Jason Denney
854c8efaa9
only admins can see checkins
2013-05-30 22:19:00 -04:00
Jason Denney
b450baa3dc
merging master
2013-05-30 22:17:18 -04:00
jnm
fa51dd25f3
Merge pull request #24 from spacemunkay/denney-reset-password
...
Denney reset password
2013-05-30 19:13:49 -07:00
Jason Denney
c9e94d8e30
Merge pull request #21 from spacemunkay/denney-new-user-form
...
Denney new user form
2013-05-30 19:09:10 -07:00
John N. Milner
c5b16139f5
Merge branch 'master' into denney-new-user-form
...
Conflicts:
db/schema.rb
2013-05-30 22:03:53 -04:00
Jason Denney
6d76385d11
Merge pull request #20 from spacemunkay/jnm-check-ins-view
...
New view to show the current day's check ins
2013-05-30 18:39:20 -07:00
Jason Denney
f6f932f63a
Fixing some cancan permission issues… i think
2013-05-30 21:35:39 -04:00
jnm
a18e34c8f1
Merge pull request #22 from spacemunkay/denney-color-picker
...
Denney color picker
2013-05-30 17:21:35 -07:00
John N. Milner
b25a4520f9
Correct log criteria for Check Ins view
2013-05-30 19:52:57 -04:00
John N. Milner
adeca0e08a
Corrected Check Ins view to show the checked-in user, not the user who logged the check in
2013-05-30 19:30:40 -04:00
Jason Denney
db1732f7bf
Bug in user_stats queries
2013-05-28 01:34:55 -04:00
Jason Denney
d5662284ab
Added link for users to update email/password
2013-05-28 00:27:34 -04:00
Jason Denney
0ef4e81474
Added reset password action column to users comp.
2013-05-28 00:27:03 -04:00
