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

825 Commits

Author SHA1 Message Date
madd15 dea23bef45 Add Expected Checkin Date 2015-07-23 11:53:07 +09:30
madd15 7afcd09651 Add Expected Checkin Date 2015-07-23 10:07:04 +09:30
madd15 2f0f2c5002 Add additional Fields 2015-07-20 14:33:50 +09:30
snipe 0c842fc772 Fixes #863 - clickable order number in asset view 2015-07-16 21:21:09 -07:00
snipe 919df7ed56 Part of #863 - adds order number to asset listing 2015-07-16 19:54:56 -07:00
snipe de62db5e18 Fixes #901 - added notes field to list view 2015-07-16 19:45:10 -07:00
madd15 ba94a57e08 Adjust Manager and Location width 2015-07-16 10:26:53 +09:30
snipe f09ee24975 Merge pull request #908 from madd15/license-delete-modal 
Add title and content to delete modal for License File Uploads
 2015-07-13 09:22:51 -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 0154f240f3 Fixes JavaScript for edited assets 2015-07-10 22:48:21 -07:00
madd15 2841eadc91 Add title and content to delete modal 2015-07-10 09:57:03 +09:30
madd15 616af831a7 Add title and content to delete modal 2015-07-10 09:54:14 +09:30
madd15 1e730078c1 Add file uploads to Users 2015-07-10 09:23:34 +09:30
snipe 0132360e49 Added spinner to show activity during ajax 
TO DO:

- Account for the default state when the page is loaded on edit (currently using onchange)

- If no status or model is selected, return false or something else so that it doesn't try to make the ajax call with no ID
 2015-07-09 08:45:06 -07:00
snipe 15e1774a13 Centered checkboxes for select all 2015-07-09 03:57:20 -07:00
snipe 16b49c25e1 Bringing back the spinner on processing screen 2015-07-09 03:56:18 -07:00
snipe c61adc7041 Partial fix for #851 datatables. Because clear error reporting is apparently for suckers 2015-07-09 03:20:57 -07:00
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 7e5f32c9d8 Merge pull request #898 from madd15/Default-Layout-fix 
Small UI fixes
 2015-07-09 01:17:02 -07:00
snipe 4a5066054b Display bugfixes for #819 2015-07-08 22:38:35 -07:00
snipe 84ffc1a728 Migration for location-specific currency, updated views for #819 
This isn't done yet though. All kinds of busted stuff.
 2015-07-08 20:35:40 -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 c2d63915c3 Fixed insecure font call 2015-07-08 17:48:59 -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 e714def74a Fix Reports showing class="active" 2015-07-08 11:46:11 +09:30
madd15 665ffa6571 Update Hardware Submenu 
Correctly identify the status from the url
 2015-07-08 11:37:20 +09:30
snipe bb7ce83c48 Merge remote-tracking branch 'origin/develop' into 2.0 2015-06-30 22:42:00 -07:00
snipe 3a44a7e8bb Disable logo upload for demo 2015-06-30 22:38:12 -07:00
snipe 588ff742fe Add manufacturer to models listing for clarity 2015-06-30 19:15:43 -07:00
snipe a8cb5c1e7d Beginning QR mobile interface 2015-06-30 19:07:44 -07:00
snipe 1fb2878772 Updated activity report for consumables 2015-06-25 18:47:03 -07:00
snipe 84e130d6aa Fixes #869 - compatibility mode for IE 2015-06-25 16:22:07 -07:00
snipe edfa064fd4 Disable emailing imported users if demo mode 2015-06-23 18:38:21 -07:00
snipe 1aa4841868 Remove extra debugging 2015-06-23 16:30:29 -07:00
snipe bf3cb73070 Include location ID on user import 2015-06-23 15:05:11 -07:00
snipe d77e763f86 Change badge to label 2015-06-23 15:04:35 -07:00
snipe 5266c22890 Show consumable checkout date 2015-06-23 14:10:04 -07:00
snipe 39a3b93537 Pagination on user history 2015-06-23 14:01:48 -07:00
snipe ba13101f64 Bad data language string 2015-06-23 13:48:56 -07:00
snipe ce55b7ab2f Tightened up history snapshot on dashboard 2015-06-23 13:46:06 -07:00
snipe 28a9f90a72 Lazy eager load history for optimized queries 2015-06-23 13:44:49 -07:00
snipe f2a2ccdab4 Nicer display for profile 2015-06-23 12:59:55 -07:00
snipe a43f075ff0 Wider profile box view 2015-06-23 12:46:08 -07:00
snipe 20d35953f1 Remove consumable category 2015-06-23 11:39:17 -07:00
snipe 537630bae4 Removed unneeded stylesheet 2015-06-23 11:33:31 -07:00
snipe 85d6b062f3 Fixed checkbox alignment 2015-06-23 11:32:32 -07:00
snipe 94f8c61720 Fixes #280, #64 and #860 - added license expiration alert 2015-06-23 01:52:06 -07:00
snipe edddf6ae80 Fixes #833 - remove status label field if asset is checked out 2015-06-22 20:01:02 -07:00
snipe ea0f2c5f34 Fixes #833 - remove status label field if asset is checked out 2015-06-22 20:00:28 -07:00
snipe 9abafba180 Updates to consumables view 2015-06-22 17:56:58 -07:00