DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15226 commits 97 branches 266 tags 291 MiB
Commit graph

4671 commits

Author SHA1 Message Date
Drew Wilkinson 7f22d3f486 Fix margin for bottom to not be equal to side gutter, looks like a typo 2016-06-07 13:03:21 -04:00
Drew Wilkinson c9d6857c73 Swap bgutter and sgutter as they seem to be reversed. I assume s=side=horizontal and b=bottom=vertical... 2016-06-07 12:39:53 -04:00
Daniel Meltzer 9648c6f1d3 Fix license Checkout. 
A mistake in the sqlite porting led to "Please select an asset"
disappearing.  This centralizes that code in Helper, and uses the code
in Licensescontroller and componentscontroller.

Also use the proper name on the components checkout page.

AssetMaintencesController reuses the same underlying code as
licensescontroller, but we don't want "Please select an asset" to be an
option there, so I'm not changing that code.
 2016-06-07 07:58:08 -05:00
Daniel Meltzer cd9cca9c6b Modify Helper::categoryList() to take a category type parameter. 
This allows for centralizing the category fetching code more and fixes
an error in asset model viewing (#2118).  Also add a few translated
strings and standardize on a base of 'Select a *' for the default value
in our lists.
 2016-06-05 09:47:44 -05:00
snipe fd32f6d4d5 New language strings 2016-06-02 19:01:09 -07:00
snipe 6de6052185 Hardcoded page number to prevent error 2016-06-02 17:17:50 -07:00
snipe 402c955f1c Fixed title 2016-06-02 17:17:42 -07:00
snipe 485fb26393 Fixes #1985 - disallow checkin/checkout if the asset is not in a deployable status 2016-06-02 14:04:54 -07:00
snipe 9551c07528 Fixes #2087 - bad route to maintenance edit 2016-06-02 11:18:17 -07:00
snipe a3e9b3df86 Updated error page title 2016-06-02 02:39:44 -07:00
snipe 89e656e709 Switched to can/cannot for blade 2016-06-02 02:39:36 -07:00
snipe 4998b5ab1b Fixes #2080 2016-06-02 00:15:38 -07:00
Daniel Meltzer 37b416d5c7 Fix my git terrribleness. 2016-06-01 23:00:29 -05:00
Daniel Meltzer c7e695d3fe Revert "Move the breadcrumb thingy back inside the header. Remove it from a list item because it wasn't part of a list" 
This reverts commit 9c77de6473.
 2016-06-01 22:55:37 -05:00
Daniel Meltzer a152b0ae54 Center the logo text on small screens. It's looking more reasonable by the week... 2016-06-01 22:52:25 -05:00
Daniel Meltzer 9c77de6473 Move the breadcrumb thingy back inside the header. Remove it from a list item because it wasn't part of a list 2016-06-01 22:41:11 -05:00
Daniel Meltzer 71ca17649c Improvements? 2016-06-01 22:30:12 -05:00
Daniel Meltzer d85d3b14f7 More layout fixes for small devices. 2016-06-01 21:37:03 -05:00
Daniel Meltzer 5d206f2c20 Fix navbar spacing on screen and mobile. Move the items on the left of the navbar to their own list. Style fixes. Move breadcrumb to outside navbar because it was breaking things and I think it looks better 2016-06-01 20:10:19 -05:00
Daniel Meltzer 2ff1ee4d33 Fix some indentaiton and a missing tag, no functionality changes here. 2016-06-01 20:10:19 -05:00
snipe e0c07d8921 Language strings for email/username format 2016-06-01 15:44:29 -07:00
snipe 99f6207a69 Added macro for email/username format 2016-06-01 15:44:16 -07:00
snipe d786be4fc0 Use local fontawesome and added select2 2016-06-01 15:43:55 -07:00
snipe 8a7a659a87 Added email domain, email format and username format to settings/setup form 2016-06-01 15:43:39 -07:00
snipe 45d3d90c94 Merge pull request #2067 from dmeltzer/ajax-mobile-upload-PR 
Mobile-Friendly image capture/upload + Ajax rewrite of asset create
 2016-06-01 11:34:42 -07:00
snipe a9870db83f Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-31 21:16:40 -07:00
snipe 697ed0d53c Fixes UAT for User 
Needed to specify form name to prevent focus in asset tag search from being submitted
 2016-05-31 21:16:30 -07:00
Daniel Meltzer b3454b1c24 Fix bug in image process logic that wouldn't resize the height. Also make it possible to choose files from android as well as pictures directly. 2016-05-31 19:50:58 -05:00
Daniel Meltzer fcc79456fd Play with a mobile friendly capture-image-from device when adding an asset. This also involved rewriting the upload to be all ajaxy and stuff 2016-05-31 19:50:58 -05:00
Daniel Meltzer dab2a50982 Only display errors in import table if things actually prevent the asset from being created. Also some table formatting improvements. 2016-05-31 18:04:01 -05:00
snipe c9d00b1f06 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-31 14:27:39 -07:00
snipe 9bb258bb99 Updated alt tag 2016-05-31 14:27:33 -07:00
Daniel Meltzer 004c63cd5d Improve web imported. Show a list of all items with that were not imported correctly after import. Modify ObjectImporter and add a web-import parameter that causes it to spit out json errors exclusively. Long term I want to separate the console command and the logic so we aren't calling the console command directly, but rather a class that does everything. This would allow for easier progress reports and ajaxification. 2016-05-26 21:29:29 -05:00
snipe c89f357e4a Fixes #2082 
LOL whoops
 2016-05-25 13:32:33 -07:00
snipe 8a968b4dfb Responsive dashboard table 2016-05-24 19:04:56 -07:00
snipe 9aff515c0a More mobile fixes 2016-05-24 18:50:54 -07:00
snipe 5f91329397 Some responsive fixes 
Still needs work tho :(
 2016-05-24 17:59:02 -07:00
snipe 0c33575962 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-24 16:10:45 -07:00
snipe 84edc9cf25 New generated JS 2016-05-24 16:10:04 -07:00
Daniel Meltzer 293b8c0dea Fix strings for StatusLabels, they still referenced locations. 2016-05-24 17:54:44 -05:00
snipe 5bceb5ce52 Display escaped parsedown note 2016-05-24 10:21:45 -07:00
snipe f844bf4b41 Nicer focus handling for asset search 2016-05-24 01:10:05 -07:00
snipe 6e006a6873 Redundant top nav 2016-05-24 00:58:59 -07:00
snipe fb35e40342 Search by asset tag 
Compatible with barcode scanners
 2016-05-20 17:02:28 -07:00
snipe b796e72faf Remove old search 2016-05-20 16:01:23 -07:00
snipe 7fd6051514 Fixes #2062 - old permissions masks to new 2016-05-20 12:23:31 -07:00
snipe 975b266cb0 Icon display on recent activity 2016-05-20 01:17:00 -07:00
snipe aad1ba4ab3 Updated language strings 2016-05-20 00:47:03 -07:00
snipe 6b5d0a5abf Translations and nicer formatting for login/password reset 2016-05-20 00:25:45 -07:00
snipe be0a60e049 Updated strings 2016-05-19 23:27:08 -07:00
snipe 3d1f051e16 Remove demo login info 2016-05-19 23:21:01 -07:00
snipe 66beeeb26d Added notes back to asset file uploads 2016-05-19 23:12:27 -07:00
snipe cbcc155f27 Settings tweaks 2016-05-19 19:49:25 -07:00
snipe 15eb6df1db Add settings for alert interval threshold and inventory threshold 2016-05-19 19:33:53 -07:00
snipe 29e54830e1 Added 2D barcodes to labels 2016-05-19 19:12:42 -07:00
snipe b2b3b3d5ad Hide bulk attributes for components (for now) 2016-05-18 20:39:53 -07:00
snipe 5333c7083a More dashboard fixes 2016-05-18 19:48:19 -07:00
snipe c1c7fa143d Components display on assets page 2016-05-18 19:26:50 -07:00
snipe fb26188e41 Fixed dashboard for components 2016-05-18 19:16:43 -07:00
snipe 47c70141c7 Gross copypasta fix for #1932 2016-05-18 19:08:16 -07:00
snipe 4ba2b89940 Add MS Excel as export 
Excel does not work in Safari - known webkit issue, no fix :(
 2016-05-18 18:14:40 -07:00
snipe 0780f97807 Add multisort to assets 2016-05-18 16:48:46 -07:00
snipe b0b7cfa999 Better handling for show/hide columns in depreciation report 2016-05-18 16:06:29 -07:00
snipe 7ee13113e0 Add depreciation name and months to depreciation report 2016-05-18 15:59:54 -07:00
snipe ed9c6183c1 Updated language files 2016-05-16 21:54:13 -07:00
snipe e552c36a0a Add model_no, item_no, and manufacturer to consumables 2016-05-16 17:11:31 -07:00
snipe 5b829884b8 Remove commented out js 2016-05-14 15:06:27 -07:00
snipe 8b0393ab52 Fontawesome animations 2016-05-14 15:06:16 -07:00
snipe f4490b14f8 [Feature] Re-order custom fields (drag and drop) 2016-05-14 14:06:59 -07:00
snipe 72d54bdb88 Fixed formatting on license checkin/checkout 2016-05-12 21:03:53 -07:00
snipe a726934cde Fixed bulk delete+checkin for users 2016-05-12 21:01:31 -07:00
snipe ae0e7b9078 Updatd documentation links, use https 2016-05-12 18:06:19 -07:00
snipe b9b8149234 Minor backups fixes 2016-05-12 16:20:23 -07:00
snipe 6d91774943 [Feature Request] Fixes #2030 - allow asset name change on checkin 2016-05-12 12:34:44 -07:00
snipe a96947efa9 Possible fix for #2037 
via https://github.com/laravel/framework/issues/8565#issuecomment-151171239
 2016-05-12 12:06:22 -07:00
snipe ae8a03fec3 Add manufacturer name/sorting/searching on assets 2016-05-12 10:38:57 -07:00
snipe c56c398d4c Fixes #1996 - replace old Sentry methods with laravel native 2016-05-09 15:40:27 -07:00
snipe d40289fbc9 Fixes #1997 and #1996 - replace sentry functions 2016-04-28 21:59:43 -07:00
snipe e6cbafe5ff Suppress console warning 2016-04-28 20:19:31 -07:00
snipe 449163c875 Fixes #1995 - updated group admin to use native permissions 2016-04-28 14:03:54 -07:00
snipe 97a91e2d83 Fix setting namespace 2016-04-25 12:15:41 -07:00
snipe 898d9ad025 [Feature] Added Supplier and Assigned to in asset email alert 
[Bugfix] Fixed escaping for email templates for L5.2
 2016-04-23 04:04:03 -07:00
snipe b250e2b5f0 [Bugfix] Fixed escaping for email templates for L5.2 2016-04-23 04:03:26 -07:00
snipe 1b5ef695f2 Add custom fields to modals in create asset 2016-04-23 03:12:31 -07:00
snipe 30c6657fc1 Fixes date selector box 2016-04-23 02:36:08 -07:00
snipe 895fbb76bf Nicer error message formatting 2016-04-23 02:34:08 -07:00
snipe 66a5050143 Fixed field name on checkin form 2016-04-23 02:06:57 -07:00
snipe b02cb91ae6 Tighter form display (offset-2) 2016-04-21 22:15:09 -07:00
snipe c9252989a1 Added red highlight back to superadmins 2016-04-21 21:59:50 -07:00
snipe e72d61d896 Checkin and Delete button 2016-04-21 21:56:28 -07:00
snipe d009c66c8b Fixed bulk user delete display 2016-04-21 21:53:31 -07:00
snipe 4b6f657739 Nicer purge box design 2016-04-21 21:53:22 -07:00
snipe ed8c72b946 Checkin and Delete User string 2016-04-21 21:53:13 -07:00
snipe 8900672181 Nicer select2 box 2016-04-21 21:00:45 -07:00
snipe e1cca75f57 Updated from alert to callout 2016-04-21 20:52:53 -07:00
snipe 2284a0783f Improved user UI for user view 2016-04-21 20:26:56 -07:00
snipe aafa5597f2 Added history string 2016-04-21 19:45:49 -07:00
snipe 4c3dada8e4 More responsive UI for small screens 2016-04-21 19:45:42 -07:00
snipe c39e27cc5e Fixes #1955 - searching within locations 2016-04-19 20:23:04 -07:00
snipe 5c99f9da15 Change certificate icon to floppy disk icon 2016-04-19 19:42:16 -07:00
snipe 2ec44ae14a Updated translation strings with new purge text 2016-04-19 12:26:49 -07:00
snipe f2d883e711 Removed box header 2016-04-19 07:43:49 -07:00
snipe 679a6a5522 Partial - add support for drag+drop reordering 2016-04-19 07:19:12 -07:00
snipe b72429a303 Suppress console log 2016-04-19 07:17:57 -07:00
snipe 3e84d66c80 Re-use settings to prevent 1001 queries 2016-04-19 06:11:20 -07:00
snipe 49c09dd356 Added ability to purge soft-deletes from admin 2016-04-19 04:36:07 -07:00
snipe 30b82f61ec I don't think we need all this for the login page 2016-04-13 05:01:13 -07:00
snipe 4b168e8cfa Fixes #1932 - disallow category delete if there are assets/accessories/etc 2016-04-07 17:15:30 -07:00
snipe 0e6b8a8358 Switch to use trans from Lang::get for laravel 5.2 2016-04-07 02:51:57 -07:00
snipe 64d36a9e64 Fixes #1922 - sort by license name 2016-04-04 22:16:24 -07:00
snipe 093e4bbb73 Updated translations 2016-03-28 21:50:00 -07:00
snipe 6f9bad1005 Use lightbox for images in asset file listing 2016-03-25 20:38:27 -07:00
snipe 3f97cc0137 Fixes the fucking "Assets Retired" thing AGAIN. 2016-03-25 18:22:25 -07:00
snipe 41384dc62f Fixes #1845 - remove ability for users to change their email and password 2016-03-25 18:20:57 -07:00
snipe 27543d16f6 Additional escaping 2016-03-25 15:24:12 -07:00
snipe f1bdaeaf95 Escaped input on listing page 2016-03-25 14:24:27 -07:00
snipe fb84ba2878 Add color picker just to settings 2016-03-25 04:18:01 -07:00
snipe 82d6a4e025 Fixed Asset namespace 2016-03-25 04:16:32 -07:00
snipe eb95f5ca4f Cleanup js and CSS elixir stuff 2016-03-25 03:36:37 -07:00
snipe 99dee751f3 Updated menu color for readability 2016-03-25 02:07:35 -07:00
snipe fe00b0e401 Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00