snipe
1dfa1da0ee
Disable the edit button if permission is not allowed
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 10:14:10 +00:00
snipe
56ba26eb45
Disallow editing of deleted assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 09:58:07 +00:00
snipe
adb8be9345
Added bootstrap formatting to show deleted assets more clearly
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 09:57:57 +00:00
akemidx
4093327b7f
adding in Last Checkin Date to Hardware view and index
2024-02-13 16:52:12 -05:00
snipe
280e778749
Merge remote-tracking branch 'origin/develop'
2024-02-13 13:46:52 +00:00
MrM
6f0fe16b87
Update default.blade.php
...
removed some repeated attributes
2024-02-11 18:45:37 +01:00
snipe
84f8eee869
Revert "Fixed barcodes crashing if asset was deleted"
2024-02-09 20:35:45 +00:00
snipe
ca62481083
Added button and route
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-09 20:23:13 +00:00
snipe
1c3306046c
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2024-02-08 23:14:54 +00:00
snipe
a7af987322
Merge pull request #14229 from Godmartinz/select2-target-fix
...
Fixed select inputs un-select2-ifying on mobile
2024-02-08 23:04:55 +00:00
Godfrey M
c4eaae923a
removed vue comments since they do not apply anymore
2024-02-08 15:02:47 -08:00
snipe
3412b4dc5a
Merge remote-tracking branch 'origin/develop'
2024-02-08 14:58:24 +00:00
snipe
a3b96aff1f
Merge pull request #14233 from uberbrady/prevent_svg_injection_with_fake_extensions_rebased
...
Fixes file upload XSS vulnerability [sc-24156]
2024-02-08 14:56:59 +00:00
Brady Wetherington
9bb191f29f
Fixes file upload XSS vulnerability [sc-24156]
2024-02-08 14:30:40 +00:00
snipe
4a43ccfa92
Merge pull request #14228 from akemidx/bug/sc-23516
...
Fixed: 404 Error on Importer When Uploading a .csv Under Certain Circumstance
2024-02-08 13:43:07 +00:00
Godfrey M
cfe2277a64
forgot to remove comment line
2024-02-06 13:05:04 -08:00
akemidx
e776c2cffa
formatting the button tag
2024-02-06 15:51:04 -05:00
Godfrey M
ca59bc3c9c
removes if statement that prevents select2-ifying inputs
2024-02-06 12:46:17 -08:00
akemidx
575362f4dc
adding in line to null out the active file on click of button
2024-02-06 15:38:07 -05:00
snipe
f0139c5e41
Merge remote-tracking branch 'origin/develop'
2024-02-06 18:25:19 +00:00
snipe
5f8ac66036
Merge pull request #14223 from Godmartinz/user-bulk-edit
...
Fixed Select2 functionality in User bulk check-in Delete User
2024-02-06 18:22:46 +00:00
Godfrey M
5aa34695a1
z
2024-02-05 16:41:29 -08:00
snipe
383e3829e5
Merge remote-tracking branch 'origin/develop'
2024-02-05 19:04:40 +00:00
snipe
4c967a43a7
Removed loading of assets for label count
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 18:56:51 +00:00
snipe
deca842eb0
Merge remote-tracking branch 'origin/develop'
2024-02-05 18:35:56 +00:00
snipe
3806cec10e
Updated language
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 18:28:05 +00:00
snipe
a800fa07f9
Removed duplicate string
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 18:27:58 +00:00
snipe
32c360f032
Re-added UI for load_remote
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 18:23:52 +00:00
snipe
25f1445afc
Merge branch 'master' of https://github.com/snipe/snipe-it
2024-02-05 17:26:54 +00:00
snipe
8316db9702
Merge pull request #13805 from gitgrimbo/more_line_based_markdown
...
Use parseEscapedMarkedownInline for more views
2024-02-05 17:19:41 +00:00
snipe
650aa25659
Merge pull request #14191 from Godmartinz/googlechat_webhook
...
Added support for Google Chat notifications
2024-02-05 17:10:54 +00:00
snipe
e6fdeb0e8a
Removed initial check for assets, licenses, etc
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 15:30:18 +00:00
Godfrey M
f452204d62
applies a conditional to have the the integration test button function properly
2024-01-31 10:47:25 -08:00
Godfrey M
2406d2cfdb
adds google notifs to license seats check in and out
2024-01-30 13:14:24 -08:00
Godfrey M
87bce0c097
adds google notifs for asset check in and out
2024-01-30 12:38:17 -08:00
Godfrey M
dfa33f651a
webhook test works
2024-01-29 12:58:09 -08:00
spencerrlongg
1248260df3
i don't think the output needs to separately escaped, the entire statement is already wrapped in {{}}
2024-01-26 12:33:35 -06:00
spencerrlongg
2b0dd8851c
probably needs more testing... but should work
2024-01-26 11:47:09 -06:00
snipe
ad2e0cc7f3
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-26 15:17:59 +00:00
snipe
ab926f2e33
Merge pull request #14153 from Godmartinz/ms_teams_webhook
...
Added support for Microsoft Teams Notifications
2024-01-25 08:27:17 +00:00
Marcus Moore
f5dafc477a
Avoid unnecessary model hydration on asset model show page
2024-01-24 16:14:51 -08:00
Godfrey M
c65b32bcdb
removed translation fixed via method
2024-01-24 14:49:42 -08:00
snipe
57a8630e99
Merge pull request #14162 from snipe/bug/sc-24511
...
Fixed #14114 - correctly sort related fields for labels
2024-01-24 21:37:20 +00:00
snipe
5909654fd4
Merge pull request #14163 from Godmartinz/ldap_test_table_fix
...
Added overflow scroll to ldap test table
2024-01-24 20:18:08 +00:00
Godfrey M
e175cdbfd7
adds table overflow scroll
2024-01-24 12:13:40 -08:00
snipe
5f8e63717d
Merge pull request #14058 from Godmartinz/ldap_test_table_fix
...
Fixed Ldap sync test table and table data from overflowing
2024-01-24 19:31:04 +00:00
snipe
2c7bbfa637
Added additional sort/order hidden fields
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 19:09:20 +00:00
snipe
dd3b2da670
Updated variable names for clarity, remove the concat of order and sort
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 19:08:47 +00:00
Godfrey M
00f07ac2ce
add translations, brush up code
2024-01-24 10:38:06 -08:00
snipe
8ca4c51186
Updated strings
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 15:29:39 +00:00
snipe
f73a55f9ab
Fixed english and attribute placeholder
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 14:58:06 +00:00
snipe
e6f94cfebf
Missed one
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 14:47:54 +00:00
snipe
c54eb22754
Moved URL string to general
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 14:46:52 +00:00
snipe
661cc2b460
Merge pull request #14131 from Godmartinz/label_engine_translations
...
Adds translations for Label example
2024-01-24 13:36:40 +00:00
snipe
49dc1dd37a
Merge pull request #14132 from marcusmoore/chore/sc-24501
...
Improved radio button values in custom report form
2024-01-24 13:22:48 +00:00
Godfrey M
7c529df49b
adds consumable checkout ms notification
2024-01-23 11:21:20 -08:00
Godfrey M
e969f8808c
adds licenses ms notifications
2024-01-23 11:10:04 -08:00
Godfrey M
5a46ef5d5b
adds Accessory Check in out Notifcations,
2024-01-22 15:30:15 -08:00
snipe
aceb072a1b
Updated URL for apple manufacturer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-18 11:49:30 +00:00
Godfrey M
ce02e43ab2
fixed integration link, added some conditionals
2024-01-17 16:30:27 -08:00
Godfrey M
9f2af40ef2
adds MS teams integration test
2024-01-17 13:41:45 -08:00
Godfrey M
93ef8317e8
added payload, new MS webhook test method
2024-01-17 11:49:31 -08:00
Marcus Moore
8aa5cf530b
Improve radio button values in custom report form
2024-01-16 12:33:16 -08:00
Godfrey M
6be8c063a9
added moar translations
2024-01-16 12:05:09 -08:00
Godfrey M
74dc17b4b9
adds translations for Label example
2024-01-16 10:47:45 -08:00
snipe
66c24e152f
Merge pull request #14114 from uberbrady/preserve_sort_in_label_generation
...
Fixed [FD-39640]: preserve sort order when generating asset labels
2024-01-11 21:46:01 +00:00
snipe
f610afb1b8
Merge pull request #14121 from Godmartinz/checkout_bug_fix
...
Fixed multiple click checkouts for consumables, accessories and components
2024-01-11 11:15:48 +00:00
Godfrey M
1f7f9717c5
fixes checkout bug
2024-01-10 11:35:32 -08:00
MrM
9d16eacad5
Added license expiration date in "view asset"
...
I've added the expiration date of the license associated with an asset in hardware/ID#software, it is useful to see all of them on the asset page instead of having to open the license details page. I've also fixed a space formatting issue.
2024-01-09 18:30:51 +01:00
Brady Wetherington
4b90f85372
Fixed [FD-39640]: preserve sort order when generating asset labels
2024-01-09 16:37:33 +00:00
snipe
7c5d29ccd9
Move Google Login prompt higher, made it bigger
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-05 14:56:34 +00:00
snipe
432f05586e
Merge pull request #14100 from Godmartinz/fix-license-seat-department-link
...
fixed `departmentNameLinkFormatter` url
2024-01-04 22:40:24 +00:00
Godfrey M
a110b5fcca
ugh
2024-01-04 12:37:53 -08:00
Godfrey M
1f1e58eb1e
remove unintentional change
2024-01-04 12:36:57 -08:00
Godfrey M
32b34ca9b9
departmentNameLinkFormatter had a bad url
2024-01-04 12:33:33 -08:00
snipe
50eb257cec
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-03 23:12:29 +00:00
spencerrlongg
41e0275c95
htmlentities()
2024-01-03 12:42:36 -06:00
snipe
8bc5f08da5
Fixed a few more small localization issues
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-24 20:14:49 +00:00
snipe
eead7b49e3
Fixed language code
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-24 19:07:11 +00:00
snipe
493ffc10c1
Defaulted to en-US on quickstart
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 20:16:00 +00:00
snipe
98e6f7e14c
Updated form marco with new locale codes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 18:12:02 +00:00
snipe
02f24d3332
WTF
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 17:57:17 +00:00
Godfrey M
4b071745fa
prevents tables and table data from overflowing
2023-12-19 09:49:40 -08:00
snipe
6801caaa0d
Added backl vendors directory
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 17:49:10 +00:00
snipe
b9a877d92d
Fixed donked dir tree
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 17:42:39 +00:00
Godfrey M
c0dba95426
testing ldap test table fix
2023-12-19 09:32:26 -08:00
snipe
026ea41dee
Use correct language codes, updated strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-19 17:23:16 +00:00
snipe
1063dcfb7b
Merge pull request #13994 from Godmartinz/add_license_to_info_for_activation
...
Added licensed to name and email in user profile license view
2023-12-19 13:16:34 +00:00
snipe
e1d2fdcfb7
Merge pull request #14001 from Godmartinz/feature/sc-18577
...
Added Status Label names to Asset history/ Action log
2023-12-18 22:41:02 +00:00
snipe
e71080ef37
Make action date sortable on asset history view
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:41:15 +00:00
snipe
14c70ee6c4
Removed BS th classes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:37:47 +00:00
snipe
8fc470c978
Added fields to activity report
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:34:44 +00:00
snipe
f5f136b9b5
Added fields to history views
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:34:31 +00:00
snipe
93c7108eda
Added action source to translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:33:49 +00:00
snipe
70250191ed
Merge pull request #14026 from snipe/bug/sc-23599
...
Fixed checkbox/radio button display on models edit for default fields
2023-12-13 14:00:27 +00:00
snipe
337d863330
Missed closing label on radio buttons
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-13 13:52:31 +00:00
snipe
ac96bad4a1
Merge pull request #14014 from Godmartinz/requested_assets_table_missing_header
...
added a missing table header on requested table for checkout
2023-12-13 12:57:20 +00:00
snipe
3834221589
Fixed radio button display
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-13 06:30:08 +00:00
snipe
016ca1adc1
Fixed HTML for checkboxes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-13 06:27:50 +00:00
snipe
631dd58de1
Added model name and number to quickscan
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 04:23:04 +00:00
snipe
41f1c5c1e3
Smaller icon size for activity reports, other action icons
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 00:58:20 +00:00
snipe
65dae836c6
Set default sorting on backups to latest first
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 00:35:08 +00:00
snipe
456e6979f0
Updated import icons
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 00:12:06 +00:00
Godfrey M
5eb08d9568
added a missing table header for checkout
2023-12-11 11:14:55 -08:00
snipe
778e45c9fd
Fixed maintenances patch endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-07 19:36:12 +00:00
Godfrey M
49342a4542
added status names to asset history
2023-12-05 11:50:43 -08:00
Godfrey M
a95f0b8862
remove column sizes
2023-12-05 11:07:52 -08:00
Godfrey M
15af64a355
fixed the bootstrap column sizes
2023-12-05 10:07:58 -08:00
snipe
7258af20fc
Added help text to RTD location field
...
Signed-off-by: snipe <snipe@snipe.net>
2023-12-05 14:40:49 +00:00
Godfrey M
0e9e31f68b
adds info needed for license self activation
2023-12-04 11:12:30 -08:00
Godfrey M
4fd43799b4
missed one view
2023-12-04 10:56:03 -08:00
Godfrey M
fdaa44654d
changes the table header Serial to Product Key
2023-11-30 10:46:18 -08:00
snipe
42109dc1eb
Merge pull request #13976 from Godmartinz/sc-24144_final
...
Fixed black dark theme, contrast issues etc
2023-11-30 16:23:13 +00:00
Godfrey M
4a19f23e7c
fixes for black dark theme
2023-11-29 11:30:02 -08:00
snipe
189c90e9e5
Merge pull request #13954 from Godmartinz/feature/sc-23756
...
Fixed user total asset cost to appear conditionally
2023-11-29 09:40:39 +00:00
snipe
c35d234cde
Merge pull request #13959 from snipe/fixes/rebased_bulk_edit_fix
...
Fixed status and model in bulk edit
2023-11-29 09:40:03 +00:00
akemidx
63065bab5d
adding in icons for clarity, since there are two places called settings
2023-11-28 17:51:43 -05:00
akemidx
108658520d
translating no group message on user edit page
2023-11-28 17:15:51 -05:00
Godfrey M
9e59550b79
removes the row instead of just the optional values
2023-11-28 10:08:32 -08:00
snipe
601ebcc1e6
Removed table header contraint
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 16:00:42 +00:00
snipe
2247be77d8
Fixed translation
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:56:20 +00:00
snipe
187d3abeb4
Use translation string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:15:07 +00:00
snipe
fa1176ce14
Added translation
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 15:14:12 +00:00
snipe
4723cfd4ba
More refactoring
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 13:33:32 +00:00
snipe
c997ae44c2
FAFO troubleshooting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-28 13:33:32 +00:00
Godfrey M
45e9d0597a
makes user total asset cost appear conditionally
2023-11-27 11:36:47 -08:00
snipe
dbb6002f9f
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-27 14:43:16 +00:00
snipe
776c91934b
Updated dir name for Khmer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-27 14:39:13 +00:00
snipe
77ab5eb875
Merge pull request #13909 from akemidx/bug/sc-23999
...
Hiding Order Column in Custom Fieldsets
2023-11-24 19:10:42 +00:00
snipe
9607567b75
Check for the array key in $activeFile->first_row
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-24 10:08:35 +00:00
snipe
978bbeccc5
Added strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-23 16:18:09 +00:00
snipe
accfbc1b99
Show number of remaining seats and category in form
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-23 16:18:03 +00:00
snipe
88cc234cbd
Higher contrast for green dark skin
...
Applies #13915 to develop
Signed-off-by: snipe <snipe@snipe.net>
2023-11-23 15:28:43 +00:00
snipe
ad6b286e10
Added default location to view-assets view
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-23 15:01:39 +00:00
snipe
7f94b7df32
Removed refresh from asset view table
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-23 15:01:24 +00:00
snipe
c6178bd619
Added translation for success password save
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 22:59:59 +00:00
snipe
3929c8f260
Nicer alert layout
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 22:57:54 +00:00
snipe
0e51a0935d
Added language strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 17:41:12 +00:00
snipe
ffc1266d0e
UI fix - don’t show the trash can icon on things that can be restored
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-22 17:41:06 +00:00
snipe
fb125af0df
Tweaked language
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-21 15:09:50 +00:00
snipe
0ae91d305d
Add the two_column_unique_undeleted translation
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-21 15:03:03 +00:00
akemidx
e5a4214b8b
hiding all order stuff
2023-11-20 20:32:14 -05:00
snipe
fe2cfa0d38
Redirect if category is missing or invalid
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-20 15:28:44 +00:00
spencerrlongg
c7f90ad86d
tested, working
2023-11-15 12:50:40 -06:00
snipe
9316ecb8d6
CLarified upload error text
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-14 16:14:39 +00:00
snipe
4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769
...
Changed data source input to select in new label engine
2023-11-13 20:38:42 +00:00
snipe
4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations
...
Added multi location sync for ldap
2023-11-13 20:20:45 +00:00
snipe
a24d21e683
Added new unescaped alert box
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-08 14:41:05 +00:00
snipe
3f8b63e053
Add linked text
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-08 14:40:02 +00:00
snipe
26311e46b8
Fixed URL to favicon on default blade (used in 404 messages)
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-08 11:38:48 +00:00
snipe
b3a6cc633b
Merge pull request #13769 from Godmartinz/location-dropdown-duplication
...
clarifies an address column under locations
2023-11-08 08:59:07 +00:00
snipe
bc9545ca96
Merge pull request #13823 from spencerrlongg/chore/sc-23922
...
New Translation Strings for Custom Asset Export
2023-11-08 08:57:20 +00:00
snipe
cf42eca198
Merge pull request #13814 from ntbutler-nbcs/feature-location-history
...
Added #13754 - asset history tab to locations view
2023-11-08 08:55:07 +00:00
spencerrlongg
93101d36b8
removed refresh button on client tables
2023-11-07 15:07:24 -06:00
snipe
d0cc42a068
Added employee number to user merge screeb
...
Signed-off-by: snipe <snipe@snipe.net>
2023-11-03 20:09:11 +00:00
Godfrey M
3b6a0d6525
allows multi location sync for ldap
2023-11-02 16:50:19 -07:00
spencerrlongg
8f75bb8706
fix translation strings
2023-10-31 21:38:52 -05:00
snipe
e381bf978f
Merge pull request #13816 from snipe/bug/sc-23900
...
Fixed datetime displayed on license edit for fields that should be date
2023-10-31 16:59:12 +00:00
snipe
22996895d8
Check for valid model
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 16:04:19 +00:00
snipe
28641493ca
Check that the category exists
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 15:58:59 +00:00
snipe
aa2a25dc19
Display the form errors correctly
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 15:30:49 +00:00
snipe
3495652827
Added checkboxes to intentionally remove field values in bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 12:52:53 +00:00
snipe
209627e2cc
Force format if dates are given
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-31 12:25:00 +00:00
Nathan Butler
79f380cbe7
Added asset history tab to locations view
2023-10-31 10:28:54 +11:00
Godfrey M
97953ae082
add missing translation string
2023-10-30 12:17:55 -07:00
snipe
8c46f4ef69
Added min_amt value to model detaul page
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-30 13:19:59 +00:00
gitgrimbo
d556f0d275
Use parseEscapedMarkedownInline for more views
2023-10-27 15:37:56 +01:00
spencerrlongg
90eb3b86cf
added user phone & address fields
2023-10-26 19:10:53 -05:00
snipe
aab7eb4a85
Merge pull request #13800 from snipe/fixes/bulk_edit_assets
...
Fixed FD-38641 - Bulk asset edit unable to update model_id, misc other bugs
2023-10-26 15:56:47 +01:00
snipe
1ce95b6eac
Removed debugging
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 14:34:27 +01:00
snipe
64219da0b4
Merge branch 'develop' into Robert-Azelis-EOL_fix_improvements
2023-10-26 13:36:18 +01:00
snipe
ff72c4fbaa
Added nicer formatting for fields in log meta
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 09:17:28 +01:00
snipe
7042260871
More style polishing on custom fields in bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 04:23:11 +01:00
snipe
77d141d19c
Don’t check the delete expected checkin by detault
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 03:56:02 +01:00
snipe
522aa96fcc
Changed error variable name
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 02:36:18 +01:00
snipe
4b6b36c639
Removed semicolon
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 01:49:14 +01:00
snipe
4a759f0a20
Added fingerprint icon for unique
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-26 01:49:01 +01:00
snipe
7509d57bf6
Merge pull request #13796 from snipe/feature/sc-23880
...
Added optional custom fields to requestable assets page
2023-10-25 20:57:54 +01:00
snipe
da08f0e26f
Merge pull request #13584 from Godmartinz/Bulk_location_edit_fix_gh-13572
...
added an option to bulk edit location & fixed location bug
2023-10-25 20:57:18 +01:00
snipe
0feb56d931
Removed period
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:39:15 +01:00
snipe
a0cae77278
Fixed weird layout quirk on smaller screens
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:21:07 +01:00
snipe
0f97c0601b
Nicer show/hide if encrypted, warn if already encrypted
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:11:06 +01:00
snipe
3916bac95f
Added warning translation for encrypted fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 20:10:46 +01:00
snipe
6264d90459
Removed ending period for consistency
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:45:11 +01:00
snipe
57d3b2d2ef
Check for encryption
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:44:10 +01:00
snipe
a202bf81fa
Removed column widths, check for encryption and showable
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:44:02 +01:00
snipe
43da292d60
Used short translation for sr-only text
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:43:34 +01:00
snipe
eb82bc290d
Clarified translation
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 19:42:07 +01:00
snipe
3c6b79e807
Added new fields to blades
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:28:55 +01:00
snipe
3a37b80251
Added translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:21:58 +01:00
snipe
e7ef7f04f0
Removed periods for consistency
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-25 17:21:48 +01:00
snipe
8c93e79397
Merge pull request #13787 from inietov/fixes/errorexception_undefined_array_key
...
Fixed ErrorException: Undefined array key in importer blade [sc-23864]
2023-10-25 07:47:48 +01:00
Ivan Nieto Vivanco
f2f3931fa9
Formatting correctly
2023-10-24 11:26:37 -06:00
snipe
944520bc5d
Fixed notification formatting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-24 17:02:16 +01:00
snipe
aae289e150
Added missing string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-24 17:02:07 +01:00
Ivan Nieto Vivanco
0c5d54dfde
Create the language string to show in the importer GUI indicating the file is empty
2023-10-23 22:09:17 -06:00
Ivan Nieto Vivanco
49f6eef9df
Places a text indicating that the file is empty and display it as an info text
2023-10-23 21:57:35 -06:00
Ivan Nieto Vivanco
8f8e5cb723
Adds condition to only process CSV if is not empty
2023-10-23 21:47:10 -06:00
Robert-Azelis
309f30f630
Update view.blade.php
...
display marker if date of EOL is expired and show real EOL rate as diff between purchase date and eol date
2023-10-22 18:38:59 +02:00
Robert-Azelis
04a867d12b
Update eol_date.blade.php
...
read EOL date from database instead calculate on the base model EOL rate
2023-10-22 18:32:20 +02:00
Robert-Azelis
7571d45d44
[Improvement[ Dashboard
...
If multicompany option is enabled much more important for admin is to see on dashboard list of companies instead of locations.
In other way if multicompanies option is disabled then locations are displayed.
2023-10-22 17:41:33 +02:00
Godfrey M
e0a4387b10
clarifies an address column under locations
2023-10-19 10:01:08 -07:00
snipe
38066bf162
Merge pull request #13758 from inietov/fixes/array_to_string_conversion_rb17355
...
Fixed ErrorException: Array to String Conversion rb17355
2023-10-18 19:09:13 +01:00
spencerrlongg
6b745930b5
what typo?
2023-10-18 13:00:13 -05:00
spencerrlongg
38de69b3da
new validation rule
2023-10-18 12:41:24 -05:00
snipe
1be503b21a
Make sure order number is not an array
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:36:16 +01:00
snipe
0c86b67ed6
Added error reporting to UI
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:13:35 +01:00
snipe
787a64d313
Check for true/false explicitly on api table view
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 13:05:06 +01:00
snipe
6d55d78280
Set resend acceptance to POST
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 16:13:41 +01:00
snipe
e5f5802235
Added tighter controls for matching log ID and item_id
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-09 15:17:03 +01:00
snipe
cd3b4754e8
Merge pull request #13704 from Godmartinz/feature/sc-23571_v2
...
Added a check-in button on components tab of Asset view
2023-10-05 14:28:37 +01:00
snipe
1dab4b59e9
Merge pull request #13693 from Godmartinz/bug/sc-9955
...
added proper margin-top to sidebar menu on bigger resolutions
2023-10-05 14:27:25 +01:00
Godfrey M
92776adb93
remove unnecessary changes
2023-10-03 12:31:58 -07:00
Godfrey M
dee36fc294
adds component checkin to asset tab
2023-10-03 12:30:08 -07:00
Godfrey M
1e8f90bcf0
gives proper margin-top to sidebar menu on bigger resolutions
2023-10-02 11:46:08 -07:00
snipe
129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2
...
Standardize Asset EOL Date
2023-10-02 16:09:22 +01:00
snipe
b7c390a257
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-10-02 14:23:22 +01:00
snipe
754ec7563a
Fixed consumable user view route name
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-29 15:15:03 +01:00
Marcus Moore
ed77e8768c
Re-order options
2023-09-28 12:33:27 -07:00
snipe
c1f545a523
Merge pull request #13679 from Godmartinz/bug/sc-23688
...
Fixed General Webhooks error messaging and validation
2023-09-28 20:24:09 +01:00
Godfrey M
8792d654b6
added translations for messages
2023-09-28 12:15:17 -07:00
Marcus Moore
36638feac4
Add assigned to as option
2023-09-28 11:37:02 -07:00
snipe
0bf423cda9
Set modal focus to modal-name field
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 19:16:40 +01:00
snipe
6fa0d42bc2
Fixed bug where license checkout/checkin notes were not being saved
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 15:40:18 +01:00
snipe
bb7a41628a
Fixed #13662 - added clipboard.js
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-28 15:06:55 +01:00
Marcus Moore
a47e36c1e5
Add custom fields as options
2023-09-27 16:51:53 -07:00
Marcus Moore
a4a25ab9d0
Remove a couple fields
2023-09-27 16:35:44 -07:00
Marcus Moore
518ae28a37
Improve option display values
2023-09-27 16:20:26 -07:00
Marcus Moore
74a891afbb
WIP: Render select box for field options in label engine
2023-09-27 15:58:01 -07:00
snipe
7bcb28d8fd
Commented out sortable columns
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-26 15:24:20 +01:00
snipe
660abeca9e
Merge pull request #13638 from marcusmoore/bug/sc-20704
...
Fixed exception being thrown when selected import was deleted
2023-09-26 15:00:35 +01:00
snipe
81ae32d3f9
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-26 14:33:51 +01:00
snipe
81a982fd77
Merge pull request #13650 from snipe/features/more_info_in_settings
...
Features/more info in settings
2023-09-25 13:46:00 +01:00
snipe
619712b927
Fixed table
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-25 13:45:46 +01:00
snipe
359cd2a267
A few more config options
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-25 13:28:13 +01:00
snipe
bd0863d9c7
Added new translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-25 10:54:46 +01:00
snipe
28cd0085b7
Added Khmer as an available language
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-25 10:54:32 +01:00
snipe
456d55c3bd
Added some mail settings to /settings for easier reference
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-21 16:14:47 +01:00
Marcus Moore
b1199100a0
Display error message if import file deleted before it can be selected
2023-09-20 17:22:12 -07:00
Godfrey M
b7901ae2d8
dont allow redirects, messaging applied, general webhook validation applied
2023-09-20 12:54:34 -07:00
spencerrlongg
7dab59c98d
fix for no eol, fix for optional in view
2023-09-20 14:17:30 -05:00
snipe
14c0517927
Fixed #13628 - removed duplicate favicon tag
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-19 10:21:38 +01:00
snipe
2a638e66f0
Added column re-ordering
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-15 21:53:34 +01:00
snipe
3ba8b60f54
Fixed regression that disabled sticky headers
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-15 20:28:28 +01:00
snipe
131ccaa5b9
Merge pull request #12869 from Godmartinz/bug/sc-23134
...
Fixed footer sizing issue
2023-09-15 14:31:07 +01:00
snipe
860e7791ff
Fixed #13592 - unable to delete model from view page
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-14 23:35:44 +01:00
snipe
bbe7d9dde2
Removed stray space
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-14 22:08:53 +01:00
snipe
932c02cc54
Typo
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-14 22:08:30 +01:00
snipe
84b0ff76ed
Revert large warning size
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-14 22:06:19 +01:00
snipe
273740b8f5
Fixed import error warning
...
Signed-off-by: snipe <snipe@snipe.net>
2023-09-14 22:04:23 +01:00