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
8c864e2006
Measurements will be in inches for the time being
2013-05-25 12:43:55 -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
jnm
19adc354a1
Merge pull request #18 from spacemunkay/denney-check-in
...
Denney check in
2013-05-23 18:01:07 -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
14973e8334
Merge pull request #17 from spacemunkay/denney-bootstrap-css
...
Add bootstrap css to login page
2013-05-19 12:45:00 -07: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
darmock
f34def2c09
Store role_id as an integer instead of a string
2013-05-10 03:30:54 -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
1e589322f4
Update README.md
...
Adding link to ExtJS 4.1 download
2013-05-08 10:52:46 -03:00
Jason Denney
be1f52568a
Update README.md
...
Adding link to license
2013-05-08 10:48:34 -03:00
Jason Denney
3f1093bca5
ExtJS version is important
2013-05-07 21:34:38 -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
jnm
ac9e5718c7
Merge pull request #14 from spacemunkay/jnm-cancan
...
cancan
2013-04-11 18:18:52 -07: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
Jason Denney
ff708d940b
Merge pull request #13 from spacemunkay/jnm-shop-id
...
Add migration to accompany 55fbd0630527761077a15988b2229a6afac548e4
2013-04-07 14:27:42 -07:00
John N. Milner
941f7a267b
Add migration to accompany 55fbd0630527761077a15988b2229a6afac548e4
2013-04-07 16:50:53 -04:00
Jason Denney
b28780e6c9
Merge pull request #12 from spacemunkay/jnm-shop-id
...
Closes #1
2013-04-04 19:31:14 -07:00
John N. Milner
55fbd06305
Closes #1
2013-04-04 22:27:54 -04:00
Jason Denney
d03194e70e
Merge pull request #11 from spacemunkay/jnm-update-rails
...
Updated to Rails 3.2.13
2013-04-04 17:07:00 -07:00
John N. Milner
a7b8651314
Updated to Rails 3.2.13
2013-04-04 19:57:59 -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
f95191b3e4
Merge pull request #9 from ahacopahacop/master
...
hack night
2013-01-23 09:33:52 -08: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
Ara Hacopian
99e7b26e19
hack night update version change
...
ruby version change
gemfile and gemfile.lock url update
2013-01-22 20:06:11 -05:00
Jason Denney
2d51bd1d9a
Creating Transactions works
...
-Need to scope transactions for users
-Only Admins should be able to create transactions
2013-01-20 16:14:53 -05:00
Jason Denney
1b7daa45ca
Nested isn't working, another approach, add trans validations
...
User a transactions border, select the customer from a view of users and customers
2013-01-20 14:57:43 -05:00
Jason Denney
31935f6f7e
Nested attributes on Transactions isn't working so well
2013-01-20 13:52:47 -05:00
Jason Denney
d95f51eeca
Created customers
2013-01-20 13:52:19 -05:00
Jason Denney
11e738b428
Adding transactions
...
-Need to create a customers table to store contact information of customers who are not a user.
-Need to scope "User Transactions" for users, staff, and admin. Need to have a "All Shop Transactions" tab.
-Need to add conditional UX to form.
2013-01-19 15:59:47 -05:00
Jason Denney
855565dcc4
Removing everything that is not necessary (keeping them in dev branch)
2013-01-13 14:08:58 -05:00
Jason Denney
a9533e6249
Merge branch 'js_refactor'
2013-01-13 13:51:49 -05:00
Jason Denney
6918520b01
Make create user let users enter address info, only require phone num
2013-01-06 22:43:40 -05:00
Jason Denney
cee461ebd9
Breaking out javascript into js files instead of inline
2013-01-06 22:41:59 -05:00
