Tree: c7974c52e8

denney-disable-on-select

denney-docker

denney-fix-saving-dates

eperez-timeinput

import-csv-task

master

menu-feature

topic-sass

0.0.0

0.0.1

0.0.1-vpede

0.0.2-rc1

0.0.2-rc2

0.0.2-rc3

testver

v0.0.0

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'c7974c52e8'

${ noResults }

Commit Graph

119 Commits (c7974c52e83d4c73f82aee046575dd611586e62c)

 

All Branches   

Search

Author	SHA1	Message	Date
Jason Denney	c7974c52e8	Adding color picker for bikes view/forms	12 years ago
Jason Denney	8c864e2006	Measurements will be in inches for the time being	12 years ago
jnm	3c90c13c3b	Merge pull request #15 from spacemunkay/denney-add-users-roles Changing UserRole to UserRoleJoin	12 years ago
jnm	19adc354a1	Merge pull request #18 from spacemunkay/denney-check-in Denney check in	12 years ago
Jason Denney	145a731ed2	Remove puts	12 years ago
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.	12 years ago
Jason Denney	14973e8334	Merge pull request #17 from spacemunkay/denney-bootstrap-css Add bootstrap css to login page	12 years ago
Jason Denney	d7755f00ed	Initial stab at check-in feature	12 years ago
Jason Denney	c504252541	Add bootstrap css to login page	12 years ago
Jason Denney	65c8cf8cf1	Fix setting default log action	12 years ago
Jason Denney	81217f1ea8	Give better names to columns, add last name col	12 years ago
Jason Denney	bc1eeea16e	Make the title of user roles tab	12 years ago
darmock	f34def2c09	Store role_id as an integer instead of a string	12 years ago
John N. Milner	8f988b2cf1	Use `self.table_name = ` instead of set_table_name to avoid deprecation warning	12 years ago
Jason Denney	1e589322f4	Update README.md Adding link to ExtJS 4.1 download	12 years ago
Jason Denney	be1f52568a	Update README.md Adding link to license	12 years ago
Jason Denney	3f1093bca5	ExtJS version is important	12 years ago
Jason Denney	a614b28558	Make it possible to limit roles by date	12 years ago
Jason Denney	6f6902dd82	Update Ability to get user roles, not role	12 years ago
Jason Denney	a083ed715b	Renamed UserRoles to UserRole Joins, Needed ID column in user_role_joins table	12 years ago
Jason Denney	91bb2ea43e	Changing UserRole to UserRoleJoin Beware, this breaks the view for some reason	12 years ago
John N. Milner	a3fcdec10c	WIP adding user roles view; adding end datetime to user roles	12 years ago
jnm	ac9e5718c7	Merge pull request #14 from spacemunkay/jnm-cancan cancan	12 years ago
John N. Milner	59e45fa4d3	Initial work on permissions with cancan	12 years ago
John N. Milner	6a29eda8d9	WIP: cancan permissions; it breaks stuff!	12 years ago
Jason Denney	ff708d940b	Merge pull request #13 from spacemunkay/jnm-shop-id Add migration to accompany 55fbd06305	12 years ago
John N. Milner	941f7a267b	Add migration to accompany 55fbd06305	12 years ago
Jason Denney	b28780e6c9	Merge pull request #12 from spacemunkay/jnm-shop-id Closes #1	12 years ago
John N. Milner	55fbd06305	Closes #1	12 years ago
Jason Denney	d03194e70e	Merge pull request #11 from spacemunkay/jnm-update-rails Updated to Rails 3.2.13	12 years ago
John N. Milner	a7b8651314	Updated to Rails 3.2.13	12 years ago
Jason Denney	ad26dab160	Finished adding default Bike task list	12 years ago
Jason Denney	cd65e34ae1	Altered Bikes view to show a bike's task list. Need to create a default task list for all bikes.	12 years ago
Jason Denney	545c33b953	Added TaskList and Task migrations and models	12 years ago
Jason Denney	ec19c8461d	Adding transactions	12 years ago
Jason Denney	1fbf183603	Use latest acts_as_loggable, switch to not wrapping bikes_border because, netzke?	12 years ago
Jason Denney	873bccb030	Completed adding transactions	12 years ago
Jason Denney	f95191b3e4	Merge pull request #9 from ahacopahacop/master hack night	12 years ago
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	12 years ago
Ara Hacopian	99e7b26e19	hack night update version change ruby version change gemfile and gemfile.lock url update	12 years ago
Jason Denney	2d51bd1d9a	Creating Transactions works -Need to scope transactions for users -Only Admins should be able to create transactions	12 years ago
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	12 years ago
Jason Denney	31935f6f7e	Nested attributes on Transactions isn't working so well	12 years ago
Jason Denney	d95f51eeca	Created customers	12 years ago
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.	12 years ago
Jason Denney	855565dcc4	Removing everything that is not necessary (keeping them in dev branch)	12 years ago
Jason Denney	a9533e6249	Merge branch 'js_refactor'	12 years ago
Jason Denney	6918520b01	Make create user let users enter address info, only require phone num	12 years ago
Jason Denney	cee461ebd9	Breaking out javascript into js files instead of inline	12 years ago
Jason Denney	c1dbd2b8ec	Merge branch 'master' of github.com:spacemunkay/velocipede	12 years ago