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
10711 commits 95 branches 267 tags 294 MiB
Commit graph

10711 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 5eeca937cb Added logic for syncing fieldset info 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:08:26 -07:00
snipe 662b7787a1 Updated redirect return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:07:50 -07:00
snipe 28d9cec1e3 Added auto_add_to_fieldsets to API response 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:59:48 -07:00
snipe 67212f9d57 Changed layout, added fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:59:29 -07:00
snipe 6cd3cfe1ea Added new field to factory 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:57:03 -07:00
snipe 4a063d23b9 We don’t actually use this test? 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 19:36:52 -07:00
snipe 705bb7375a
Merge pull request #12914 from marcusmoore/fixes/fix-test-cases 
Fixes state leak between tests
 2023-04-25 17:22:56 -07:00
snipe 4e3ccb74bc Fixed slightly weird padding 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:59:19 -07:00
snipe 4954b50280 Added new strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:57:46 -07:00
snipe 07336bbc6a Added auto_add_to_fieldsets field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:51:36 -07:00
snipe 0e73923c24
Merge pull request #12913 from uberbrady/fix_scim_id_string 
Change from a standard Eloquent mapping for ID to a custom setRead
 2023-04-25 12:02:36 -07:00
Marcus Moore a528ebeab0
Use superuser instead of admin state 2023-04-25 11:53:47 -07:00
Brady Wetherington 3da5df0127 Change from a standard Eloquent mapping for ID to a custom setRead 2023-04-25 11:50:55 -07:00
Godfrey M 20d8ff2a4f removed a typo 2023-04-25 11:49:33 -07:00
snipe a7e2182ec9
Merge pull request #12904 from zacharyfleck/develop 
Fixed #8342: Add ARM64 architecture to Docker Builds
 2023-04-25 11:45:27 -07:00
Godfrey M cb68f41d9c added ldap_location to settings 2023-04-25 11:44:04 -07:00
Zachary Fleck af0a0276e0
Merge branch 'snipe:develop' into develop 2023-04-25 14:43:41 -04:00
Zachary Fleck ef07f39ccf
remove space 2023-04-25 14:43:34 -04:00
Zachary Fleck aa223359d4
remove space 2023-04-25 14:42:09 -04:00
snipe b0e342508f Merge remote-tracking branch 'origin/develop' 2023-04-25 08:09:59 -07:00
snipe efc0929bbc
Merge pull request #12910 from snipe/fixes/finer_permissions_for_bulk_assets 
Added more granular permissions on bulk actions for assets
 2023-04-25 08:09:30 -07:00
snipe 66ce02fc48 Added permission on restore 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 08:09:16 -07:00
snipe 6e7f0728fd Added more granular permissions on bulk actions for assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 08:06:45 -07:00
Marcus Moore b4f162f316
Fix operator in where clause 2023-04-24 17:26:06 -07:00
akemidx 9cd2783185 Regex added for link instead 2023-04-24 20:07:21 -04:00
zacharyfleck 63ade327a5
add ARM64 architecture 2023-04-24 16:24:44 -04:00
snyk-bot 056790e9cd
fix: upgrade bootstrap-table from 1.21.3 to 1.21.4 
Snyk has created this PR to upgrade bootstrap-table from 1.21.3 to 1.21.4.

See this package in npm:
https://www.npmjs.com/package/bootstrap-table

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
 2023-04-22 14:47:28 +00:00
snipe 0c425ed0e7 Merge remote-tracking branch 'origin/develop' 2023-04-21 05:19:19 -07:00
snipe 7d9062c065
Merge pull request #12877 from joelpittet/patch-1 
Allow an environment variable to set the session cookie path
 2023-04-21 04:45:17 -07:00
snipe fc721a9388
Merge pull request #12887 from marcusmoore/bug/sc-23158 
Fix: Ensure users editing themselves do not deactivate their account
 2023-04-21 04:42:04 -07:00
snyk-bot 6af3ab8954
fix: upgrade webpack from 5.76.2 to 5.77.0 
Snyk has created this PR to upgrade webpack from 5.76.2 to 5.77.0.

See this package in npm:
https://www.npmjs.com/package/webpack

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
 2023-04-21 06:57:42 +00:00
Marcus Moore 2aba8252f3
Ensure users editing themselves do not deactivate their account 2023-04-20 21:59:55 -07:00
akemidx 16a5a883e5 new request, preparing support_url for validation 2023-04-20 16:34:25 -04:00
snipe c3c22fae3c
Merge pull request #12885 from inietov/fixes/error_call_member_function_totalSeatsByLicenseID 
Fixed Call to a member function totalSeatsByLicenseID() on null
 2023-04-20 10:43:28 -07:00
Ivan Nieto Vivanco 747d6cfdb4 Change the flow of the condition using an early return 2023-04-20 10:37:26 -06:00
Ivan Nieto Vivanco ae53609b1b Declare variables only if license is found 2023-04-20 10:16:11 -06:00
Marcus Moore c357d9f01e
Update data provider name 2023-04-19 18:10:23 -07:00
Marcus Moore 645f6ed692
Remove unneeded doc block 2023-04-19 17:52:44 -07:00
Marcus Moore dd40798c43
Remove unneeded comments 2023-04-19 17:49:31 -07:00
Marcus Moore e92c1e7bea
Minor docblock update 2023-04-19 17:22:56 -07:00
Godfrey M bd212b3108 adds component costs to asset view 2023-04-19 16:35:06 -07:00
Joel Pittet 608c5d037f
Use environment variable and default to PHP's sendmail_path 
Use sendmail_path in PHP instead of hardcoded path and options
 2023-04-19 15:25:48 -07:00
Joel Pittet 351928adff
Allow an environment variable to set the session cookie path 2023-04-19 15:18:50 -07:00
Marcus Moore 144382e57a
Update docblock types 2023-04-19 12:31:12 -07:00
Marcus Moore 835f8876c4
Move notification sending into try catch block 2023-04-19 12:26:48 -07:00
snipe 4a5426f959
Merge pull request #12875 from Godmartinz/sidebar_undeployable_runaway_parenthesis 
Fixed space from un deployable total in sidebar
 2023-04-19 11:49:42 -07:00
Marcus Moore 15280c435e
Merge branch 'develop' into bug/sc-15034 2023-04-19 11:45:16 -07:00
Godfrey M 0e1f50c226 adds checkout-range to jquery 2023-04-19 10:11:26 -07:00
Godfrey M d2118ba230 removed space from un deployable total in sidebar 2023-04-19 09:46:15 -07:00
Godfrey M 8a5612d1c9 fixes comment 2023-04-19 09:13:43 -07:00