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
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
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
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
Jason Denney
db1732f7bf
Bug in user_stats queries
2013-05-28 01:34:55 -04:00
Jason Denney
d5662284ab
Added link for users to update email/password
2013-05-28 00:27:34 -04:00
Jason Denney
0ef4e81474
Added reset password action column to users comp.
2013-05-28 00:27:03 -04:00
Jason Denney
761ab81b56
Added reset password api method
2013-05-28 00:25:23 -04:00
Jason Denney
687cb33974
Added color blocks to grid view
2013-05-26 19:52:40 -04:00
Jason Denney
7f029f2a83
Removing commented js
2013-05-26 13:33:35 -04:00
Jason Denney
c7974c52e8
Adding color picker for bikes view/forms
2013-05-26 13:31:52 -04:00
Jason Denney
8c864e2006
Measurements will be in inches for the time being
2013-05-25 12:43:55 -04:00
Jason Denney
6d2e7686d6
Remove unneeded if
2013-05-25 11:13:52 -04:00
Jason Denney
9021294c4b
Auth by username instead of email
...
Added username to User table/model
2013-05-25 11:08:58 -04:00
Jason Denney
a07d6345e8
Mildly better looking signup page w/ errors.
2013-05-25 10:25:12 -04:00
Jason Denney
db6b7ff7da
Adjusting how javascript is loaded
...
Now js is loaded per controller
2013-05-25 10:12:03 -04:00
Jason Denney
75734a075c
Moving new_user.js to devise/registrations.s
2013-05-25 09:59:49 -04:00
Jason Denney
73bb35de88
Moving bootstrap.js
2013-05-25 09:58:43 -04:00
Jason Denney
8c5132814f
New User Sign up now annoys user to input contact info
2013-05-25 09:02:26 -04:00
Jason Denney
2e08f655ea
Registration form now remembers field values for nested form errors
2013-05-25 09:00:12 -04:00
Jason Denney
145a731ed2
Remove puts
2013-05-19 16:44:28 -04:00
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.
2013-05-19 16:41:43 -04:00
Jason Denney
14973e8334
Merge pull request #17 from spacemunkay/denney-bootstrap-css
...
Add bootstrap css to login page
2013-05-19 12:45:00 -07:00
Jason Denney
d7755f00ed
Initial stab at check-in feature
2013-05-19 15:43:44 -04:00
Jason Denney
c504252541
Add bootstrap css to login page
2013-05-16 23:40:36 -04:00
Jason Denney
65c8cf8cf1
Fix setting default log action
2013-05-16 22:44:27 -04:00
Jason Denney
81217f1ea8
Give better names to columns, add last name col
2013-05-16 22:41:31 -04:00
Jason Denney
bc1eeea16e
Make the title of user roles tab
2013-05-16 22:41:00 -04:00
Jason Denney
1e589322f4
Update README.md
...
Adding link to ExtJS 4.1 download
2013-05-08 10:52:46 -03:00
Jason Denney
be1f52568a
Update README.md
...
Adding link to license
2013-05-08 10:48:34 -03:00
Jason Denney
3f1093bca5
ExtJS version is important
2013-05-07 21:34:38 -04:00
Jason Denney
ff708d940b
Merge pull request #13 from spacemunkay/jnm-shop-id
...
Add migration to accompany 55fbd06305
2013-04-07 14:27:42 -07:00
Jason Denney
b28780e6c9
Merge pull request #12 from spacemunkay/jnm-shop-id
...
Closes #1
2013-04-04 19:31:14 -07:00
Jason Denney
d03194e70e
Merge pull request #11 from spacemunkay/jnm-update-rails
...
Updated to Rails 3.2.13
2013-04-04 17:07:00 -07:00
Jason Denney
f95191b3e4
Merge pull request #9 from ahacopahacop/master
...
hack night
2013-01-23 09:33:52 -08:00
Jason Denney
960d40ecad
Update README.md
...
Update install procedure
2013-01-05 14:55:05 -05:00
Jason Denney