bike/BikeShed-1
1
0
Fork 0
mirror of https://github.com/fspc/BikeShed-1.git synced 2025-02-28 08:43:23 -05:00
Code Issues Projects Releases Wiki Activity
365 Commits 8 Branches 8 Tags
Commit Graph

365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brigitte Warner
57f268a4f8 wip fix progress 2014-09-23 17:42:15 -04:00
Brigitte Warner
1b7e40b827 fix merge conflicts 2014-08-18 13:23:29 -04:00
Brigitte Warner
56704fd269 change root route 2014-08-14 21:17:19 -04:00
Brigitte Warner
d50c73c539 only show menu if user signed in 2014-08-14 21:16:55 -04:00
Brigitte Warner
1862f5dbc1 remove unnecessary home button from views 2014-08-14 21:15:59 -04:00
Brigitte Warner
0cc44273d0 remove site controller and views 2014-08-14 21:14:45 -04:00
Brigitte Warner
a4b6ca12f9 define bike on all authenticated pages 2014-08-14 21:08:17 -04:00
Brigitte Warner
9df3dfcfd5 application nav WIP 2014-08-14 20:06:44 -04:00
Brigitte Warner
91a5b7c64c remove unneeded sass-cache 2014-08-07 20:55:44 -04:00
Brigitte Warner
2148fec9f4 add vendor and sass-cache to gitignore 2014-08-07 20:46:26 -04:00
Brigitte Warner
d9ed9feec1 update sign in page with bootstrap 3 2014-08-07 20:43:26 -04:00
Brigitte Warner
c2e2ce5b1b update ruby and gem versions 2014-07-24 20:42:37 -04:00
Brigitte Warner
e1e49cbbb2 update less to sass 2014-07-24 20:42:09 -04:00
Jason Denney
fd5d4798b0 Merge pull request #103 from spacemunkay/denney-fix-user-add-bike 
Fix User being able to add bikes
0.0.2-rc3 		2014-06-12 22:26:30 -04:00
Jason Denney
3e480981c7 Fix User being able to add bikes 2014-06-12 22:24:00 -04:00
Jason Denney
523135ed9f Merge pull request #102 from spacemunkay/denney-fix-edit-redirect 
root path to user edit
0.0.2-rc2 		2014-06-12 21:25:29 -04:00
Jason Denney
5e95ce542c root path to user edit 2014-06-12 21:24:02 -04:00
Jason Denney
a8e0c87d37 Merge pull request #101 from spacemunkay/mobile-ui 
Mobile UI
0.0.2-rc1 		2014-05-04 20:55:41 -04:00
Jason Denney
1b2c0fa378 Submit dates in locale format for time being 
Added jquery date format plugin
 2014-05-04 20:43:46 -04:00
Jason Denney
785e096aea Giving up on checkin tests for now 2014-05-04 11:26:37 -04:00
Jason Denney
5c4007a1be Show add another bike link after creating bike 2014-05-04 11:14:50 -04:00
Jason Denney
b9b6ed5ca0 Remove stray puts in spec 2014-05-04 10:56:29 -04:00
Jason Denney
0605d0f0d9 Fixed creating bike work time entry & added spec 2014-05-04 10:56:14 -04:00
Jason Denney
071815b9fd Fix app layout for mobile devices 2014-05-04 10:34:55 -04:00
Jason Denney
ca3026e7c5 Added delete time entry feature spec 2014-05-03 22:53:27 -04:00
Jason Denney
5e0d678ea1 Finish time entry delete JS/html 2014-05-03 22:08:23 -04:00
Jason Denney
d94c436ba5 Added api/time_entry/delete method 2014-05-03 22:06:56 -04:00
Jason Denney
24facd4dee Time entry actions had the wrong IDs... 2014-05-03 21:48:35 -04:00
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.
 2014-05-03 21:41:33 -04:00
Jason Denney
4ce4bd6597 WIP, rigged up JS/html to delete work entries 2014-05-03 19:29:57 -04:00
Jason Denney
2e21e327ca Home page link to time entries 2014-05-03 19:29:22 -04:00
Jason Denney
57d72c04a7 Fix TimeEntry scope 2014-05-03 19:28:56 -04:00
Jason Denney
4224f0de40 Added Time entries index page 2014-04-27 18:59:50 -04:00
Jason Denney
3d71add637 WIP, adding time entry index page 2014-04-27 15:46:42 -04:00
Jason Denney
7dd556d718 Fixed forwarding on time entry creation 2014-04-27 15:46:13 -04:00
Jason Denney
338905878e feature spec for adding new time entry 2014-04-27 15:07:21 -04:00
Jason Denney
7897795e8b Correct spec description 2014-04-27 14:39:32 -04:00
Jason Denney
00511c5b64 Finish Api/TimeEntries spec, fix bike_id handling 2014-04-27 14:39:11 -04:00
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…
 2014-04-26 20:06:47 -04:00
Jason Denney
c0a9d8c1e5 Return time entry on successful create 2014-04-20 22:56:48 -04:00
Jason Denney
82f38fe35c Actually merge time_entry defaults 2014-04-20 22:56:26 -04:00
Jason Denney
2321197973 If bike selected, forward to bike checklist 2014-04-20 22:56:04 -04:00
Jason Denney
069a11f480 WIP, adding JS and api time entry create 2014-04-19 21:06:29 -04:00
Jason Denney
b30203b750 Allow user select bike worked when adding time 2014-04-19 16:48:10 -04:00
Jason Denney
3e56f2eb19 Updating edit task list page w/ home & bike link 2014-04-19 16:25:15 -04:00
Jason Denney
2d65ebb45f JS Formatting 2014-04-19 16:22:54 -04:00
Jason Denney
80b2b7ff60 Added New Time Entry Front End 2014-04-19 16:20:14 -04:00
Jason Denney
98b136e4f4 Add link to view bike check list when showing bike 2014-03-16 13:50:13 -04:00
Jason Denney
9527725e07 Adding makeshift home button, Added view your bike link 2014-03-16 13:34:56 -04:00
Jason Denney
8f637348cf Fix check in/ check out 2014-03-12 23:35:09 -04:00