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

245 Commits

Author SHA1 Message Date
Brady Wetherington 20eb2df9be Fix to nicen up the layout for the inline-adding and Bootstrapify it. 2015-07-28 14:25:47 -07:00
snipe 1e38ced885 Nicer display of "add new" inline functionality. 
TODO:

Handle validation failures in a less fugly way
 2015-07-28 11:58:45 -07:00
snipe fe2fb63007 Localization strings for inline modals 2015-07-28 11:31:08 -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
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
madd15 2835905398 Fix dup file uploads and layout 2015-07-24 12:24:10 +09:30
snipe 0de1d45492 Merge pull request #944 from madd15/Feature/Additional-Email-Info 
WIP - Feature #709/#606 - Additional Email Info / Expected Checkin Date
 2015-07-23 16:16:19 -07:00
madd15 4f1f21287c Add Expected Checkin Date 2015-07-23 12:37:45 +09:30
madd15 dea23bef45 Add Expected Checkin Date 2015-07-23 11:53:07 +09:30
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 2457003deb Fixed issue found with date being handled incorrectly 
Updated multiple views to reflect this issue
 2015-07-20 21:16:06 -04:00
Vincent Sposato 5ee4eb5871 Update the migration to fix an issue with the improvement_time so it would be an integer 
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
 2015-07-20 21:15:46 -04:00
Vincent Sposato c253000af1 Updated the ImprovementsController to support date formatting for start and completion date on the data table 
Updated the supplier and hardware view views to include the date formatting for start and completion date
 2015-07-20 21:15:33 -04:00
Vincent Sposato c3439b41b8 Updated the view for a hardware asset so that we could see the improvements on an asset 2015-07-20 21:14:51 -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 9d949a5b89 Merge branch '2.0' of github.com:snipe/snipe-it into 2.0 2015-07-20 16:34:55 -07:00
snipe 01c2968388 Revert "Fixes #863 - clickable order number in asset view" 
This reverts commit 0c842fc772.
 2015-07-20 16:34:14 -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 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
snipe 0154f240f3 Fixes JavaScript for edited assets 2015-07-10 22:48:21 -07:00
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 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 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 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
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
snipe a8cb5c1e7d Beginning QR mobile interface 2015-06-30 19:07:44 -07:00
Vincent Sposato b2847811ef Fixed issue found with date being handled incorrectly 
Updated multiple views to reflect this issue
 2015-06-27 17:42:15 -04:00
Vincent Sposato b7f050aa3b Update the migration to fix an issue with the improvement_time so it would be an integer 
Created the view for improvements
Updated messages in language pack for additional items needed
Updated the asset view and supplier view to fix an issue
 2015-06-27 17:15:23 -04:00
Vincent Sposato cc67569425 Updated the ImprovementsController to support date formatting for start and completion date on the data table 
Updated the supplier and hardware view views to include the date formatting for start and completion date
 2015-06-27 15:55:56 -04:00
Vincent Sposato e406dd02ed Updated the view for a hardware asset so that we could see the improvements on an asset 2015-06-27 14:38:12 -04: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 2be1d64de3 Merge remote-tracking branch 'origin/develop' into 1.3.0 2015-06-16 12:56:14 -07:00
snipe c3c4e9def2 Fixes #852 - localized string for file types, added zip and rar for asset upload 2015-06-16 12:54:53 -07:00
snipe 123caf42c2 Merge remote-tracking branch 'origin/develop' into 1.3.0 
# Conflicts:
#	app/views/backend/hardware/labels.blade.php
#	app/views/backend/layouts/default.blade.php
 2015-05-27 11:17:14 -07:00
snipe a80d67c1ff Escaping on labels 2015-05-19 19:37:22 -07:00
snipe 7c95f4231e Fixes #799 - missing text in file delete confirmation 2015-05-14 20:52:19 -07:00
Daniel Nemanic 6e8ad5b085 Generating Asset Name to Label Print 
Added the Asset Name to the Label printing page.
 2015-05-13 10:51:06 +02:00
snipe 51eeee09d7 Fixes bug in #736 for new fields 2015-05-04 11:14:38 -07:00
snipe c8870ddcab Fixes #736 - more fields in bulk edit 2015-05-04 01:30:20 -07:00
snipe c88ce0d14d Fixes for #722 datatables 2015-04-02 14:55:36 -07:00
snipe 33e7ce6761 Fixes for #722 localization 2015-04-02 14:28:11 -07:00
madd15 ff23616bb5 Fix #712 - Change RTD to Deployed if checkedout 2015-04-01 09:36:54 +10:30
Madd15 06b3d6e5ce Fix saveState, change chumper defaults 
Hopefully this will fix the saveState issues
 2015-03-27 16:49:03 +10:30