Ilya Konanykhin
5564a1931f
BikeCsvImporter: import bikes, first step (main code, shop_id)
2017-03-16 15:17:14 +06:00
Ilya Konanykhin
904b824c8b
Create rake task (import:bikes:csv, import:bikes:analyze_csv) & importing class
2017-03-15 15:17:40 +06:00
Ilya Konanykhin
45e14a1070
Fix: user email should be null instead of empty string
2017-01-31 23:46:10 +06:00
Ilya Konanykhin
66fee66db0
Fix: validate username presence & uniqueness
2017-01-26 15:56:28 +06:00
Ilya Konanykhin
5f7eb43f63
Bike photo upload
2017-01-18 18:38:29 +06:00
Ilya Konanykhin
a68e7eca56
User avatar upload at sign up
2017-01-18 17:18:32 +06:00
Jason Denney
3e480981c7
Fix User being able to add bikes
2014-06-12 22:24:00 -04:00
Jason Denney
ca3026e7c5
Added delete time entry feature spec
2014-05-03 22:53:27 -04:00
Jason Denney
5e0d678ea1
Finish time entry delete JS/html
2014-05-03 22:08:23 -04:00
Jason Denney
894423e66f
Fixed bug in user credits available
...
Personal work was counting toward credits, now it’s possible to add a
column to user actions to denote if a user action can count to credits.
2014-05-03 21:41:33 -04:00
Jason Denney
57d72c04a7
Fix TimeEntry scope
2014-05-03 19:28:56 -04:00
Jason Denney
4224f0de40
Added Time entries index page
2014-04-27 18:59:50 -04:00
Jason Denney
1191014471
WIP, cleaned up api/time_entries, added TimeEntry
...
* Added scoped TimeEntry model
* Removed setting defaults in TimeEntry controller
* Still working on tests…
2014-04-26 20:06:47 -04:00
Jason Denney
062ed9c2d1
Added tests for user checkin/checkout on index
2014-03-12 21:52:37 -04:00
Jason Denney
3b904f95f2
Adding api task_lists#show and spec, edit.haml updates
2014-03-09 19:20:00 -04:00
Jason Denney
d0c05a0244
Fix validations for creating a bike, view respond to errors
2014-02-09 18:23:35 -05:00
Jason Denney
83a4e4e9c1
Make bike color not required
2014-02-02 17:10:17 -05:00
Jason Denney
9edb90203c
Remove whitespace
2014-02-02 09:45:18 -05:00
Jason Denney
a11f5a1b91
Needed to add task_list_id as attr_accessible
...
Also improved labels for adding task
2013-11-21 20:36:35 -05:00
Jason Denney
852a00881e
Velocipede changed their wording to CLASS
...
Can't find purpose by name, will have to rely on default ID in case wording is changed.
2013-11-21 19:37:30 -05:00
Jason Denney
ea79c167eb
Don't attempt to show a wheel size if it's blank
2013-11-04 09:38:53 -05:00
Jason Denney
1f9bd4f3a0
Don't validate top tube on bike model
2013-11-03 10:07:53 -05:00
Jason Denney
4aed82cf80
Make wheel size an combobox option on bikes
2013-10-19 15:37:01 -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
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
cecb3b1a32
Changing bike_status to bike_purporse
2013-09-02 14:02:18 -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
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
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
2c548ff63c
User#completed_build_bikes method, and stats page list
2013-06-01 17:11:57 -04:00
Jason Denney
b450baa3dc
merging master
2013-05-30 22:17:18 -04: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
f6f932f63a
Fixing some cancan permission issues… i think
2013-05-30 21:35:39 -04:00
Jason Denney
db1732f7bf
Bug in user_stats queries
2013-05-28 01:34:55 -04:00
Jason Denney
2e08f655ea
Registration form now remembers field values for nested form errors
2013-05-25 09:00:12 -04:00
jnm
3c90c13c3b
Merge pull request #15 from spacemunkay/denney-add-users-roles
...
Changing UserRole to UserRoleJoin
2013-05-23 18:03:59 -07:00
Jason Denney
145a731ed2
Remove puts
2013-05-19 16:44:28 -04:00
Jason Denney
d7755f00ed
Initial stab at check-in feature
2013-05-19 15:43:44 -04:00
John N. Milner
8f988b2cf1
Use self.table_name = instead of set_table_name to avoid deprecation warning
2013-05-10 03:21:13 -04:00
Jason Denney
a614b28558
Make it possible to limit roles by date
2013-04-25 21:38:55 -04:00
Jason Denney
6f6902dd82
Update Ability to get user roles, not role
2013-04-25 21:25:49 -04:00
Jason Denney
a083ed715b
Renamed UserRoles to UserRole Joins, Needed ID column in user_role_joins table
2013-04-24 07:56:02 -04:00
Jason Denney
91bb2ea43e
Changing UserRole to UserRoleJoin
...
Beware, this breaks the view for some reason
2013-04-23 23:21:17 -04:00
John N. Milner
a3fcdec10c
WIP adding user roles view; adding end datetime to user roles
2013-04-18 22:16:13 -04:00
John N. Milner
59e45fa4d3
Initial work on permissions with cancan
2013-04-11 21:14:27 -04:00
John N. Milner
6a29eda8d9
WIP: cancan permissions; it breaks stuff!
2013-04-07 20:44:53 -04:00
