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

141 Commits

Author SHA1 Message Date
snipe e1837069da Allow bulk model update for #1462, fixes #1442 2015-12-09 20:35:24 -08:00
Brady Wetherington e88f5629df Add new form partial and AJAX endpoint for custom fields. 2015-12-01 17:17:32 -08:00
Brady Wetherington 9316af7ed8 Deletion support for fields and fieldsets 2015-11-30 17:09:57 -08:00
snipe e4ceddd6ce Fix for merge conflict on routes 2015-11-30 10:19:37 -08:00
snipe 948e9c2a2b Merge branch 'develop' into custom_fields_adminify 
# Conflicts:
#	app/routes.php
 2015-11-29 17:24:26 -08:00
Brady Wetherington beeb28bf09 Fix routes for custom fields, fix admin access. Helps with #1397 2015-11-28 18:18:53 -08:00
Brady Wetherington 4f3cdc20f5 Start of moving custom fields to the /admin/ space 2015-11-26 13:47:09 -08:00
snipe 1efb1f7038 Remove MAC address fields since they are now custom fields 2015-11-26 13:42:13 -08:00
Brady Wetherington d653126a2a Merge branch 'develop' into custom_fields 
Conflicts:
	app/controllers/admin/AssetsController.php
	app/views/backend/hardware/index.blade.php
	app/views/backend/hardware/view.blade.php
 2015-11-25 14:22:22 -08:00
snipe 120c8394bb Fixes #1380 - groups pagination 2015-11-23 19:18:00 -08:00
Abdullah Alansari c708a24657 Restrict backups to super users 2015-11-19 09:13:20 +03:00
Abdullah Alansari 8fb7d82bab Fix no admin/consumables route 2015-11-18 16:46:29 +03:00
Abdullah Alansari 6bf2a2875f Add initial support for multiple companies 
You can find screenshots and other files
related to the feature on Dropbox here:
https://www.dropbox.com/sh/wugnzqepwgzwlnh/AAAwNWA5hIKrP0y2VTu-LMHHa?dl=0

https://github.com/snipe/snipe-it/issues/23
 2015-11-07 15:22:10 +03:00
snipe bc8c8e4225 Fixes #1012 - more consistency in manufacturer view 2015-11-04 00:48:53 -08:00
snipe e07dcf2598 Added location detail view 2015-11-02 16:45:19 -08:00
Brady Wetherington a67951fbce Merge branch 'develop' into custom_fields 
Conflicts:
	app/controllers/admin/AssetsController.php
	app/views/backend/hardware/index.blade.php
 2015-10-22 02:30:30 -07:00
Brady Wetherington 5890d26545 Terribly rough Custom Fields creation 2015-10-22 00:38:07 -07:00
snipe 9c914e7ef5 New API routes for #1266 2015-10-21 19:09:47 -07:00
snipe b5b8865b36 Locations in bootstrap tables for #1266 2015-10-21 15:43:12 -07:00
snipe b492ac4950 Merge branch 'bootstrap-table-experiment' into develop-bootstrap-tables-integration 
# Conflicts:
#	.gitignore
#	app/controllers/admin/AccessoriesController.php
#	app/controllers/admin/AssetsController.php
#	app/controllers/admin/LicensesController.php
#	app/models/Accessory.php
#	app/models/Asset.php
#	app/routes.php
#	app/views/backend/accessories/index.blade.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/hardware/index.blade.php
#	app/views/backend/licenses/index.blade.php
 2015-10-20 17:52:02 -07:00
snipe 4abe93ae2e Call the artisan command to do import, show output 2015-09-23 02:36:16 -07:00
snipe 586c04354e Starter asset import routes 2015-09-22 20:23:00 -07:00
snipe c12139e624 Added generate and delete backups 2015-09-15 02:05:51 -07:00
madd15 a1c6ea798a matching wording.....so damn picky :P 2015-08-18 16:15:41 +09:30
Aladin Alaily 176469294b Added routes to LDAP 2015-08-13 13:20:30 -04:00
snipe 6ad7a9bb70 Replaced missing route from previous cleanup 2015-08-12 21:50:35 -07:00
root b576fce1f7 Modified files for accessory report. 2015-08-11 16:35:18 -07:00
Vincent Sposato b195934a4a Finished building out the report, and refactoring to make the code more expressive 
Need to finish writing the code to track threads
 2015-08-01 12:20:49 -04:00
