ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,614 Commits 84 Branches 293 Tags
d581fbc2c8fdeba5cb148dcd9747f34aae4c3a96
Commit Graph

70 Commits

Author SHA1 Message Date
snipe 96e40721b2 Added type to query 2015-03-13 16:50:12 -07:00
snipe 6a89728380 First shot at datatables for assets 2015-03-10 15:06:24 -07:00
snipe 1c333e4a24 Fixes #596 - better routes for checking in multiple items from user 2015-03-04 15:15:38 -08:00
snipe 30db9a2943 Unified asset/accessory acceptance 2015-02-26 18:42:39 -08:00
snipe 97d97fc4df Merge branch 'develop' of github.com:snipe/snipe-it into develop 
Conflicts:
	app/views/backend/categories/edit.blade.php
	app/views/backend/depreciations/edit.blade.php
	app/views/backend/groups/create.blade.php
	app/views/backend/groups/edit.blade.php
	app/views/backend/hardware/bulk.blade.php
	app/views/backend/hardware/checkin.blade.php
	app/views/backend/hardware/checkout.blade.php
	app/views/backend/hardware/edit.blade.php
	app/views/backend/licenses/checkin.blade.php
	app/views/backend/licenses/checkout.blade.php
	app/views/backend/licenses/edit.blade.php
	app/views/backend/locations/edit.blade.php
	app/views/backend/manufacturers/edit.blade.php
	app/views/backend/models/edit.blade.php
	app/views/backend/statuslabels/edit.blade.php
	app/views/backend/suppliers/edit.blade.php
	app/views/frontend/account/change-email.blade.php
	app/views/frontend/account/change-password.blade.php
	app/views/frontend/account/profile.blade.php
	app/views/frontend/auth/forgot-password-confirm.blade.php
	app/views/frontend/auth/signin.blade.php
 2015-02-26 10:26:04 -08:00
madd15 9f3edd701b Fixes #565 - Soft Delete Models and Allow Restore 
Allow models to be deleted and restored which in turn allows deleted
hardware to function when model is deleted.
 2015-02-26 22:35:57 +10:30
snipe 663d5213eb Accessory checkout/checkin routes 2015-02-26 03:08:01 -08:00
snipe 3ba6e45011 Added Accessories scaffolding 2015-02-25 16:31:22 -08:00
snipe 097bb38a23 Fixes #163 - accept acceptance + eula 
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
 2015-02-24 22:15:36 -08:00
snipe 87936a58fa CSV user import 2015-02-18 02:48:16 -08:00
snipe e02bea4275 Fixes #457 - added bulk options to hardware 2015-02-16 18:21:29 -08:00
snipe 24f5cdc743 Fixes #523 - added file uploads to assets 2015-02-16 13:49:51 -08:00
snipe 80e10c4c98 Fixes #387 - sortable asset view by manufacturer 2015-02-11 04:57:59 -08:00
snipe 35a133bbf9 Fixes #382 - allow admins to restore deleted assets 2015-02-11 04:44:39 -08:00
snipe c89be34503 Fixes #329 and #454 - added category asset view 2015-02-11 03:51:01 -08:00
snipe ab1c921443 Requestable assets views and controllers 2015-02-10 23:55:06 -08:00
snipe 3a9cb9ba7a Display uploaded files 2015-02-06 21:31:16 -08:00
snipe 6d0828bfe5 Delete file interface and routes 2015-02-06 20:42:40 -08:00
Mohamed Rashid 533be7f942 fixed #435. using namespace with route groups to increase the readability 2015-01-05 01:24:16 +05:30
Svpernova09 8ec5934af5 Add menu option in dropdown to create new hardware. Add optional parameter in create/hardware route to handle the parameter in the incoming link 2014-12-03 14:04:02 -06:00
Madd15 6d2a073d04 Custom Asset Report 2014-11-12 16:05:59 +10:30
Madd15 02605bdf69 Add Asset Report with Reduced Load Time 2014-11-12 12:03:33 +10:30
Madd15 432e348e56 Add Report Controller and License Report 2014-11-12 12:02:55 +10:30
snipe 6b2d3efe3e Fixes #237 - reporting-only group 2014-11-04 18:21:10 -05:00
snipe 7c97477a53 Added default location to physical hardware 2014-10-16 17:41:56 -04:00
Cordeos Team 8d3d8c86b1 A0.4.3 add asset, license, user, model clone and artisan db migration 2014-08-12 17:25:07 +09:00
Cordeos Team b1fafa7ca4 Added asset, license, user and model cloning 2014-08-12 13:41:17 +09:00
Cordeos Team 0dfc9660ca alpha 0.4.0 release candidate 2014-08-11 17:13:43 +09:00
snipe 89000440f3 Added admin ability to unsuspend locked accounts #changelog 2014-07-16 18:21:22 -04:00
snipe 2825bcb431 Fixed #179 - account page to show assets checked out to the logged in user 2014-07-02 13:55:34 -04:00
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -04:00
snipe 6f42b3045e Resolves #155 2014-06-23 22:09:32 -04:00
Jake McGraw af603f0380 make text below asset tags configurable 2014-05-03 20:06:59 +00:00
Jake McGraw 5cb0a1465e added QR code route for asset controller 
added QR code inclusion on asset controller getView  action/template
 2014-01-28 05:16:57 +00:00
snipe 5ba487d74e Removed CSRF filters - they already run elsewhere 2013-12-13 14:33:42 -05:00
snipe cfd6c4301c Merge pull request #110 from flashingcursor/develop 
Started implementing Datatables ... User table partially implemented.
 2013-12-02 03:09:10 -08:00
Gil Rutkowski a0267db832 Datatables partially implemented on user table. 2013-12-02 00:21:04 -06:00
Desmond Morris 47b065208e Implements first pass at csv exports of reports (#35) 2013-12-01 22:04:56 -05:00
snipe 4142629665 Layout tweaks for mobile - related to #54 2013-11-28 19:22:39 -05:00
snipe d2959e82a1 Redirect to /hardware to finish cleaning up re-routing from #88 2013-11-28 18:47:54 -05:00
snipe d9a37f3822 Fixes #88 2013-11-28 18:31:36 -05:00
snipe 65cd28aad3 Fixes #14 2013-11-27 03:39:28 -05:00
snipe aa38d83ba6 Fixes #63 and #70 2013-11-27 02:38:16 -05:00
snipe 0f0059342c CSRF routing 
Not sure if this method will work
 2013-11-26 12:49:04 -05:00
snipe a345cbd907 Added view for model in routes 2013-11-25 12:40:09 -05:00
snipe 8dd5704697 Added settings 2013-11-22 03:17:55 -05:00
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 67aaeaf7f8 Added route for license view 2013-11-19 17:32:18 -05:00
snipe cab75ed7d6 Added asset view to routes 2013-11-19 05:30:32 -05:00
snipe a28775b9b7 Routes updated for reports 2013-11-18 21:51:02 -05:00