Tree: 85129dccaa

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 '85129dccaa'

${ noResults }

Commit Graph

243 Commits (85129dccaa7c6d8c77488c1558fad3bbdc4c0fc1)

 

All Branches   

Search

Author	SHA1	Message	Date
Jason Denney	b450baa3dc	merging master	12 years ago
jnm	fa51dd25f3	Merge pull request #24 from spacemunkay/denney-reset-password Denney reset password	12 years ago
Jason Denney	c9e94d8e30	Merge pull request #21 from spacemunkay/denney-new-user-form Denney new user form	12 years ago
John N. Milner	c5b16139f5	Merge branch 'master' into denney-new-user-form Conflicts: db/schema.rb	12 years ago
Jason Denney	6d76385d11	Merge pull request #20 from spacemunkay/jnm-check-ins-view New view to show the current day's check ins	12 years ago
Jason Denney	f6f932f63a	Fixing some cancan permission issues… i think	12 years ago
jnm	a18e34c8f1	Merge pull request #22 from spacemunkay/denney-color-picker Denney color picker	12 years ago
John N. Milner	b25a4520f9	Correct log criteria for Check Ins view	12 years ago
John N. Milner	adeca0e08a	Corrected Check Ins view to show the checked-in user, not the user who logged the check in	12 years ago
Jason Denney	db1732f7bf	Bug in user_stats queries	12 years ago
Jason Denney	d5662284ab	Added link for users to update email/password	12 years ago
Jason Denney	0ef4e81474	Added reset password action column to users comp.	12 years ago
Jason Denney	761ab81b56	Added reset password api method	12 years ago
Jason Denney	687cb33974	Added color blocks to grid view	12 years ago
Jason Denney	7f029f2a83	Removing commented js	12 years ago
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
Jason Denney	6d2e7686d6	Remove unneeded if	12 years ago
Jason Denney	9021294c4b	Auth by username instead of email Added username to User table/model	12 years ago
Jason Denney	a07d6345e8	Mildly better looking signup page w/ errors.	12 years ago
Jason Denney	db6b7ff7da	Adjusting how javascript is loaded Now js is loaded per controller	12 years ago
Jason Denney	75734a075c	Moving new_user.js to devise/registrations.s	12 years ago
Jason Denney	73bb35de88	Moving bootstrap.js	12 years ago
Jason Denney	8c5132814f	New User Sign up now annoys user to input contact info	12 years ago
Jason Denney	2e08f655ea	Registration form now remembers field values for nested form errors	12 years ago
John N. Milner	b67062fb32	New view to show the current day's check ins	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