Jason Denney
cb2acd19ba
ignore public/assets
2013-08-28 23:06:02 -04:00
Jason Denney
06856f115c
Merge pull request #52 from spacemunkay/denney-remove-bike-serial-constraint
...
Remove unique constraint on bike_serial
2013-08-17 21:56:07 -07:00
Jason Denney
a9fb3487a1
Remove unique constraint on bike_serial
...
bike serial index was already removed.
2013-08-18 00:51:45 -04:00
Jason Denney
869b67d3e4
Merge pull request #50 from spacemunkay/denney-user-roles-by-full-name
...
User roles added by full name instead of username
2013-08-17 21:04:02 -07:00
Jason Denney
cd4f891c95
User roles added by full name instead of username
2013-08-18 00:00:53 -04:00
Jason Denney
71a4bb0af4
Merge pull request #49 from spacemunkay/denney-remove-hours-bike
...
remove hours, created_at, updated_at in bike logs
2013-08-17 20:43:22 -07:00
Jason Denney
f1214ab7e6
remove hours, created_at, updated_at in bike logs
2013-08-17 23:38:07 -04:00
Jason Denney
aaa6fda90c
Merge pull request #48 from spacemunkay/denney-add-end-date-user-timesheet
...
Added end date to user timesheet, removed created & updated
2013-08-17 20:23:17 -07:00
Jason Denney
4a7751959c
Added end date to user timesheet, removed created & updated
2013-08-17 23:22:07 -04:00
Jason Denney
028a45702e
More comments
2013-08-17 14:07:35 -04:00
Jason Denney
1a8b9c9247
Merge pull request #47 from spacemunkay/denney-create-user-sign-in
...
Changed so that user gets checked in after create.
2013-08-17 11:03:00 -07:00
Jason Denney
4e7f3a1761
Changed so that user gets checked in after create.
2013-08-17 14:01:40 -04:00
Jason Denney
a6b41b5560
Merge pull request #46 from spacemunkay/denney-fix-search
...
Fixing search form for bikes updated to netzke 8.4
2013-08-15 19:07:01 -07:00
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
2013-08-15 22:05:29 -04:00
Jason Denney
cf922be1b1
Quick workflow short term fix
2013-07-28 15:24:02 -04:00
Jason Denney
d755f9971e
Update README.md
2013-06-29 17:20:53 -04:00
Jason Denney
52e67a1182
Adding Made in Bmore to Login
2013-06-29 17:18:51 -04:00
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)
2013-06-29 15:19:38 -04:00
Jason Denney
bccd5f10d7
Updated seeds.rb for PG
2013-06-29 11:45:19 -04:00
Jason Denney
f0ce8b7171
Switch DB from sqlite to Postgres
...
-Postgres for production
-Migrations don't translate well between sqlite and postgres, better to just develop using the same database as production.
-Fixed migrations to work with Postgres
-Updated Readme for PG install instructions
-database config moved to .example
2013-06-25 23:50:34 -04:00
Jason Denney
238a3af7d5
minor change to check for seeding admin
2013-06-25 22:31:29 -04:00
Jason Denney
fee421cabe
not optimal production config, but it works
2013-06-25 22:24:21 -04:00
Jason Denney
f713c6bacd
Forgot to remove nickname from registration form
2013-06-25 22:06:43 -04:00
Jason Denney
ac24711289
Rename User History to User Timesheet
2013-06-13 21:14:42 -04:00
Jason Denney
b89873d0e5
Updating schema file w/ removed user nick
2013-06-13 21:12:34 -04:00
Jason Denney
d431024f01
Adding bike_admin fixture, fixed seeds.rb
2013-06-13 21:11:54 -04:00
Jason Denney
ff60fdd67f
Removing nickname from user
2013-06-13 20:59:01 -04:00
Jason Denney
03abb963ac
Merging Master
2013-06-11 00:38:20 -04:00
Jason Denney
cd41735cee
Bug in User#completed_build_bikes query. inner
2013-06-11 00:35:15 -04:00
Jason Denney
0f89cf057a
Display User roles by username, then full name
...
Also set the default_fields_for_forms
2013-06-11 00:34:45 -04:00
Jason Denney
8172b04805
2013-06-11 00:34:01 -04:00
Jason Denney
9cb4ed42dc
Update README.md
2013-06-10 23:49:39 -04:00
Jason Denney
7c85e2901f
Changes needed to run in produciton
2013-06-02 21:50:22 -04:00
Jason Denney
2c548ff63c
User#completed_build_bikes method, and stats page list
2013-06-01 17:11:57 -04:00
Jason Denney
1defca3668
Fixing some bike logs permissions
2013-06-01 16:32:33 -04:00
Jason Denney
88d3160e29
Fixing logs add_in_form and search
2013-06-01 14:47:20 -04:00
Jason Denney
edff478204
Reordering Admin tab panel, putting logs last
2013-06-01 14:46:59 -04:00
Jason Denney
84ca3a6f96
Search form requires :field_label when overriding default_fields_for_forms
2013-06-01 14:10:18 -04:00
Jason Denney
51caa93afa
Some js wasn't getting loaded at login. and other fixes
2013-06-01 11:39:42 -04:00
jnm
7a935c250b
Merge pull request #27 from spacemunkay/denney-fix-some-cancan
...
Fixing some cancan permission issues… i think
2013-05-30 19:21:37 -07:00
Jason Denney
854c8efaa9
only admins can see checkins
2013-05-30 22:19:00 -04:00
Jason Denney
b450baa3dc
merging master
2013-05-30 22:17:18 -04:00
jnm
fa51dd25f3
Merge pull request #24 from spacemunkay/denney-reset-password
...
Denney reset password
2013-05-30 19:13:49 -07:00
Jason Denney
c9e94d8e30
Merge pull request #21 from spacemunkay/denney-new-user-form
...
Denney new user form
2013-05-30 19:09:10 -07:00
John N. Milner
c5b16139f5
Merge branch 'master' into denney-new-user-form
...
Conflicts:
db/schema.rb
2013-05-30 22:03:53 -04:00
Jason Denney
6d76385d11
Merge pull request #20 from spacemunkay/jnm-check-ins-view
...
New view to show the current day's check ins
2013-05-30 18:39:20 -07:00
Jason Denney
f6f932f63a
Fixing some cancan permission issues… i think
2013-05-30 21:35:39 -04:00
jnm
a18e34c8f1
Merge pull request #22 from spacemunkay/denney-color-picker
...
Denney color picker
2013-05-30 17:21:35 -07:00
John N. Milner
b25a4520f9
Correct log criteria for Check Ins view
2013-05-30 19:52:57 -04:00
John N. Milner
adeca0e08a
Corrected Check Ins view to show the checked-in user, not the user who logged the check in
2013-05-30 19:30:40 -04:00
