DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 01:24:06 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
9521 commits 95 branches 267 tags 294 MiB
Commit graph

9521 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 6c89f08193
Register the accessories.files ability and allow users with the ability to upload files for accessories 2023-01-17 16:59:50 -08:00
corydlamb 295f0dd1f5
Update WelcomeNotification.php 
Used htmlspecialchars_decode to fix the issue I had involving Ampersands in the password field (and I'm assuming the other fields) of the welcome notification email. Changes are all in lines 22-26. Sorry if I'm not doing this very well as this is my first pull request.
 2023-01-17 19:33:25 -05:00
Marcus Moore 1fef992fa8
Allow users with components.files ability to upload files for components 2023-01-17 15:58:11 -08:00
Marcus Moore e23ee7540d
Register the components.files ability 2023-01-17 15:45:40 -08:00
snipe dd8c6e92db
Merge pull request #12355 from snipe/features/make_category_visable_on_models_page_by_default 
Added catergories to default visiable set on asset models
 2023-01-15 17:09:00 -08:00
snipe f4630d67be Added catergories to default visiable set 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-15 17:07:50 -08:00
snipe 6f6f99f64e
Merge pull request #12354 from uberbrady/fix_npm_dependencies 
Backed out less-loader version requirement so that builds still work
 2023-01-14 10:57:35 -08:00
Brady Wetherington 6f89e8b0d8 Backed out less-loader version requirement so that builds still work 2023-01-14 10:53:36 -08:00
snipe 6815a16a5f
Merge pull request #12353 from snipe/fixes/rollbar_logging 
Only add rollbar to the logging array if the app is in production
 2023-01-13 13:53:30 -08:00
snipe 0c3d03a4ce Only add rollbar to the logging array if the app is in production 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-13 13:50:16 -08:00
snipe 8048d06853
Merge pull request #12352 from snipe/fixes/added_south_sudan_to_country_list 
Added South Sudan to country list
 2023-01-13 13:24:54 -08:00
snipe 50cc69c427 Added South Sudan to country list 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-13 13:23:57 -08:00
snipe 021e54adaa
Merge pull request #12351 from snipe/fixes/check_filename_has_value_before_delete 
Check that the `$use_db_field` has a value before attempting a delete
 2023-01-13 11:29:31 -08:00
snipe 9d0a15990e Check that the $use_db_field has a value before attempting a delete 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-13 11:26:11 -08:00
Marcus Moore 51da747809
Add note about database requirements when running Dusk tests 2023-01-11 18:05:07 -08:00
Marcus Moore 0dd7cc9967
Add note about installing ChromeDriver to testing readme 2023-01-11 13:54:28 -08:00
Marcus Moore 49f2573f36
Update testing readme 2023-01-11 13:51:01 -08:00
Marcus Moore bc80f672ee
Keep the example dusk environment file 2023-01-11 13:00:34 -08:00
Marcus Moore 49383ddbe0
Delete old dusk local configuration 2023-01-11 12:58:57 -08:00
Marcus Moore 9a3a796e17
Add dusk environment files to gitignore 2023-01-11 12:57:05 -08:00
Marcus Moore e8c2b84d24
Add example dusk environment file 2023-01-11 12:51:15 -08:00
snipe 4f8951f6f1
Merge pull request #12335 from uberbrady/windows_snipeit_restore 
Fixed #12004: Snipe-IT restore didn't work on Windows
 2023-01-11 11:03:44 -08:00
snipe 85b712e915
Merge pull request #12337 from snipe/docs/added_jamf_rename 
Added jamf-snipe-rename script to third party list
 2023-01-10 18:10:47 -08:00
snipe ca244911ed Added jamf-snipe-rename script to third party list 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 18:10:13 -08:00
snipe 942681bee5
Merge pull request #12336 from snipe/features/category_query_optimization 
Refactor category API for fewer queries
 2023-01-10 17:54:45 -08:00
snipe 459c95064e Fixed default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 17:54:04 -08:00
Marcus Moore b5ea8b8a4f
Conditionally drop table 2023-01-10 17:29:38 -08:00
Marcus Moore aec64fa64a
Comment out migration's down method to match its up method 2023-01-10 17:25:25 -08:00
Marcus Moore 03938d0f32
Conditionally drop table 2023-01-10 17:24:38 -08:00
Marcus Moore 296c9a723d
Reverse column rename in migration's down method 2023-01-10 17:22:29 -08:00
snipe 2eac03db4a
Merge pull request #12329 from snipe/fixes/rollbar_integration 
Fixed rollbar integration if ROLLBAR_TOKEN is provided
 2023-01-10 17:21:52 -08:00
Marcus Moore c5b09ed955
Fix column name typo 2023-01-10 17:21:46 -08:00
Marcus Moore 4ee3cbf60e
Comment out migration's down method to match its up method 2023-01-10 17:20:20 -08:00
Marcus Moore 39ab545cf5
Update alter statement to use correct suffix for column 
This is brittle...
 2023-01-10 17:08:28 -08:00
Marcus Moore e5cb68cc5e
Move drop column command to correct migration 2023-01-10 17:06:16 -08:00
Marcus Moore b8b2543b0d
Reference the correct table in migration down method 2023-01-10 17:04:21 -08:00
Marcus Moore bc0f666906
Create Setting in test to avoid being redirected to the setup screen 2023-01-10 17:03:09 -08:00
Marcus Moore 581655f756
Run database migrations for all Dusk tests 2023-01-10 17:02:11 -08:00
Marcus Moore 2aa50859b3
Bump Dusk version to fix broken macOS chrome driver link 2023-01-10 17:01:03 -08:00
snipe 0b0fdd8aa5 Small formatting fixes, fixed typo in comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:32:18 -08:00
snipe 8f3a237ea0 More comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:29:51 -08:00
snipe 151719a91c Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:24:46 -08:00
snipe 825df2cf75 Load up the item counts with the individual API methods for accurate numbers without n+1 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:17:03 -08:00
snipe b66cd313b9 Refactored itemCount() to use existing blah_count fields if they exist 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:16:25 -08:00
snipe d508374c57 Disallowed category type change string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:15:51 -08:00
snipe f50b622eb8 Disallow editing of category type once created, added help text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:15:40 -08:00
snipe bef4224e14 Added notes to itemCount() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 13:50:24 -08:00
snipe 249b188654 Refactor category API and transformer for query optimization 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 13:30:01 -08:00
Brady Wetherington 2170343958 Fixed #12004: Snipe-IT restore didn't work on Windows 2023-01-10 13:06:47 -08:00
snipe 17c308f3ca Merge remote-tracking branch 'origin/master' into develop 2023-01-10 02:08:23 -08:00