Wächtler, Yannick
c0891e6827
Added localized strings for modals
2021-11-02 15:27:13 +01:00
Wächtler, Yannick
30d30490a3
Added localized strings for locations
2021-11-02 15:14:54 +01:00
Wächtler, Yannick
4af6412da6
Added localized strings for licenses
2021-11-02 14:55:49 +01:00
Wächtler, Yannick
4fcd4a930f
Added localized strings for layouts
2021-11-02 14:45:58 +01:00
Wächtler, Yannick
8bad9c5140
Added localized strings for kits
2021-11-02 14:25:21 +01:00
Wächtler, Yannick
26e056fb3c
Added localized strings for improter, added en structure
2021-11-02 14:09:22 +01:00
Wächtler, Yannick
c16ade2d87
Added localized strings for hardware
2021-11-02 14:02:48 +01:00
Wächtler, Yannick
167bf97d46
Added localized strings for groups
2021-11-02 12:03:41 +01:00
Wächtler, Yannick
e825fa81aa
Added localized strings for depreciations
2021-11-02 11:50:56 +01:00
Wächtler, Yannick
a96c53784c
Added localized strings for custom_fields
2021-11-02 11:27:53 +01:00
Wächtler, Yannick
c11af0e222
Added missing localized strings for account/accept/index.blade.php and view-assets.blade.php
2021-11-02 10:40:41 +01:00
Wächtler, Yannick
433d6fd3e0
Added localized strings for admin/companies
2021-11-02 10:23:15 +01:00
Wächtler, Yannick
b784e63aa8
Added localized strings for account
2021-11-02 10:13:22 +01:00
Godfrey M
1683b04244
changed min_amt_help message
2021-11-01 11:05:44 -07:00
Matthew Nickson
90ca66834b
Fixed sumFormatterQuantity if using 1.234,56 fomat
...
Previously sumFormatterQuantity used the parseFloat to convert the
string purchase_cost to a floating point number. parseFloat does not
return the correct value when using the comma format. To fix this
sumFormatterQuantity now used the cleanFloat function to convert
purchase_cost to a float.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2021-10-30 22:48:45 +01:00
Brady Wetherington
31933a56fa
Trying to get the login screen working
2021-10-28 18:18:11 -07:00
snipe
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
snipe
76cc46c419
Merge pull request #9814 from 01ste02/importMinAmt
...
Improved Consumable Import: Import min_amt for consumables
2021-10-28 17:49:44 -07:00
snipe
dc71f6ddc6
Merge pull request #9871 from jethron/patch-1
...
Fixed: double slashes in branding logo URL path
2021-10-28 17:36:43 -07:00
snipe
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
snipe
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
snipe
3951de1669
Merge branch 'develop' into bug/sc-17129/v6-integration-pie-chart-disappears-if-you
2021-10-28 17:13:37 -07: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
668e8a357c
Fixed labels in profile form
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-28 12:57:27 -07:00
Godfrey M
b0da936c5c
changed get to receive in the message
2021-10-27 16:41:38 -07:00
Godfrey M
8719667c44
adds info on how to nullify reorder alerts for consumables, components and accessories
2021-10-27 16:36:04 -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
365349fd91
Center custom fields email icon
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-18 18:39:46 -07:00
snipe
bda23bb1e6
Fixes possible XSS on all-file-types export
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-15 11:50:52 -05:00
snipe
4095a3f8c4
Removed dupe bars
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-12 12:31:08 -07:00
snipe
94c4265524
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-10-12 12:30:39 -07:00
snipe
4a98519c1f
Compiled assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-12 12:30:25 -07:00
snipe
892fc0004a
Fixed misisng hamburger menu
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-12 12:09:46 -07:00
Matthew Nickson
8996c24d1f
Merge branch 'develop' into sum_cost_by_quantity
2021-10-10 13:01:44 +01:00
Dampfklon
ab4a234e20
fix rebase errors
2021-10-07 21:32:57 +02:00
Dampfklon
4418ad2340
Enable display of deleted acceptances, strike deleted users, add date, enable sorting
2021-10-07 21:03:46 +02:00
Dampfklon
12ee06deb6
add Download All Button, change route analogue to activity report
2021-10-07 21:01:50 +02:00
Dampfklon
ed99532c30
Unaccepted Assets Report Actions (send reminder, delete) added
...
Unaccepted Assets Export fixed
2021-10-07 20:53:02 +02:00
snipe
7848a3c3dc
Use Storage:: facade for image preview for models
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 13:12:42 -07:00
snipe
f306401e7e
Fixed SVG XSS vuln
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-06 12:26:45 -07:00
Brady Wetherington
bbeedc026d
A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working.
2021-10-04 22:07:29 -07:00
Brady Wetherington
d80604f2ac
Most of the basics are working, but not done and lots of debug messages are about
...
I picked up the change that picked a point-release difference on the AWS library since that usually
works out for us (x.y.1 vs. x.y.2 - usually a good call)
2021-10-04 22:06:48 -07:00
snipe
dc3af7cc74
Resolved conflicts
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 20:39:24 -07:00
snipe
903609b5a5
Updated languages
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 19:59:55 -07:00
snipe
e491a93892
Removed restore link
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 19:56:56 -07:00
snipe
b20c841a89
Fixed asset models restore
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 19:29:13 -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
8bf09d9f89
Make form-based restore button on asset view
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 19:01:16 -07:00
snipe
3594ec9905
Handle bulk check and uncheck
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:58:16 -07:00
snipe
52caee2a9f
Handle checking and unchecking for bulk actions
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:26 -07:00
snipe
52ea172e5d
Fix ID array
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-04 17:18:07 -07:00
snipe
89e650f842
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-30 16:01:56 -07:00
snipe
43a437000b
Slightly better right-padding on row-new-striped
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-29 11:20:32 -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
ae466be153
Fix license output, tweak CleanFloat function to handle numbers over 1 million
2021-09-28 19:10:25 -07:00
Brady Wetherington
f380da3f19
Try to ensure all currency output is formatted correctly.
2021-09-28 16:45:47 -07:00
snipe
9a83b90e44
Make row-new-striped 100% width
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 15:04:57 -07:00
snipe
9311f8694f
Fixed incorrect icon for map marker
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 09:35:48 -07:00
NMC
c680977791
Merge branch 'develop' into api-licenses
2021-09-27 15:02:51 -04:00
snipe
1657ba396f
Added available license seat count to top tabs for licenses
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 15:03:56 -07:00
snipe
f0da1977fb
Small visual improvements on consumables view
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 14:32:51 -07:00
snipe
450da5661d
Add additional info on accessories view page
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 03:59:04 -07:00
snipe
a6632a7b9f
Use new row striping on licenses detail page
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 03:58:53 -07:00
snipe
7e41c74cc3
Updated more fa icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 01:11:08 -07:00
snipe
8738451685
Fixed font awesome caret
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-25 23:17:35 -07:00
snipe
65a6da5bd2
Added files tab back to assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-25 22:59:02 -07:00
snipe
a7b3f98e9f
Updated angle icon with new font awesome
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-25 22:57:27 -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
667639b9fb
Backed out the ribbon CSS for now
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-25 22:56:54 -07:00
snipe
67d898e897
Updated map icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 14:30:36 -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
e03d7b7016
More fa icon updates
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 13:07:02 -07:00
snipe
20e23c1248
Fixed 500 on wrong association
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 12:54:47 -07:00
snipe
5875cf1e9e
Removed test code
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 12:33:34 -07:00
snipe
decc771459
Starting to refactor the hardware page
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 12:05:48 -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
0d1bd5b470
Updated more fa icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 11:13:34 -07:00
snipe
8d1c3106b5
Building assets again
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 11:13:15 -07:00
snipe
299ad681f7
More fa icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 07:21:30 -07:00
snipe
b2dc92b088
And a few more missed icons
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 06:44:38 -07:00
snipe
ad6f073c82
Few more icon updates
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 06:38:23 -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
06e8e826bc
Added some BS tables style overrides for mobile
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 04:12:41 -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
8937396a26
Added padding to the sidenav on mobile
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 03:02:57 -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
9a299973ff
Mobile CSS overrides
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 03:02:19 -07:00
snipe
7f41bdf0b0
Use new striping on hardware page
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 02:17:57 -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
snipe
12df310449
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-24 02:16:58 -07:00
snipe
d37dedb654
Merge pull request #10123 from takuy/patch-1
...
Fixed #9928 : update expected field name for response list
2021-09-23 18:57:02 -07:00
snipe
fedf51dda4
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 18:29:47 -07:00
Sam
d0f284129a
Update expected field for response list
...
The existing code to handle the "enter key" / auto selections broke at some point. It was expecting results to be in an "items" list, not a "results" list. This should close #9928 hopefully. Tested locally.
2021-09-23 20:12:45 -04:00
snipe
0f40ba2b34
Check for admin rights before displaying admin permission options
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 19:31:49 -07:00
snipe
39a702397a
Add user permissions message if the user is not an admin or better
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 19:05:02 -07:00
snipe
61cf9ec009
Small conflict handling bits
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 00:00:44 -07:00
snipe
e27065fe16
Merge branch 'develop-v6-integration' into develop-v6-rc1
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
2021-09-21 23:46:50 -07:00
snipe
b4a90045e6
Added totals to depreciation report footer
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 21:52:18 -07:00
snipe
9b78b25372
Grr. 100 should be 1000
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 21:28:59 -07:00
snipe
7df4f98e19
Bump number per page up to 1000
...
Use this shit at your own peril. Very large pages will load slowly, as these are very complex queries.
Signed-off-by: snipe <snipe@snipe.net>
2021-09-21 21:25:22 -07:00
Godfrey M
941cba73b9
removed deadspace and unnecessary css changes
2021-09-21 19:27:17 -07:00
Godfrey M
4a0c8de82a
adds jquery eventlistner to monitor chart.js width and refresh accordingly
2021-09-21 19:13:09 -07:00
snipe
dacdf788bc
Reverted erroneous german text in UK language files
2021-09-21 17:50:13 -07:00
snipe
0d633ce618
Fixed issue where created_at date was not showing on uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-13 17:13:01 -07:00
snipe
c6b26965a0
Check for valid category name
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-13 15:47:13 -07:00
Ivan Nieto Vivanco
1ae665b645
Use the property 'archived' so if the 'name' one changes it doesn't fails
2021-09-13 16:45:05 -05:00
Ivan Nieto Vivanco
1b433920f1
Delete an extra semicolon
2021-09-13 16:24:12 -05:00
Ivan Nieto Vivanco
2b64af0d34
Add a condition in the view 'print all assigned' from locations where it skips the assets in relation of if they're archived and that option is marked in the settings
2021-09-13 16:17:34 -05:00
snipe
514f9aa64a
Fixed #9973 - add use_default_eula to categories API endpoint
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-10 20:23:49 -07:00
snipe
a4e307c4db
Updated languages
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-08 13:49:33 -07:00
snipe
cfaa6679af
Merge pull request #10031 from inietov/fixes/checkout_date_not_saved_in_asset_history
...
Fixed #10026 : Checkout date not saved in asset history
2021-09-07 17:37:30 -07:00
snipe
387018c44e
Updated depreciation report blade to use server-side API
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-01 17:05:31 -07:00
Ivan Nieto Vivanco
e621eaf456
Change date showed in the activity report view, the condition is now on action_date
2021-09-01 13:58:17 -05:00
snipe
d5a7955e1d
Fixed #10024 - use string for dashboard in side nav instead of hard coded
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-31 22:25:00 -07:00
snipe
7e2def7896
Merge pull request #9880 from inietov/bug/fd18463/cannot_edit_departments
...
Fixes: Can't update departments if Full Company Support is activated
2021-08-30 19:40:59 -07:00
snipe
4abb9baa95
Merge remote-tracking branch 'origin/develop'
2021-08-24 15:29:41 -07:00
Godfrey M
a407fe9312
removed more dead space
2021-08-24 15:07:56 -07:00
Godfrey M
53ddf5ae04
removed dead space
2021-08-24 15:07:18 -07:00
Godfrey M
a197b730a1
fixed a layout issue with the month field in depreciations [ch17111]
2021-08-24 15:02:42 -07:00
Ivan Nieto Vivanco
830ba470dd
Change the used function to only affect single and double quotes
2021-08-23 22:10:59 -05:00
Ivan Nieto Vivanco
80fb24e861
Fix issue caused for single and double quotes when used as listbox's values
2021-08-23 22:00:01 -05:00
snipe
70f6753f50
Merge pull request #9979 from uberbrady/add_client_side_ldap_certs
...
Add client side ldap certs
2021-08-23 16:30:46 -07:00
snipe
4ec4e0f44e
Merge remote-tracking branch 'origin/develop'
2021-08-19 12:09:48 -07:00
Brady Wetherington
e28db2d221
Fix regression for NULL valued numbers in the summary calculation
2021-08-19 12:01:47 -07:00
snipe
24af2ab67a
Merge remote-tracking branch 'origin/develop'
2021-08-18 14:31:53 -07:00
Brady Wetherington
4519f6e180
Fixed sum total calculation on Bootstrap Table pages
2021-08-18 14:13:31 -07:00
snipe
04fa5f2022
Merge remote-tracking branch 'origin/develop'
2021-08-18 01:05:25 -07:00
snipe
923d2a79ae
Fixed weird layout on bulk audit [ch17146]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 01:05:09 -07:00
snipe
f99602c039
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2021-08-18 00:47:33 -07:00
snipe
8a6c7269d3
Fixed border radius for bulk checkout field [ch16936]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 00:44:55 -07:00
snipe
37f2c7beac
Nicer bulk asset select width
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 00:44:16 -07:00
snipe
b5bb74b8ca
Merge remote-tracking branch 'origin/develop'
2021-08-17 22:01:23 -07:00
snipe
cce808c784
Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]
...
Duplicates d4e46ee41f
2021-08-17 21:59:33 -07:00
Brady Wetherington
4d4badf830
Got the client-side LDAP setup working well enough for sync!
2021-08-17 14:43:36 -07:00
Godfrey M
9480709ea3
changed value to current value
2021-08-16 18:22:24 -07:00
Godfrey M
cef0e424e1
adds a Floor value for depreciation models
2021-08-16 18:14:10 -07:00
snipe
29c584289f
Merge remote-tracking branch 'origin/develop'
2021-08-14 14:09:31 -07:00
Godfrey M
01037cf9cb
initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]
2021-08-10 18:26:43 -07:00
Computroniks
8121d904e7
Licence cost calculation
...
Licences use diffrent key to track quantity. sumFormatterQuantity has
been modified to detect which key to use.
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
2021-08-04 22:33:39 +01:00
Computroniks
f994af16da
Added function to calculate cost based on quantity
...
sumFormatterQuantity takes the same input as sumFormatter but instead
of calculating the specified columns total it calculates the total
purchase cost of an item based upon its quantity. Also updated affected
pressenters to use this formatter.
Signed-off-by: Computroniks <mnickson@sidingsmedia.com>
2021-08-04 22:09:50 +01:00
NMC
976957ddd4
Add Maintained filed in licenses view and api. + Expires in API
2021-08-01 14:30:16 -04:00
Ivan Nieto Vivanco
1b8156ac7f
Add a hidden field to handle departments inside Full Company Support config
2021-07-29 13:28:57 -05:00
Jethro Nederhof
d8fdd1b408
Fix branding logo URL path
...
The current method adds an additional slash to the URL which results in the logo request producing a 404 error on for Storage drivers like S3 and GCS that don't automatically collapse additional forward slashes into single slashes.
E.g. with the current code my logo URL renders like `https://storage.googleapis.com/mybucketname/public//setting-logo-Al0aKMhmYz.svg ` (note the double slash after "public") when instead it should render like `https://storage.googleapis.com/mybucketname/public/setting-logo-Al0aKMhmYz.svg `
For a local driver this should work fine since webservers handle the additional slashes case, but for key-based storage this 404s.
Thanks for your work on Snipe-It, seems like a good system so far!
2021-07-28 14:55:34 +10:00
snipe
75d4a46fff
Merge pull request #9856 from inietov/bug/ch15413/model_number_is_not_on_accessory_import_dropdown
...
Fixes: Model Number is not on the Accessory import dropdown of mappable fields [ch15413]
2021-07-24 01:05:26 -07:00
Ivan Nieto Vivanco
0f1c48cb6f
Add the field model_number to Accessory importer
2021-07-24 02:38:44 -05:00
Ivan Nieto Vivanco
35ffe8b902
Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view
2021-07-20 18:56:22 -05:00
