snipe
|
ed8e82a606
|
Removed sr-only class for now - not sure why it’s interfering with the submit button JS
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-14 11:02:02 -07:00 |
|
|
snipe
|
8eed01bfa4
|
Merge pull request #11078 from snipe/fixes/show_encrypted_on_custom_field_view
Adds encrypted status to custom fields overview
|
2022-05-14 10:25:45 -07:00 |
|
|
snipe
|
5030c7e5ff
|
Added missing backups help string
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-14 10:24:03 -07:00 |
|
|
snipe
|
91fb27ee00
|
Adds encrypted status to custom fields overview
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-14 10:20:04 -07:00 |
|
|
snipe
|
5f1f6baee9
|
Fixed unrelated typo
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-14 10:19:12 -07:00 |
|
|
snipe
|
3fe0e04d52
|
Fix roite for people file deletion
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-14 08:25:22 -07:00 |
|
|
snipe
|
3a31104b5c
|
Fixed #11052 - add file sizes to upload displays
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 19:33:14 -07:00 |
|
Brady Wetherington
|
b6284e6651
|
Fix 'cancel' button in two-factor screen
|
2022-05-13 14:49:37 -07:00 |
|
|
snipe
|
d8a4509b22
|
Fix logout on 2fa
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 14:36:20 -07:00 |
|
|
snipe
|
c0868a68fb
|
Removed console.log cruft
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 13:44:38 -07:00 |
|
|
snipe
|
eccc5e7cf0
|
Make logout a post on 2FA cancel
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 13:35:13 -07:00 |
|
|
snipe
|
b36bfad0ca
|
Set maxlength on password confirmation form element
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 05:27:47 -07:00 |
|
|
snipe
|
6b27c0311d
|
Updated help text on groups for more info on deselecting
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 05:23:12 -07:00 |
|
|
snipe
|
93454decec
|
Fixed broken quotes
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 05:14:53 -07:00 |
|
|
snipe
|
deb2d958d8
|
Sets maxlength of user fields to 191
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 04:54:12 -07:00 |
|
|
snipe
|
714f6d80f2
|
Merge pull request #11059 from Godmartinz/feature/sc-19017/change-bootstrap-tables-export-to-be-landscape
Bootstrap tables export as landscape
|
2022-05-12 09:28:47 -07:00 |
|
Godfrey M
|
54f5e268a0
|
removed change from tableExport.js
|
2022-05-12 09:20:19 -07:00 |
|
|
Godfrey M
|
83d0743ab8
|
saves bootstrap pdf tables in landscape
|
2022-05-12 09:18:44 -07:00 |
|
|
snipe
|
91cc08d3fb
|
Merge pull request #11050 from uberbrady/fix_encrypted_textareas
Make sure to decrypt Textareas as well as input type=text
|
2022-05-11 19:03:02 -07:00 |
|
|
Brady Wetherington
|
e3696ff84c
|
Make sure to decrypt Textareas as well as input type=text
|
2022-05-10 18:39:03 -07:00 |
|
|
snipe
|
446e44deb6
|
Merge pull request #11048 from Godmartinz/bug/sc-18989/purchase-cost-can-be-negative
Fixed validation for purchase cost allowed to be negative
|
2022-05-10 17:36:01 -07:00 |
|
|
snipe
|
780222d372
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
|
2022-05-10 17:26:26 -07:00 |
|
|
Godfrey M
|
33b1ab3658
|
prevents values for assets being negative through validation
|
2022-05-10 16:19:06 -07:00 |
|
|
snipe
|
d5edb0908b
|
Added translation string to the correct file this time
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 14:07:05 -07:00 |
|
|
snipe
|
89fee23d32
|
Commented out console log that was pooping up the joint
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 08:34:30 -07:00 |
|
|
snipe
|
2982d78899
|
Added translation for no assets selected
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:42:02 -07:00 |
|
|
snipe
|
304cd75af5
|
Fixed extra divs
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:20:44 -07:00 |
|
|
snipe
|
59a0f4722b
|
Use partial for asset bulk edit
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:20:35 -07:00 |
|
|
snipe
|
418a797e7e
|
Use partial for asset bulk edit
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:20:29 -07:00 |
|
|
snipe
|
0c20543c49
|
Remove conflicting toolbar call in model listing
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:15:58 -07:00 |
|
|
snipe
|
fe98e505fe
|
Use the new partial for bulk asset edit
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:15:31 -07:00 |
|
|
snipe
|
78a9c16761
|
Minor formatting improvements
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:15:10 -07:00 |
|
|
snipe
|
c4bf0045c8
|
Fixed stray < tag
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:14:55 -07:00 |
|
|
snipe
|
c64f34ebcc
|
Check the "do not change” radio button by default
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:14:31 -07:00 |
|
|
snipe
|
cf0548bd1f
|
Create a new partial for asset bulk actions
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 05:11:52 -07:00 |
|
|
snipe
|
caef98d36d
|
Patched #11025 to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 02:06:12 -07:00 |
|
|
snipe
|
fba731ac1c
|
Missed a few hard coded english strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 02:01:17 -07:00 |
|
|
snipe
|
784bf4d784
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .github/ISSUE_TEMPLATE/feature_request.yml
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ReportsController.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/users/print.blade.php
# webpack.mix.js
|
2022-05-06 01:52:43 -07:00 |
|
|
snipe
|
39ee825ba2
|
Fixed html lang specification
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 01:32:20 -07:00 |
|
|
snipe
|
c0e9393092
|
Fixed #10890 - use translation strings in user asset printout
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 01:30:58 -07:00 |
|
|
snipe
|
3a415b2fce
|
Use full app_url in favicon paths
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 00:19:32 -07:00 |
|
|
snipe
|
5370c2ca42
|
Merge pull request #10941 from Godmartinz/gh8856_signature_not_showing_in_print_all
[Fix] changes the query for the accept signature on print blade
|
2022-05-05 13:32:37 -07:00 |
|
|
snipe
|
953b3a8d6e
|
Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8
Merge master into develop for RC 6.0.0-8
|
2022-05-05 10:53:17 -07:00 |
|
|
snipe
|
c01f0880ef
|
Changed language string
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-05 10:52:57 -07:00 |
|
Johnson Yi
|
281c6df7b3
|
Customize login page when REQUIRE_SAML is enabled
|
2022-04-29 15:35:40 +00:00 |
|
|
snipe
|
edab4e1371
|
Uses str_slug for filename for JS export (like we do elsewhere)
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-28 21:55:26 +01:00 |
|
|
snipe
|
9aac1cbba4
|
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/MoveUploadsToNewDisk.php
# app/Http/Controllers/ActionlogController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Assets/AssetCheckinController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/BulkUsersController.php
# app/Http/Requests/AssetCheckoutRequest.php
# app/Importer/LicenseImporter.php
# app/Models/Actionlog.php
# app/Models/License.php
# app/Models/User.php
# app/Observers/AssetObserver.php
# composer.lock
# config/version.php
# database/factories/LicenseFactory.php
# database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
# database/migrations/2018_10_18_191228_add_kits_licenses_table.php
# database/migrations/2018_10_19_153910_add_kits_table.php
# database/migrations/2018_10_19_154013_add_kits_models_table.php
# database/migrations/2019_02_07_185953_add_kits_consumables_table.php
# database/migrations/2019_02_07_190030_add_kits_accessories_table.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/ar/general.php
# resources/lang/ar/passwords.php
# resources/lang/cs/general.php
# resources/lang/cs/passwords.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/fr/admin/custom_fields/general.php
# resources/lang/fr/admin/hardware/general.php
# resources/lang/fr/admin/locations/table.php
# resources/lang/fr/admin/settings/message.php
# resources/lang/hu/admin/custom_fields/general.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/general.php
# resources/lang/it/admin/settings/general.php
# resources/lang/nl/admin/custom_fields/general.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/sv-SE/passwords.php
# resources/lang/tr/general.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/reports/activity.blade.php
# resources/views/users/print.blade.php
|
2022-04-28 17:49:06 +01:00 |
|
|
Godfrey M
|
380cb38b7d
|
changes the query for the accept signature on print blade
|
2022-04-14 17:17:28 -07:00 |
|
|
snipe
|
5fba8202d6
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-11 15:40:58 +01:00 |
|
|
Brady Wetherington
|
4db7cb0e21
|
This disables the display of HTML content during exports, without enabling XSS attacks
|
2022-04-07 16:37:32 +01:00 |
|