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 |
|
|
snipe
|
06a05e6340
|
Added remote to view
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 05:37:28 -08:00 |
|
|
snipe
|
43c1949092
|
Add remote option to user
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 05:35:26 -08:00 |
|
|
snipe
|
a9069e65e5
|
Don’t show groups in menu if there are none yet
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-04 04:39:39 -08:00 |
|
|
snipe
|
8b8e93d703
|
Fixed #10659 - wrong translation string reference
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-10 21:03:09 -08:00 |
|
|
Ivan Nieto Vivanco
|
fa2f8409f9
|
Add a casting to a truthy/falsy that needs to be integer
|
2022-02-02 14:09:23 -06:00 |
|
|
Ivan Nieto Vivanco
|
eac8e0bdba
|
Add a casting to a truthy/falsy that needs to be integer
|
2022-02-02 13:54:57 -06:00 |
|
Wächtler, Yannick
|
04d649122b
|
Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO
|
2022-01-06 12:35:37 +01:00 |
|
|
Wächtler, Yannick
|
1b76185798
|
Added TODO: comments to pages, where there are non-localized strings, in order to keep track of them
|
2021-11-19 15:32:13 +01:00 |
|
|
snipe
|
52ef9280ba
|
Adds reqestable as model bulk edit field
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-28 15:15:54 -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 |
|
|
snipe
|
e491a93892
|
Removed restore link
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-04 19:56:56 -07:00 |
|
|
snipe
|
8fe59f8383
|
Switch users restore over to POST
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-04 19:22:38 -07:00 |
|
|
snipe
|
85b5f52cd8
|
Nicer mobile view for user view icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-28 23:04:30 -07:00 |
|
|
snipe
|
61f16f47a2
|
Use Helper alias
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-28 19:44:55 -07:00 |
|
Brady Wetherington
|
f380da3f19
|
Try to ensure all currency output is formatted correctly.
|
2021-09-28 16:45:47 -07:00 |
|
|
snipe
|
7e41c74cc3
|
Updated more fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-26 01:11:08 -07:00 |
|
|
snipe
|
8ee00d0f42
|
Changed paperflip to file icon
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-25 22:57:06 -07:00 |
|
|
snipe
|
a9b306f2d2
|
Backing out the ribbon - too finicky on mobile :(
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 14:30:29 -07:00 |
|
|
snipe
|
5875cf1e9e
|
Removed test code
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 12:33:34 -07:00 |
|
|
snipe
|
78fa6452ee
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 12:05:18 -07:00 |
|
|
snipe
|
2c141813f1
|
Better formatting
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 11:51:52 -07:00 |
|
|
snipe
|
3317b5107a
|
Added ribbon to show on user's photo that they are an admin
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 11:13:55 -07:00 |
|
|
snipe
|
299ad681f7
|
More fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 07:21:30 -07:00 |
|
|
snipe
|
8aba37522d
|
More FA icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:18:22 -07:00 |
|
|
snipe
|
dbe93d91cd
|
Updated fontawesome icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:07:46 -07:00 |
|
|
snipe
|
4a8f06b0f1
|
Added badge counters to tabs
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 04:12:22 -07:00 |
|
|
snipe
|
fd7c6179d5
|
Show the user's photo frst on mobile view
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 03:02:47 -07:00 |
|
|
snipe
|
90c22caa4b
|
Rework user page to no longer use tables for data layout
This also fixes the weird display when lines break
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 02:17:40 -07:00 |
|