Tree: 98a51f51d2

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 '98a51f51d2'

${ noResults }

Commit Graph

76 Commits (98a51f51d2f620e9b03dc87f2212a44618d7ed16)

Author	SHA1	Message	Date
Jason Denney	3e480981c7	Fix User being able to add bikes	11 years ago
Jason Denney	ca3026e7c5	Added delete time entry feature spec	11 years ago
Jason Denney	5e0d678ea1	Finish time entry delete JS/html	11 years ago
Jason Denney	894423e66f	Fixed bug in user credits available Personal work was counting toward credits, now it’s possible to add a column to user actions to denote if a user action can count to credits.	11 years ago
Jason Denney	57d72c04a7	Fix TimeEntry scope	11 years ago
Jason Denney	4224f0de40	Added Time entries index page	11 years ago
Jason Denney	1191014471	WIP, cleaned up api/time_entries, added TimeEntry * Added scoped TimeEntry model * Removed setting defaults in TimeEntry controller * Still working on tests…	11 years ago
Jason Denney	062ed9c2d1	Added tests for user checkin/checkout on index	11 years ago
Jason Denney	3b904f95f2	Adding api task_lists#show and spec, edit.haml updates	11 years ago
Jason Denney	d0c05a0244	Fix validations for creating a bike, view respond to errors	11 years ago
Jason Denney	83a4e4e9c1	Make bike color not required	11 years ago
Jason Denney	9edb90203c	Remove whitespace	11 years ago
Jason Denney	a11f5a1b91	Needed to add task_list_id as attr_accessible Also improved labels for adding task	11 years ago
Jason Denney	852a00881e	Velocipede changed their wording to CLASS Can't find purpose by name, will have to rely on default ID in case wording is changed.	11 years ago
Jason Denney	ea79c167eb	Don't attempt to show a wheel size if it's blank	11 years ago
Jason Denney	1f9bd4f3a0	Don't validate top tube on bike model	11 years ago
Jason Denney	4aed82cf80	Make wheel size an combobox option on bikes	11 years ago
Ron Warholic	86ada003d6	Fixed default sort and added migration for shop_id => Integer	11 years ago
Jason Denney	ec5db646a0	Use models to sort data when possible	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	cecb3b1a32	Changing bike_status to bike_purporse	11 years ago
Jason Denney	a9fb3487a1	Remove unique constraint on bike_serial bike serial index was already removed.	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	ff60fdd67f	Removing nickname from user	12 years ago
Jason Denney	cd41735cee	Bug in User#completed_build_bikes query. inner	12 years ago
Jason Denney	2c548ff63c	User#completed_build_bikes method, and stats page list	12 years ago
Jason Denney	f6f932f63a	Fixing some cancan permission issues… i think	12 years ago
Jason Denney	db1732f7bf	Bug in user_stats queries	12 years ago
Jason Denney	2e08f655ea	Registration form now remembers field values for nested form errors	12 years ago
Jason Denney	145a731ed2	Remove puts	12 years ago
Jason Denney	d7755f00ed	Initial stab at check-in feature	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	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
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
John N. Milner	55fbd06305	Closes #1	12 years ago
Jason Denney	ad26dab160	Finished adding default Bike task list	12 years ago
Jason Denney	545c33b953	Added TaskList and Task migrations and models	12 years ago
Jason Denney	873bccb030	Completed adding transactions	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
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