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
14465 commits 97 branches 266 tags 291 MiB
Commit graph

115 commits

Author SHA1 Message Date
snipe beb0836d69 Updated route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 23:01:44 +01:00
snipe 651001bf6e Removed duplicate routes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:58:15 +01:00
Godfrey M e2679852ce added export button, half the logic for export method 2024-04-10 11:31:30 -07:00
snipe 495df737fc Unfixed indenting :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-13 16:39:35 +00:00
snipe 9bff2d0bbf Fixed indenting? 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-09 21:47:29 +00:00
snipe 6da0671143 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:44:09 +00:00
snipe d2bf71327b Redirect /asset_tag/view to /asset_tag 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:56 +00:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
snipe b2940f9915 Added confirm modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:29:48 -07:00
slong753 e4c76f454c this is good, just needs translations done in view 2023-03-29 18:24:56 -05:00
snipe 4f8542b71b
Merge pull request #12680 from akemidx/clone_accessories 
Clone accessories
 2023-03-21 13:37:04 -07:00
snipe 853e809ff8 Added route 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:26 -07:00
akemidx ec5836dab4 cloning accessories first bit 2023-03-07 16:41:48 -05:00
cram42 c2c009a018
Merge branch 'develop' into develop 2023-01-24 09:53:42 +08:00
snipe eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
snipe 3d8e0b707e Fixed component file route controller names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:29:13 -07:00
snipe f51b312843 Added component routes for uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:09:51 -07:00
snipe f6a6478804 Added consumable uploads gitignore 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:52:04 -07:00
Cram42 d37605ff18 Add localization strings 2022-11-01 20:01:18 +08:00
snipe e79a819724 Fixed inconsistency in naming 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 17:45:39 -07:00
snipe 3e48f436af Handled user route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:13:30 -07:00
snipe 5e488bd81f Handle components route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:10:39 -07:00
snipe 53ff28d2b0 Handle consumables route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:07:56 -07:00
snipe 4a4636bd03 Handle accessories route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:06:28 -07:00
snipe 744d0d299e Handle model route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:03:45 -07:00
snipe b035003546 Handled hardware route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 15:59:54 -07:00
snipe af14ee0d47
Merge pull request #11453 from mikeroq/fixes/asset_restore_not_working 
Fixes #11452 - Asset Restore routes/buttons also asset models/users restore as well
 2022-07-02 13:07:29 -07:00
Mike Roquemore 6e9f24c08f Change restore route to POST instead of GET 2022-07-02 14:34:23 -05:00
Mike Roquemore 1650c9f878 Remove duplicate users routes 2022-07-02 14:34:22 -05:00
Mike Roquemore 123963c14c Modify genericActionsFormatter restore link to be a button instead since it's in a form. 
Changed user restore route to POST
 2022-07-02 14:34:22 -05:00
Godfrey M e471aa8639 adds button to email user list of assets from profile 2022-06-29 11:15:15 -07:00
snipe c90ed9f25f Allow models uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 15:50:07 -07:00
snipe ce154a2382
Merge pull request #10455 from adagioajanes/features/quickscan_checkin 
Added #10454: Quick Scan Checkin
 2022-02-01 20:19:45 -08:00
Ivan Nieto Vivanco fcd203f4dc Fix the route to associate custom fields with fieldsets 2022-01-26 14:43:20 -06:00
Alex Janes b01a4468c7 refactored from bulkcheckin to quickscancheckin 2021-12-20 23:27:36 -05:00
Alex Janes bc4fe88ac0 First version of bulk checkin 2021-12-19 16:53:31 -05:00
Ivan Nieto Vivanco 2402f00a2e Fix route to checkout components from the details page 2021-12-14 12:26:46 -06:00
snipe 250f6b6fb8 Fixed v6 bug 500 server error when trying to checkin [sc-17711] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-18 14:37:12 -08:00
snipe db45de5da2 Fixed old style user routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:26:07 -08:00
snipe 207c785b1d Added missing use statements for Laravel 8 routes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:20:10 -08:00
snipe 8a747be3a0 Fixed routes for newer format (l8) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-15 20:16:40 -08:00
snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	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/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
 2021-11-15 19:24:38 -08:00
snipe 0d811d067c Turn cusotm fields required/optional/remove into POST requests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-05 10:53:48 -07:00
snipe aa8f1378c9 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Http/Controllers/Accessories/AccessoriesController.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Assets/BulkAssetsController.php
#	app/Http/Controllers/Components/ComponentsController.php
#	app/Http/Controllers/Consumables/ConsumablesController.php
#	app/Http/Controllers/Licenses/LicenseFilesController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/UserFilesController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Http/Transformers/LicensesTransformer.php
#	app/Importer/UserImporter.php
#	app/Models/Asset.php
#	config/app.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/en/admin/users/message.php
#	resources/lang/is/button.php
#	resources/lang/ja/admin/kits/general.php
#	resources/lang/ro/admin/users/general.php
#	resources/lang/zh-HK/admin/depreciations/general.php
#	resources/lang/zh-HK/admin/models/general.php
#	resources/views/hardware/qr-view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/users/view.blade.php
#	routes/web.php
#	routes/web/hardware.php
#	routes/web/models.php
#	routes/web/users.php
 2021-10-20 17:26:41 -07:00
Brady Wetherington d80604f2ac Most of the basics are working, but not done and lots of debug messages are about 
I picked up the change that picked a point-release difference on the AWS library since that usually
works out for us (x.y.1 vs. x.y.2 - usually a good call)
 2021-10-04 22:06:48 -07:00
snipe caad5be957 Updated routes to use POST for restore 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 17:17:36 -07:00
snipe 03e3c21d7e
Merge pull request #10129 from snipe/features/improved_mobile_ux 
Features/improved mobile ux
 2021-09-24 12:30:56 -07:00
Ivan Nieto Vivanco efc9a8e2c9 Fixes route not defined exception on components and consumables 2021-09-24 11:38:07 -05:00
snipe 1574d24dde Fixed accessories route 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-24 04:11:58 -07:00
snipe 1ecd11dd2e More route fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-23 21:46:17 -07:00