|
|
31933a56fa
|
Trying to get the login screen working
|
2021-10-28 18:18:11 -07:00 |
|
|
|
5458e44a40
|
Merge pull request #9508 from sh1hab/feature/remove_deleted_user_from_unaccepted_assets_report
Feature #9378 remove deleted user from unaccepted assets report
|
2021-10-28 18:11:19 -07:00 |
|
|
|
d36849bd41
|
Merge branch 'develop' into feature/remove_deleted_user_from_unaccepted_assets_report
|
2021-10-28 18:11:03 -07:00 |
|
|
|
84a3a85823
|
Fixed parse error for merge conflict
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-28 18:04:03 -07:00 |
|
|
|
798f6d65de
|
Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self
Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view
|
2021-10-28 17:53:24 -07:00 |
|
|
|
d54434fdf7
|
Merge pull request #9541 from misilot/change-var-aws-public-url
Change from ENV to config value for PUBLIC_AWS_URL
|
2021-10-28 17:46:25 -07:00 |
|
|
|
bdf321ecc9
|
Merge branch 'develop' into change-var-aws-public-url
|
2021-10-28 17:46:16 -07:00 |
|
|
|
3ede7c7f18
|
Use icon and string for maintained value in license view
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-28 17:26:03 -07:00 |
|
|
|
2d782cd31f
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2021-10-28 17:20:27 -07:00 |
|
|
|
645529ba78
|
Merge pull request #9889 from ncareau/api-licenses
Add licenses api parameters and fix a missing variable in license view.
|
2021-10-28 17:20:09 -07:00 |
|
|
|
636dc6877b
|
Merge pull request #10113 from Godmartinz/bug/sc-17129/v6-integration-pie-chart-disappears-if-you
Fixed #sc17129 - Pie chart disappears when window resizes
|
2021-10-28 17:14:14 -07:00 |
|
|
|
3951de1669
|
Merge branch 'develop' into bug/sc-17129/v6-integration-pie-chart-disappears-if-you
|
2021-10-28 17:13:37 -07:00 |
|
|
|
3088230236
|
Merge pull request #10209 from Godmartinz/feature/sc-1474/sync-parent-asset-location-with-children-assets
Fixes Bug: When parent asset is assigned to other location, children assets loca…
|
2021-10-28 16:49:44 -07:00 |
|
|
|
984bc501a5
|
Merge pull request #9906 from Toreg87/fixes/advanced_search_serial_v2
Fixed #9904: Advanced search with serial and another field produce incorrect results (v2)
|
2021-10-28 16:42:32 -07:00 |
|
|
|
371a39a118
|
Merge branch 'develop' into fixes/advanced_search_serial_v2
|
2021-10-28 16:42:10 -07:00 |
|
|
|
d3d199efc3
|
Add @PlaneNuts as a contributor
|
2021-10-28 16:39:28 -07:00 |
|
|
|
7821d38e60
|
Merge pull request #10238 from inietov/fixes/asset_components_must_return_relationship_instance
Fixes asset components must return relationship instance
|
2021-10-28 16:38:21 -07:00 |
|
|
|
1895dd326f
|
Merge pull request #10245 from Sxderp/pr-support-appache-rewrite-redirect-headers-for-remote-user
support apache REDIRECT_* for remote user login
|
2021-10-28 16:34:57 -07:00 |
|
|
|
1975afaca6
|
Merge pull request #10248 from snipe/features/add_requestable_to_bulk_model_edit
Adds reqestable as model bulk edit field
|
2021-10-28 16:30:55 -07:00 |
|
|
|
52ef9280ba
|
Adds reqestable as model bulk edit field
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-28 15:15:54 -07:00 |
|
|
|
30cfc34ecf
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2021-10-28 14:42:58 -07:00 |
|
|
|
668e8a357c
|
Fixed labels in profile form
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-28 12:57:27 -07:00 |
|
|
|
efc644c960
|
support apache REDIRECT_* for remote user login
|
2021-10-28 14:23:38 -04:00 |
|
|
|
ee9133f722
|
Return the proper Asset-Components relationship
|
2021-10-27 16:42:51 -05:00 |
|
|
|
8cfa8d97b4
|
Merge pull request #10215 from inietov/fixes/bulk_edit_counts_more_users_selected
Fixes bulk edit message counts more users than the actual selected users number
|
2021-10-21 13:02:03 -07:00 |
|
|
|
9eaf89aaa7
|
Add a variable to better control the selected user's ids
|
2021-10-21 13:28:58 -05:00 |
|
|
|
31d49b5c9b
|
Fixed merge error parse error
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 18:11:34 -07:00 |
|
|
|
6e0f8068b2
|
Fixed duplicate use statement from merge fuckery
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 17:54:32 -07:00 |
|
|
|
9ee13f0d2a
|
Fixed dupe use statement from merge fuckery
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 17:53:43 -07:00 |
|
|
|
ae1a4bb3c9
|
Fixed extra braces from merge fuckery
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-20 17:36:06 -07:00 |
|
|
|
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 |
|
|
|
9ae7d0b23a
|
when parent asset is assigned to other location, children assets location are updated as well.
|
2021-10-20 17:01:25 -07:00 |
|
|
|
365349fd91
|
Center custom fields email icon
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-18 18:39:46 -07:00 |
|
|
|
a88f622ec3
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
v5.3.0
|
2021-10-18 16:45:51 -07:00 |
|
|
|
f87ffb84d5
|
Merge pull request #10201 from snipe/fixes/xss_on_export
Fixes possible XSS on all-file-types export
|
2021-10-15 09:54:52 -07:00 |
|
|
|
bda23bb1e6
|
Fixes possible XSS on all-file-types export
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-15 11:50:52 -05:00 |
|
|
|
4095a3f8c4
|
Removed dupe bars
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-12 12:31:08 -07:00 |
|
|
|
94c4265524
|
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
|
2021-10-12 12:30:39 -07:00 |
|
|
|
4a98519c1f
|
Compiled assets
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-12 12:30:25 -07:00 |
|
|
|
d126b265ee
|
Merge pull request #10192 from snipe/bug/sc-17471/font-awesome-hamburger-menu-is-showing-as
Fixed misisng hamburger menu
|
2021-10-12 12:10:53 -07:00 |
|
|
|
892fc0004a
|
Fixed misisng hamburger menu
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-12 12:09:46 -07:00 |
|
|
|
2cbbf7efe2
|
Merge pull request #10186 from tanji/patch-2
Exclude web.config from Apache
|
2021-10-11 10:03:37 -07:00 |
|
|
|
494ed3d17a
|
Exclude web.config from Apache
|
2021-10-11 14:14:00 +02:00 |
|
|
|
5d94b99035
|
Switched to 5 in one minute
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-08 15:53:32 -07:00 |
|
|
|
c4856c8aed
|
Merge pull request #10180 from snipe/fixes/add_rate_limiting_to_forgotten_password
Throttle password reset requests to 5 every 60 seconds
|
2021-10-08 15:44:43 -07:00 |
|
|
|
0674ef5a3d
|
Fixed number to 1 (for minutes)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-08 15:43:32 -07:00 |
|
|
|
702791210e
|
Throttle password reset requests to 5 every 60 seconds
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-08 14:26:30 -07:00 |
|
|
|
1f5c38ad7e
|
Merge pull request #10179 from inietov/features/allow_same_category_name_for_different_types
Fixes #9365 #9800 Added a validation to use the same name in categories with different types [sc-17487]
|
2021-10-08 14:10:29 -07:00 |
|
|
|
23b770fac6
|
Added a validation to use the same name in categories with different types
|
2021-10-08 15:19:16 -05:00 |
|
|
|
1c77fd0d09
|
Merge pull request #10178 from inietov/bug/sc-17520/symfony_component_debug_exception_fatalthrowableerror
Fixed typo when setting the headers
|
2021-10-08 12:04:45 -07:00 |
|
