snipe
|
026ea41dee
|
Use correct language codes, updated strings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 17:23:16 +00:00 |
|
snipe
|
b07133a008
|
Add @coach1988 as a contributor
|
2023-12-19 14:05:54 +00:00 |
|
snipe
|
f07ae45fc0
|
Merge pull request #14056 from snipe/bug/retarget_of_13987_dymo_fix
Implement 1D barcode for label "Tapes\Dymo\LabelWriter_30252" #13987
|
2023-12-19 14:05:22 +00:00 |
|
snipe
|
2226bd2cd7
|
Implement 1D barcode for label "Tapes\Dymo\LabelWriter_30252" #13987
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 14:03:55 +00:00 |
|
snipe
|
aca51d992b
|
Merge pull request #14038 from ubc-cpsc/bugfix/CVE-2023-50251
Fixes CVE-2023-50251 and CVE-2023-50262 DoS on parsing SVG
|
2023-12-19 14:00:13 +00:00 |
|
snipe
|
fee0956832
|
Merge pull request #14039 from ubc-cpsc/bugfix/CVE-2023-43655
Fixes CVE-2023-43655 Composer Remote Code Execution vulnerability public composer.phar
|
2023-12-19 13:59:48 +00:00 |
|
snipe
|
36a76084da
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-12-19 13:31:10 +00:00 |
|
snipe
|
fe51d0ef79
|
Merge pull request #14055 from snipe/bug/disallow_arrays_for_model_id_in_api_hardware_update
Make sure we're getting an object instead of a collection on Asset API for model_id
|
2023-12-19 13:30:54 +00:00 |
|
snipe
|
f9139e0f10
|
Changed to use instanceof
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 13:25:32 +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
|
79ad598673
|
Merge pull request #14050 from marcusmoore/add-logging-to-checking-alerts-command
Added log message for who is being sent expected checkin notifications
|
2023-12-19 13:14:04 +00:00 |
|
snipe
|
f13c1a53ef
|
Get an object instead of a collection
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 12:51:35 +00:00 |
|
snipe
|
aef95e2218
|
Merge remote-tracking branch 'origin/develop'
|
2023-12-19 12:32:19 +00:00 |
|
snipe
|
f08ce34036
|
Fixed translation string in JSON
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 12:31:55 +00:00 |
|
Marcus Moore
|
1708897726
|
Add log message for who is being sent expected checkin notifications
|
2023-12-18 17:14:03 -08:00 |
|
snipe
|
ac8926abc2
|
Merge pull request #14047 from snipe/dependabot/github_actions/develop/github/codeql-action-3
Bump github/codeql-action from 2 to 3
|
2023-12-18 22:57:10 +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 |
|
dependabot[bot]
|
2305224221
|
Bump github/codeql-action from 2 to 3
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2023-12-18 08:13:48 +00:00 |
|
snipe
|
ea8181d3ec
|
Merge remote-tracking branch 'origin/develop'
|
2023-12-15 16:41:55 +00:00 |
|
snipe
|
05bc9f117c
|
Merge pull request #14042 from snipe/bug/sc-24356
Fixed #14037 - record current time on accessory checkin
|
2023-12-15 16:41:42 +00:00 |
|
snipe
|
444c41bedb
|
Fixed #14037 - record current time on accessory checkin
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-15 16:39:18 +00:00 |
|
snipe
|
ec3c4674de
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-15 13:58:45 +00:00 |
|
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 |
|
Joël Pittet
|
32aedabfe5
|
Force update with PHP 7.4.3 platform requirement and update lock
|
2023-12-14 09:59:11 -08:00 |
|
Joël Pittet
|
b746c7d371
|
Fixes CVE-2023-43655 Composer Remote Code Execution vulnerability via web-accessible composer.phar
|
2023-12-14 09:34:25 -08:00 |
|
Joël Pittet
|
0a5eca53db
|
Fixes CVE-2023-50251 and CVE-2023-50262 DoS on parsing SVG
|
2023-12-14 09:28:21 -08: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 |
|