bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-04-04 05:33:22 -04:00
Code Issues Projects Releases Wiki Activity

Commit Graph

  • 9cb4ed42dc Update README.md Jason Denney 2013-06-10 23:49:39 -04:00
  • 7c85e2901f Changes needed to run in produciton Jason Denney 2013-06-02 21:50:22 -04:00
  • 2c548ff63c User#completed_build_bikes method, and stats page list Jason Denney 2013-06-01 17:11:57 -04:00
  • 1defca3668 Fixing some bike logs permissions Jason Denney 2013-06-01 16:32:33 -04:00
  • 88d3160e29 Fixing logs add_in_form and search Jason Denney 2013-06-01 14:47:20 -04:00
  • edff478204 Reordering Admin tab panel, putting logs last Jason Denney 2013-06-01 14:46:59 -04:00
  • 84ca3a6f96 Search form requires :field_label when overriding default_fields_for_forms Jason Denney 2013-06-01 14:10:18 -04:00
  • 51caa93afa Some js wasn't getting loaded at login. and other fixes Jason Denney 2013-06-01 11:39:42 -04:00
  • 7a935c250b Merge pull request #27 from spacemunkay/denney-fix-some-cancan jnm 2013-05-30 19:21:37 -07:00
  • 854c8efaa9 only admins can see checkins Jason Denney 2013-05-30 22:19:00 -04:00
  • b450baa3dc merging master Jason Denney 2013-05-30 22:17:18 -04:00
  • fa51dd25f3 Merge pull request #24 from spacemunkay/denney-reset-password jnm 2013-05-30 19:13:49 -07:00
  • c9e94d8e30 Merge pull request #21 from spacemunkay/denney-new-user-form Jason Denney 2013-05-30 19:09:10 -07:00
  • c5b16139f5 Merge branch 'master' into denney-new-user-form John N. Milner 2013-05-30 22:03:53 -04:00
  • 6d76385d11 Merge pull request #20 from spacemunkay/jnm-check-ins-view Jason Denney 2013-05-30 18:39:20 -07:00
  • f6f932f63a Fixing some cancan permission issues… i think Jason Denney 2013-05-30 21:35:39 -04:00
  • a18e34c8f1 Merge pull request #22 from spacemunkay/denney-color-picker jnm 2013-05-30 17:21:35 -07:00
  • b25a4520f9 Correct log criteria for Check Ins view John N. Milner 2013-05-30 19:52:57 -04:00
  • adeca0e08a Corrected Check Ins view to show the checked-in user, not the user who logged the check in John N. Milner 2013-05-30 19:30:40 -04:00
  • db1732f7bf Bug in user_stats queries Jason Denney 2013-05-28 01:34:55 -04:00
  • d5662284ab Added link for users to update email/password Jason Denney 2013-05-28 00:27:34 -04:00
  • 0ef4e81474 Added reset password action column to users comp. Jason Denney 2013-05-28 00:27:03 -04:00
  • 761ab81b56 Added reset password api method Jason Denney 2013-05-28 00:25:23 -04:00
  • 687cb33974 Added color blocks to grid view Jason Denney 2013-05-26 19:52:40 -04:00
  • 7f029f2a83 Removing commented js Jason Denney 2013-05-26 13:33:35 -04:00
  • c7974c52e8 Adding color picker for bikes view/forms Jason Denney 2013-05-26 13:31:52 -04:00
  • 8c864e2006 Measurements will be in inches for the time being Jason Denney 2013-05-25 12:43:55 -04:00
  • 6d2e7686d6 Remove unneeded if Jason Denney 2013-05-25 11:13:52 -04:00
  • 9021294c4b Auth by username instead of email Jason Denney 2013-05-25 11:08:58 -04:00
  • a07d6345e8 Mildly better looking signup page w/ errors. Jason Denney 2013-05-25 10:25:12 -04:00
  • db6b7ff7da Adjusting how javascript is loaded Jason Denney 2013-05-25 10:12:03 -04:00
  • 75734a075c Moving new_user.js to devise/registrations.s Jason Denney 2013-05-25 09:59:49 -04:00
  • 73bb35de88 Moving bootstrap.js Jason Denney 2013-05-25 09:58:43 -04:00
  • 8c5132814f New User Sign up now annoys user to input contact info Jason Denney 2013-05-25 09:02:26 -04:00
  • 2e08f655ea Registration form now remembers field values for nested form errors Jason Denney 2013-05-25 09:00:12 -04:00
  • b67062fb32 New view to show the current day's check ins John N. Milner 2013-05-23 23:56:18 -04:00
  • 3c90c13c3b Merge pull request #15 from spacemunkay/denney-add-users-roles jnm 2013-05-23 18:03:59 -07:00
  • 19adc354a1 Merge pull request #18 from spacemunkay/denney-check-in jnm 2013-05-23 18:01:07 -07:00
  • 145a731ed2 Remove puts Jason Denney 2013-05-19 16:44:28 -04:00
  • a00c1ed925 Finished Checkin/out feature for now Jason Denney 2013-05-19 16:41:43 -04:00
  • 14973e8334 Merge pull request #17 from spacemunkay/denney-bootstrap-css Jason Denney 2013-05-19 12:45:00 -07:00
  • d7755f00ed Initial stab at check-in feature Jason Denney 2013-05-19 15:43:44 -04:00
  • c504252541 Add bootstrap css to login page Jason Denney 2013-05-16 23:40:36 -04:00
  • 65c8cf8cf1 Fix setting default log action Jason Denney 2013-05-16 22:44:27 -04:00
  • 81217f1ea8 Give better names to columns, add last name col Jason Denney 2013-05-16 22:41:31 -04:00
  • bc1eeea16e Make the title of user roles tab Jason Denney 2013-05-16 22:41:00 -04:00
  • f34def2c09 Store role_id as an integer instead of a string darmock 2013-05-10 03:30:54 -04:00
  • 8f988b2cf1 Use self.table_name = instead of set_table_name to avoid deprecation warning John N. Milner 2013-05-10 03:18:36 -04:00
  • 1e589322f4 Update README.md Jason Denney 2013-05-08 10:52:46 -03:00
  • be1f52568a Update README.md Jason Denney 2013-05-08 10:48:34 -03:00
  • 3f1093bca5 ExtJS version is important Jason Denney 2013-05-07 21:34:38 -04:00
  • a614b28558 Make it possible to limit roles by date Jason Denney 2013-04-25 21:38:55 -04:00
  • 6f6902dd82 Update Ability to get user roles, not role Jason Denney 2013-04-25 21:25:49 -04:00
  • 01d1dcdcf1 WIP, got a component enabling/disabling on select. denney-disable-on-select Jason Denney 2013-04-25 21:06:35 -04:00
  • a083ed715b Renamed UserRoles to UserRole Joins, Needed ID column in user_role_joins table Jason Denney 2013-04-24 07:56:02 -04:00
  • 91bb2ea43e Changing UserRole to UserRoleJoin Jason Denney 2013-04-23 23:21:17 -04:00
  • a3fcdec10c WIP adding user roles view; adding end datetime to user roles John N. Milner 2013-04-18 22:16:13 -04:00
  • ac9e5718c7 Merge pull request #14 from spacemunkay/jnm-cancan jnm 2013-04-11 18:18:52 -07:00
  • 59e45fa4d3 Initial work on permissions with cancan John N. Milner 2013-04-11 21:14:27 -04:00
  • 6a29eda8d9 WIP: cancan permissions; it breaks stuff! John N. Milner 2013-04-07 20:44:53 -04:00
  • ff708d940b Merge pull request #13 from spacemunkay/jnm-shop-id Jason Denney 2013-04-07 14:27:42 -07:00
  • 941f7a267b Add migration to accompany 55fbd0630527761077a15988b2229a6afac548e4 John N. Milner 2013-04-07 16:50:53 -04:00
  • b28780e6c9 Merge pull request #12 from spacemunkay/jnm-shop-id Jason Denney 2013-04-04 19:31:14 -07:00
  • 55fbd06305 Closes #1 John N. Milner 2013-04-04 22:27:54 -04:00
  • d03194e70e Merge pull request #11 from spacemunkay/jnm-update-rails Jason Denney 2013-04-04 17:07:00 -07:00
  • a7b8651314 Updated to Rails 3.2.13 John N. Milner 2013-04-04 19:57:59 -04:00
  • ad26dab160 Finished adding default Bike task list Jason Denney 2013-02-09 22:34:56 -05:00
  • cd65e34ae1 Altered Bikes view to show a bike's task list. Jason Denney 2013-02-09 10:00:46 -05:00
  • 545c33b953 Added TaskList and Task migrations and models Jason Denney 2013-02-08 22:10:52 -05:00
  • ec19c8461d Adding transactions Jason Denney 2013-02-02 14:30:00 -05:00
  • 1fbf183603 Use latest acts_as_loggable, switch to not wrapping bikes_border because, netzke? Jason Denney 2013-02-02 14:26:51 -05:00
  • 873bccb030 Completed adding transactions Jason Denney 2013-02-02 14:08:42 -05:00
  • f95191b3e4 Merge pull request #9 from ahacopahacop/master Jason Denney 2013-01-23 09:33:52 -08:00
  • 55d0b8f2f7 Some Transactions view adjustments Jason Denney 2013-01-23 00:09:39 -05:00
  • 99e7b26e19 hack night update version change Ara Hacopian 2013-01-22 20:06:11 -05:00
  • 2d51bd1d9a Creating Transactions works Jason Denney 2013-01-20 16:14:53 -05:00
  • 1b7daa45ca Nested isn't working, another approach, add trans validations Jason Denney 2013-01-20 14:57:43 -05:00
  • 31935f6f7e Nested attributes on Transactions isn't working so well Jason Denney 2013-01-20 13:52:47 -05:00
  • d95f51eeca Created customers Jason Denney 2013-01-20 13:52:19 -05:00
  • 11e738b428 Adding transactions Jason Denney 2013-01-19 15:59:47 -05:00
  • 855565dcc4 Removing everything that is not necessary (keeping them in dev branch) Jason Denney 2013-01-13 14:08:31 -05:00
  • a9533e6249 Merge branch 'js_refactor' Jason Denney 2013-01-13 13:51:49 -05:00
  • 6918520b01 Make create user let users enter address info, only require phone num Jason Denney 2013-01-06 22:43:40 -05:00
  • cee461ebd9 Breaking out javascript into js files instead of inline Jason Denney 2013-01-06 22:41:59 -05:00
  • c1dbd2b8ec Merge branch 'master' of github.com:spacemunkay/velocipede Jason Denney 2013-01-06 17:28:39 -05:00
  • 92f7a3178c Changed tab titles, and removed some redundant panel headers(titles) Jason Denney 2013-01-06 17:28:19 -05:00
  • 960d40ecad Update README.md Jason Denney 2013-01-05 14:55:05 -05:00
  • 40393d882f adding public/images directory Jason Denney 2013-01-05 14:46:53 -05:00
  • aa3658ec63 fix wrong id in fixtures Jason Denney 2013-01-05 14:31:59 -05:00
  • 55584bf003 Update lock Jason Denney 2013-01-05 14:29:00 -05:00
  • a42aba6961 Ignore extjs library, icons, and .DS_Store Jason Denney 2013-01-05 14:19:34 -05:00
  • 9b7ca53f8e remove comment Jason Denney 2013-01-05 14:09:37 -05:00
  • c00c8fa3df Fixed user profiles and added NOTE action to bike_logs Jason Denney 2013-01-05 14:01:26 -05:00
  • b11d04a397 Removing puts and console.logs Jason Denney 2013-01-01 21:06:41 -05:00
  • 3ac630f9f3 Round hours on stats page Jason Denney 2013-01-01 20:49:30 -05:00
  • 665cc9f97a Update stats when user log grid updated, and other stuff Jason Denney 2013-01-01 20:48:57 -05:00
  • 189137ba9d Almost usable, still a lot of work left Jason Denney 2012-12-31 15:38:34 -05:00
  • 922af526c1 Order bike brands and models alphabetically Jason Denney 2012-12-29 16:22:46 -05:00
  • db9982dcd2 Added user roles and authentication, sign in/out Jason Denney 2012-12-29 16:22:24 -05:00
  • bb27c7a585 Removing unused file Jason Denney 2012-12-29 16:19:23 -05:00