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

83 Commits

Author SHA1 Message Date
snipe 95279f885b Fixes #759 - populate form with parent location info 2015-05-07 01:51:46 -07:00
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
Madd15 80090a41ec Add Group User View 2015-04-07 13:25:20 +09:30
snipe 5d946b19cb Fixed checkmodel at route level 2015-03-27 17:44:49 -07:00
madd15 a9f15fbcae Convert Categories View to use Datatables, and fix Model View missing comma 2015-03-25 12:03:49 +10:30
madd15 7d266fdc4e Convert Models View to use Datatables 2015-03-25 12:03:48 +10:30
madd15 7f03c7538f Convert Accessories View to use Datatable 2015-03-25 12:03:47 +10:30
madd15 7881e70afb Update Model Check in Hardware Edit and move to API 2015-03-25 12:03:45 +10:30
madd15 3e98f05564 Convert Models and Categories Index to use Datatables 2015-03-25 12:02:32 +10:30
madd15 14aa12eb09 Add Licenses API 2015-03-19 16:53:43 +10:30
madd15 603fccb26c Update Routes for API 2015-03-19 16:07:38 +10:30
madd15 c9628722cb Add check/model route 2015-03-19 11:31:01 +10:30
snipe 46c1f2a28b Server side datatables for user view - needs fix for deleted users 2015-03-16 17:33:41 -07:00
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