Commit graph

12248 commits

Author SHA1 Message Date
snipe 61a1fed0a2 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
2023-12-15 13:58:25 +00:00
snipe 2427cb787b Updated assets
Signed-off-by: snipe <snipe@snipe.net>
2023-12-15 13:57:37 +00:00
snipe e3d6d48e04
Merge pull request #13966 from marcusmoore/feature/sc-24120
Removed jquery-ui-bundle
2023-12-15 13:55:56 +00:00
snipe 0bb5abd24d Merge remote-tracking branch 'origin/develop' 2023-12-15 13:45:02 +00:00
snipe 130be26820
Merge pull request #14031 from snipe/bug/ldap_undefined_search_base
Fixed undefined $search_base
2023-12-15 13:33:34 +00:00
snipe 2d85eeface Added indexes for reports
Signed-off-by: snipe <snipe@snipe.net>
2023-12-15 13:24:01 +00:00
snipe 56f9c7f2f5
Merge pull request #14036 from snipe/feature/sc-24355
Added user agent, remote_ip, action_source to action_logs
2023-12-15 11:18:46 +00:00
snipe 421802893e Added new fields to action report
Signed-off-by: snipe <snipe@snipe.net>
2023-12-15 10:45:22 +00:00
snipe 7aabf94a35 Added comments
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:43:38 +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 a90b04c905 Allowed sorting on user_agent, etc
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:34:08 +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 40052e99a7 Added user agent to log method
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:33:39 +00:00
snipe 70303c2b2d Added searchable fields, improved formatting
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:33:25 +00:00
snipe 4dac3712a6 Added DB migration for remote_ip, action_source, user_agent in logs
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 14:32:26 +00:00
Brady Wetherington 430f1b0212
Merge branch 'develop' into feature/sc-24120 2023-12-14 13:28:17 +00:00
snipe 5df6575c37 Fixed undefinted $search_base
Signed-off-by: snipe <snipe@snipe.net>
2023-12-14 00:11:02 +00:00
snipe cb18606b2e Merge remote-tracking branch 'origin/develop' 2023-12-13 17:55:57 +00:00
snipe 6b4bc9723c Added logo to readme
Signed-off-by: snipe <snipe@snipe.net>
2023-12-13 17:55:46 +00:00
snipe 547d58cf14 Merge remote-tracking branch 'origin/develop' 2023-12-13 14:15:36 +00:00
snipe b92906b071
Merge pull request #14028 from snipe/security/snyk_14013
[Snyk] Upgrade alpinejs from 3.12.3 to 3.13.3 #14013
2023-12-13 14:15:07 +00:00
snipe b1d4d89b19 [Snyk] Upgrade alpinejs from 3.12.3 to 3.13.3 #14013
Signed-off-by: snipe <snipe@snipe.net>
2023-12-13 14:14:04 +00:00
snipe 4f56c2e9d6 Added radio to seeder for custom fields
Signed-off-by: snipe <snipe@snipe.net>
2023-12-13 14:03:13 +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 7b85a30b64 Fixed checkbox seeder
Signed-off-by: snipe <snipe@snipe.net>
2023-12-13 13:16:45 +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 7743b3a0fa Merge remote-tracking branch 'origin/develop' 2023-12-12 14:02:18 +00:00
snipe 8d4a4ccdab
Merge pull request #14022 from snipe/chore/sc-24329
Added GH test action status badge
2023-12-12 14:01:56 +00:00
snipe c5c3000a38 Added GH test action status badge
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 13:59:45 +00:00
snipe 46c0d38c6d Removed huntr.dev badge
They refocused their company to only AI now :(

Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 13:44:11 +00:00
snipe f9697887e8 Removed extraneous test
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 13:41:35 +00:00
snipe c2896c034d Merge remote-tracking branch 'origin/develop' 2023-12-12 13:33:50 +00:00
snipe 0241e66f2d
Merge pull request #14021 from snipe/bug/sc-24328
Fixed HTML double-encoded on checkout emails.
2023-12-12 13:31:41 +00:00
snipe b53a4c366e Removed escaping on notes on checkout
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 13:26:41 +00:00
snipe 1572d5c3cc Merge remote-tracking branch 'origin/develop' 2023-12-12 12:27:15 +00:00
snipe 6bb842f52c
Merge pull request #14020 from snipe/bug/sc-24326
Added $user->created_at to API user create method
2023-12-12 12:26:58 +00:00
snipe e894138fd4 Added $user->created_at to API user create method
Signed-off-by: snipe <snipe@snipe.net>
2023-12-12 12:26:02 +00:00
snipe f8a56f6dc2 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
2023-12-12 04:33:04 +00:00
snipe 068f64a78e
Merge pull request #14018 from snipe/features/more_info_in_quickscan
Added model name and number to quickscan
2023-12-12 04:30:11 +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 bbe5c7c6e8
Merge pull request #14017 from snipe/bug/sc-24323
Smaller icon size for activity reports, other action icons
2023-12-12 01:02:45 +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 8100f11a36
Merge pull request #14016 from snipe/feature/sc-24184
Set default sorting on backups to latest first
2023-12-12 00:36:28 +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