snipe
a1fe2a8d58
Fixed translation reference
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-20 18:01:55 -07:00
snipe
458d61fafe
Front-end updates for checkin without delete
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-20 17:57:39 -07:00
mikeroq
5efe45226d
Fixes Email List of All Assigned being "successful" when the user has no email
...
Added check in view to disable button if there is no email
Added translation for title on disabled button and for email check in controller
Fixed missing trans for user not found message
2022-07-11 20:02:10 -05:00
snipe
8114d01799
Only show sig file if there is a value for accepted sig
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-11 14:46:45 -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
07ac4087a3
Remove link from alert since there is already a restore button on the side
2022-07-02 14:34:22 -05:00
snipe
46d055cf74
Fixed weird extra padding on crown
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 14:17:53 -07:00
Godfrey M
fc636ea888
removed redundant header
2022-06-29 12:01:56 -07:00
Godfrey M
e471aa8639
adds button to email user list of assets from profile
2022-06-29 11:15:15 -07:00
snipe
e33a4c2ef2
Added disclosure arrows to use screen
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 16:35:44 -07:00
snipe
86d2c2b153
Small naming changes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 19:11:59 -07:00
snipe
62ab867051
Fixed url param
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:43:10 -07:00
snipe
3e559044b2
Changed method and scope names
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:41:13 -07:00
snipe
e63183649a
Show admin in user view
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:17:48 -07:00
snipe
398c77bfdc
Use new scope for additional tabs
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 15:37:39 -07:00
snipe
f0f37df76e
Added missing postal code from user view
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-22 12:18:57 -07:00
snipe
a111482217
Use number_format on badges
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-15 14:59:06 -07:00
snipe
5fe1078013
Squashed commit of the following:
...
commit a011b07d99b392ed2696059e9e11#11315 from snipe/features/adds_fullscreen_option_to_tables
Added fullscreen option to tables
commit b392ed269b693043e64e6d792bdf#11316 from snipe/fixes/smaller_padlock_on_table_header
Tweaked CSS for smaller padlock
commit 6059e9e119e6d792bdf7
2022-06-14 17:54:18 -07:00
Godfrey M
c8bc0eff11
fixes translation references in the users ldap blade
2022-06-08 09:52:55 -07:00
snipe
1ea667e709
Update views with additional data fields
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 21:03:56 -07:00
snipe
7c77e03c5a
Initial rework of locations display
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 18:08:15 -07:00
snipe
91822d2e45
Use shorter helper config method
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 13:26:29 -07:00
snipe
67616dbcf4
Updated language strings from activated to able to login
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 13:12:02 -07:00
snipe
4839985f38
Added forced space after admin/superadmin badge
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 12:59:36 -07:00
snipe
64eafb062e
Fixed bug where username wasn’t showing for regular users
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 10:48:02 -07:00
snipe
891009dc67
Nicer formatting for buttons in bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 15:35:57 -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
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
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
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
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
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
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
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
Ivan Nieto Vivanco
2d213a9c77
Make the report take the dates of pivot table instead of asset log
2022-04-05 12:57:49 -05:00
snipe
08588a2e6a
Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view
...
Fixes #10898 (invalid consumable date time info in user view)
2022-04-05 18:30:23 +01:00
Achmad Fienan Rahardianto
231a34ace3
FIX : #10898 (invalid consumable date time info in user view)
2022-04-05 15:31:27 +07:00
snipe
b2056816c9
Use the same string for both radio buttons in bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 16:45:55 +01:00
snipe
781b426018
Fixed #10826 - parse error on translation string for print all assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 08:50:47 -07:00
snipe
9a358087ec
Add remote user to bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-04 06:47:23 -08:00
