Marcus Moore
|
d9164281ab
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# resources/views/livewire/oauth-clients.blade.php
|
2024-06-17 12:57:04 -07:00 |
|
snipe
|
27063d5bae
|
Fix weird layout in admin oauth [sc-25673]
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 15:44:07 +01:00 |
|
snipe
|
891a0a0965
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2024-06-17 13:05:31 +01:00 |
|
snipe
|
50f0797850
|
Added aria hidden to icon
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 13:05:27 +01:00 |
|
snipe
|
d9cc3c3ec7
|
Removed extra divs
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 12:52:23 +01:00 |
|
Marcus Moore
|
c3e6e1144f
|
Merge branch 'develop' into chore/sc-23725/livewire3
|
2024-06-12 15:12:40 -07:00 |
|
snipe
|
cacb5d62dc
|
Merge pull request #14800 from snipe/fixes/importer_tweaks
Importer tweaks
|
2024-06-12 12:51:11 +01:00 |
|
snipe
|
7e3d66ec53
|
Merge branch 'develop' into fixes/companyable_trait_on_users
|
2024-06-12 11:27:26 +01:00 |
|
snipe
|
f8ab9f62f6
|
Merge pull request #14842 from Godmartinz/adjust-preview-window
Fixed label preview window position
|
2024-06-07 18:09:56 +01:00 |
|
Godfrey M
|
77e6058e4c
|
remembers chosen label
|
2024-06-06 13:55:15 -07:00 |
|
Godfrey M
|
4a60026162
|
moves preview down by field definitions
|
2024-06-06 13:42:06 -07:00 |
|
Godfrey M
|
3621292a0e
|
removes unnecessary height
|
2024-06-06 13:28:05 -07:00 |
|
Godfrey M
|
6df1c36011
|
oops
|
2024-06-06 13:24:02 -07:00 |
|
Godfrey M
|
44dae22a3c
|
adjust label preview window
|
2024-06-06 13:18:19 -07:00 |
|
snipe
|
871255f28c
|
Fixed #14812 - added consumables to individual inventory report
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 20:40:45 +01:00 |
|
Marcus Moore
|
60c7efae3c
|
Remove commented code
|
2024-06-05 11:48:10 -07:00 |
|
snipe
|
e054fc1ef1
|
Removed noisy import debugging, made nicer output
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:28:35 +01:00 |
|
snipe
|
f4d530b4b1
|
Removed filename column since it’s never worked
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:28:35 +01:00 |
|
snipe
|
9d56617caf
|
Moved expected checkin date on view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 10:28:35 +01:00 |
|
snipe
|
832ceeba56
|
Fixed missing endpush
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 09:57:10 +01:00 |
|
Marcus Moore
|
b2a0e7958b
|
Inject alpine on label engine page
|
2024-06-04 17:03:36 -07:00 |
|
Marcus Moore
|
ef91c8123e
|
Remove unneeded re-render of select2
|
2024-06-04 15:49:57 -07:00 |
|
Marcus Moore
|
296cf3e34b
|
Update OauthClients component
|
2024-06-04 15:37:41 -07:00 |
|
Godfrey M
|
6202f6157a
|
fix select2 behavior
|
2024-06-04 08:41:00 -07:00 |
|
snipe
|
a15ed6eaee
|
Wrap disabled <a> links in a span for tooltips
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 19:29:29 +01:00 |
|
snipe
|
1d97d95c10
|
UI and styling tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:48:34 +01:00 |
|
snipe
|
4a1b1675cb
|
Use storage helper
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:48:09 +01:00 |
|
snipe
|
8c5249ba4b
|
Disable buttons on view page if model is invalid
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:47:53 +01:00 |
|
snipe
|
b936591240
|
Warn and disable on checkout if model is invalid
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:47:34 +01:00 |
|
snipe
|
76e664d647
|
Warn and disable the checkout button if model is invalid
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:47:18 +01:00 |
|
snipe
|
0253c2a756
|
Lauout tweaks, warn and disable button if model is invalid
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 18:46:57 +01:00 |
|
Marcus Moore
|
1736bf5510
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# app/Livewire/LoginForm.php
# package.json
# resources/views/livewire/login-form.blade.php
|
2024-05-30 16:56:50 -07:00 |
|
Marcus Moore
|
1a1b891309
|
Remove unused Login Livewire component
|
2024-05-30 16:49:05 -07:00 |
|
Marcus Moore
|
2eaac3d381
|
Fix select2 re-renders
|
2024-05-30 16:20:04 -07:00 |
|
Marcus Moore
|
f03249898a
|
Update id syntax in custom fields component
|
2024-05-30 16:12:52 -07:00 |
|
Godfrey M
|
0ee441a976
|
adds hidden as well
|
2024-05-30 11:19:06 -07:00 |
|
Godfrey M
|
cf8de3baa9
|
fix checkin option from appearing
|
2024-05-30 11:11:35 -07:00 |
|
snipe
|
aadee068b3
|
Merge pull request #14740 from Godmartinz/redirect_back_to_asset
Added Redirect options to asset check in/out
|
2024-05-30 14:14:04 +01:00 |
|
snipe
|
a46e2ebfd8
|
Small tweaks to user export, user view translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-30 13:59:00 +01:00 |
|
snipe
|
f6fe6e70b9
|
Merge branch 'develop' into redirect_back_to_asset
|
2024-05-30 13:38:11 +01:00 |
|
Marcus Moore
|
e80b80f5d1
|
Remove manual livewire tags
|
2024-05-29 16:04:05 -07:00 |
|
Marcus Moore
|
9e35441281
|
Importer fixes
|
2024-05-29 15:50:42 -07:00 |
|
Godfrey M
|
e28ad50bec
|
fixes the color change
|
2024-05-29 15:34:08 -07:00 |
|
Marcus Moore
|
7d95e7765d
|
Add a few .prevents
|
2024-05-29 14:13:29 -07:00 |
|
Marcus Moore
|
8d924b60d7
|
Replace references to @this in importer
|
2024-05-29 13:51:57 -07:00 |
|
Marcus Moore
|
34595c266d
|
Update script tag
|
2024-05-29 13:16:30 -07:00 |
|
Marcus Moore
|
638ae9bdd5
|
Use new id method
|
2024-05-29 13:15:59 -07:00 |
|
Godfrey M
|
713ce7836f
|
add some css in label field selector
|
2024-05-29 13:07:33 -07:00 |
|
Marcus Moore
|
43616d1874
|
Remove alpine reference from webpack
|
2024-05-29 12:30:20 -07:00 |
|
Marcus Moore
|
73e3ac7dd8
|
Migrate to $dispatch
|
2024-05-29 12:18:31 -07:00 |
|
Marcus Moore
|
45419586fe
|
Migrate away from wire:model.prevent
|
2024-05-29 12:11:33 -07:00 |
|
Marcus Moore
|
d8a480b2a8
|
Migrate to wire:model.blur
|
2024-05-29 12:11:02 -07:00 |
|
Marcus Moore
|
29d87246a2
|
Migrate away from wire:model.defer
|
2024-05-29 12:10:46 -07:00 |
|
Marcus Moore
|
58e638d3cb
|
Migrate to wire:model.live
|
2024-05-29 12:08:25 -07:00 |
|
snipe
|
12e107a71b
|
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout
Bulk Consumable Checkout
|
2024-05-29 19:42:25 +01:00 |
|
snipe
|
7bbee053c6
|
Updated fa icon call
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 19:19:45 +01:00 |
|
snipe
|
369c819a27
|
Merge pull request #14754 from Godmartinz/footer_user_bug
Removed extra div from User Details.
|
2024-05-29 11:29:02 +01:00 |
|
snipe
|
a5d0a21757
|
Fixed string path
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 00:26:33 +01:00 |
|
snipe
|
df882bbcbc
|
Pass item’s currency if set by location
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-28 10:24:10 +01:00 |
|
snipe
|
b3fe10baa8
|
Merge branch 'snipeit_v7_laravel10' into chore/sc-25656/minus_icon_for_fieldsets
|
2024-05-25 11:19:43 +01:00 |
|
snipe
|
dc5e15f919
|
Added translation for external link
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-25 11:02:07 +01:00 |
|
snipe
|
ad7b291062
|
Added translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-25 10:55:48 +01:00 |
|
snipe
|
b54c1caa74
|
Improved translation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-25 10:43:28 +01:00 |
|
snipe
|
c3cf123189
|
Better translation for custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-25 10:39:47 +01:00 |
|
snipe
|
3a2900621c
|
Changed icon, added translation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-25 10:20:52 +01:00 |
|
Godfrey M
|
442903ea5e
|
trying to get link to work, fixed up markup and url
|
2024-05-23 16:08:18 -07:00 |
|
Godfrey M
|
d3ab152d30
|
adds reminder notification constructor and updates markdown
|
2024-05-23 12:47:02 -07:00 |
|
Brady Wetherington
|
4adbd7af4c
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-22 21:02:11 +01:00 |
|
Godfrey M
|
c4d96f6ea3
|
removed extra div
|
2024-05-22 12:35:32 -07:00 |
|
snipe
|
c9f7847fb3
|
Merge pull request #14745 from snipe/fixes/self_api_endpoint
Refactor group syncing on user edit API endpoint
|
2024-05-22 12:43:22 +01:00 |
|
Godfrey M
|
f2693ee957
|
conditionally fixed redirect select option
|
2024-05-21 14:08:35 -07:00 |
|
Godfrey M
|
9f02be0823
|
removed extra div
|
2024-05-21 10:15:18 -07:00 |
|
Godfrey M
|
b5553af8ed
|
rename variable
|
2024-05-21 10:11:53 -07:00 |
|
Godfrey M
|
4d6f4303f5
|
fixed partial up
|
2024-05-21 10:11:01 -07:00 |
|
Godfrey M
|
8a0afae90f
|
fixed query, fixed no email logic, needs new markdown
|
2024-05-21 09:42:00 -07:00 |
|
snipe
|
a7ccf0efff
|
Added translation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-21 09:56:51 +01:00 |
|
Godfrey M
|
db9c435ae0
|
removed extra div tags
|
2024-05-20 10:48:57 -07:00 |
|
Godfrey M
|
280c03dcad
|
remove license checkout changes
|
2024-05-20 10:25:59 -07:00 |
|
Brady Wetherington
|
f633dbba64
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-20 12:55:29 +01:00 |
|
snipe
|
6a6272ace3
|
Translate no records found message
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-20 11:19:47 +01:00 |
|
snipe
|
81efaa7481
|
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form
|
2024-05-16 16:13:21 +01:00 |
|
snipe
|
de088d452f
|
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance
Adds a note text area to asset acceptances/declines
|
2024-05-16 15:06:05 +01:00 |
|
snipe
|
30f738646e
|
Merge pull request #14700 from marcusmoore/chore/sc-25471
Updated alpine to the latest version (3.13.10)
|
2024-05-15 19:59:51 +01:00 |
|
snipe
|
71b5bf2eef
|
Added visual on the hardware view screen
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-15 16:33:48 +01:00 |
|
snipe
|
ab8b40745e
|
Added next audit date to create/edit asset screen
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-15 16:33:48 +01:00 |
|
snipe
|
16ec47573b
|
Added help text to bulk edit blade
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-15 16:33:48 +01:00 |
|
snipe
|
556d0b44a3
|
Added asset
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-15 16:33:48 +01:00 |
|
snipe
|
8841e21dc9
|
Removed quickscan header
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-15 16:33:47 +01:00 |
|
snipe
|
f5e03b264f
|
Show additional help text if help text is given
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-15 16:33:47 +01:00 |
|
snipe
|
eb09a99eb0
|
Merge pull request #14707 from spencerrlongg/bug/sc-24912
Bulk Edit Tests and Tweaks
|
2024-05-15 11:22:31 +01:00 |
|
Godfrey M
|
dc418a7033
|
need to make variables names uniform
|
2024-05-14 14:09:54 -07:00 |
|
Godfrey M
|
15cc4345ab
|
adds dynamic redirects to Assets
|
2024-05-14 13:25:52 -07:00 |
|
Marcus Moore
|
d7f0ee49b7
|
Update Alpine to 3.13.10
Includes fix to new label engine.
|
2024-05-07 17:08:05 -07:00 |
|
snipe
|
934593e0b6
|
Updated icon
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 18:09:55 +01:00 |
|
snipe
|
49dc9767b6
|
Added debugging :(
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 15:54:43 +01:00 |
|
snipe
|
92ae069629
|
Disable button in UI if user cannot be deleted
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 12:06:35 +01:00 |
|
snipe
|
3594ed67d1
|
Removed back buttons on settings index
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-06 20:48:32 +01:00 |
|
snipe
|
c816b960b5
|
Fixed stray closing paren
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-06 20:34:36 +01:00 |
|
Brady Wetherington
|
5b02a43957
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-06 18:44:03 +01:00 |
|
Mustafa Online
|
55b004d53d
|
Improve RTL support
|
2024-05-04 13:32:42 +02:00 |
|
Mustafa Online
|
c1b72a8ce6
|
Revert "Improve RTL support"
This reverts commit fa0bea87e6 .
|
2024-05-04 13:31:52 +02:00 |
|
Mustafa Online
|
fa0bea87e6
|
Improve RTL support
I'm starting to make some improvements to RTL support, more PR's to come to address other parts.
|
2024-05-04 13:17:48 +02:00 |
|
Godfrey M
|
c94a7613ca
|
dropdown redirect options, helper function and session variable added
|
2024-05-02 12:16:20 -07:00 |
|
snipe
|
f893b23129
|
Refactored title blade areas
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-02 12:35:52 +01:00 |
|
snipe
|
8c65880504
|
Changed badge to span in default blade
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-02 12:35:41 +01:00 |
|
spencerrlongg
|
25480293dc
|
change keys to values, add test
|
2024-04-30 18:03:26 -05:00 |
|
snipe
|
bfd0530597
|
Fixed notification
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 20:59:13 +01:00 |
|
snipe
|
fc61a4b88d
|
Fixed badge HTML
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 19:50:58 +01:00 |
|
snipe
|
860764a436
|
Use totals for sidebar
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 19:12:21 +01:00 |
|
snipe
|
76129e9011
|
Use trans_choice for title
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 18:59:13 +01:00 |
|
snipe
|
9c8411c7ff
|
Added checkin due blade
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 18:58:56 +01:00 |
|
snipe
|
c661d732b3
|
Refactored sidenav links for audit
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 18:58:44 +01:00 |
|
snipe
|
4b4e3badb7
|
Removed hardware audit overdue blade
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 18:53:36 +01:00 |
|
snipe
|
fe4dd23d39
|
Removed “all” text
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 15:49:12 +01:00 |
|
snipe
|
de6d71cc3b
|
Use plural api endpoints in blades
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 15:47:19 +01:00 |
|
snipe
|
bd8737d986
|
Changed sidenav badge class
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 15:44:21 +01:00 |
|
snipe
|
14b6a75507
|
Updated routes
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 14:01:38 +01:00 |
|
snipe
|
bfc30794c5
|
Updated badge styling
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-26 14:01:22 +01:00 |
|
Brady Wetherington
|
3f5c5cbe82
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-04-24 16:24:43 +01:00 |
|
snipe
|
2439758ef3
|
Merge pull request #14587 from Godmartinz/License-export-button
Added a License Export function and button
|
2024-04-24 04:42:56 +01:00 |
|
snipe
|
685f1cbfb8
|
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels
Removed encrypted fields from label options
|
2024-04-23 13:31:38 +01:00 |
|
Godfrey M
|
96b3af7cbc
|
fixed view from sending all custom fields
|
2024-04-22 18:27:34 -07:00 |
|
Marcus Moore
|
ac8aab0043
|
Add default "select an option" to data source options
|
2024-04-22 12:22:10 -07:00 |
|
Godfrey M
|
420225c2d5
|
Merge branch 'refs/heads/develop' into License-export-button
|
2024-04-22 10:33:30 -07:00 |
|
snipe
|
b5c83721ad
|
Merge pull request #14577 from Godmartinz/signature_pad_upgrade
Upgraded Signature-pad.js && Fixed Resizing Canvas on mobile
|
2024-04-11 15:35:47 +01:00 |
|
Godfrey M
|
133fdd7a37
|
fix conditional
|
2024-04-10 12:31:04 -07:00 |
|
Godfrey M
|
e2679852ce
|
added export button, half the logic for export method
|
2024-04-10 11:31:30 -07:00 |
|
akemidx
|
f0aefaac42
|
padding fix
|
2024-04-09 17:51:42 -04:00 |
|
Godfrey M
|
052f1eedd0
|
fixes signature canvas refresh on mobile
|
2024-04-09 10:30:33 -07:00 |
|
Godfrey M
|
858da800be
|
attempting to lock screen orientation
|
2024-04-09 09:40:39 -07:00 |
|
snipe
|
90cf612ac7
|
Remove city as required field on location modal
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-08 10:50:52 +01:00 |
|
Godfrey M
|
a9ed748fb2
|
adds audit dates to label options
|
2024-04-04 11:39:49 -07:00 |
|
steve@degga.net
|
83443ad2b5
|
Sometimes I should just slow down.
|
2024-04-04 11:36:21 -04:00 |
|
steve@degga.net
|
3fcc067481
|
Removes accidental changes on two lines
|
2024-04-04 10:27:44 -04:00 |
|
snipe
|
dcba2bfd25
|
Merge pull request #14529 from mauro-miatello/develop
Hide/Show encrypted values in hardware list
|
2024-04-04 15:07:58 +01:00 |
|
steve@degga.net
|
3e564eaf19
|
fixed accidentally forgot update a call to the old dynamicWarrantyUrl() method in hardware/view.blade.php
|
2024-04-03 20:09:37 -04:00 |
|
Godfrey M
|
5afe024644
|
changed translation on asset acceptancen blade
|
2024-04-03 11:40:48 -07:00 |
|
Godfrey M
|
df5cacf8a2
|
removed front end if statement
|
2024-04-03 11:06:05 -07:00 |
|
snipe
|
79c5697042
|
Fixed dev - take 2!
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-03 13:06:49 +01:00 |
|
Brady Wetherington
|
65e21faa3e
|
Merge branch 'develop' into snipeit_v7_laravel10
Hopefully, last merge?
|
2024-04-02 20:34:04 +01:00 |
|
steve@degga.net
|
83ce04dc8d
|
Fixes syntax error.
|
2024-03-31 22:31:06 -04:00 |
|
steve@degga.net
|
f7bbec6be4
|
Makes all manufacturer URLs dynamic, not just warranty lookup.
|
2024-03-31 22:18:44 -04:00 |
|
MrM
|
658ba092e2
|
Hide encrypted values in hardware list
Encrypted values are now hidden also in hardware list, clicking on them show the decrypted value
|
2024-03-31 18:55:58 +02:00 |
|
MrM
|
b221d99e7b
|
Encrypted values enhancement
Show asterisks instead of the value, respecting the length of the field
|
2024-03-31 12:27:35 +02:00 |
|
snipe
|
57010b4c23
|
Merge pull request #14500 from Godmartinz/add-accessory-signature-to-print-all
Added signature to user print report for Accessories and Consumables
|
2024-03-27 19:02:59 +00:00 |
|
snipe
|
545a185614
|
Merge pull request #14262 from akemidx/bug/sc-24812
Last Checkin Date added to Hardware View and Index
|
2024-03-27 19:02:25 +00:00 |
|
Godfrey M
|
bc66c0f223
|
removes jquery and updates translation
|
2024-03-27 11:56:47 -07:00 |
|
snipe
|
ae403da8c1
|
Merge pull request #14502 from marcusmoore/bug/sc-25004/pwd_secure_complexity-validation
Added validation around `pwd_secure_complexity`
|
2024-03-26 20:05:04 +00:00 |
|
Marcus Moore
|
b5b8777c94
|
Extract translation string
|
2024-03-26 12:23:57 -07:00 |
|
snipe
|
850f85ff59
|
Merge pull request #14369 from spencerrlongg/bug/sc-24343
Add new validator for custom field checkboxes and fix asset model default updates
|
2024-03-26 19:22:29 +00:00 |
|
Godfrey M
|
84cc88831d
|
adds signature for components
|
2024-03-26 12:18:10 -07:00 |
|
Godfrey M
|
f4f9b165a7
|
moves signature check inside of td
|
2024-03-26 11:24:34 -07:00 |
|
Godfrey M
|
3222d4c8df
|
adds signature check
|
2024-03-26 09:18:34 -07:00 |
|
Godfrey M
|
3173ead2e7
|
adds accessory signature to user print report
|
2024-03-26 09:11:54 -07:00 |
|
Godfrey M
|
040f826c52
|
removes encrypted fields as a selectable option for labels
|
2024-03-26 08:57:18 -07:00 |
|
snipe
|
f450cafe3e
|
Fixed missing div
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 12:29:25 +00:00 |
|
snipe
|
a4e5ae0938
|
Removed duplicates
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 12:20:27 +00:00 |
|
snipe
|
77dacfcc30
|
Show if deleted supplier
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 12:19:29 +00:00 |
|
snipe
|
0d9b6eaf71
|
Added supplier details to license view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 12:18:04 +00:00 |
|
snipe
|
9df84e235c
|
Check for config variable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 09:54:40 +00:00 |
|
snipe
|
566ba4783e
|
Fixed #14483 - adds deeplinking to search/sort/pagination
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 09:50:01 +00:00 |
|
snipe
|
31a57cdf14
|
Fixed #14482 - bad method call on restore from view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 08:18:59 +00:00 |
|
snipe
|
7ebbef25e7
|
Standardize button styling
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 08:18:36 +00:00 |
|
Marcus Moore
|
bd506820b7
|
Display error message
|
2024-03-25 17:59:39 -07:00 |
|
Godfrey M
|
21c3b1fbd2
|
rename declined message to note, increased width of textarea
|
2024-03-21 14:03:25 -07:00 |
|
snipe
|
c4b7e77498
|
Merge pull request #14089 from spencerrlongg/bug/escaped_quotes_in_listbox
Use `htmlentities()` instead of `htmlspecialcharacters()` on Custom Field Listbox Values
|
2024-03-21 12:55:25 +00:00 |
|
snipe
|
945e8b402f
|
Only offer the 2FA reset if the user already has 2FA set up
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 23:52:51 +00:00 |
|
snipe
|
f2a5eac256
|
Tightened up 2FA text
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 23:43:05 +00:00 |
|
snipe
|
de18e449a6
|
Merge pull request #14464 from snipe/features/toggle_all_columns
Added "toggle all" to column selector
|
2024-03-20 21:26:23 +00:00 |
|
snipe
|
1f586d3102
|
Removed data-show-columns-toggle-all data attribute
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 21:25:16 +00:00 |
|
snipe
|
e5d01170d2
|
Fixed locale, added showColumnsToggleAll and minimumCountColumns
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 21:24:59 +00:00 |
|
snipe
|
a0a5480c97
|
Added default location to print all assigned
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 18:55:47 +00:00 |
|
snipe
|
3b66912742
|
Fixed #14460 - added support for avif
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 12:25:02 +00:00 |
|
snipe
|
278a25c63b
|
Added toggle all to column selector
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 12:14:41 +00:00 |
|
snipe
|
0d124bb5a1
|
Fixed indent
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 12:08:35 +00:00 |
|
snipe
|
3d306aacc5
|
Fixed mismatched HTML tag
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 11:52:51 +00:00 |
|
snipe
|
ddf81ba135
|
Wider country dropdown
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 11:00:06 +00:00 |
|
snipe
|
c7083488b2
|
Merge pull request #14447 from snipe/feature/sc-25020_better_print_view
Add additional options to print all assigned view
|
2024-03-19 15:01:50 +00:00 |
|
snipe
|
4b4d383509
|
Removed - it’s for another PR
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-19 15:00:26 +00:00 |
|
Godfrey M
|
b9986033cc
|
removed abbr. of variable, changed variable types in migration
|
2024-03-18 16:03:40 -07:00 |
|
snipe
|
fcd130ae15
|
Layout improvements
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-18 21:17:46 +00:00 |
|
Godfrey M
|
8b52d5da85
|
fixed typos, reordered jquery, fixed migrations
|
2024-03-18 12:36:54 -07:00 |
|
Godfrey M
|
57f5d4a570
|
deleted_msg saves to db
|
2024-03-18 10:45:47 -07:00 |
|
Godfrey M
|
4588393b76
|
adds declined msg to mail notif, updates lang files and checkout acceptance controller
|
2024-03-18 10:25:55 -07:00 |
|
Godfrey M
|
0fd99d410e
|
adds a text field and jquery to show/hide text field
|
2024-03-18 09:36:09 -07:00 |
|
snipe
|
002fd4ce30
|
Nicer formatting for signoff
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-18 13:44:51 +00:00 |
|
snipe
|
7b4ecb275f
|
Use trans choice for language
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-18 13:29:01 +00:00 |
|
snipe
|
2df5d3a8ff
|
Fixed column selector
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-18 13:06:08 +00:00 |
|
snipe
|
d0d4d14787
|
Make sure the category is still valid before displaying on view assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-18 12:29:00 +00:00 |
|
snipe
|
0e2aaebda4
|
Merge pull request #14406 from mauro-miatello/develop
Hide/Show ecnrypted values when click on the lock icon
|
2024-03-18 12:19:54 +00:00 |
|
snipe
|
85123b3e66
|
Rework print page
Still seeing a weird error tho, not done yet
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-13 12:36:17 +00:00 |
|
snipe
|
c5c6b3bbc6
|
Starting the revised print page
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-11 14:23:25 +00:00 |
|
snipe
|
3f5cc2507d
|
Used updated_at instead
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-10 16:39:49 +00:00 |
|
MrM
|
8abd359b5b
|
Script to hide / show encrypted values in web ui
added a function to show/hide encrypted values with a simple trick because ClipboardJS can't copy display:none element's value
|
2024-03-10 15:18:54 +01:00 |
|
MrM
|
9359809b4f
|
Hide / Show encrypted values in web ui
added a span element to hide encrypted values
|
2024-03-10 15:09:46 +01:00 |
|
snipe
|
28ec0b8ebb
|
Removed debugging console lines
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-08 17:19:31 +00:00 |
|
Godfrey M
|
feb78d00cf
|
conditionally shows label fields if on old label engine only
|
2024-03-06 11:25:49 -08:00 |
|
spencerrlongg
|
a251e61d73
|
rm commented code and add comment
|
2024-03-05 13:40:44 -06:00 |
|
spencerrlongg
|
af06b1cd06
|
hide encryption option for checkbox and radio
|
2024-03-05 13:37:30 -06:00 |
|
Brady Wetherington
|
5b9120ba6c
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-03-05 19:22:37 +00:00 |
|
Godfrey M
|
95ef3a336b
|
Merge branch 'develop' into default_label_bug
|
2024-03-04 12:03:54 -08:00 |
|
akemidx
|
eb0657c953
|
Merge branch 'develop' into bug/sc-24812
|
2024-02-28 17:22:16 -05:00 |
|
snipe
|
3da47cdacd
|
Removed header for consistency
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 15:03:34 +00:00 |
|
snipe
|
658dda916c
|
Changed operator
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 15:01:00 +00:00 |
|
snipe
|
a0cbf66c81
|
Only show tabs if there are requestable assets/models
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 14:59:20 +00:00 |
|
snipe
|
ee75df0f0a
|
Merge pull request #14346 from snipe/feature/sc-18728
Added `min_amt` functionality to licenses
|
2024-02-28 11:26:25 +00:00 |
|
snipe
|
92eff653f1
|
Removed logging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 11:26:03 +00:00 |
|
snipe
|
1e66985a78
|
Merge pull request #14344 from snipe/features/added_created_by_to_groups
Added created_by to groups table
|
2024-02-28 11:19:52 +00:00 |
|
snipe
|
b5603fbfe9
|
Added min amt to license blade
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 11:09:07 +00:00 |
|
snipe
|
767cf96010
|
Added min_amt to form
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 11:08:33 +00:00 |
|
snipe
|
3ccc55a78f
|
Added license min amt formatter for BS table
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 11:06:50 +00:00 |
|
snipe
|
0bd27d61b0
|
Added created_by to groups table
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 08:15:59 +00:00 |
|
Godfrey M
|
b67ceab849
|
fields appear in preview, but not bulk generate labels
|
2024-02-27 11:29:19 -08:00 |
|
MrM
|
9475871edb
|
Fix multiple tooltip issue
If there are multiple tooltips, they all report the message "copied" because there is no element selection. This fix resolves the issue.
|
2024-02-25 14:48:05 +01:00 |
|
MrM
|
b69364d5ff
|
Add copy of encrypted custom fields
Encrypted custom fields may contain sensitive or important information, and it may be useful to have the ability to copy them.
|
2024-02-25 14:47:06 +01:00 |
|
snipe
|
a184b4e67c
|
Nicer UI for history importer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-23 11:40:10 +00:00 |
|
snipe
|
4a37632ef3
|
Check for valid supplier in license view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-23 10:48:53 +00:00 |
|
snipe
|
e494a2670f
|
Merge pull request #14321 from akemidx/accessory_pdf_dl_link
Adding in PDF download to Accesories/Asset/License Histories
|
2024-02-23 08:18:55 +00:00 |
|
Godfrey M
|
550f9e2afa
|
removes visibility checkmarks for certain fields when in new label engine
|
2024-02-22 16:19:28 -08:00 |
|
Godfrey M
|
c0215baca5
|
minor changes
|
2024-02-22 11:41:04 -08:00 |
|
Godfrey M
|
c62758c5b5
|
adds custom field select to default label view
|
2024-02-22 11:36:39 -08:00 |
|
snipe
|
e8ad8a7448
|
Added email, phone icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-22 14:48:01 +00:00 |
|
akemidx
|
0f3be4fdf8
|
adding in eula pdf dl link. mimics activity log
|
2024-02-21 17:45:10 -05:00 |
|
Brady Wetherington
|
8f2843bfcf
|
Merge branch 'develop' into snipeit_v7_laravel10
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
|
2024-02-21 20:22:28 +00:00 |
|
snipe
|
71610fb20f
|
Merge pull request #14304 from snipe/feature/sc-24018
Added ability to bulk delete locations
|
2024-02-20 18:14:51 +00:00 |
|
snipe
|
cb0f9024b1
|
Fixed gate
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 17:56:40 +00:00 |
|
snipe
|
9010b7acd0
|
Use isDeletable instead of asset count
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 17:27:10 +00:00 |
|
snipe
|
b57b68571e
|
Added blade views
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 16:44:45 +00:00 |
|
snipe
|
1ca9420baa
|
Fixed incorrect gate
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 16:44:29 +00:00 |
|
snipe
|
0383938536
|
API-ify the managed locations tab in user view
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 16:44:20 +00:00 |
|
snipe
|
50b841d54d
|
Added table data-dash attributes to make the checkbox stuff work
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 16:43:57 +00:00 |
|
snipe
|
8f71460fa1
|
Formatting changes only
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 16:43:27 +00:00 |
|
snipe
|
30f9acfcf3
|
Disallow uploads in demo mode
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-19 16:11:17 +00:00 |
|
snipe
|
db73f80058
|
Starting off
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-16 18:57:50 +00:00 |
|
snipe
|
00cea3eb3c
|
Merge remote-tracking branch 'origin/develop'
|
2024-02-15 14:45:30 +00:00 |
|
snipe
|
6237f6192c
|
Added fieldset button
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-15 14:14:18 +00:00 |
|
snipe
|
cc58d4c3ad
|
Nicer form UI
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-15 14:08:06 +00:00 |
|
snipe
|
50c910461a
|
Merge remote-tracking branch 'origin/develop'
|
2024-02-14 11:36:28 +00:00 |
|
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 |
|
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 |
|