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

7209 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Misilo 930666ffa0 Adding .my.cnf to disable column-statistics backup 
Fixes #10176

The ```.my.cnf``` file is copied to ```/root/.my.cnf``` for each
Dockerfile that exists
 2022-01-13 14:36:00 -06:00
snipe 984db1ef44 Apply personal API token fix to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 01:39:56 -08:00
snipe 0e5ef53c35
Merge pull request #10504 from snipe/fixes/auth_controls_on_api_key_creation 
Fixes auth controls on api key creation
 2022-01-13 01:36:52 -08:00
snipe 512dbfee7a Added gate to check that the user is allowed to view API keys 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 01:33:27 -08:00
snipe eb8f23a888 Removed commented code 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 01:32:28 -08:00
snipe 8f4ec95fbb Remove assets query, since we handle that via API call now and just need the count() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 23:23:00 -08:00
snipe 67ba8a6281 Removed extra spaces 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 23:18:39 -08:00
snipe 9368ddeaf0 Added badge count on requestable assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 23:17:54 -08:00
snipe f206d4ed4e Fixed double div in current purchase value 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 22:26:56 -08:00
snipe 224d0b2fd2 Small language file additions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 22:21:00 -08:00
snipe ae50f86c39 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 20:52:30 -08:00
snipe 43c57c8461 Merge master into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Http/Controllers/BulkAssetModelsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ModalController.php
#	app/Http/Transformers/GroupsTransformer.php
#	config/version.php
#	package-lock.json
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/lang/en/admin/hardware/message.php
#	resources/lang/en/admin/settings/general.php
#	resources/views/partials/bootstrap-table.blade.php
#	routes/web.php
 2022-01-12 20:51:33 -08:00
snipe ba5b835933 Lock seeder to english 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 13:10:29 -08:00
Brady Wetherington a063806bcc Permit DONT_REQ_PREAUTH AD users to log in 2022-01-12 12:50:39 -08:00
Brady Wetherington c8fe929e09 Add new UserAccountControl to permitted UAC's for AD. 2022-01-12 12:07:51 -08:00
snipe df0da0f3bc Fixed escaped string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 11:20:31 -08:00
snipe 181dc5127f Add @UniversalSuperBox as a contributor 2022-01-11 15:03:08 -08:00
snipe 303fc39966 Regenerated assets to pikc up #10089 changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-11 14:38:17 -08:00
snipe 730c2a6821
Merge pull request #10496 from UniversalSuperBox/fix/improve-asset-card-view 
Fixed #10089 (partially): Back to master: Added some BS tables style overrides for mobile
 2022-01-11 14:10:18 -08:00
Alex Janes d2bb3e6377
Merge branch 'develop' into features/quickscan_checkin 2022-01-11 16:40:20 -05:00
snipe bc10761b49 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-11 12:44:16 -08:00
snipe 2262176a60
Merge pull request #10449 from adagioajanes/features/lock_logins_to_saml 
Added #10436: Restricted Logins to SAML controlled via environment variable
 2022-01-11 12:37:54 -08:00
Alex Janes edef640d35
Merge branch 'develop' into features/lock_logins_to_saml 2022-01-11 09:05:14 -05:00
snipe cf14a0222c
Merge pull request #10498 from Haxatron/master 
Fix access control
 2022-01-10 19:24:31 -08:00
snipe 23a2700178
Merge pull request #10491 from snipe/fixes/migration_licenses_table_issue 
Fixed - v6 migration licenses table issue
 2022-01-10 15:51:18 -08:00
snipe ea83567e7d
Merge pull request #10494 from exula/fix/increase_max_licenses 
Fixed #7824
 2022-01-10 15:04:47 -08:00
snipe dcc199835b Add @nuraeil as a contributor 2022-01-10 14:56:22 -08:00
snipe d9624b59b4
Merge pull request #10264 from nuraeil/added-localized-strings 
Added #10242: Improved localized strings
 2022-01-10 14:48:52 -08:00
snipe b98c97b00e
Merge pull request #10265 from uberbrady/remove_old_ldap 
Remove old ldap
 2022-01-10 14:34:34 -08:00
snipe b18b3812df Back to master: Added some BS tables style overrides for mobile 
This repeats 06e8e826, which alone improves the mobile view immensely,
on master.
 2022-01-10 15:23:43 -06:00
Brad 6b6a83a525 Removing something stupid PHPStorm put in the use area 2022-01-10 14:21:19 -05:00
Brad 81084fa717 Fixed #7824 
Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure.

This commit allievates those pain points

- removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index
- removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that)
- removed the 999 max seats limit from the License Model,
- reworked how new license seats are created when increasing seats or creating licenses
- Added an index the license_seats table to help speed up lookups
 2022-01-10 14:03:28 -05:00
Wächtler, Yannick f906dbd81e Added missed translation strings, fixed the column width for the date selector (too small in certain languages) 2022-01-10 09:21:23 +01:00
Nuraeil 5bb2f6fa0f
Merge branch 'develop' into added-localized-strings 2022-01-09 17:40:54 +01:00
Wächtler, Yannick b77e7f88d4 fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix 2022-01-09 17:35:28 +01:00
snipe 66976d9359
Merge pull request #10492 from snipe/fixes/finish_localizing_backup_restore 
Finished localizing backup restore strings
 2022-01-07 16:51:43 -08:00
snipe 0f5bb0e65d Localize bakcup restore strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-07 16:50:19 -08:00
snipe 8719b3d3e9 Only try to create the licenses table if it doesn't exist 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-07 15:43:34 -08:00
Wächtler, Yannick c3ab4c7512 Fixed the tables not displaying the correct language 2022-01-06 14:29:10 +01:00
Wächtler, Yannick 04d649122b Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO 2022-01-06 12:35:37 +01:00
Haxatron bb095641c2
Update BulkAssetModelsController.php 
https://huntr.dev/bounties/efdf2ead-f9d1-4767-9f02-d11f762d15e7
 2022-01-06 09:50:11 +08:00
Nuraeil 271c364ef8
Merge pull request #9 from snipe/develop 
Merge snipe/snipe-it:develop into nuraeil/snipe-it:added-localized-strings
 2022-01-04 10:48:51 +01:00
snipe b78e610ce3
Merge pull request #10480 from snipe/fixes/check_for_valid_custom_field 
Fixed format property on invalid custom field object when trying to edit a field that doesn't exist
 2022-01-03 19:28:25 -08:00
snipe 884b6b0270 Fixes format property on invalid custom field object 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-03 19:14:50 -08:00
Brady Wetherington 95c30cae8d Some duplicate imports at the top of the Settings file 2022-01-03 13:53:53 -08:00
Brady Wetherington 3c7f2e89ec Merge branch 'develop' into remove_old_ldap 
Had to re-do the composer install because the conflicts were too complicated.
 2022-01-03 12:56:58 -08:00
snipe 7a1ab1292c
Merge pull request #10479 from adagioajanes/fixes/auto_asset_tag_phrasing 
Fixed auto asset tag phrasing
 2021-12-31 15:17:59 -08:00
Alex Janes 87bb741013
Merge branch 'snipe:master' into fixes/auto_asset_tag_phrasing 2021-12-31 16:34:57 -05:00
Alex Janes 5fe2083688 Adjusted the phrasing around auto-incrementing asset tags. 2021-12-31 16:33:30 -05:00
snipe 2ee84c2675 Added a few more comments 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-30 18:33:28 -08:00