Jason Denney
77d7fad3ce
Merge pull request #88 from spacemunkay/grid-sizing-79
...
Added forceFit option to all the grids so they resize nicely
2013-10-19 15:30:08 -07:00
Jason Denney
3bea39b53a
Merge pull request #75 from spacemunkay/default-dropdown-values-67
...
Default dropdown values 67
2013-10-19 15:09:51 -07:00
Jason Denney
4eae374aa9
Fix column title while we're at it
2013-10-19 18:08:55 -04:00
Jason Denney
dc60630d2d
On second thought, don't want to default this one.
2013-10-19 18:08:32 -04:00
Ron Warholic
ba0f84a97c
Added forceFit option to all the grids so they resize nicely
2013-10-19 16:19:27 -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
Ron Warholic
5e042c2577
Added migration file
2013-10-19 10:03:02 -04:00
Jason Denney
bceac0543a
Merge pull request #73 from spacemunkay/denney-min-chars
...
Denney min chars
2013-10-18 21:36:18 -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
6cbe0f8b57
Merge branch 'master' of https://github.com/spacemunkay/velocipede
2013-10-18 23:45:51 -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
9a78478f1a
Merge pull request #71 from spacemunkay/sequence-increment-bug-31
...
Fixed the seeder loading the sql incorrectly; now stubs the index out so...
2013-10-18 19:57:51 -07:00
Jason Denney
8d8058dea0
Comment for bike brands sql insert issue
2013-10-18 22:57:10 -04:00
Ron Warholic
93b8e3b055
Fixed the seeder loading the sql incorrectly; now stubs the index out so it generates the sequence number.
2013-10-18 21:24:44 -04:00
Jason Denney
cfeb6fd1d2
Update README.md
...
Remove mailcatcher instructions since no emails are sent currently.
2013-10-15 16:21:57 -04:00
Jason Denney
ec5db646a0
Use models to sort data when possible
2013-09-02 18:24:34 -04:00
Jason Denney
de266e72d9
Merge pull request #62 from spacemunkay/denney-css-user-sign-up
...
Make user signup easier to read & enter
2013-09-02 15:08:59 -07: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
3c4e5c21c2
Merge pull request #59 from spacemunkay/denney-remove-bike-log-end-date
...
Bike log events are instanteous, remove end_date
2013-09-02 12:28:59 -07:00
Jason Denney
69c01b8225
Bike log events are instanteous, remove end_date
2013-09-02 15:26:08 -04:00
Jason Denney
0aa9c16dbd
Merge pull request #58 from spacemunkay/denney-default-sort-order
...
Set default sort order on users, bikes, userroles
2013-09-02 11:17:08 -07:00
Jason Denney
e491c0530c
Set default sort order on users, bikes, userroles
2013-09-02 14:16:39 -04:00
Jason Denney
3599cc2bbb
Merge pull request #56 from spacemunkay/denney-bike-status-to-purpose
...
Changing bike_status to bike_purporse
2013-09-02 11:03:21 -07:00
Jason Denney
cecb3b1a32
Changing bike_status to bike_purporse
2013-09-02 14:02:18 -04:00
Jason Denney
611b1b1151
Merge pull request #55 from spacemunkay/denney-disable-username-edit
...
set username to read only
2013-09-02 09:23:32 -07:00
Jason Denney
5e80c8866a
set username to read only
2013-09-02 12:22:26 -04:00
Jason Denney
835e73ea97
Merge branch 'master' of github.com:spacemunkay/velocipede
2013-08-28 23:06:14 -04:00
Jason Denney
cb2acd19ba
ignore public/assets
2013-08-28 23:06:02 -04:00
Jason Denney
ee12bfee8a
Merge pull request #54 from spacemunkay/denney-autocomplete-max-chars
...
Changing min_chars for autocomplete to 1 char
2013-08-28 20:03:21 -07:00
Jason Denney
4d008163e1
Changing min_chars for autocomplete to 1 char
2013-08-28 23:01:29 -04:00
Jason Denney
06856f115c
Merge pull request #52 from spacemunkay/denney-remove-bike-serial-constraint
...
Remove unique constraint on bike_serial
2013-08-17 21:56:07 -07: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
869b67d3e4
Merge pull request #50 from spacemunkay/denney-user-roles-by-full-name
...
User roles added by full name instead of username
2013-08-17 21:04:02 -07:00
Jason Denney
cd4f891c95
User roles added by full name instead of username
2013-08-18 00:00:53 -04:00
Jason Denney
71a4bb0af4
Merge pull request #49 from spacemunkay/denney-remove-hours-bike
...
remove hours, created_at, updated_at in bike logs
2013-08-17 20:43:22 -07:00
Jason Denney
f1214ab7e6
remove hours, created_at, updated_at in bike logs
2013-08-17 23:38:07 -04:00
Jason Denney
aaa6fda90c
Merge pull request #48 from spacemunkay/denney-add-end-date-user-timesheet
...
Added end date to user timesheet, removed created & updated
2013-08-17 20:23:17 -07:00
Jason Denney
4a7751959c
Added end date to user timesheet, removed created & updated
2013-08-17 23:22:07 -04:00
Jason Denney
028a45702e
More comments
2013-08-17 14:07:35 -04:00
Jason Denney
1a8b9c9247
Merge pull request #47 from spacemunkay/denney-create-user-sign-in
...
Changed so that user gets checked in after create.
2013-08-17 11:03:00 -07:00
Jason Denney
4e7f3a1761
Changed so that user gets checked in after create.
2013-08-17 14:01:40 -04:00
Jason Denney
a6b41b5560
Merge pull request #46 from spacemunkay/denney-fix-search
...
Fixing search form for bikes updated to netzke 8.4
2013-08-15 19:07:01 -07:00
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
2013-08-15 22:05:29 -04:00
