DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
1265 commits 95 branches 267 tags 294 MiB
Commit graph

441 commits

Author SHA1 Message Date
snipe 71be73781b Add company name option to reports 2016-09-19 22:27:34 -07:00
tiagom62 8233d520c6 Missing file formats (#2621) 
Missing allowed file formats zip and rar.

Added rtf format pending PR 2614.
 2016-09-16 16:18:33 -07:00
snipe 04898c49b2 Fixed wrong translation from PR 2016-09-15 20:03:47 -07:00
Karol eeff305b02 Update dashboard.blade.php (#2593) 2016-09-15 19:59:01 -07:00
Daniel Meltzer 2d8269ddcd Checkout Improvements, and initial support for requesting an asset model (#2573) 
* Create a new action_log table to replace asset_log.  Use Polymorphism to generalize class and targets.  Port everything I can find to use it.  Add a migration to port the asset_logs table to action_logs.

* Initial work on requestable asset models

* Backend work for polymorphic requests table to store checkout requests.

* Add missing files

* Add a record to the db when requesting items.  Build up a testing route for interfacing with this.

* Users can now toggle requests of items on the request page.  Reformat page to use the same tab layout we use elsewhere

* Polymorphic request function.  Implement requesting of asset models.  Need to port mail/slack to notifications still.

* Implement requesting of asset models.  Build up emails and notifications to support it.  Allow specifying a quantity of model to request.

* Add view to show currently requested assets.  Needs some work and cleanup, but it isn't accessible from anywhere yet.
 2016-09-15 19:58:27 -07:00
snipe 391c9a77ef Misc debug template for use with debugging CSV exports, etc 2016-09-12 14:05:31 -07:00
Daniel Meltzer e86adccf19 Actionlog Class: Improvements and polymorphism (#2561) 
* Save progress

* Create a new action_log table to replace asset_log.  Use Polymorphism to generalize class and targets.  Port everything I can find to use it.  Add a migration to port the asset_logs table to action_logs.

* Allow accepted_id to be nullable.

* Comment out the thread_id migration, because it b0rks on a new database with the move.  I'm unsure if the thread_id does anything...It doesn't seem to be used

* Clean up all old methods from Actionlog model.  Port everything to use new cleaner interface.

* Port the actionlog factory to fix travis.

* Adjust code to work on php5.  Also fix lurking adminlog call.

* Remove weird code

* Port the pave command.  Also fix dangling adminlog
 2016-09-06 19:39:42 -07:00
snipe d4dc1830ec Fixes #2527 - honor the setting for whether Snpie-IT can access the outside world 2016-08-30 12:58:08 -07:00
snipe 04e9ca0942 Fixes #2399 2016-08-30 12:34:23 -07:00
snipe 06021d79c1 Fixed typo 2016-08-30 12:25:46 -07:00
snipe 5090468357 Fixes #2510 and #2488 - CSS class added to images in views 2016-08-30 07:20:07 -07:00
snipe 213cda8cf4 Fixes #2525 2016-08-30 07:03:22 -07:00
snipe 8816c481af Added HTML for generating passwords in asset user creation modal 2016-08-30 06:48:23 -07:00
snipe 3ed0cf2be8 Moved import errors up higher on the screen, fixed some weird formatting bugaboos 2016-08-30 06:48:00 -07:00
snipe 25902db659 Generate password from modal 2016-08-30 06:47:18 -07:00
snipe 35a67ab18a Fixes #2516 - listbox error on new asset 2016-08-29 23:49:23 -07:00
Daniel Meltzer 276e0a7114 Importer: Implement item update and interface improvments (#2507) 
* Add support for updating assets to the importer.

If an asset with a matching asset tag is found, and the --update flag is
passed to the importer, we edit the matching asset with any
asset-specific values, and persist to the database.  Any missing/blank
values are skipped.

TODO: Add to web interface, add support in consumables/accessories

* Allow deleting of files on the import page.

* Extend web interface to allow updating of imported items.

This adds a modal dialog to the import process.  Currently the dialog
allows the choice of update vs ignore, and choosing the item type to
import (Accessory, Asset, Consumable).

Also use Helper::ParseFloat() for purchase_cost processing.  It exists,
and fixes issues on my end at least.

* Implement editing of consumables and accessories.

* Rename getProcessImportFile to postProcessImportFile to reflect how it's now used

* Fix copy-pasta error.
 2016-08-29 15:49:32 -07:00
snipe 0d088f3031 Fixes #2491 - show asset tag on dashboard 2016-08-25 21:28:46 -07:00
snipe 35439f9976 Additional strings 2016-08-25 21:04:36 -07:00
snipe d473432436 Show encryption in fieldset list 2016-08-25 21:04:25 -07:00
snipe 96eb832fd3 Only decrypt if the user is an admin 2016-08-25 21:03:24 -07:00
snipe f185c2e0de Hide radio and checkboxes for now 2016-08-25 19:48:11 -07:00
snipe 122f0b9cba Custom fields form in asset edit view 2016-08-25 18:35:28 -07:00
snipe c49f10c9bb Removed line break 2016-08-25 18:35:16 -07:00
snipe 308fcf96de Updated language strings 2016-08-25 17:43:07 -07:00
snipe f1fab8b164 Added Indonesian to dropdown locale list 2016-08-25 17:22:08 -07:00
snipe 0e8502a323 Removed newline 2016-08-25 17:12:50 -07:00
snipe 3171d9230b Better language 2016-08-25 17:12:34 -07:00
snipe b76ad5ea88 Reverted name of form field 2016-08-25 17:08:39 -07:00
snipe 61aa9beddb Added new fields to custom fields views 2016-08-25 16:36:00 -07:00
snipe e89fd9b3a2 Additional strings 2016-08-25 16:35:45 -07:00
snipe f38912a5cf Custom fields additions 2016-08-23 18:52:54 -07:00
snipe ad22293f4b Added show in nav for status label views and controller 2016-08-23 18:52:42 -07:00
snipe 90d2d0c7e1 Fixes #2469 - corrected config app.url 2016-08-23 16:04:22 -07:00
snipe 9407b4e28c Removed console warning 2016-08-23 15:53:18 -07:00
snipe ec19924bea Custom field types 2016-08-23 15:52:34 -07:00
snipe 7b8403cdb9 Pass status ID to ajax 2016-08-23 15:52:10 -07:00
snipe 11dc20de61 Show in nav language option 2016-08-23 15:51:45 -07:00
snipe e52a0f65bb Update asset report to show deployed if asset is checked out 2016-08-23 11:36:34 -07:00
snipe d9f2e7bf58 If custom field is type URL, display it as a link 2016-08-18 12:44:55 -07:00
snipe 923352537c Moved column for in/out 2016-08-18 07:06:55 -07:00
snipe 4419dc7434 Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format 
# Conflicts:
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/LicensesController.php
#	resources/views/hardware/view.blade.php
 2016-08-16 18:53:45 -07:00
Daniel Meltzer ac63642224 Add manufacturer to licenses (#2436) 
* Add manufacturer to licenses.  Shows in table and edit.  Need to improve manufacturer view to show lists beyond assets still.

* Remove extra closing tags, formatting

* Work on making the manufacturer view show more options. Need to figure out how to change the table dynamically.

* Cleanup formatting and fix a few weirdities in hardware/view.blade.php

* Standardize on two-space tabs in this file, as it seems the most
* common.

* Fix a few places where we call number_format without guaranteeing the
* item is a number and not a string.

* Show a "No Results" message on components page if there are no
* components.

* Show table of licenses on manufacturer view page.

This reworks the ManufacturersController::getDataView method to delegate
the view to a sub method (currently assets or licenses, but plan to
extend to consumables/accessories/components as well).  We then put tabs
at the top of the view to show multiple tables.  This just duplicates
the table layout from licenses/index.blade, but I wonder if theres a way
to centralize that code, maybe through partials, over time..

The only known missing part of manufacturers for licenses would be adding it
to the importer, but the license importer should probably migrate to
object importer before doing too much more...

* Add manufacturer to accessory.

* Add consumables to the manufacturer view page.
 2016-08-16 18:49:54 -07:00
Daniel Meltzer 5959f83de3 Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better. 2016-08-16 20:47:53 -05:00
Daniel Meltzer 0c912bcf49 Fix more number_format madness. 
This does two main things:
1) The importer now imports as numbers, not parsed strings.  This allows
is to format values on output instead of input, which is what was
happening in most places.

2) Add a Helper::parseCurrencyString method and port everything to use
this.  This checks to see if the value is numeric or empty, and returns
the appropriate value in all cases.  Should fix all known occurances of
number_format expections.
 2016-08-16 20:41:28 -05:00
Daniel Meltzer a852c624d3 Fix 2347 (#2394) 
* Prevent multiple checkouts of the same asset.

This adds a new method to the Asset model, availableForCheckout.
Port getDataTable to use availableForCheckout instead of doing the
check manually.

Fixes Issue #2347

* Use availableForCheckout in categories controller.  Also gate the checkin/checkout actions here.

* Use gate and availableForCheckout in manufactuers as well.
 2016-08-16 13:02:42 -07:00
snipe 7edf1db101 Small tweaks to history 2016-08-12 19:03:32 -07:00
snipe 5e9740e0b4 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-08-12 17:10:10 -07:00
snipe 41a20d8f66 Tidied up some debugging code, better explanation 2016-08-12 17:10:03 -07:00
snipe 7a0843e954 Import history language file 2016-08-12 16:02:51 -07:00
snipe 06fcf3e07d Import history blade 2016-08-12 16:01:34 -07:00
Daniel Meltzer cc15a4f018 Use showAssetName instead of asset->name to include the asset tag (#2437) 2016-08-11 23:56:40 -07:00
snipe 4c787891e4 Use custom maintenance middleware 2016-08-11 19:22:26 -07:00
snipe 7992258b46 Updated UI with new required indicator 2016-08-11 15:44:01 -07:00
snipe 869da1da78 Add maintenance notes to maintenances tab in hardware view 2016-08-11 15:40:41 -07:00
snipe 1d3255a00b Allow admin to turn LDAP password sync off. 
This is added to handle customers/users with a security policy that prohibits third-parties or external databases from storing LDAP passwords.
 2016-08-04 14:29:28 -07:00
snipe 29eadb10ae Fixes #2387 2016-08-02 17:03:15 -07:00
snipe 1ca5f8bee5 Removed asterisks, use orange bar for req fields in locations 2016-08-02 16:40:38 -07:00
snipe 75e0c5565c Add username and custom fields option to custom report 2016-08-02 15:04:10 -07:00
snipe 098e7e4feb Hide email address if there is no value 2016-08-02 15:03:45 -07:00
snipe ca8ca89955 Added custom color to status labels, only show status labels if there are results 2016-08-02 13:25:50 -07:00
snipe 03c2c267bc Added favicon explicit link 2016-08-02 12:39:49 -07:00
snipe a76fe98b2d Only show a logo if a logo is uploaded 2016-08-02 12:34:08 -07:00
snipe 9e43a44d20 Better styling for forgotten password screens 2016-08-02 12:30:22 -07:00
snipe 17d5e40e02 Fixes #2383 2016-08-02 09:54:31 -07:00
snipe 0e5209e80f Few more dashboard fixes 2016-08-02 05:06:17 -07:00
snipe cbc42f3e59 Fix for deleted users display 2016-08-02 04:45:48 -07:00
snipe ef6fb69cee Fix translation 2016-08-02 04:26:07 -07:00
snipe 39929c7d89 Better handling for deleted users 2016-08-02 04:23:13 -07:00
snipe 23e23bab90 Remove display of port number since it’s ignored anyway 2016-08-02 03:26:38 -07:00
snipe 6204969639 Fixed requestable link 2016-08-02 02:12:18 -07:00
snipe 283bb4ae4b Fixes #2381 2016-08-02 01:36:14 -07:00
snipe 8246a319a2 Fixes #2363 and #1097 2016-08-02 00:54:38 -07:00
snipe bfc18c758a Removed console message from JS 2016-08-01 21:43:56 -07:00
snipe 27dee1b793 Removed comment 2016-08-01 20:15:25 -07:00
snipe cdeccb399f Hide extra options if superadmin is checked 2016-08-01 20:11:54 -07:00
snipe eac6abe60a Fixes #2378 - disallow admins to create/edit superadmins 
Also disables admins from being able to edit groups, since that can grant superadmin access.
 2016-08-01 18:43:11 -07:00
snipe 139325d8ba Small tweaks for bad data 2016-08-01 10:17:46 -07:00
snipe 1f30bdee99 Fixes #2361 2016-07-30 17:27:08 -07:00
snipe 0f72989953 Updated language strings 2016-07-29 14:32:31 -07:00
snipe 46eca54b44 Moved bulk checkout into assets nav 2016-07-29 14:17:59 -07:00
zjean fcb1d6ac15 Fixed feedback on #2349 (#2359) 2016-07-29 13:59:50 -07:00
snipe a53346be1f Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-07-29 12:15:14 -07:00
snipe fd94c76874 Fixes asset created_at 2016-07-29 12:15:09 -07:00
zjean 108a3c9dad Updated view for #2324 (#2357) 2016-07-29 11:55:16 -07:00
snipe 85232c47da Merge branch 'develop' of github.com:snipe/snipe-it into develop 2016-07-28 21:31:58 -07:00
snipe 47f6635992 A few more permissions tweaks 2016-07-28 21:31:53 -07:00
Daniel Meltzer eef8d1609e Small fixes (#2350) 
* components.view should point to view, not create

* Fix comment

* Rename variable to accurately reflect its responsibility

* Fix line breaks in serial key, remove places where adding line breaks makes no sense.  Fixes #2344
 2016-07-28 20:59:42 -07:00
snipe 8a9307f357 Wordwrap license key 2016-07-28 18:56:02 -07:00
snipe f31637adb4 Fixes #2346 2016-07-28 08:39:28 -07:00
snipe 3e5d2b5385 Ability to remove field from fieldset 2016-07-28 08:10:15 -07:00
snipe 0ee5dea1a1 Fixes #2344 2016-07-28 06:43:31 -07:00
snipe 9fbe6c68ac Fixes #2304 2016-07-27 21:30:38 -07:00
snipe eb508901c5 Zerofilling for auto-increment 2016-07-27 21:28:00 -07:00
snipe 3fd5fb836f Restore linebreaks in notes 2016-07-27 20:24:09 -07:00
Daniel Meltzer b4e54225a2 Fix exports (#2338) 
* Update tableexport.js to the new version.

* Give the export file in each table a useful name.

The name takes the form of tabletype-export-YYYY-MM-DD.extension.
 2016-07-27 19:45:45 -07:00
snipe a44b90dfc9 Custom validator for multiple deleted items with the same unique field 2016-07-26 00:44:26 -07:00
snipe eec22c5aeb Removed port stuff, since LDAP ignores it anyway :-/ 2016-07-22 16:21:16 -07:00
snipe b03330aae0 Added TLS option in settings for LDAP 2016-07-22 16:00:37 -07:00
snipe ba25972b49 Add LDAP port number option 2016-07-22 15:09:49 -07:00
snipe cc6b2a0081 FIxes #2280 
This shouldn’t ever happen though. Bad data somwhere, I’m guessing.
 2016-07-22 07:48:46 -07:00
snipe 128290bd82 Cleanup checkin blade 2016-07-22 02:34:25 -07:00
snipe 114540d836 Cleanup checkout form 2016-07-22 02:20:05 -07:00
snipe 0b57f74e36 Check for model name (this should never be blank, but…) 2016-07-22 02:14:12 -07:00
snipe 03d7d01e12 Fixes #2300 2016-07-22 02:12:04 -07:00
snipe a1640d7fe3 Form cleanup 2016-07-22 02:11:57 -07:00
snipe 1f85f4b337 Clearer demo mode text 2016-07-22 02:11:46 -07:00
snipe 297820d347 Newer required style 2016-07-22 01:33:55 -07:00
snipe 78fda31379 Helper method to introspect into the model level validation to see if the field is required 
(This does not yet handle form request validation)
 2016-07-22 00:29:23 -07:00
snipe 3a04686ade Nicer demo mode message 2016-07-22 00:28:22 -07:00
snipe ca5d3e3006 Nicer license form display 2016-07-22 00:25:41 -07:00
snipe f0c00897ca Required class 2016-07-22 00:21:56 -07:00
snipe e256bdc9f7 Clearer version in footer 2016-07-21 21:39:23 -07:00
snipe b0dc5b4183 Fixes #2290 2016-07-21 21:28:17 -07:00
snipe f6a4d4aaab Better display for some features disabled for demo mode 2016-07-21 19:40:23 -07:00
Daniel Meltzer c2f6e0cfd8 Don't escape html in default eula. Fixes #2277 (#2279) 2016-07-20 19:39:48 -07:00
Daniel Meltzer ba6f26cef9 If a category has items in it, disable changing the category type (#2288) 2016-07-20 19:27:33 -07:00
Daniel Meltzer 68d8e6a3a9 Importer again (#2260) 
* Quote item names when displaying in error table.

* Remove the danger class as well as the warning class when uploading a file.  Fixes a display error if a file is successful after a file fails upload.
 2016-07-18 15:46:03 -07:00
snipe 616f922306 Fixes #2254 2016-07-14 19:50:00 -07:00
snipe 99a42dfc38 More AD fixes 2016-07-14 16:27:32 -07:00
snipe 0cf8ac1d95 Add AD domain to settings 2016-07-14 15:52:52 -07:00
snipe e6b872299d Possible fix for #2246 - needs AD testing 2016-07-13 15:18:29 -07:00
snipe a00198abc7 Added spinner for LDAP test 2016-07-13 07:34:54 -07:00
snipe ab6e2a7301 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-07-13 05:50:45 -07:00
snipe ff6c3cfa17 Added LDAP settings check in settings page 2016-07-13 05:47:23 -07:00
Daniel Meltzer bf88cd8233 Check for variables to exist and not null rather than assuming it does. Fixes #2247. (#2248) 2016-07-12 21:03:23 -07:00
Daniel Meltzer f683c78a69 Fix adding an image to an asset when public/uploads/assets does not exist (#2240) 
* Fix adding an image to an asset when public/uploads/assets does not exist.

 First check to see if we can create directory and do so.  If any errors occur, display the error string as an error on the page.

* Add the public/uploads/assets directory to new installs.

* Add some comments explaining this code so I remember what it does next time.
 2016-07-10 18:43:00 -07:00
snipe 6bdc88cfea Removed extra space 2016-07-09 18:20:14 -07:00
snipe 5e8d8d6df0 Nicer date display 2016-07-07 02:07:31 -07:00
snipe f2ddc7b0ae Added purchase cost and purchase date to listing 2016-07-07 02:07:21 -07:00
snipe a7a748385f Longer cookie 2016-07-01 01:05:22 -07:00
snipe 0c65b6cad1 Nicer bulk delete layout 2016-06-29 04:30:21 -07:00
snipe 0c98390eef Hide bulk actions, checkbox and checkout/in if deleted 2016-06-29 04:19:37 -07:00
snipe 6d5bc64b2b Another fix for status label types 
This is a little janky, as it breaks up the errors into multiple screens if you don't have a status label type AND don't have a name. This is because the model-level validation won't work since we transmogrify that dropdown list of status label types into  boolean values for the DB. Should eventually find a less clunky way to handle this, but needed to get a fix in now.
 2016-06-28 14:52:11 -07:00
Daniel Meltzer 52c89ca889 Hide Delete action if user is deleted. (#2205) 
Issue: 1493
 2016-06-28 11:50:11 -07:00
Daniel Meltzer d484636bba Add model number column to the hardware list. (#2204) 
* Add model number column to the hardware list and allow searching based on model number.   Column is hidden by default.

* Fix sorting.  Add scope to order by model number.
 2016-06-27 22:32:40 -07:00
snipe 0cf563ae5b Show admin in maintenances 2016-06-22 17:04:47 -07:00
snipe e5a5de6a0d Just use inline validation instead of form request, since it's a one-off 2016-06-22 15:59:00 -07:00
snipe 0ca85f8a8a Updates to components 2016-06-22 14:55:17 -07:00
snipe 014e7ba9c4 Updated strings 2016-06-22 14:39:19 -07:00
snipe fdd17a2088 Fixed weird capitalisation of language strings 2016-06-22 12:58:29 -07:00
Daniel Meltzer 43e64a5f8c Store a list of errors associated with each field instead of overwriting the error if multiple occur. Also Adjust the importer to extract the asset tag earlier in the process so all asset related errors are associated with the asset tag rather than some being tied to the name. 2016-06-22 15:13:01 -04:00
snipe dd1241f964 Fix in case crated_at is blank 2016-06-21 17:19:46 -07:00
snipe e9227f77b6 Fixes #2163 - put model image in view if no asset image 2016-06-21 12:20:22 -07:00
snipe 6165d804f9 Merge pull request #2145 from dmeltzer/disable-select2-on-ios 
Disable select2 on ios.
 2016-06-17 17:15:47 -07:00
snipe 161c6fe2e6 Merge pull request #2173 from twistedR/fix-password-login 
Use app.url for password reset instead of hard coded one.
 2016-06-17 17:15:05 -07:00
snipe 1c51db876c Merge pull request #2172 from ddreier/v3-label-changes 
Center 1D Barcode and include Custom CSS in barcodes view
 2016-06-17 17:14:28 -07:00
snipe 48595e3d76 Merge pull request #2135 from YetAnotherCodeMonkey/v3 
Swap bgutter and sgutter as they seem to be reversed.
 2016-06-17 17:12:47 -07:00
Raveesh bb3d88cce5 Use the full app.url for the password link 2016-06-17 17:52:14 -04:00
Daniel Dreier 52084a2c24 Add CSS to center the 1D barcode and add PHP to include the custom CSS from Settings. 2016-06-17 14:38:50 -05:00
snipe 412756b651 Fix link to view manufacturer in hardware view 2016-06-15 21:14:26 -07:00
snipe 87352470c0 Added sortable created_at to assets and users 2016-06-15 21:06:17 -07:00
snipe 6a277a5391 Added inheritance back into users/groups 2016-06-15 20:45:45 -07:00
snipe 1efa69e51f Fixes #2158 2016-06-15 11:50:57 -07:00
snipe 0fd43c0a5d Updated language strings 2016-06-13 12:16:43 -07:00
snipe 3ca81f4d73 Fixes #2140 2016-06-13 12:07:01 -07:00
snipe dec95c3e06 Updated blade for box panel 2016-06-13 11:39:57 -07:00
snipe 2daed3c271 Fix for custom fields not saving 2016-06-10 16:36:46 -07:00
Daniel Meltzer 2159d77fc2 No longer necessary. 2016-06-10 07:46:38 -05:00
Daniel Meltzer 9c4c91063f Merge branch 'v3' into Fix-Asset-Creation-with-old-data 2016-06-10 07:35:30 -05:00
Daniel Meltzer 4e74c553bd Fix editing of assets. This also uses the asset form request for validation. 2016-06-10 07:33:33 -05:00
snipe 7a9cfb1a8f Fixed label weirdness when no serial 2016-06-10 04:43:17 -07:00
snipe 4e1472f66d Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-10 00:48:33 -07:00
Daniel Meltzer 25c10c43dd Disable select2 on ios. It's terribly slow, doesn't register click events, and has forces focus to the search bar by default (which makes the keyboard popup and take over the screen. The latter issue might justify disabling it for all mobile devices, but the performance issues certainly justify it on iOS. 2016-06-09 20:31:23 -05:00
Daniel Meltzer 044695cb02 Fix hardware creation error making old input disappear. This should be redone to dynamically update on the client side based on a JSON response instead of flashing and reloading, but that's a lot of change for v3 at this point. 2016-06-09 20:28:49 -05:00
snipe 66adffe6d9 Moved include 2016-06-09 14:41:58 -07:00
snipe a04d6293d1 Proper hypenation of Snipe-IT in footer 2016-06-09 03:08:42 -07:00
snipe 2b5fb04ba9 Allow admin to add user on checkout screen 2016-06-09 00:36:52 -07:00
snipe bb758d618b Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-08 23:28:53 -07:00
snipe 9b2c7d749b Fixed barcode descriptions 2016-06-08 23:28:44 -07:00
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