Vincent Sposato 8f68bdb318 Working through getting the dataset correctly from the asset logs so that we can generate a report 2015-08-01 12:17:13 -04:00
snipe b79841d481 Fix for @uberbrady's missing route on inline adding 2015-07-28 11:18:18 -07:00
snipe e4ad1011da Merge pull request #969 from snipe/inline_adding 
Inline adding of dependent drop-down contents on asset-creation
 2015-07-27 23:39:07 -07:00
Brady Wetherington de8180ec70 Abililty to inline-add things when you are creating a new asset 2015-07-27 23:27:45 -07:00
snipe a901a648af Fixes #875 - allow user to decline asset and check asset back in if declined 2015-07-26 22:53:48 -07:00
snipe bc7c456f99 Added decline route 2015-07-26 21:22:28 -07:00
Brady Wetherington 28304556a9 First pass at this, the ugly way. Just to see wha it looks like. 2015-07-26 18:15:06 -07:00
snipe 6a5777816c Pulled extra route resources that weren't being used 2015-07-26 17:51:18 -07:00
snipe 442db4b5c8 Removed duplicate routes from previous merge 2015-07-24 16:56:44 -07:00
Vincent Sposato d1d6fe26a6 Fixed all issues that were reported by @leobg 
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
 2015-07-20 21:34:19 -04:00
Vincent Sposato 3df0550b19 Built the report and the export for the Improvements report 
Added the links on the navigation
 2015-07-20 21:26:23 -04:00
Vincent Sposato 0282169703 Added all of the routing for the added improvement section 2015-07-20 21:10:59 -04:00
Brady Wetherington c683c1c57e Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking" 
This reverts commit 41b711740a, reversing
changes made to 55309bfaef.

It also un-reverts reversions that were done inadvertently.
 2015-07-20 17:12:28 -07:00
snipe 41b711740a Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking 
# Conflicts:
#	app/controllers/admin/ReportsController.php
#	app/lang/en/general.php
#	app/routes.php
#	app/views/backend/hardware/view.blade.php
#	app/views/backend/layouts/default.blade.php
#	composer.lock
 2015-07-20 16:12:35 -07:00
snipe aed7036595 Merge pull request #907 from madd15/user-fileuploads 
Feature #746 - Add File Uploads to Users
 2015-07-13 09:22:39 -07:00
snipe 9fbb9746bc Merge pull request #895 from madd15/patch-1 
Add Checkout of first available license to license list view
 2015-07-13 09:22:18 -07:00
snipe 0154f240f3 Fixes JavaScript for edited assets 2015-07-10 22:48:21 -07:00
madd15 1e730078c1 Add file uploads to Users 2015-07-10 09:23:34 +09:30
snipe 6524ac3678 Beginning of #851 - no controller methods yet, but still troubleshooting stupid datatables errors. 
[Error] TypeError: undefined is not an object (evaluating 'f.nTf=a[b].cell')
	jb (jquery.dataTables.min.js, line 24)
	ga (jquery.dataTables.min.js, line 45)
	(anonymous function) (jquery.dataTables.min.js, line 92)
	each (jquery-latest.js, line 383)
	each (jquery-latest.js, line 136)
	o (jquery.dataTables.min.js, line 82)
	(anonymous function) (users, line 371)
	fire (jquery-latest.js, line 3119)
	fireWith (jquery-latest.js, line 3231)
	ready (jquery-latest.js, line 3443)
	completed (jquery-latest.js, line 3474)
 2015-07-09 03:09:18 -07:00
snipe 74429d9075 Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/lang/en/general.php
#	app/start/artisan.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/layouts/default.blade.php
 2015-07-08 18:07:53 -07:00
snipe fd59ca0802 Fixed spacing 2015-07-08 17:33:51 -07:00
snipe de23ec5785 Fixes #544 - disable checking an asset out to a user if it is not a deployable status 2015-07-08 17:18:46 -07:00