DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14678 commits 97 branches 266 tags 291 MiB
Commit graph

14678 commits

This branch
This branch
All branches
Author SHA1 Message Date
snyk-bot 88b0dbf4c1
fix: package.json & package-lock.json to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-BOOTSTRAP-7444593
- https://snyk.io/vuln/SNYK-JS-BOOTSTRAP-7444617
 2024-07-27 12:00:43 +00:00
snipe 0dd0baa511 Merge remote-tracking branch 'origin/develop' 2024-07-27 10:12:23 +01:00
snipe c3a296c19f Added qr code back 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-27 10:12:13 +01:00
snipe f6cc923e01 Merge remote-tracking branch 'origin/develop' 2024-07-26 17:29:46 +01:00
snipe aab29fbb6b Use translated string for restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 16:47:40 +01:00
snipe d9d3ff27ae Merge remote-tracking branch 'origin/develop' 2024-07-26 15:31:52 +01:00
snipe 614d05acb5
Merge pull request #15170 from uberbrady/simplify_css_skin_building 
Dynamically iterate through the skin listing to build skins
 2024-07-26 15:14:24 +01:00
snipe e4a82edd3f
Merge pull request #15172 from snipe/features/blade_component_for_submit 
Use blade component for submit redirect on asset edit/create
 2024-07-26 15:13:30 +01:00
snipe eceaa72781 And more tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 15:07:43 +01:00
snipe ddf45c5ee9 Renamed test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 15:00:16 +01:00
snipe ff100c0b9f Added more tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 14:58:10 +01:00
snipe 037cc4d098 More tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 14:27:07 +01:00
snipe ff6e6ef88c Added more tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 13:43:10 +01:00
snipe e8ec11652f Very basic checkin tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 13:16:31 +01:00
snipe cd7f276c40 Fixed logging for component 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 13:09:21 +01:00
snipe fc8bb82a02 Made dropdown wider 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:48:18 +01:00
snipe 5d7f1f77a3 Added redirect to checkin/checkout controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:48:07 +01:00
snipe 5dea3f4495 Added blade component to checkin/checkout pages 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:47:33 +01:00
snipe c6e709cd36 Added parameters 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 12:45:06 +01:00
Brady Wetherington daf5a80081 Use a similar loop for the minification step for CSS 2024-07-26 12:03:03 +01:00
snipe 759ab78f80 Added more redirects 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 11:27:36 +01:00
snipe b6d9f736e3 Pulled use session 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 10:41:28 +01:00
snipe 243ab51def Fixed back button 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 10:40:48 +01:00
snipe c5603a0e10 Merge remote-tracking branch 'origin/develop' 2024-07-26 10:26:23 +01:00
snipe 57f6ecb1da Added created_by to license view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 10:24:13 +01:00
snipe 64082ada1e Updated test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 22:08:51 +01:00
snipe 068535a80c Removed logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 22:08:46 +01:00
snipe 08f4fe5f35 Add status messages to redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 22:02:34 +01:00
snipe 018b5684fc Refactor helper method for redirection 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 22:02:03 +01:00
snipe 73a80a5fbc Use blade component for redirect option 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 21:35:13 +01:00
Brady Wetherington 4c8bf9ae19 Dynamically iterate through the skin listing to build skins 2024-07-25 21:20:06 +01:00
snipe f77d300549
Merge pull request #15169 from uberbrady/create_directories_when_needed_on_restore 
Create intermediate directories on restore if needed - Fixes [SC-25950]
 2024-07-25 18:45:54 +01:00
snipe 62655be2d0 Fixed BYOD label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 18:41:37 +01:00
Brady Wetherington eb938bdba3 Create intermediate directories on restore if needed 2024-07-25 18:40:26 +01:00
snipe 129d3b35fb
Merge pull request #15168 from uberbrady/improve_restore_sanitization 
Improve restore sanitization - Fixes [sc-24840]
 2024-07-25 18:20:05 +01:00
Brady Wetherington 84df23e1f6 Better handle older SQL dumps that got created in Windows format 2024-07-25 18:07:25 +01:00
snipe a439d8abe8 Use fully qualified use statements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-25 16:08:46 +01:00
snipe 24b7659c23
Merge pull request #15150 from marcusmoore/chore/sc-26113 
Registered custom anonymous blade component directory
 2024-07-25 16:08:01 +01:00
snipe 1331bffaca Merge remote-tracking branch 'origin/develop' 2024-07-24 21:42:41 +01:00
snipe 9b422e5c97 Baremetrics BMPay breaks with CSP turned [sc-25011] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 21:42:20 +01:00
snipe 0c86855392 Merge remote-tracking branch 'origin/develop' 2024-07-24 21:04:20 +01:00
snipe 962ae5231d
Merge pull request #15162 from snipe/fixes/added_location_assets_endpoint 
Added assets endpoint for locations
 2024-07-24 21:03:43 +01:00
snipe 590d13061a One more test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:57:26 +01:00
snipe c3a2cdeee9 Added assets endpoint for locations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:53:58 +01:00
snipe ef77fb91c0 Merge remote-tracking branch 'origin/develop' 2024-07-24 20:20:37 +01:00
snipe 02bd8d7ea1
Merge pull request #15161 from snipe/fixes/500_when_depreciation_is_active_but_no_purchase_date 
Fixes 500 when depreciation is active but no purchase date
 2024-07-24 20:20:10 +01:00
snipe da4ec145d7 Removed test no longer needed due to validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:17:30 +01:00
snipe ef145e47b4 Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:13:15 +01:00
snipe adf58a06da Added check for purchase date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:13:11 +01:00
snipe 63f0b5279d Added check for purchase_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-24 20:13:01 +01:00