Commit Graph

287 Commits

Author SHA1 Message Date
snipe 7b2cf64d7f DB seed info 2013-11-22 03:17:32 -05:00
snipe 60b577166a Added label for setting readability 2013-11-22 03:17:19 -05:00
snipe da93fb18b8 Added settings controller 2013-11-22 03:16:58 -05:00
snipe a3db6ba99c Comment typo 2013-11-22 03:16:44 -05:00
snipe 08db7fbb38 Hurr. Already had a settings table. 2013-11-22 01:07:41 -05:00
snipe 7b9eebe51c Settings table 2013-11-22 00:53:50 -05:00
snipe 8a348ead33 Merge pull request #38 from rashivkp/develop
Develop
2013-11-21 12:30:56 -08:00
Mohamed Rashid fc8c3c086c fixed #37 2013-11-21 20:34:54 +05:30
snipe 5fae91d4e9 Added status label functionality
remember to run artisan DB migrations to make this work
2013-11-20 22:06:41 -05:00
snipe f7cdc8d5c0 Status addition, seeder stuff 2013-11-20 16:57:45 -05:00
snipe de98f20b9c Added status label table 2013-11-20 08:22:36 -05:00
snipe 904a024636 Status table for non-deployed 2013-11-20 08:10:49 -05:00
snipe 261690986a Prevent orphans in categories 2013-11-20 07:43:18 -05:00
snipe 7ada2cc021 Adding soft-delete to manufacturers 2013-11-20 07:33:54 -05:00
snipe 1b5f0e1dd1 Add check to prevent orphaned models 2013-11-20 07:33:41 -05:00
snipe 595f151ff9 Add soft delete to locations - migration 2013-11-20 07:28:34 -05:00
snipe aa34c4a4dd Add checks to prevent orphaned records 2013-11-20 07:28:24 -05:00
snipe 1d04235520 Associated error messages 2013-11-20 07:27:27 -05:00
snipe ed3fd129bf Get the number of models for the depreciation 2013-11-20 07:27:10 -05:00
snipe 53e6d22f83 Soft delete for locations 2013-11-20 07:26:39 -05:00
snipe f3114dec7a Prevent licenses, models and assets from being deleted if they are assigned to something else 2013-11-20 06:48:25 -05:00
snipe d46556a83d Fixed phone display if no value set 2013-11-20 05:56:22 -05:00
snipe 7f77f1e0b1 Better handling for displaying assets that have been soft-deleted so you don't lose their history 2013-11-20 05:55:18 -05:00
snipe 549c0a9fd6 Linked header boxes
Need to add filters on these asset screens to filter avail vs checked out
2013-11-20 04:54:45 -05:00
snipe 84dbb64caf Removed placeholder copy 2013-11-20 04:32:39 -05:00
snipe c93469c465 Fixed query for asset/license header boxes 2013-11-20 04:31:40 -05:00
snipe 781deb2551 Added live counts to the top callout boxes 2013-11-20 04:12:04 -05:00
snipe 44c5817992 Deleted unnecessary crap 2013-11-20 04:11:42 -05:00
snipe 4e9aa99e42 Merge branch 'develop' of github.com:snipe/snipe-it into develop
Conflicts:
	app/views/backend/layouts/default.blade.php
2013-11-20 01:08:50 -05:00
snipe fb9f0d837e More detailed modal confirm 2013-11-20 01:05:55 -05:00
snipe 080f38a899 enable soft-deletes on assets 2013-11-20 01:04:35 -05:00
snipe b00f3430cb Added a check where the system wouldn't blow up if asset isn't found 2013-11-20 00:57:21 -05:00
snipe 97a69625ba Please submit your pull requests to develop - thanks! 2013-11-20 00:57:03 -05:00
snipe 34bbf460ee Added modal confirm-delete 2013-11-20 00:56:39 -05:00
snipe 171346b5ea Merge branch 'refs/heads/Chandu-feature-confirm-deletes' into develop 2013-11-19 22:29:11 -05:00
snipe 61cceb5f0b Fixed open tag in CSS 2013-11-19 22:28:35 -05:00
snipe f7032f0eaa Merge branch 'feature-confirm-deletes' of github.com:Chandu/snipe-it into Chandu-feature-confirm-deletes 2013-11-19 22:19:40 -05:00
Chandu e3160957e6 Added confirmation popups for deletes 2013-11-19 21:37:01 -05:00
snipe 57f5f5705f Merge branch 'refs/heads/develop' 2013-11-19 18:28:46 -05:00
snipe 4e8c3517a7 Tightened up display if admin is deleted 2013-11-19 17:50:20 -05:00
snipe 0ee08e47e9 Fixed fatal error if admin who created the asset was deleted. (This should never happen, but...) 2013-11-19 17:48:53 -05:00
snipe 9c08d6fcf7 weird bug 2013-11-19 17:43:55 -05:00
snipe d6a718e997 Fixed bug in views for created_at date 2013-11-19 17:40:06 -05:00
snipe 8daffa82fe Added logging to license checkin/checkout 2013-11-19 17:32:50 -05:00
snipe 7352eaec2e Helper methods for license view display 2013-11-19 17:32:33 -05:00
snipe 67aaeaf7f8 Added route for license view 2013-11-19 17:32:18 -05:00
snipe 76da83cbe1 Fixed links to edit/checkout 2013-11-19 17:31:52 -05:00
snipe 4929f803cc Added view links to index 2013-11-19 17:31:39 -05:00
snipe 24972a330a Added license view blade 2013-11-19 17:31:23 -05:00
snipe 1b160d251e Tidied up the user view, added more info 2013-11-19 17:13:35 -05:00