Tree: 47f616b7b0

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 '47f616b7b0'

${ noResults }

Commit Graph

69 Commits (47f616b7b08700579cf5ab358d7e384d6828b2df)

Author	SHA1	Message	Date
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	69c01b8225	Bike log events are instanteous, remove end_date	11 years ago
Jason Denney	e491c0530c	Set default sort order on users, bikes, userroles	11 years ago
Jason Denney	cecb3b1a32	Changing bike_status to bike_purporse	11 years ago
Jason Denney	5e80c8866a	set username to read only	11 years ago
Jason Denney	4d008163e1	Changing min_chars for autocomplete to 1 char	11 years ago
Jason Denney	cd4f891c95	User roles added by full name instead of username	11 years ago
Jason Denney	f1214ab7e6	remove hours, created_at, updated_at in bike logs	11 years ago
Jason Denney	4a7751959c	Added end date to user timesheet, removed created & updated	11 years ago
Jason Denney	cf922be1b1	Quick workflow short term fix	11 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)	11 years ago
Jason Denney	ac24711289	Rename User History to User Timesheet	11 years ago
Jason Denney	ff60fdd67f	Removing nickname from user	11 years ago
Jason Denney	0f89cf057a	Display User roles by username, then full name Also set the default_fields_for_forms	11 years ago
Jason Denney	8172b04805		11 years ago
Jason Denney	2c548ff63c	User#completed_build_bikes method, and stats page list	11 years ago
Jason Denney	1defca3668	Fixing some bike logs permissions	11 years ago
Jason Denney	88d3160e29	Fixing logs add_in_form and search	11 years ago
Jason Denney	edff478204	Reordering Admin tab panel, putting logs last	11 years ago
Jason Denney	84ca3a6f96	Search form requires :field_label when overriding default_fields_for_forms	11 years ago
Jason Denney	854c8efaa9	only admins can see checkins	11 years ago
Jason Denney	f6f932f63a	Fixing some cancan permission issues… i think	11 years ago
John N. Milner	b25a4520f9	Correct log criteria for Check Ins view	11 years ago
John N. Milner	adeca0e08a	Corrected Check Ins view to show the checked-in user, not the user who logged the check in	11 years ago
Jason Denney	d5662284ab	Added link for users to update email/password	11 years ago
Jason Denney	0ef4e81474	Added reset password action column to users comp.	11 years ago
Jason Denney	687cb33974	Added color blocks to grid view	11 years ago
Jason Denney	c7974c52e8	Adding color picker for bikes view/forms	11 years ago
Jason Denney	8c864e2006	Measurements will be in inches for the time being	11 years ago
Jason Denney	6d2e7686d6	Remove unneeded if	11 years ago
Jason Denney	9021294c4b	Auth by username instead of email Added username to User table/model	11 years ago
John N. Milner	b67062fb32	New view to show the current day's check ins	11 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.	11 years ago
Jason Denney	65c8cf8cf1	Fix setting default log action	11 years ago
Jason Denney	81217f1ea8	Give better names to columns, add last name col	11 years ago
Jason Denney	bc1eeea16e	Make the title of user roles tab	11 years ago
Jason Denney	a083ed715b	Renamed UserRoles to UserRole Joins, Needed ID column in user_role_joins table	11 years ago
Jason Denney	91bb2ea43e	Changing UserRole to UserRoleJoin Beware, this breaks the view for some reason	11 years ago
John N. Milner	a3fcdec10c	WIP adding user roles view; adding end datetime to user roles	11 years ago
John N. Milner	59e45fa4d3	Initial work on permissions with cancan	11 years ago
John N. Milner	6a29eda8d9	WIP: cancan permissions; it breaks stuff!	11 years ago
John N. Milner	55fbd06305	Closes #1	11 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	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	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