Commit graph

14882 commits

Author SHA1 Message Date
Marcus Moore 7c2fae7b9d
Scaffold api test cases 2024-04-10 17:08:45 -07:00
Marcus Moore 70934e54cf
Remove unneeded comment 2024-04-10 16:34:14 -07:00
Marcus Moore f6ad275030
Clean ups 2024-04-10 16:28:48 -07:00
Marcus Moore 6666a78936
Organization 2024-04-10 16:19:04 -07:00
Marcus Moore bbb2cdcceb
Add note 2024-04-10 16:15:43 -07:00
Marcus Moore 6b6e18695f
Account for null asset in factory state 2024-04-10 16:12:47 -07:00
Marcus Moore b63962e90b
Add additional assertions 2024-04-10 16:01:15 -07:00
Marcus Moore 4434de6241
Add test case 2024-04-10 15:47:26 -07:00
Godfrey M a2bca0e358 fixed comments 2024-04-10 15:05:21 -07:00
Marcus Moore 6d572424ac
Add validation around dates 2024-04-10 14:02:25 -07:00
Marcus Moore d371d14c1f
Implement test 2024-04-10 13:49:07 -07:00
Marcus Moore 72eda1e909
Improve naming 2024-04-10 13:29:31 -07:00
Marcus Moore 7dbf8a8a8e
Add tests for asset and location check out 2024-04-10 13:28:52 -07:00
Godfrey M 133fdd7a37 fix conditional 2024-04-10 12:31:04 -07:00
Godfrey M 0849262243 fixed notes 2024-04-10 12:19:34 -07:00
Godfrey M 17095feb33 fix typo 2024-04-10 12:15:48 -07:00
Godfrey M f42ae46338 exports all licenses 2024-04-10 12:14:44 -07:00
Marcus Moore 37ebf1827f
Organization 2024-04-10 12:12:44 -07:00
Marcus Moore e65252725a
Add simple test for LogListener 2024-04-10 11:52:59 -07:00
Marcus Moore 6f53f2ac64
Finish implementing test case 2024-04-10 11:43:50 -07:00
Godfrey M e2679852ce added export button, half the logic for export method 2024-04-10 11:31:30 -07:00
Marcus Moore deaba46e1c
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-04-10 11:01:35 -07:00
snipe 989dab6259 Moved company scoping methods to group them together
Signed-off-by: snipe <snipe@snipe.net>
2024-04-10 14:35:13 +01:00
snipe adacdc038d Apply company scoping for users
Signed-off-by: snipe <snipe@snipe.net>
2024-04-10 12:34:32 +01:00
akemidx f0aefaac42 padding fix 2024-04-09 17:51:42 -04:00
Marcus Moore 1aeaa0094a
Fix assigned to in labels 2024-04-09 13:52:54 -07:00
akemidx 6d3fa12f37 white texty for dropdown lists 2024-04-09 14:52:43 -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 954cac3af7 Merge remote-tracking branch 'origin/develop' 2024-04-08 10:56:04 +01:00
snipe d0f171ebc6
Merge pull request #14567 from snipe/bug/sc-25257
Remove city as required field on location modal
2024-04-08 10:54:09 +01: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
snipe 802b5863ab Merge remote-tracking branch 'origin/develop' 2024-04-08 08:49:54 +01:00
snipe 4baa949a99
Merge pull request #14557 from Godmartinz/add-audit-date-to-labels
Added audit dates to label options
2024-04-08 04:59:53 +01:00
snipe 3bed04a6d3
Merge pull request #14559 from Godmartinz/ldap_location_bug
Fixed  ldap location syncing incorrect locations for users.
2024-04-08 04:59:27 +01:00
spencerrlongg 99d7155729 translation strings 2024-04-07 19:50:53 -05:00
spencerrlongg f30439a544 small refactor, pretty much good to go now though 2024-04-07 17:07:46 -05:00
spencerrlongg 997eddfed1 cleanup + notes for monday 2024-04-04 18:23:03 -05:00
Godfrey M d548b800d5 nullifies location after ldap user sync 2024-04-04 15:43:33 -07:00
spencerrlongg 52340aca78 just about wrapped up 2024-04-04 17:41:10 -05:00
akemidx f7f199d929 black hover bg for dark yellow theme 2024-04-04 15:51:46 -04:00
akemidx 5519fddb78 new clean branch for color change 2024-04-04 15:50:30 -04:00
spencerrlongg e1fb446888 this is a pretty good start, need to know about other PR 2024-04-04 14:20:03 -05: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
snipe 72c91ead8b Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
2024-04-04 15:06:37 +01:00
snipe 774d0aa90c Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
2024-04-04 15:05:35 +01:00
snipe 2eea67ce34
Merge pull request #14547 from Godmartinz/user-dropdown-media-change
Fixed alignment of dropdown menu for user in nav bar
2024-04-04 15:04:36 +01:00