Marcus Moore
|
5306e1cd15
|
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/reports/custom.blade.php
|
2024-10-15 12:32:01 -07:00 |
|
snipe
|
4d9e85026a
|
Fixed #15439 - check database on healthcheck
Signed-off-by: snipe <snipe@snipe.net>
|
2024-10-02 15:36:01 +01:00 |
|
|
Marcus Moore
|
8bba11e1bb
|
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
# app/Http/Controllers/ReportsController.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/status-select.blade.php
# resources/views/reports/custom.blade.php
|
2024-09-17 15:26:35 -07:00 |
|
|
snipe
|
229d8b9bf5
|
Added location restore
Signed-off-by: snipe <snipe@snipe.net>
|
2024-08-19 13:19:59 +01:00 |
|
|
Marcus Moore
|
9044aa4ed9
|
Import class
|
2024-06-05 11:48:47 -07:00 |
|
|
Marcus Moore
|
b52380f376
|
Migrate to new namespace
|
2024-05-29 12:07:48 -07:00 |
|
|
snipe
|
bc8db3deab
|
Added bulk delete routes
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 16:42:14 +00:00 |
|
|
Marcus Moore
|
530ea474d1
|
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
# resources/lang/en/admin/reports/general.php
# resources/views/reports/custom.blade.php
|
2024-01-23 13:55:07 -08:00 |
|
|
Marcus Moore
|
fda77179a3
|
Simplify url
|
2023-12-20 16:48:25 -08:00 |
|
|
Marcus Moore
|
0504c09a9a
|
Implement ability to delete templates
|
2023-12-20 16:19:04 -08:00 |
|
|
Marcus Moore
|
26cc4497eb
|
Use dedicated show route for report templates
|
2023-12-20 14:01:46 -08:00 |
|
|
Marcus Moore
|
9fcb1a2d0e
|
Rename SavedReport to ReportTemplate
|
2023-12-18 12:55:48 -08:00 |
|
|
Marcus Moore
|
27bb938d9e
|
WIP: add dedicated edit report page
|
2023-12-13 18:09:42 -08:00 |
|
akemidx
|
ad202be374
|
update method (WIP ver)
|
2023-12-13 17:31:58 -05:00 |
|
|
Marcus Moore
|
52028ddef2
|
Add authorization to saving saved reports route
|
2023-12-11 15:34:17 -08:00 |
|
|
snipe
|
e554a80589
|
Handle redirect from after POST request from backup restore
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-30 20:01:01 +00:00 |
|
|
snipe
|
6d55d78280
|
Set resend acceptance to POST
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-09 16:13:41 +01:00 |
|
|
akemidx
|
734af87f2f
|
template structuring
|
2023-08-28 19:26:31 -04:00 |
|
Grant Le Roux
|
b1464e028c
|
Merge branch 'develop' into develop
|
2023-07-31 07:57:29 +08:00 |
|
Ivan Nieto Vivanco
|
1c29bd37a6
|
Added feature to cancel requests from the Requested Assets view
|
2023-06-27 18:11:10 -06:00 |
|
|
snipe
|
b183e53c45
|
Added settings routes for google auth
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:34:48 -07:00 |
|
|
snipe
|
c52b48c383
|
Google oauth login
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:14:28 -07:00 |
|
|
Marcus Moore
|
4a0b3efd1f
|
Include user's name in Acceptance result notifications for accessories
|
2023-05-03 14:22:05 -07:00 |
|
|
snipe
|
b6889ff399
|
Fixed #12918 - wrong toite for clone location
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 09:52:13 -07:00 |
|
Brady Wetherington
|
09c1298e03
|
Merge branch 'develop' into livewire_importer_2_squashed_and_rebased
I'll be taking in the changes to the importer front-end elsewhere
|
2023-03-07 18:51:05 -08:00 |
|
|
snipe
|
9b522006f3
|
Usew route group for locations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-01 14:05:53 -08:00 |
|
|
snipe
|
dac877f184
|
Added location clone
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-01 13:51:35 -08:00 |
|
|
Brady Wetherington
|
54cb38603b
|
Cleaned up the last of the FIXME's (or downgraded them to TODO's)
|
2023-02-28 22:34:44 -08:00 |
|
|
Brady Wetherington
|
2f94bf96ff
|
Everything's all wired up; just need to clean up all the FIXME's and stuff
|
2023-02-28 18:36:52 -08:00 |
|
Cram42
|
48fb4f2439
|
Add labels route for testing layouts
|
2022-11-02 17:23:52 +08:00 |
|
|
snipe
|
891b5b2882
|
Added routes, language
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-04 15:45:25 -07:00 |
|
|
snipe
|
af7ccf3beb
|
Handle logout route names
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-01 16:17:40 -07:00 |
|
|
snipe
|
5b02d9ed06
|
Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/account/accept/create.blade.php
|
2022-06-29 04:58:13 -07:00 |
|
|
snipe
|
a7dc6162fa
|
Simplify password attempts rate limiting
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-22 09:11:24 -07:00 |
|
|
snipe
|
b00db3cc56
|
Added throttling to password reset token form
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-21 19:30:11 -07:00 |
|
|
snipe
|
172e8d463f
|
Use newer forgotten password variables
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-21 19:11:57 -07:00 |
|
|
snipe
|
17ee332715
|
Remove throttle from GET in password reset
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-21 18:53:14 -07:00 |
|
|
snipe
|
386272a618
|
Manually add the additional routes so we can throttle them
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-21 18:40:53 -07:00 |
|
|
snipe
|
93eba43b76
|
Removed trailing slash from route
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-19 17:55:59 -07:00 |
|
Johnson Yi
|
4401dab8d6
|
fix saml slo for logout
|
2022-05-14 11:59:34 +00:00 |
|
|
snipe
|
1424e168d6
|
Switch logout back to post
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 13:30:11 -07:00 |
|
|
snipe
|
7c82f5670b
|
One more 2FA login change
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 12:48:55 -07:00 |
|
|
snipe
|
32bbe7c715
|
Fixed 2FA middleware
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 12:45:54 -07:00 |
|
Godfrey M
|
5fcc3c39f3
|
routes eula agreements for download correctly to the asset history
|
2022-03-16 11:56:56 -07:00 |
|
|
Godfrey M
|
e1a6a2afc6
|
adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet
|
2022-03-10 12:15:50 -08:00 |
|
|
Godfrey M
|
59c583ac74
|
adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI
|
2022-03-08 16:42:27 -08:00 |
|
Dampfklon
|
0d49fc3a2e
|
remove unused route, controller functions and view
|
2022-02-13 12:10:19 +01:00 |
|
|
Brady Wetherington
|
c527a5c6e7
|
Duplicate route meant overwrite of route-name
|
2022-01-13 16:03:32 -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
|
9b2dd6522f
|
Switch GET to POST for asset request
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-16 20:36:08 -08:00 |
|