bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2026-09-16 08:31:36 -04:00
Code Issues Projects Releases Wiki Activity
190 Commits 8 Branches 8 Tags
cecb3b1a32f5aa92d2cecdf8d76f8c7dd45d1e52
Commit Graph
66 Commits
Author SHA1 Message Date
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 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 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 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 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 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
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 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
Jason Denney 687cb33974 Added color blocks to grid view 2013-05-26 19:52:40 -04:00
Jason Denney c7974c52e8 Adding color picker for bikes view/forms 2013-05-26 13:31:52 -04:00
Jason Denney 8c864e2006 Measurements will be in inches for the time being 2013-05-25 12:43:55 -04:00
Jason Denney 6d2e7686d6 Remove unneeded if 2013-05-25 11:13:52 -04:00
Jason Denney 9021294c4b Auth by username instead of email 
Added username to User table/model
 2013-05-25 11:08:58 -04:00
John N. Milner b67062fb32 New view to show the current day's check ins 2013-05-23 23:56:18 -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 a00c1ed925 Finished Checkin/out feature for now 
-Checkin/out api methods can be used while signed in
-Added checkout button in Netzke App, which also signs out in addition to checking out.
 2013-05-19 16:41:43 -04:00
Jason Denney 65c8cf8cf1 Fix setting default log action 2013-05-16 22:44:27 -04:00
Jason Denney 81217f1ea8 Give better names to columns, add last name col 2013-05-16 22:41:31 -04:00
Jason Denney bc1eeea16e Make the title of user roles tab 2013-05-16 22:41:00 -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
John N. Milner 55fbd06305 Closes #1 2013-04-04 22:27:54 -04:00
Jason Denney ad26dab160 Finished adding default Bike task list 2013-02-09 22:34:56 -05:00
Jason Denney cd65e34ae1 Altered Bikes view to show a bike's task list. 
Need to create a default task list for all bikes.
 2013-02-09 10:00:46 -05:00
Jason Denney 1fbf183603 Use latest acts_as_loggable, switch to not wrapping bikes_border because, netzke? 2013-02-02 14:26:51 -05:00
Jason Denney 873bccb030 Completed adding transactions 2013-02-02 14:08:42 -05:00
Jason Denney 55d0b8f2f7 Some Transactions view adjustments 
-moved js to customers and users components, in order to use accordion.
-Made the transaction form a little prettier
 2013-01-23 00:09:39 -05:00