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

114 Commits

Author SHA1 Message Date
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
madd15 518680f23c Add freecheckout for getting first available seat 2015-07-07 12:33:53 +09:30
Vincent Sposato 1b423f5b54 Fixed all issues that were reported by @leobg 
Also, renamed and fixed items of concern by @snipe
Renamed Improvements to Asset Maintenances
 2015-07-06 10:36:54 -04:00
Vincent Sposato 269f73205a Built the report and the export for the Improvements report 
Added the links on the navigation
 2015-06-28 15:00:55 -04:00
Vincent Sposato c28feb56a8 Added all of the routing for the added improvement section 2015-06-27 14:37:11 -04:00
snipe f2e1ec0928 Fixed QR simple view route 2015-06-23 12:59:33 -07:00
snipe 61e3381b24 Backup routes 2015-06-19 17:37:49 -07:00
snipe e4517a8782 Removed checkin for #782, since that doesn't exist in consumables 2015-06-09 19:58:22 -07:00
snipe 19604480bb Consumables section 
TODO:

- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
 2015-06-09 19:50:34 -07:00
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