bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-10-31 08:55:36 -04:00
Code Issues Projects Releases Wiki Activity
143 Commits 8 Branches 8 Tags
Commit Graph

102 Commits

Author SHA1 Message Date
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
Jason Denney
761ab81b56 Added reset password api method 2013-05-28 00:25:23 -04:00
Jason Denney
687cb33974 Added color blocks to grid view 2013-05-26 19:52:40 -04:00
Jason Denney
7f029f2a83 Removing commented js 2013-05-26 13:33:35 -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
Jason Denney
a07d6345e8 Mildly better looking signup page w/ errors. 2013-05-25 10:25:12 -04:00
Jason Denney
db6b7ff7da Adjusting how javascript is loaded 
Now js is loaded per controller
 2013-05-25 10:12:03 -04:00
Jason Denney
75734a075c Moving new_user.js to devise/registrations.s 2013-05-25 09:59:49 -04:00
Jason Denney
73bb35de88 Moving bootstrap.js 2013-05-25 09:58:43 -04:00
Jason Denney
8c5132814f New User Sign up now annoys user to input contact info 2013-05-25 09:02:26 -04:00
Jason Denney
2e08f655ea Registration form now remembers field values for nested form errors 2013-05-25 09:00:12 -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
145a731ed2 Remove puts 2013-05-19 16:44:28 -04: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
d7755f00ed Initial stab at check-in feature 2013-05-19 15:43:44 -04:00
Jason Denney
c504252541 Add bootstrap css to login page 2013-05-16 23:40:36 -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
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
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
545c33b953 Added TaskList and Task migrations and models 2013-02-08 22:10:52 -05:00
Jason Denney
ec19c8461d Adding transactions 2013-02-02 14:30:00 -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