BikeShed-1

Commit Graph

Author	SHA1	Message	Date
Ron Warholic	83bdaf5973	Removed errant whitespace	11 years ago
Ron Warholic	d94d747373	Merge branch 'master' of https://github.com/spacemunkay/velocipede	11 years ago
Ron Warholic	da176e00ba	Added default values for most add-item forms	11 years ago
Jason Denney	f17c168d1d	Merge pull request #72 from spacemunkay/sorting-and-shop-id-fix-68-63 Sorting and shop id fix 68 63	11 years ago
Ron Warholic	5e042c2577	Added migration file	11 years ago
Jason Denney	bceac0543a	Merge pull request #73 from spacemunkay/denney-min-chars Denney min chars	11 years ago
Jason Denney	3faa19bc0c	Adding min chars to forms	11 years ago
Jason Denney	bbba67d7d5	remove trailing whitespace	11 years ago
Ron Warholic	6cbe0f8b57	Merge branch 'master' of https://github.com/spacemunkay/velocipede	11 years ago
Ron Warholic	86ada003d6	Fixed default sort and added migration for shop_id => Integer	11 years ago
Jason Denney	9a78478f1a	Merge pull request #71 from spacemunkay/sequence-increment-bug-31 Fixed the seeder loading the sql incorrectly; now stubs the index out so...	11 years ago
Jason Denney	8d8058dea0	Comment for bike brands sql insert issue	11 years ago
Ron Warholic	93b8e3b055	Fixed the seeder loading the sql incorrectly; now stubs the index out so it generates the sequence number.	11 years ago
Jason Denney	cfeb6fd1d2	Update README.md Remove mailcatcher instructions since no emails are sent currently.	11 years ago
Jason Denney	ec5db646a0	Use models to sort data when possible	11 years ago
Jason Denney	de266e72d9	Merge pull request #62 from spacemunkay/denney-css-user-sign-up Make user signup easier to read & enter	11 years ago
Jason Denney	67c51068cc	Make user signup easier to read & enter	11 years ago
Jason Denney	8c6513099d	Merge pull request #61 from spacemunkay/denney-move-model-to-bike Moving bike model to the bikes table	11 years ago
Jason Denney	47f616b7b0	Moving bike model to the bikes table Leaving the bike_models table and bikes.bike_model_id column as a backup.	11 years ago
Jason Denney	087325c444	Whoops, only create once… not for every update...	11 years ago
Jason Denney	3c4e5c21c2	Merge pull request #59 from spacemunkay/denney-remove-bike-log-end-date Bike log events are instanteous, remove end_date	11 years ago
Jason Denney	69c01b8225	Bike log events are instanteous, remove end_date	11 years ago
Jason Denney	0aa9c16dbd	Merge pull request #58 from spacemunkay/denney-default-sort-order Set default sort order on users, bikes, userroles	11 years ago
Jason Denney	e491c0530c	Set default sort order on users, bikes, userroles	11 years ago
Jason Denney	3599cc2bbb	Merge pull request #56 from spacemunkay/denney-bike-status-to-purpose Changing bike_status to bike_purporse	11 years ago
Jason Denney	cecb3b1a32	Changing bike_status to bike_purporse	11 years ago
Jason Denney	611b1b1151	Merge pull request #55 from spacemunkay/denney-disable-username-edit set username to read only	11 years ago
Jason Denney	5e80c8866a	set username to read only	11 years ago
Jason Denney	835e73ea97	Merge branch 'master' of github.com:spacemunkay/velocipede	11 years ago
Jason Denney	cb2acd19ba	ignore public/assets	11 years ago
Jason Denney	ee12bfee8a	Merge pull request #54 from spacemunkay/denney-autocomplete-max-chars Changing min_chars for autocomplete to 1 char	11 years ago
Jason Denney	4d008163e1	Changing min_chars for autocomplete to 1 char	11 years ago
Jason Denney	06856f115c	Merge pull request #52 from spacemunkay/denney-remove-bike-serial-constraint Remove unique constraint on bike_serial	11 years ago
Jason Denney	a9fb3487a1	Remove unique constraint on bike_serial bike serial index was already removed.	11 years ago
Jason Denney	869b67d3e4	Merge pull request #50 from spacemunkay/denney-user-roles-by-full-name User roles added by full name instead of username	11 years ago
Jason Denney	cd4f891c95	User roles added by full name instead of username	11 years ago
Jason Denney	71a4bb0af4	Merge pull request #49 from spacemunkay/denney-remove-hours-bike remove hours, created_at, updated_at in bike logs	11 years ago
Jason Denney	f1214ab7e6	remove hours, created_at, updated_at in bike logs	11 years ago
Jason Denney	aaa6fda90c	Merge pull request #48 from spacemunkay/denney-add-end-date-user-timesheet Added end date to user timesheet, removed created & updated	11 years ago
Jason Denney	4a7751959c	Added end date to user timesheet, removed created & updated	11 years ago
Jason Denney	028a45702e	More comments	11 years ago
Jason Denney	1a8b9c9247	Merge pull request #47 from spacemunkay/denney-create-user-sign-in Changed so that user gets checked in after create.	11 years ago
Jason Denney	4e7f3a1761	Changed so that user gets checked in after create.	11 years ago
Jason Denney	a6b41b5560	Merge pull request #46 from spacemunkay/denney-fix-search Fixing search form for bikes updated to netzke 8.4	11 years ago
Jason Denney	4d7634605c	Fixing search form for bikes updated to netzke 8.4 Updated Netzke 8.4, better search styling, case insensitive search, can search associations Fixed mistake where bikes.condition_id was a string… durrrrrr needs to be integer	11 years ago
Jason Denney	cf922be1b1	Quick workflow short term fix	11 years ago
Jason Denney	d755f9971e	Update README.md	12 years ago
Jason Denney	52e67a1182	Adding Made in Bmore to Login	12 years ago
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)	12 years ago
Jason Denney	bccd5f10d7	Updated seeds.rb for PG	12 years ago

... 3 4 5 6 7 ...

415 Commits (c79ec5768499c69ccf120119ee8f053000beab5e) All Branches Search

415 Commits (c79ec5768499c69ccf120119ee8f053000beab5e)

All Branches