snipe
b8ddbadd2b
Use icons for 2FA, LDAP, etc info on user view
2020-09-03 15:55:41 -07:00
snipe
3e120812e3
Removed 2FA reset button if the user is not enrolled in 2FA
2020-09-03 15:55:20 -07:00
snipe
3ea3e8b856
Updated user asset listing to use bootstrap-tables and asset endpoint [ch1389]
2020-09-03 15:12:51 -07:00
snipe
fb59405a87
User view can t be loaded [ch15079]
2020-09-03 14:07:30 -07:00
Ivan Nieto
3fcd83c499
Fixes some errors in forms using the deprecated Input:: facade
2020-09-03 13:42:33 -05:00
snipe
ed79eacb9d
Updated help text
2020-08-31 19:55:30 -07:00
snipe
408435057e
Small vue fixes
2020-08-31 19:41:05 -07:00
snipe
7cab9f48e5
Use darker red for errors
2020-08-31 19:40:49 -07:00
snipe
a64e1be278
Fixed Input:: () vs request()
2020-08-31 17:18:09 -07:00
snipe
13216b8860
Fixed pGenerator (again)
2020-08-31 17:17:51 -07:00
snipe
453fc718d9
Merge branch 'develop' into integrations/2020-08-31-dev-into-master
...
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Models/Ldap.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/less/overrides.less
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# tests/unit/UserTest.php
2020-08-31 12:44:03 -07:00
snipe
9c8ca6af21
Squashed commit of the following:
...
commit e321aeabae8ec99ff4337568ae9e37568ae9ec01a83216932ad9050c#8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cf01a832169cbcad49ce73c6883489#8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489cbcad49ce79b5acca89d7e52919cf1b714576be429f3a5c48#8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f134e8e6fb9714576be45b999c50a2512899294#8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 51289929400291323502e0f6f9b839f1a6308002b999c50a2e9ca20e496e3906b245#8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9ca20e4964e0644dbbf456a74d88#8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c799c059070c62d43a778b725bd0faee0644dbbf65b6925b00004ecad05#8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00cdf17a859bf24c43056ba606b7e905dd73ddad4779a39cf721e7410b16838994f3e15#8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835e955c983ab09e7d19b#8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15ed23f1a77cae955c983a32fa17ac18eed41e454#8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b32fa17ac185b905154373b1e46f72#8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b0c1a1de2a220c9ae5818eed41e4549b750f4754fc17a06792a4f76cc6cfbb905154373Fixed #8247 - added notes field to user details display
commit daf748e531799a93c46a34aa12e22981a633288897757bd0#8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd04c7125c393781a63328896e563f6e4b5320f5c677f69ae953https://github.com/snipe/snipe-it
commit 5320f5c67c7f69ae953bc79f8c1ba17f6fbabf#8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfac79f8c1baf12c92e30b536401fe0#8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c912c92e30b7fd10b755b0dbbb7680d9cf0dd5bbad25e53d8c7fec6ed256f89d433b41#8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41ae2570ada6f45afe725a1536401fe0fec6ed256fb2aaa7bed2d339bdddc3cc9f1577a#8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a4ab1fe8be0c339bdddc3835b9cf4b707ccb41371e2e60a457bf2390d2160bb42801f6a00b051b8c#8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c705b3a9ad7e4fb880384f43042ad841a716382ac436c8f7f4f1b42801f6aede4934f21946129f20#8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f206b941ef1e08d1aa11ec89de4934f21daf06e4205b10076b01#8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015af06e420569a2440dc4bbeae8efb22ac1c1636#8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c004ecad059beae8efb21d14ab7e3e9839e5e56#8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566d14ab7e3e1#8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c1e97cf011b6ed23505054001e721530f886837668210da6e8#8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82f88683766be4385c0f8cFixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa7fb3a9b82c9a2ed804cecb1e87fe#8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6f43df5f04195cc48e4229a2ed804cad20fad28e5ae813ddf75bb42109c0cf46ecf8ec0b9e821c0e69ee28c75131a8ba067020fd232e70ee4d69b1chttps://github.com/snipe/snipe-it
commit 0fd232e70dee4d69b1c531c535094d1ad11194#8041 from alek13/patch-1
use supported package for slack
commit d1ad111949https://github.com/maknz/slack/issues/94
commit 31c53509417eb70e17e05bb4f271a3dfcb4699#7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb4699196eb96f964a2f08bd3bae009fbe59f5bb4f271aaFixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
snipe
8ec99ff433
Merge pull request #8374 from snipe/fixes/moar_flysystem
...
WIP - More Flysystem fixes
2020-08-31 09:45:27 -07:00
snipe
e1cc003cec
Fixed backup urls for download
2020-08-28 18:22:37 -07:00
snipe
f83acf8378
Merge pull request #8383 from Godmartinz/develop
...
removed a duplicate date format in the settings.
2020-08-27 14:35:00 -07:00
Godfrey M
242af2c90b
removed a duplicate date format in the settings.
2020-08-27 12:58:44 -07:00
snipe
d25a05d748
Misc Flysystem/image upload request fixes
2020-08-26 11:53:36 -07:00
snipe
f385f3e928
Fixed user image upload
...
TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images
2020-08-26 02:30:23 -07:00
snipe
53c46ac8de
Fixed stupid import layouts
2020-08-24 21:15:46 -07:00
snipe
a90d2ba077
Fixed suppliers upload
2020-08-24 18:53:33 -07:00
snipe
232e3f30aa
Fixed accessories “current image” path in edit form
2020-08-24 14:30:55 -07:00
Michael Pietsch
4f5374b2e8
enable use custom file based saml certificate/private key
2020-08-14 12:25:00 +02:00
snipe
19d8d7b146
Updated components and consumables to use storage facade
2020-08-12 13:02:54 -07:00
Godfrey M
e3906b245c
added translation for admin/licenses/message.not_found
2020-08-12 12:27:18 -07:00
snipe
5b6925b00c
Removed debugging :(
2020-08-04 21:00:37 -07:00
snipe
df17a859bf
Changed modal IDs so manager creation modal works on user creation main page
2020-08-04 20:59:54 -07:00
snipe
24c43056ba
Moved pGenerator script to default layout footer
...
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
2020-08-04 20:58:28 -07:00
snipe
4e0a9c7a94
Fart fix
...
I just…. don’t ask.
2020-08-03 12:35:34 -07:00
snipe
6a089f86f8
Fixed pathing for accessories
2020-08-03 11:17:56 -07:00
snipe
502b3c50a9
Fixed upload preview (fixed regression from #6736 )
...
This change appears to have been stomped on in one of the merges. :(
2020-07-31 14:36:50 -07:00
snipe
3e62a6ea2d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-07-31 11:01:35 -07:00
snipe
e955c983a3
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer
...
Added address, city, state and country to importer and city to bulk editor
2020-07-22 13:43:29 -07:00
Godfrey Martinez
3b1e46f72b
Update general.php
2020-07-22 11:25:57 -07:00
Godfrey Martinez
0c1a1de2a2
Update general.php
...
fixed typo
2020-07-22 11:24:36 -07:00
Godfrey M
20c9ae5818
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats
2020-07-22 10:21:19 -07:00
snipe
eed41e4549
Moved address down further, fixed broken HTML
2020-07-21 16:57:32 -07:00
snipe
b750f4754f
Added city to bulk user importer
2020-07-21 16:49:54 -07:00
snipe
c17a06792a
Added address, city, state, country to user importer
2020-07-21 16:49:38 -07:00
snipe
b905154373
Fixed #8247 - added notes field to user details display
2020-07-20 14:29:32 -07:00
Brady Wetherington
68263ff806
Changed selectlist results to be 'items' for internal consistency
2020-07-16 15:33:38 -07:00
snipe
81a6332889
Removed license ID from seats table cookie info
...
This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses
2020-07-14 13:55:38 -07:00
Brady Wetherington
17f6fbabfa
Switch to 'items' to maintain compatbility with other internal API's
2020-07-13 21:12:03 -07:00
Brady Wetherington
318da67230
Fix Select2 'infinite scroll' drop-downs for Snipe-IT v5
2020-07-13 17:43:15 -07:00
Brady Wetherington
e7a820f7c9
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
2020-07-13 17:14:31 -07:00
Ivan Nieto
8fd4529fad
Change the form input name for serials in the view
2020-07-13 13:49:21 -05:00
snipe
12c92e30b7
Show whether or not the user was imported via LDAP in the view page
2020-07-10 16:21:27 -07:00
snipe
fd10b755b0
Removed the sr-only tag in table headers
...
It was breaking Bootstrap Tables column selector :(
2020-07-10 11:30:01 -07:00
Sean Borg
567a9639f4
Enhanced #5762 Able to bulk edit expected checkin date
...
In light of the need to edit 500+ devices #5762 (comment)
I added the expected checkin date to the bulk edit page for assets
2020-07-10 19:21:34 +01:00
Sean Borg
7a433f8598
Updated purchase date format in hardware/bulkedit
...
The Purchase date box in hardware/bulkedit was a different style
to the normal hardware/{id}/edit
It also prevents a strange bug I see in firefox when clicking the old datepicker
it presented 2 datepicker boxes
2020-07-10 19:21:22 +01:00
snipe
b941ef1e08
Pulled CSS font awesome styles out of the blade and into overrides.css
2020-06-22 20:41:40 -07:00
snipe
d1aa11ec89
Fix for weird padlock display in asset listing with encrypted custom fields
2020-06-22 20:29:19 -07:00
Godfrey M
b10076b015
corrected an error where font-size for labels were static in settings.
2020-06-22 17:04:39 -07:00
snipe
a7eb89f6b6
Misc fixes for flysystem paths
2020-06-16 16:06:25 -07:00
snipe
7a785b4952
Updated a few flysystem settings
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-28 01:54:29 -07:00
Godfrey M
9839e5e566
adjusted for all label text, removed local variable
2020-05-27 12:27:40 -07:00
snipe
5b4e4c8dcd
Merge pull request #8061 from Godmartinz/develop
...
fixed a table header error
2020-05-26 19:52:14 -07:00
Godfrey M
e7f74d94c1
Label_Woes
2020-05-26 17:22:45 -07:00
Godfrey M
e97cf011b6
Label_Woes
2020-05-26 17:15:39 -07:00
Godfrey M
ed23505054
Label_Woes
2020-05-26 17:10:45 -07:00
Daniel Meltzer
7ea862787c
Refactor controller to use one method that shows all modals based on name.
2020-05-23 15:24:00 -04:00
Daniel Meltzer
7a76cb08a0
We accept xlsx in uploads
2020-05-23 11:36:47 -04:00
Daniel Meltzer
8210da6e82
Fix Missing Category selection in Asset Model Modal dialog.
...
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
2020-05-20 10:29:27 -04:00
Daniel Meltzer
6a80f95769
Fix Missing Category selection in Asset Model Modal dialog.
...
A select html tag needs a full closing tag. <select /> is not valid.
This was causing the select2 js to barf and eat additional information.
2020-05-20 10:23:04 -04:00
Godfrey M
edd4797178
fixed a table header error
2020-05-19 16:59:09 -07:00
Daniel Meltzer
a6f90cb3fc
Assorted licenses UI fixes while testing.
...
* Rename licenses route checkin parameter to clarify it's purpose and
fix incorrect route in users view page.
* Checkin note can be nullable for checking in a license.
* License Seat view was only showing 20 license seats due to faulty
transformer logic.
2020-05-12 14:38:21 -04:00
Daniel Meltzer
1321304720
Importer UI: Removed misleading checked out to field. Add full name and asset tag fields to licenses.
2020-05-12 14:38:21 -04:00
snipe
730632e2eb
Apply PR #8043 to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 22:57:55 -07:00
snipe
f43df5f041
Fixed form label
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 20:44:46 -07:00
snipe
95cc48e422
Added option to disable backup in import
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 20:41:10 -07:00
snipe
9a2ed804ca
Fixed mismatched HTML header tags
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 20:28:42 -07:00
snipe
d20fad28e5
Use more modern request helper
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 20:28:24 -07:00
snipe
9ee28c7513
Switched to use info instead of danger on undeployable statuses
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 18:07:02 -07:00
Johnson Yi
572185ac96
Revised how saml sp info is displayed
2020-05-09 09:44:51 +10:00
Johnson Yi
b2930d6069
Added #542 : add saml authentication
2020-05-06 00:06:19 +10:00
snipe
8ecb7969df
Fixed incorrect route for saving groups
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-01 01:26:15 -07:00
snipe
31c5350941
Fixed incorrect route for groups edit
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-01 01:05:48 -07:00
snipe
8507bcd16b
Merge pull request #8008 from dmeltzer/component-checkinout-fixes
...
Component checkout/checkin fixes.
2020-04-30 17:49:22 -07:00
snipe
e47c44d055
Merge pull request #8007 from dmeltzer/permissions-form-cleanup
...
Permissions edit cleanups.
2020-04-30 17:48:24 -07:00
snipe
8bb3c01f78
Addressed merge issue for reset password for #7997
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 17:45:05 -07:00
Daniel Meltzer
bfba30058c
Fix incorrect routing.
2020-04-30 10:35:26 -04:00
Daniel Meltzer
debdccf5f1
Remove old help text translation that doesn't exist any more
2020-04-30 10:35:11 -04:00
Daniel Meltzer
68224757f4
Validate when editing the quantity of a component that the new quantity is > the amount checked out
2020-04-29 13:25:04 -04:00
Daniel Meltzer
358609720a
Component checkout/checkin fixes.
...
- Provide proper translated messages for checkin vs checkout
- Pass appropriate methods to the Checkout event, fixes an error on
checkin.
- Default to a value of 1 on checkin in UI to save a click sometimes.
2020-04-29 12:50:09 -04:00
Daniel Meltzer
42e1e9a0bd
Permissions edit cleanups.
...
- Make each section of permissions it's own tbody for better styling
- Remove extra separators when theres nothing to separate
- Vertically center radio buttons in header rows.
Still on the ideal list:
- Unify code between users and groups into one partial with
conditionals.
- Sticky header row or put the header row in each section.
2020-04-29 12:33:50 -04:00
Daniel Meltzer
bb50828ca0
Remove General serial field now that the serial is part of the multi asset creation.
2020-04-28 11:39:53 -04:00
snipe
c2f1fd4942
Make user form a little nicer looking
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-28 00:01:47 -07:00
snipe
412caebf69
Fixed logo uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 23:22:52 -07:00
snipe
3613da3685
Fixed dashboard boxes
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 23:05:04 -07:00
snipe
b433b49469
Ficing webpack, CSS and JS (*whew* that sucked)
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 22:41:33 -07:00
snipe
f172747495
Handle parse error in custom fields edit per #7997
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 19:36:07 -07:00
snipe
6427f46a6b
Removed mix (switched to url()) for now until assets are fixed
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 19:35:21 -07:00
snipe
6847a331a7
Backport the column icon fix from master
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 05:55:38 -07:00
snipe
3dfcb46991
Minor formatting changes
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:41:08 -07:00
snipe
96eb96f964
Removed stray val (typo)
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:27:00 -07:00
snipe
a2f08bd3ba
Added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:08:54 -07:00
snipe
e009fbe59f
Converted table heading icons in People to CSS glyphs
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:04:53 -07:00
snipe
5bb4f271aa
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 00:47:19 -07:00
snipe
bea3a7b982
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 00:39:32 -07:00
snipe
88d39b4287
Updated generated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:46:41 -07:00
snipe
44962d1eb9
Switched to use Primary button
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:44:48 -07:00
snipe
e69461d797
Cleaned up LDAP sync blade
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:44:28 -07:00
snipe
796e693dda
Removed duplicate signature padd css files
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:44:17 -07:00
snipe
b01e8720dc
Fixed ldap settings JS error
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 14:41:20 -07:00
snipe
c50b81ff19
Added resources
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:15:24 -07:00
snipe
b5cc845216
Removed vendor.js from setup blade
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:15:12 -07:00
snipe
599cf23d63
Added icheck icons to resources
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:14:23 -07:00
snipe
a160da6619
Removed unused styles
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:11:38 -07:00
snipe
3435485a46
Updated path to skin css
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 06:41:19 -07:00
snipe
3a446e6396
Updated variables.less with additional values
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 06:40:27 -07:00
snipe
2db527f4d2
Removed CSS skins (these are generated in the css dir)
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 03:27:51 -07:00
snipe
82b6d2b31b
Fixed a few more tests
2020-04-21 21:13:00 -07:00
snipe
05e9861b71
Checkin/checkout fixes
2020-04-21 11:28:31 -07:00
snipe
cff2a65f62
Fixed broken if/else in view from bad merge
2020-04-21 11:13:29 -07:00
snipe
7a6ca5cb40
Tempt fix for css weirdness
...
TODO: figure out why overrides isn’t being compiled into css/dist/all.css
2020-04-21 11:03:32 -07:00
snipe
1d8c3a73ea
Use non-min version of skin until we can get the other webpack stuff sorted
2020-04-21 10:43:04 -07:00
snipe
e786ef8290
Pull branding back to develop normal
2020-04-21 10:42:37 -07:00
snipe
64b0dbdafe
Fixed mismatched html tag
2020-04-21 10:42:09 -07:00
snipe
c38bbfc8bd
Removed title from more info link
2020-04-21 06:29:34 -07:00
snipe
be446eedb0
Updated html styles on settings index
2020-04-21 06:29:08 -07:00
snipe
dc6e329d96
Fixed name in comments
2020-04-21 06:18:24 -07:00
snipe
72b3228d82
Fixed HTML tags
2020-04-21 06:15:31 -07:00
snipe
aaaf5f8b42
Missed a mismatched h2
2020-04-21 04:23:53 -07:00
snipe
4fe32e1c9c
Fixed broken h2 tag
2020-04-21 04:22:09 -07:00
snipe
cb71bcc4af
Switch to old() helper
2020-04-21 03:58:31 -07:00
snipe
58f6b2da5a
Fixing assets
2020-04-21 03:42:35 -07:00
snipe
b670371e0b
Ugggh… fixing a donked merge
2020-04-21 03:30:21 -07:00
snipe
f532e9b462
Fixing assets :(
...
Not sure what happened in tbis merge exactly
2020-04-21 03:07:11 -07:00
snipe
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
snipe
7ebd21bc04
Added sr-only to the unstyles image upload button
2020-04-09 19:29:16 -07:00
snipe
ec723a3da1
Changed LDAP messaging
2020-04-09 10:37:51 -07:00
snipe
83ee64f155
Added missing CSS class to text-only logo
2020-04-08 17:25:14 -07:00
snipe
b7d12ff944
Changed placeholder text back to lighter grey - it was confusing when darker
2020-04-08 17:24:59 -07:00
snipe
0858fec7f1
Fixed CSS issue where text-only logos at the top would be the wrong color
2020-04-08 17:24:38 -07:00
snipe
a0f7fdc57a
Merge branch 'fixes/accessibility_fixes'
...
# Conflicts:
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
2020-04-08 11:19:42 -07:00
snipe
b7d9790acb
Fixed color style for btn-sm.btn-warning and btn-sm.btn-danger
2020-04-06 21:59:30 -07:00
snipe
1a5785a8d3
Fixed dashboard header size
2020-04-06 21:30:28 -07:00
snipe
320d660e83
Updated chartjs
2020-04-06 21:17:26 -07:00
snipe
fb903b2fda
Added comments, better indenting
2020-04-06 21:05:42 -07:00
snipe
c18646d096
Yellow highlight on selected rows
2020-04-06 21:00:11 -07:00
snipe
7bf398aca4
More settings filter fixes
2020-04-06 20:47:05 -07:00
snipe
f6bb655383
Prevent form submission
2020-04-06 20:17:44 -07:00
snipe
19f71face9
Added filtering to settings page
2020-04-06 20:11:13 -07:00
snipe
d82b94e281
Pull blue stylesheet if no skin was selected
2020-04-06 19:04:49 -07:00
snipe
0d3c18d1df
Fixed importer vue code for niceer layout
2020-04-06 15:09:37 -07:00
snipe
a8032ac388
Switched to btn-primary for submit
2020-04-02 18:38:54 -07:00
snipe
21d8225696
Use button primary for higher contrast
2020-04-02 18:33:26 -07:00
snipe
766c2b22cb
Removed stray tag
2020-04-02 18:33:10 -07:00
snipe
bdddab5b8b
Added role=“option” to option items, additional icon font fixes
2020-04-02 18:17:21 -07:00
snipe
031adc3be4
Small display fixes to importer table
2020-04-01 19:51:36 -07:00
snipe
c906026acd
Merge branch 'master' into fixes/accessibility_fixes
2020-04-01 14:04:02 -07:00
snipe
56c2740b68
Radio button tweaks
2020-04-01 06:56:27 -07:00
snipe
4688d62b9f
Small UI fixes
2020-04-01 06:50:37 -07:00
snipe
99686bd73a
Added labels for bulk actions
2020-04-01 06:48:02 -07:00
snipe
120e224961
Add the ability to remove all group memberships in bulk
2020-04-01 06:35:13 -07:00
snipe
e27d69a31d
Remove viewport restrictions
2020-04-01 06:18:37 -07:00
Ivan Nieto
c492ba7245
Adding changes to 'upload-table' for being painted in CSS ( #7934 )
2020-04-01 05:24:05 -07:00
snipe
53658e365f
Removed duplicate HTML tag
2020-04-01 04:36:28 -07:00
snipe
4cfa0e36b1
Added labels to password reset
2020-04-01 04:30:54 -07:00
snipe
9d9b5d3885
Added form labels to auth screens
2020-04-01 04:29:54 -07:00
snipe
36f9905be0
Removed test code
2020-04-01 04:29:35 -07:00
snipe
2d2cd68061
Switched to h2 from h4
2020-04-01 03:51:08 -07:00
snipe
fd642e95eb
Hide success icons from screen readers
2020-04-01 03:25:07 -07:00
snipe
9ab3370be5
Hide icons in error messages
2020-04-01 03:21:15 -07:00
snipe
4dcc1ffdbc
More form labels
2020-04-01 02:22:24 -07:00
snipe
7718abaa72
Added aria-hidden
2020-04-01 01:26:44 -07:00
snipe
59c5a1ea87
Added aria label to form helper
2020-04-01 01:26:32 -07:00
snipe
0cf70c9e16
Fixed select2 placeholder
2020-04-01 01:26:19 -07:00
snipe
c3d2e8ff26
Added aria-hidden to inline form error text
2020-04-01 00:18:20 -07:00
snipe
192f703885
Trying placeholder CSS styling for the high contrast skin
...
Doesn’t seem to work :(
2020-04-01 00:15:58 -07:00
snipe
be93b23488
Added aria-label to form fields
2020-04-01 00:15:33 -07:00
snipe
b079d0d6d5
Use btn-primary for submit button
2020-03-31 23:38:10 -07:00
snipe
c6c75cc11f
Fixed missing </h3 tags
2020-03-31 23:36:56 -07:00
snipe
b188285bc9
Fixed empty table headings
2020-03-31 23:02:24 -07:00
snipe
6d659a84b8
Removed extra div tag
2020-03-31 22:53:58 -07:00
snipe
3e3828229d
Removed _tab from tab names
2020-03-31 22:52:21 -07:00
snipe
bf6a0f8d2f
Added aria-hidden
2020-03-31 22:50:38 -07:00
snipe
3873c4b253
Added aria form labels to upload modal
2020-03-31 22:50:29 -07:00
snipe
6cc23f69f9
Added aria form labels
2020-03-31 22:50:14 -07:00
snipe
a467a6999e
Use upload modal
2020-03-31 22:50:07 -07:00
snipe
e0eb10ca1e
Added aria-hidden tags
2020-03-31 22:49:49 -07:00
snipe
99c4c73c09
Fixed aria labels on dropdowns
2020-03-31 21:53:26 -07:00
snipe
bde45cbb34
Fixed h3 to h2 for semantic header levels
2020-03-31 21:30:24 -07:00
snipe
c408c27bf4
Updated dark skins
2020-03-31 21:10:55 -07:00
snipe
bfa9c0c528
Updated dark skins with updated styles
2020-03-31 20:58:54 -07:00
snipe
9cc9cddd68
Fixed visited button text color
2020-03-31 20:39:41 -07:00
snipe
fe2261c88d
A few more aria-hidden fixes
2020-03-31 19:34:01 -07:00
snipe
6aeb3c0a47
Use divs instead of layout table on view
2020-03-31 19:27:21 -07:00
snipe
dfaa1c9578
Use the same “no results” treatment for each tab
2020-03-31 18:45:43 -07:00
snipe
0ef1dfe061
Switched from layout tables to decorated divs for asset detail page
2020-03-31 18:39:58 -07:00
snipe
ba8bcd6413
Slight tweaks to div table styles
2020-03-31 18:39:41 -07:00
snipe
7854003ec2
Added sr-only text to “made with love” footer
2020-03-31 17:29:20 -07:00
snipe
c71dd9b68a
Added sr-only text
2020-03-31 17:29:06 -07:00
snipe
dfeabbc85d
Added table-styles div CSS
...
(Still needs to be applied for dark mode skins)
2020-03-31 17:28:40 -07:00
snipe
b8b9ac8a1b
Fixed mismatched <b>/<strong> tags
2020-03-28 18:00:46 -07:00
snipe
80ac2607cd
Added alt tags to assigned assets view
2020-03-28 18:00:19 -07:00
snipe
3552fb1fd8
Added alt tags to profile image
2020-03-28 18:00:05 -07:00
snipe
54a96b8453
Fixed <b> to <strong>
2020-03-28 17:30:17 -07:00
snipe
03be4e74df
Higher contrast pagination
2020-03-28 04:00:46 -07:00
snipe
e9ddd1af81
Added th content on activity report
2020-03-28 04:00:26 -07:00
snipe
f305885e8e
Regenerated assets
2020-03-28 03:43:35 -07:00
snipe
f0b9cd7820
Changed header for h2
2020-03-28 03:43:24 -07:00
snipe
59accca89d
Added form labelss
2020-03-28 03:43:08 -07:00
snipe
e72ebfb94b
Added placeholder text for modal header
2020-03-28 03:42:45 -07:00
snipe
0b7316d548
Changed side heading to h2
2020-03-28 03:42:27 -07:00
snipe
d0cf76989a
Fixed table headers for custom fields
2020-03-28 02:52:14 -07:00
snipe
c299efca0c
Darkened the home screen boxes for high contrast
2020-03-28 02:41:43 -07:00
snipe
5e4918579a
Added table headers
2020-03-28 02:41:27 -07:00
snipe
db75f0e894
Regenerated assets
2020-03-28 01:38:01 -07:00
snipe
5a6c13e364
Added aria-hidden and sr-only tags to minus/collapse symbol
2020-03-28 01:37:49 -07:00
snipe
4b22f07dd7
Fixed less attribute names
2020-03-28 01:37:27 -07:00
snipe
57cb5146fc
Just use navy for links
2020-03-28 01:37:13 -07:00
snipe
5c68353e62
Use non-min bs tables for now
2020-03-28 01:36:35 -07:00
snipe
53728e5c71
Removed whitespace
2020-03-28 01:36:22 -07:00
snipe
b965d170ab
Added accessibility features to bootstrap tables
2020-03-28 00:51:26 -07:00
snipe
34a1bb7152
Fixed contrast skin
2020-03-28 00:24:37 -07:00
snipe
8787f228d9
Fixed asset build
2020-03-28 00:16:28 -07:00
snipe
623655b6f6
New dark background skins
2020-03-28 00:07:34 -07:00
snipe
da6830225a
Remove light colored less files - it looks crappy
2020-03-28 00:06:51 -07:00
snipe
a729410fe8
Regenerated JS
2020-03-27 22:03:30 -07:00
snipe
03a9219a7c
Fixed duplicate color: attribute
2020-03-27 22:01:43 -07:00
snipe
a8f6bbd86a
Added alt text to image formatter in bootstrap tables
2020-03-27 22:01:24 -07:00
snipe
9a2ee2638b
Updated color-specific skins
2020-03-27 21:46:00 -07:00
snipe
2a813244a2
Wrapped text in h5s, added aria hidden to icons
2020-03-27 21:45:27 -07:00
snipe
b50894fca1
Use a variable in the settings to determine what css classes to use
2020-03-27 21:44:50 -07:00
snipe
41fa2d1aa1
Added aria handlers and sr-only text
2020-03-27 21:44:32 -07:00
snipe
54d39c04ad
Added additional themes to dropdown
2020-03-27 21:44:18 -07:00
snipe
3c1365b2c8
Added color variables
2020-03-27 21:44:00 -07:00
snipe
5858c90e71
Minor formatting change (spacing)
2020-03-27 15:50:01 -07:00
snipe
f0ef06ebe1
Added more alt tags
2020-03-27 15:35:29 -07:00
snipe
700f7de748
Added alt text to logo
2020-03-27 14:10:56 -07:00
snipe
af2ea7ac03
Added aria-hidden="true" to create dropdown in topnav
...
Since it’s technically duplicated content
2020-03-27 14:08:01 -07:00
snipe
690d8255c9
Removed the title attribute from the select2 output
...
It contains duplicate info since its auto-generated by select2
2020-03-27 14:07:30 -07:00
snipe
aded2193a2
Added aria-hidden="true" to top navigation elements
2020-03-27 13:29:00 -07:00
snipe
6d99b2a68c
Added “skip to content” link
2020-03-27 13:28:48 -07:00
snipe
55a619778f
Added language header
2020-03-25 16:32:33 -07:00
snipe
039f5da0e1
Add image upload to user edit [ch10508] ( #7877 )
...
* Use correct Request include
* Updated to use additional form request
* Added SVG sanitizer
* Added response method to form request
* Allow ImageUploadRequest to accept fieldname params, added SVG sanitization, fixed delete
* Fixed upload path for avatars
* Added fieldname variable to blade partial for image upload
* Added enctype="multipart/form-data" to form to allow uploads
* Added image field
* Updated Request::old() to use $request->old()
* Fixed derp in edit blade referring to $item when it should be $user
* Added svg+xml to image rule
2020-03-05 18:00:24 -08:00
snipe
60fc1d3f6d
Added/matched forgotten password strings in lang files
2020-03-04 22:07:35 -08:00
snipe
d1a8d76d85
Set maxlength in password reset form to 250
2020-03-04 22:06:43 -08:00
snipe
03c5a42f5a
Fixes for flysystem paths :(
2020-02-11 20:22:55 -08:00
snipe
46a138c64b
Fixed id to statuslabel in sidenav
2020-02-10 12:36:48 -08:00
Fabian Grutschus
5becb93e6c
Added: allow appending of domain name to username when user tries to login ( #7790 )
2020-02-04 12:47:49 -08:00
Ivan Nieto
ab36784edd
Added a parameter that http://snipe-it.app/fields expected, without it that functionality was broken ( #7687 )
...
Nice!
2019-12-30 20:18:47 -08:00
snipe
b5db0b22f8
Switched to Request facade
...
I don’t know why my greps keep missing this shit.
2019-12-10 19:47:54 -08:00
snipe
296de34e8a
WIP: Upgrade develop to Laravel 6.6.1 ( #7637 )
...
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell.
* Upgraded framework to Laravel 6
### TO DO:
- Fix password restriction rules- the old library isn’t compatible with Laravel 6 :(
- Figure out why in-app API calls are returning “Unauthorized”
* More updates from Input:: to Request:: helper
* Switch to Request:: from Input
* Added passport config
* Fixed goofy password minimum in seeder
* Added laravel/helpers
* Changed ($item) to ($item->id) in forms
I have no idea why this is necessary
* Changed ($item) to ($item->id) in forms
* Updated API middleware to auth:api
* Updated with added laravel auth.php values
* FIxed *&!^$%^&$^%!!!! ajax issue
* Switch to Request::get from Input::get
* Switched to Request facade
* Added password security minimums back in
The package we were using has not been updated to Laravel v6, so I created custom validators instead
* Added language strings for error messages for password rules
* Fixed `($item)` issue in formActions for partials
2019-12-10 19:32:50 -08:00
snipe
88fb1370f0
Added slightly friendlier error handling for assets without models
...
This scenario should never happen, barring someone manually editing their data, but better to handle that scenario in a more user-friendly way.
2019-12-06 18:17:03 -08:00
snipe
893454dca7
Updated translations
2019-12-06 12:03:04 -08:00
snipe
de0b5a6149
Fixes #6440 - quote marks in the right place
2019-12-06 11:04:16 -08:00
Dustin B
8fd4e35244
Closes #6440 Print All Assigned - New Tab ( #7135 )
...
Should add the functionality to, by default open in a new tab and not reference back to the source page. Reduces overhead and should resolve #6440 .
Untested, need confirmation.
2019-12-06 11:00:01 -08:00
Valentyn Tulub
6ad1f51673
Added #6489 : show asset assignments under user assignments ( #7293 )
...
* Add a setting to show assets assigned to other assets #6489
* Update user's views to show assets assigned to other assets #6489
* Add ukrainian and russian translation for the feature #6489 in settings
2019-12-06 10:57:48 -08:00
Godfrey Martinez
5b946087c4
added a proper response for password errors ( #7636 )
2019-12-05 17:49:56 -08:00
snipe
e820d4bc4d
Moved js/css/less out of resources/assets
...
Per https://laravel.com/docs/5.7/upgrade
2019-12-04 17:03:16 -08:00
snipe
88cf456386
Adding Dept to license seats ( #7609 )
...
* Adding Dept to license seats
* Added query scope to order by department
* Make license seat department sortable
* Disable license seat internal search - this never actually worked
2019-11-21 22:03:56 -08:00
snipe
d8049209ca
Fixed bug where deleted consumable would throw an error on print page
2019-11-21 21:43:54 -08:00
snipe
5290c47e2a
Merge branch 'develop' into v5-master-develop-integration
...
# Conflicts:
# .env.example
# .travis.yml
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Middleware/EncryptCookies.php
# app/Http/Requests/AssetRequest.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/AssetImporter.php
# app/Models/AssetMaintenance.php
# app/Models/Location.php
# app/Models/User.php
# composer.json
# composer.lock
# config/backup.php
# config/database.php
# config/version.php
# public/mix-manifest.json
# resources/lang/en-ID/general.php
# resources/lang/vi/admin/settings/general.php
# resources/views/accessories/edit.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
snipe
22d2ad9248
Fixes nested location selectlist ( #7483 )
...
* Rename child locations method
* Use Ajax dropdown for locations selectlist for edit/create
* Removed locations database call on edit/create blades for faster loading
* Updated locations controller to use the new iterator
* Increase pagination on locations controller to 500
We’re already loading all of that data up beforehand anyway, so no point in keeping the query smaller.
* Fixed the else to make codacy happy
* Improve the design and performance of the nested location selectlist (#7484 )
* Improve the design and performance of the nested location selectlist
* Fixed parse errors
* Removed debugging code/comments
2019-10-02 03:56:56 -07:00
snipe
7f5f4a1297
Added softwarew support and hardware support to maintenance types
2019-09-24 01:34:23 -07:00
Martin Berg
3dcef9aac9
Add support for custom remote user header ( #7370 )
2019-09-03 11:07:26 -07:00
Logan Swartzendruber
4c8b26f732
Implement #3088 : Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. ( #7388 )
...
* Implement #3088 : Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view.
* Add conditional for including the asset number in the URL of the barcode image.
* Change case of variables to pass Codacy PR review standards.
2019-09-03 11:02:55 -07:00
snipe
60bb385cf7
Make status label required
2019-08-14 23:46:09 -07:00
snipe
47724d7268
Make error text color match
2019-08-14 23:46:00 -07:00
snipe
c9f9a60354
Fixed asset tag error message alignment
2019-08-14 23:28:01 -07:00
snipe
441ae69f5c
Integrations/develop into master ( #7352 )
...
* Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992 )
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
* Leave the activated state for users alone in normal LDAP synchronisation. (#6988 )
* Fixed #7003 - crash when warranty months or purchase date is null
* Fixed #6956 - viewKeys policy inconsistent (#7009 )
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
* Added API middleware to API routes to enable throttling
TODO: Figure out how to make this costumizable without touching the code
* Import locations from CSV via command line (#7021 )
* Added import locations command
* Small fixes to location importer
* Added country, LDAP OU
* Cleaned up comments, added more clarification to what the script does
* Added ability to update groups via API
Fixes [ch9139]
* Bumped version
* Fixed #6883 - remove escaping of fields on LDAP import
* Fixed #6880 - correctly encrypt encrypted fields via the API
* Fixes #5054 : LDAP users deactivated for none-ad (#7032 )
When using none-AD ldap, users are automatically deactivated every LDAP
sync. This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.
Fixed #5054 , at least for 4.X
* Updated packages
- Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%)
- Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%)
- Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%)
- Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%)
- Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%)
- Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed)
Downloading (100%)
- Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%)
- Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%)
* Fixed #7044 - API update deleted custom fields if they are not re-presented
* Fixed XSS vulnerability when creating a new categories, etc via modal on create
Same fix as before, because of the weird select2 post-parsing ajax behavior
* Updated email strings
* Fixed #7046 - added user website url back into UI
* Updated language strings
* Bumped version
* Updated packages
* New backups config for spatie
* Removed debugbar service provider (autodiscovery)
* Use laravel v5.5 withCount manual aliases
* Added spatie language files
* Removed old laravel backups config
This config file was renamed in a newer version of spatie laravel-backup
* Set the serialization
* Added the command loader to console kernel
* Renamed fire() to handle()
* Updated withCount to use manual naming
* Updated backup path in backup admin
* Updated travis with new php versions
* Bumped laravel version in readme
* Fixed custom field edit screen
* Fixed baseUrl is undefined error
I literally cannot figure out how this ever worked before.
* Fix for included files in backup
* Bumped version
* Switch has() to filled()
* Change ->has() to ->filled()
* Removed cosole log
* Bumped packages
* Use getReader instead of fetchAssoc for CSV parser
https://csv.thephpleague.com/9.0/upgrading/
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Trying to fix ajax asset validation
This I think gets us closer, but still not handling the validation on the asset properly.
When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:
```
Illuminate\Support\MessageBag Object
(
[messages:protected] => Array
(
[name] => Array
(
[0] => The name field is required.
)
[seats] => Array
(
[0] => The seats field is required.
)
[category_id] => Array
(
[0] => The category id field is required.
)
)
[format:protected] => :message
)
```
Currently the Assets ajax returns:
```
[2019-05-24 06:52:06] develop.ERROR: array (
'messages' =>
array (
'model_id' =>
array (
0 => 'The model id field is required.',
),
'status_id' =>
array (
0 => 'The status id field is required.',
),
'asset_tag' =>
array (
0 => 'The asset tag field is required.',
),
),
)
```
So not sure why it’s not working.
* Fixed missing asset validation
* Check that a model exists before trying to fiddle with fieldsets
* Tidied up license check
* Removed extra escaping on checkin
* Updated importer to work with newer CSV Reader::getRecords() method
* Fixed field mapping
* Small fix for reordering fields
Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151]
This needs revisiting for a more solid fix, especially for data that was already entered bad.
* Fixed bug where sorting by company name in Users API did not work
Fixes [ch9200]
* Removed custom fields from AssignedSearch to prevent confusing data in selectlist
Fixes [ch9193]
* Removed alert-danger from tests
* Fixed missed consumables_count withCount() statement
* Fixed Undefined variable user in $backto if checked out to a non-user
Fixes [ch9194]
* Check for valid model before attempting to access fieldsets
Fixes [ch1249]
* Only build the log upload destination path if there is a matching record
Fixes [ch1232]
* Fixed free_seats_count variable name
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
* Only gtry to delete the file if a record is found in the log
* Only try to get fieldset if model is valid
* Fixed more camel-casing -> snake-casing
* Only display the file if the log record can be found
* Fixed casing in sync command
* Updated README
* Derp - typo
* Added link to Atlassian plugin
* More Atlassian clarifications
* Show accessory image on view page
* Increased image size to 800px, added lightboxes
* Fixed #7083 - Removed user_exists constraint on department save
If the user has been deleted, this prevented the department from being successfully saved on edit
* Updated branch in version file
* Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084 )
* bump up to php7.1
& change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect`
* AND modapache ><
* 2 updates required to get software-properties+ppa
* Bumped version
* Bumped release again :(
* Missed one
* Fixed #7098 - updated backup config for deleteFile() method
* Fixed #7092 - handle weird port forwarding/port numbers for baseUrl
* Bumped version
* Fixed #7099 - set email to null by default for backup notifications
* Removed old comments
* Fixed #7100 - Check if $user isset on checkin
* Increased throttle to 120 requests per minute
* Added Filipino, corrected order for Spanish variations
* Update language strings
* Bumped hash
* Changed has to filled to fix bulk asset editing
* Bumped point version
* Small fixes for phpleague CSB reader v9
* Improved error checking in locations importer
* Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility
* Reduce minimum group name length to 2 (from 3)
eg: IT
* Back in time fix FOR #7145 for new installs on MySQL 8+
* Fixed permission insert
//TODO
Handle this via model
* Possible fix for reporting/admin migration back in time
* Fixed #7164 - change table name to permission_groups
* Fixed LDAP password blanking on save
* fixing previous commit's actual wiping of password (#7183 )
replaced Input::fille('ldap_pword') with _filled_. Should be good to go.
https://github.com/snipe/snipe-it/issues/7179
https://github.com/snipe/snipe-it/issues/7169
* Bumped version
* Downgrading rollbar for Laravel 5.5
* Spelling Correction (#7206 )
Fixed Spelling for the word reqrite, to be rewrite.
* Fix #6910 : Add logic to manipulate the eloquent query. (#7006 )
* Added company_id to consumables_users table
* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users
* Remove a migration that tries to fix this problem, but is not longer necessary
* Addresses #7238 - add PWA code to layout
Needs additional UX testing
* Better log message for bad LDAP connection
* Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed
* Comment clarification on #7186
* Check for valid seat on hardware view
* Added space between footer and custom message
* Cap warranty months to three characters
Filles rollbar 209
* Cap warranty months to 3 on the frontend blade
* Fixed countable() strings on user destroy
* Check that the user has assets and that the aset model is valid
* Bumped hash
* Caps asset warranty to 20 years
* Command to fix custom field unicode conversion differences between PHP versions (#7263 )
* Fixes #7252 form request changes (#7272 )
* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests
* Removed debug info
* More fixes for #7252
This is mostly working as intended, if not yet the way Laravel wants us to do it.
Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.
* Removed experimental method
* Check for digits_between:0,240 for warranty
* Removed debug code
* Apply fix from PR #7273 to master
* Bumped hash
* Fixed #7250 - permission issue for API fieldsets and fields endpoints
This applies the change from #7294 to master
* Add @mskrip as a contributor
* Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
* CORS for api (#7292 )
* Added CORS support to API
* Changed order so CORS will still work if throttle hit
* Added APP_CORS_ALLOWED_ORIGINS env option
* Fixed typo
* Clarified header comments
* More clarification
* DIsable CORS allowed origins by default to replicate existing behavior
* Change variable name to be clearer
* Bumped version
* Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317 )
* Added comments to the ByFilter query scope for clarity
* Added accessories checkout/checkin API endpoint
* Fixed CVE-2019-10742
https://nvd.nist.gov/vuln/detail/CVE-2019-10742
* Update README.md (#7334 )
Add reference to CSV importer.
* Group related variables in .env
* History importer fixes
* Fixes to history importer
2019-08-14 21:48:14 -07:00
snipe
8b4a9aa382
Fixes to history importer
2019-08-13 18:15:42 -07:00
snipe
0e93495ca2
Check that the user has assets and that the aset model is valid
2019-07-17 17:51:35 -07:00
snipe
77a6f6f400
Cap warranty months to 3 on the frontend blade
2019-07-17 12:15:15 -07:00
snipe
fecf8015a1
Added space between footer and custom message
2019-07-17 12:09:32 -07:00
snipe
79ab0d8dc2
Check for valid seat on hardware view
2019-07-17 12:09:18 -07:00
snipe
6736b1c4e7
Addresses #7238 - add PWA code to layout
...
Needs additional UX testing
2019-07-15 13:49:56 -07:00
snipe
6966c132d0
Update language strings
2019-05-31 12:17:09 -07:00
snipe
c29ab90029
Added Filipino, corrected order for Spanish variations
2019-05-31 11:58:14 -07:00
snipe
087cdd859e
Fixed #7092 - handle weird port forwarding/port numbers for baseUrl
2019-05-29 14:57:58 -07:00
snipe
2dd31544fe
Increased image size to 800px, added lightboxes
2019-05-24 19:11:08 -07:00
snipe
237acdcff0
Show accessory image on view page
2019-05-24 18:22:57 -07:00
sreyemnayr
f85ac97d8c
Feedback for Kits; Fix checkins for accessories ( #7060 )
...
* Kits feedback
* Fix accessory checkin
2019-05-23 19:39:30 -07:00
snipe
149ac4bdf8
Removed cosole log
2019-05-23 17:52:53 -07:00
snipe
f6ef139111
Fixed baseUrl is undefined error
...
I literally cannot figure out how this ever worked before.
2019-05-23 16:56:22 -07:00
snipe
de1189295a
Added spatie language files
2019-05-22 00:51:00 -07:00
snipe
21ec670531
Updated language strings
2019-05-21 19:17:00 -07:00
snipe
b2eacb147b
Fixed #7046 - added user website url back into UI
2019-05-21 18:55:12 -07:00
snipe
729e3eb70d
Updated email strings
2019-05-21 18:43:00 -07:00
snipe
978533b2f4
Fixed XSS vulnerability when creating a new categories, etc via modal on create
...
Same fix as before, because of the weird select2 post-parsing ajax behavior
2019-05-21 18:29:50 -07:00
Ivan Nieto
e40a5a70a5
RTF support added ( #7024 )
...
* Added the Gatte Facade to AssetsController
* Added the filetype RTF in the modal to upload files
* Added validation of RTF files
2019-05-15 15:47:40 -07:00
snipe
d016076806
Fixed #6956 - viewKeys policy inconsistent ( #7009 )
...
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
2019-05-08 08:14:49 -04:00
snipe
407445456a
Merge branch 'features/6204_email_audit-alerts' into develop
...
# Conflicts:
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/LicensesController.php
# composer.json
# composer.lock
# config/version.php
# resources/views/auth/two_factor_enroll.blade.php
2019-05-06 08:45:13 -04:00
snipe
e5c2d77c7d
Fixes #6204 - added email alerts and web/API access to assets due for audits ( #6992 )
...
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
2019-05-05 22:32:52 -04:00
snipe
e4a298ca2a
Added scope for both overdue and upcoming
2019-05-05 22:13:30 -04:00
snipe
00a8a2aff3
Fixed next audit date math
2019-05-05 20:00:05 -04:00
snipe
7d416d1175
Fixed :threshold placeholder
2019-05-05 19:57:23 -04:00
snipe
e9b9301efb
Added language strings for audit views
2019-05-05 19:35:20 -04:00
snipe
4369d6adc6
Added audit due/overdue blades
2019-05-05 19:21:48 -04:00
snipe
69614a7db4
Added gated sidenav items to left nav
2019-05-05 19:21:26 -04:00
snipe
8154d1116c
Added bootstrap-tables presenter formatter to display an audit button
2019-05-05 19:21:06 -04:00
snipe
e46cccdf90
Added upcoming audit report
...
TODO: Fid diff/threshold math
2019-05-04 17:52:17 -04:00
ajsy
0cdc7af611
Update print.blade.php
2019-05-03 15:22:01 +03:00
snipe
ce16eae508
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-05-02 15:20:52 -07:00
snipe
dc73dbfbfd
Fixed #6911 - note must be a string on license checkin
2019-05-02 15:20:47 -07:00
ajsy
878cfee5a2
Revert "Delete print.blade.php"
...
This reverts commit a0721412fa
2019-04-20 09:28:48 +03:00
ajsy
a0721412fa
Delete print.blade.php
2019-04-19 15:50:05 +03:00
ajsy
52add03e56
Update print.blade.php
...
replace string in serial number with x except last five character
2019-04-19 15:43:40 +03:00
ajsy
c974968821
Update view.blade.php
2019-04-19 14:03:09 +03:00
