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
|
417caae589
|
Added translation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 12:07:18 +00:00 |
|
snipe
|
3d306aacc5
|
Fixed mismatched HTML tag
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 11:52:51 +00:00 |
|
snipe
|
ea4ecaea03
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2024-03-20 11:04:34 +00:00 |
|
snipe
|
6c90f9e395
|
Merge pull request #14462 from snipe/fixes/small_ui_tweaks_for_country_dropdown
Wider country dropdown
|
2024-03-20 11:01:39 +00:00 |
|
snipe
|
ddf81ba135
|
Wider country dropdown
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 11:00:06 +00:00 |
|
snipe
|
8ebb41caa6
|
Merge pull request #14461 from snipe/security/update_bs_tables
[Snyk] Upgrade bootstrap-table from 1.22.2 to 1.22.3 #14455
|
2024-03-20 10:39:05 +00:00 |
|
snipe
|
faf48b1684
|
[Snyk] Upgrade bootstrap-table from 1.22.2 to 1.22.3 #14455
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 10:37:53 +00:00 |
|
snipe
|
b8232d205b
|
Merge pull request #14457 from Godmartinz/bulk_delete_locations_bug
Fixed Bulk delete locations bug
|
2024-03-20 10:35:45 +00:00 |
|
spencerrlongg
|
0ffceb9691
|
some notes and a little progress
|
2024-03-20 00:07:52 -05:00 |
|
spencerrlongg
|
1e810d2426
|
most tests now passing, still one broken
|
2024-03-19 19:47:26 -05:00 |
|
spencerrlongg
|
c0110e7f29
|
some more tests and refinement
|
2024-03-19 19:27:35 -05:00 |
|
Godfrey M
|
62745923cf
|
fixes API location delete
|
2024-03-19 15:25:28 -07:00 |
|
Godfrey M
|
090466123f
|
add withCount to query instead
|
2024-03-19 15:18:18 -07:00 |
|
Godfrey M
|
38a3e36cd6
|
fixes translation usage
|
2024-03-19 14:32:21 -07:00 |
|
Godfrey M
|
e8dc634a40
|
fixes translation usage
|
2024-03-19 14:30:53 -07:00 |
|
Godfrey M
|
0d0984a400
|
Bulk Delete Locations does not work [sc-25100]
|
2024-03-19 14:26:40 -07:00 |
|
spencerrlongg
|
86ab880c90
|
buncha progress
|
2024-03-19 15:34:59 -05:00 |
|
akemidx
|
8640cad033
|
was using lcoations and not locale. fixed
|
2024-03-19 16:11:32 -04:00 |
|
akemidx
|
dc29717623
|
fixing default
|
2024-03-19 15:51:05 -04:00 |
|
Godfrey M
|
866f0a9f56
|
syncs assets location to users location
|
2024-03-19 11:58:49 -07:00 |
|
snipe
|
814914924f
|
Merge remote-tracking branch 'origin/develop'
|
2024-03-19 15:51:07 +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 |
|
akemidx
|
3680e04817
|
migration to set legacy locations to an standardized format
|
2024-03-18 18:29:59 -04:00 |
|
snipe
|
21e23baa37
|
Fixed ternary
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-18 21:28:46 +00: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 |
|
Marcus Moore
|
d1dffb84dc
|
Remove InteractsWithSettings trait for remaining tests
|
2024-03-18 12:33:45 -07:00 |
|
Marcus Moore
|
541350916d
|
Merge branch 'develop' into chore/sc-25071
# Conflicts:
# tests/Feature/Api/Users/UpdateUserApiTest.php
# tests/Feature/Notifications/AccessoryWebhookTest.php
# tests/Feature/Notifications/AssetWebhookTest.php
# tests/Feature/Notifications/ComponentWebhookTest.php
# tests/Feature/Notifications/ConsumableWebhookTest.php
# tests/Feature/Notifications/LicenseWebhookTest.php
|
2024-03-18 12:33:31 -07:00 |
|
Godfrey M
|
01afa9a749
|
declined notes are reflected in the action logs
|
2024-03-18 10:50:15 -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
|
7070bad53b
|
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-03-18 12:32:22 +00:00 |
|
snipe
|
da62d6af26
|
Merge pull request #14445 from snipe/fixes/check_for_valid_license_category_on_view_assets
Make sure the category is still valid before displaying on view assets
|
2024-03-18 12:30:15 +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
|
09d69b214b
|
Merge pull request #14436 from marcusmoore/chore/sc-24901
Organized notification test cases
|
2024-03-18 12:20:23 +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
|
ec2c58163f
|
Merge pull request #14437 from marcusmoore/chore/sc-25070
Removed dead test code
|
2024-03-18 12:19:35 +00:00 |
|
Godfrey M
|
05a8d3030b
|
correct column name
|
2024-03-16 19:54:48 -07:00 |
|
Godfrey M
|
595dad0f18
|
updates all assets assigned to user with new location
|
2024-03-16 19:51:40 -07:00 |
|
Marcus Moore
|
a28bee86ba
|
Extract method
|
2024-03-14 16:33:49 -07:00 |
|
Marcus Moore
|
fb64892971
|
Re-order
|
2024-03-14 16:26:27 -07:00 |
|
Marcus Moore
|
95ff692b14
|
Improve InteractsWithSettings name
|
2024-03-14 15:06:52 -07:00 |
|