Wächtler, Yannick
f906dbd81e
Added missed translation strings, fixed the column width for the date selector (too small in certain languages)
2022-01-10 09:21:23 +01:00
Nuraeil
5bb2f6fa0f
Merge branch 'develop' into added-localized-strings
2022-01-09 17:40:54 +01:00
Wächtler, Yannick
b77e7f88d4
fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix
2022-01-09 17:35:28 +01:00
snipe
0f5bb0e65d
Localize bakcup restore strings
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-07 16:50:19 -08:00
Wächtler, Yannick
c3ab4c7512
Fixed the tables not displaying the correct language
2022-01-06 14:29:10 +01: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
Nuraeil
271c364ef8
Merge pull request #9 from snipe/develop
...
Merge snipe/snipe-it:develop into nuraeil/snipe-it:added-localized-strings
2022-01-04 10:48:51 +01:00
Brady Wetherington
3c7f2e89ec
Merge branch 'develop' into remove_old_ldap
...
Had to re-do the composer install because the conflicts were too complicated.
2022-01-03 12:56:58 -08:00
Alex Janes
5fe2083688
Adjusted the phrasing around auto-incrementing asset tags.
2021-12-31 16:33:30 -05:00
Alex Janes
ea93f82bde
added the notes field to allow users to quickly add notes to multiple checkins at once
2021-12-23 17:37:48 -05:00
Alex Janes
b01a4468c7
refactored from bulkcheckin to quickscancheckin
2021-12-20 23:27:36 -05:00
snipe
48d3bfef03
Merge pull request #10421 from Robert-Azelis/patch-5
...
Create new user account from asset form - additional fields
2021-12-20 17:05:38 -08:00
Alex Janes
55b8d080b9
more lang changes
2021-12-20 19:39:06 -05:00
Alex Janes
3841c3560b
changed a page title
2021-12-20 16:52:00 -05:00
Alex Janes
08cb8c354b
more cleanup to fit formatting convention
2021-12-19 19:11:24 -05:00
Alex Janes
29da4f4325
Removed a bunch of redundant code I created from the API
2021-12-19 18:39:57 -05:00
Alex Janes
bc4fe88ac0
First version of bulk checkin
2021-12-19 16:53:31 -05:00
Alex Janes
ead142cdf7
Corrected a tiny HTML typo in the SAML view. (Unrelated to this PR)
2021-12-18 12:00:07 -05:00
snipe
9b2dd6522f
Switch GET to POST for asset request
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:36:08 -08:00
snipe
4ca2252e3b
Switches GET to POST for request assset
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:32:29 -08:00
Wächtler, Yannick
2901525194
Merge branch 'snipe-develop' into added-localized-strings
2021-12-17 00:22:08 +01:00
Wächtler, Yannick
279fced877
merge
2021-12-17 00:14:36 +01:00
snipe
398180dc59
Small merge unmagling
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 14:38:04 -08:00
snipe
c3d55ee27e
Merge master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Models/Setting.php
# config/version.php
# resources/lang/af/button.php
# resources/lang/ar/button.php
# resources/lang/bg/button.php
# resources/lang/cs/button.php
# resources/lang/cy/button.php
# resources/lang/da/button.php
# resources/lang/de/button.php
# resources/lang/el/button.php
# resources/lang/en-GB/button.php
# resources/lang/en-ID/button.php
# resources/lang/es-CO/admin/groups/message.php
# resources/lang/es-MX/button.php
# resources/lang/et/admin/custom_fields/general.php
# resources/lang/et/admin/hardware/table.php
# resources/lang/et/admin/kits/general.php
# resources/lang/et/admin/manufacturers/message.php
# resources/lang/et/admin/models/general.php
# resources/lang/et/admin/settings/general.php
# resources/lang/et/button.php
# resources/lang/et/mail.php
# resources/lang/fa/button.php
# resources/lang/fa/help.php
# resources/lang/fi/button.php
# resources/lang/fil/button.php
# resources/lang/fr/button.php
# resources/lang/ga-IE/button.php
# resources/lang/he/button.php
# resources/lang/hr/button.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/auth/message.php
# resources/lang/hu/button.php
# resources/lang/hu/mail.php
# resources/lang/id/admin/hardware/table.php
# resources/lang/id/button.php
# resources/lang/it/button.php
# resources/lang/iu/button.php
# resources/lang/ja/button.php
# resources/lang/ko/button.php
# resources/lang/lt/button.php
# resources/lang/lv/button.php
# resources/lang/mi/button.php
# resources/lang/mk/button.php
# resources/lang/ml-IN/button.php
# resources/lang/mn/button.php
# resources/lang/ms/admin/hardware/table.php
# resources/lang/ms/admin/kits/general.php
# resources/lang/ms/admin/models/general.php
# resources/lang/ms/admin/models/message.php
# resources/lang/ms/admin/settings/general.php
# resources/lang/ms/button.php
# resources/lang/nl/button.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/auth/message.php
# resources/lang/no/button.php
# resources/lang/no/help.php
# resources/lang/no/mail.php
# resources/lang/pl/button.php
# resources/lang/pt-BR/button.php
# resources/lang/pt-PT/auth/message.php
# resources/lang/pt-PT/button.php
# resources/lang/pt-PT/mail.php
# resources/lang/ro/button.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/help.php
# resources/lang/sl/admin/custom_fields/general.php
# resources/lang/sl/admin/hardware/table.php
# resources/lang/sl/admin/kits/general.php
# resources/lang/sl/admin/manufacturers/message.php
# resources/lang/sl/admin/models/general.php
# resources/lang/sl/admin/settings/general.php
# resources/lang/sl/admin/users/general.php
# resources/lang/sl/auth/message.php
# resources/lang/sl/button.php
# resources/lang/sl/help.php
# resources/lang/sr-CS/button.php
# resources/lang/ta/button.php
# resources/lang/th/button.php
# resources/lang/th/mail.php
# resources/lang/tl/button.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/auth/message.php
# resources/lang/tr/button.php
# resources/lang/uk/button.php
# resources/lang/ur-PK/button.php
# resources/lang/vi/button.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-HK/button.php
# resources/lang/zh-TW/admin/hardware/table.php
# resources/lang/zh-TW/button.php
# resources/lang/zu/button.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/slack.blade.php
2021-12-16 14:26:24 -08:00
Nuraeil
c3b7576d99
Merge pull request #7 from snipe/develop
...
Develop
2021-12-14 19:51:40 +01:00
Wächtler, Yannick
484b996879
fixed merge conflicts
2021-12-14 19:48:59 +01:00
snipe
52322806fa
Merge pull request #10434 from inietov/fixes/v6_components_error
...
Fix route to checkout components from the details page
2021-12-14 10:41:24 -08:00
Wächtler, Yannick
4397a12efc
Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop
2021-12-14 19:37:27 +01:00
Ivan Nieto Vivanco
d083f89f30
Delete extra character remaining from previous tests :(
2021-12-14 12:32:30 -06:00
Ivan Nieto Vivanco
2402f00a2e
Fix route to checkout components from the details page
2021-12-14 12:26:46 -06:00
Ivan Nieto Vivanco
c80aa2a289
Add title column to custom reports
2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco
0037cdb00c
Add title column to custom reports
2021-12-13 20:27:23 -06:00
Robert-Azelis
01608d81ab
Update user.blade.php
...
Create new user account from asset form - additional fields #10420
2021-12-13 09:22:25 +01:00
snipe
e1bf3b50f4
Added model number to accessory report
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-10 15:09:29 -08:00
snipe
ff97b359ad
Removed form request on ajax, cleaned up some other things
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 17:58:46 -08:00
snipe
cde2bad297
Small mods to slack jquery
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-08 15:56:05 -08:00
snipe
6d84482104
Merge pull request #10388 from snipe/features/switch_to_dusk
...
WIP - Fixing unit tests, switching to dusk
2021-12-06 14:19:36 -08:00
snipe
0ba55e0eaf
Merge pull request #10393 from aranar-pro/fix/#10365-Total-Purchase
...
Fixed #10365 : Snipe-IT has a wrong total purchase cost when reaches m…
2021-12-06 14:08:24 -08:00
snipe
ebdbc20740
Adds stricter validation for slack endpoints
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-06 11:40:24 -08:00
Andrew Roth
d1d3b84f77
Fixed #10365 : Snipe-IT has a wrong total purchase cost when reaches million. Fixed to remove multiple commas in +1M per item.
2021-12-06 13:06:23 -05:00
snipe
cae62fd4c7
Merge pull request #9902 from SidingsMedia/sum_cost_by_quantity
...
Fixed #5676 : Sum cost by quantity
2021-12-02 12:13:04 -08:00
snipe
d08c1787a1
First steps at getting dusk working
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-30 20:09:29 -08:00
Nuraeil
d3972888dc
Merge pull request #6 from snipe/develop
...
Develop
2021-11-30 06:37:17 +01:00
snipe
3b68a6f1be
Merge pull request #10345 from leitwerk-ag/master
...
Fixed #10344 and #9135 : don't prepand fields with a whitespace in text based export formats
2021-11-24 19:43:21 -08:00
snipe
4afd598df7
Merge pull request #10356 from bestlong/fix_modal_dialog_html_typo
...
fix modal-title html tag unpaired.
2021-11-24 19:39:58 -08:00
Shao Yu-Lung
55d05eeae3
fix modal-title html tag unpaired.
2021-11-24 10:28:10 +08:00
Ivan Nieto Vivanco
d95d3dc282
Add the call to defaultValue() function in custom fields with date format
2021-11-23 17:21:46 -06:00
Ivan Nieto Vivanco
741eb28622
Add the call to defaultValue() function in custom fields with date format
2021-11-23 17:11:21 -06:00
Klaus J. Mueller
a85fa14f9c
fix #10344 and #9135
2021-11-22 17:58:26 +01:00
Matthew Nickson
9381ba2404
Merge branch 'develop' into sum_cost_by_quantity
2021-11-21 18:59:34 +00: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
Wächtler, Yannick
9164daf5bc
Added localized strings for admin/settings
2021-11-19 15:23:48 +01:00
Wächtler, Yannick
6917d59185
Added localized strings for reports
2021-11-19 12:39:19 +01:00
Wächtler, Yannick
04fec144a0
Added localization strings for partials, added file structure
2021-11-19 12:12:11 +01:00
Nuraeil
7084703b5a
Merge pull request #4 from snipe/develop
...
Merge current develop into branch
2021-11-18 21:30:45 +01:00
Wächtler, Yannick
5a2f8788a9
Fixed merge issue in view.blade.php and added translatable string
2021-11-16 19:34:20 +01:00
Wächtler, Yannick
f2c3e51a83
Catching up to snipe-it/develop branch
2021-11-16 19:25:23 +01:00
Wächtler, Yannick
6feb39f6b9
Merge branch 'develop' of https://github.com/snipe/snipe-it into snipe-develop
2021-11-16 08:50:45 +01:00
snipe
bbb0d1be17
Possible fix for asset model editing when no custom fieldset is associated
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-15 21:09:35 -08:00
snipe
65d1855b38
Display app_locked message on front-end
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-15 19:50:55 -08:00
snipe
f2f8f96991
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Importer/ConsumableImporter.php
# app/Models/Consumable.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# routes/web.php
# routes/web/fields.php
2021-11-15 19:24:38 -08:00
snipe
bc21875324
More refinements to the UI
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 18:15:38 -08:00
snipe
1a703bf78b
Added logout clarification
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 17:59:52 -08:00
snipe
494c72d92b
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 17:58:04 -08:00
snipe
69fe3c0299
Added some comments on the JS
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 17:57:15 -08:00
snipe
e2702186a9
Slightly reworked UI
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 17:48:59 -08:00
snipe
b069eec43a
Fixed upload disabled button
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 16:01:22 -08:00
snipe
f8cf65bbb3
Small layout fixes
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 13:01:02 -08:00
snipe
ec2a3b0f35
Updated label names
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 01:44:34 -08:00
snipe
230a568145
Added help text and more info in the modal
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 01:44:11 -08:00
snipe
856b9294f8
Improved BS tables on backups
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 00:08:43 -08:00
snipe
8590e5d67e
UNRELATED: fixed wrong html tag for license view badge count
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-10 00:08:15 -08:00
snipe
fb21712a68
Added restore modal HTML
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-09 19:38:40 -08:00
Brady Wetherington
a58c5ce27f
Better documentation, disable AdLdap2-based "Add domain" setting
2021-11-08 17:11:47 -08:00
snipe
edf98cb795
Merge pull request #10279 from snipe/fixes/turn_get_into_post_for_custom_field_required
...
Turn custom fields required/optional/remove into POST requests
2021-11-08 14:37:36 -08:00
snipe
38c36af6fc
Changes logout to POST
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-08 12:53:11 -08:00
snipe
0d811d067c
Turn cusotm fields required/optional/remove into POST requests
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-05 10:53:48 -07:00
Wächtler, Yannick
6b2801867d
Renamed account/api to account/general to match naming schema, changed the associated account/api trans() to account/general
2021-11-04 20:15:23 +01:00
Wächtler, Yannick
63b30489df
Added localized strings for notifications
2021-11-02 15:44:57 +01:00
Wächtler, Yannick
670b70c7e1
Added localized strings for models
2021-11-02 15:34:50 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
fedf51dda4
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-23 18:29:47 -07: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
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
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
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
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
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
snipe
4cfdaf89d8
Merge remote-tracking branch 'origin/develop'
2021-07-08 17:47:08 -07:00
Brady Wetherington
0ec2884c29
The custom settings section of SAML sometimes has bad linefeeds
2021-07-08 17:00:01 -07:00
snipe
f264cade7d
Merge remote-tracking branch 'origin/develop'
2021-07-08 16:05:32 -07:00
snipe
06806341c7
Nicer tab names for permissions
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-08 15:57:41 -07:00
Ivan Nieto Vivanco
d2e94dfc1c
Added cookie option to assets Bootstrap Table to save the state of the table.
2021-07-08 14:05:40 -05:00
snipe
a12ae19e32
Try deferring the load so it doesn’t query the server server 7 times for login
...
This doesn’t work?
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 10:50:32 -07:00
snipe
3332bbe072
Removed unused properties on login
...
This may be dumb anyway - we probably don’t need to make so many round trips to the server just to see if things are required or not… But I’d really like to standardize the validation across the system
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 10:27:44 -07:00
snipe
704eb728bc
Added livewire the login screen
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-29 02:16:57 -07:00
snipe
576e605f73
Make livewire less assy looking
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 22:40:18 -07:00
snipe
ebb0aa5532
Merge pull request #9766 from uberbrady/livewire_integration_v6
...
Livewire integration for Snipe-IT v6
2021-06-28 21:51:00 -07:00
Brady Wetherington
a6ac4f94f1
Breaking out field-listing into its own Livewire blade for use elsewhere
2021-06-28 21:00:20 -07:00
Brady Wetherington
ea1f1eb972
Get some basic Livewire going for 'edit model's default values.
2021-06-28 21:00:20 -07:00
Brady Wetherington
8e66abb926
Basic Laravel7 compatibility, starting getting Livewire going
2021-06-28 21:00:16 -07:00
snipe
dc125af029
Fixed locations link on homepage module
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 19:56:41 -07:00
snipe
2365634139
Added dashboard module for locations [ch9199]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 19:46:56 -07:00
snipe
4af247f845
Added additional boxes to the dashboard
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 16:36:15 -07:00
snipe
d4e46ee41f
Added comma in US currency format [ch16628]
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 16:14:32 -07:00
snipe
f504d7ef5f
Merge remote-tracking branch 'origin/develop'
2021-06-28 13:12:10 -07:00
snipe
a016f4ecd0
Applies PR #9761 to integration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 13:11:22 -07:00
snipe
30297e479e
Hide notes field by default
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 13:08:32 -07:00
snipe
a4fd0c9c6d
Fixed #9745 - added searchable, sortable notes field to status labels
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:52:57 -07:00
snipe
3ca3de9e4f
Merge remote-tracking branch 'origin/develop'
2021-06-23 20:05:38 -07:00
snipe
174d53aff9
Fixed #9729 - order number maxlength updated to 200
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 20:05:22 -07:00
snipe
1ea843248b
Fixed #9729 - bulk edit order number capped at 20
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 20:04:45 -07:00
Brady Wetherington
8268aca9fc
Removed Ziggy.baseUrl references for meta references that had baseUrl
2021-06-23 19:57:45 -07:00
snipe
7b51bf4f51
Merge remote-tracking branch 'origin/develop'
2021-06-23 14:41:27 -07:00
snipe
4db5a8f62b
Merge pull request #9695 from Joly0/master
...
Update print.blade.php
2021-06-23 14:33:25 -07:00
snipe
b3ec4bb31b
Porting PR #9720 to v6 integration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 14:28:06 -07:00
snipe
ac52ea3463
Porting PR #9720 to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 14:27:15 -07:00
Brady Wetherington
9456a03a88
Almost finished with the routes which is...hopefully? The last thing?
2021-06-22 16:58:23 -07:00
bmkalle
a330dca7d4
Update company-select.blade.php
...
select should be disabled if full multiple companies is activated and the user isn't a superuser. otherwise the user get the ability to choose all companies.
2021-06-17 10:51:00 +02:00
Joly0
9a429952ff
update print.blade.php
2021-06-15 08:52:01 +02:00
snipe
3095a78664
Small tweaks to Dashboard controller
...
Still gettiing a bizarre `Non-static method App\Http\Controllers\DashboardController::index() should not be called statically` error
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 14:43:47 -07:00
Joly0
72f27ccc5b
Update print.blade.php
2021-06-11 11:05:39 +02:00
Ivan Nieto Vivanco
9f944ad497
Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471].
2021-05-27 15:48:13 -05:00
snipe
9f2b4c721d
Allow password reset from user profile
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-26 15:32:23 -07:00
snipe
3f09d17389
Fixed typo “synchronization”
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-25 18:45:06 -07:00
snipe
9eea46adef
Fixed parse error in user print view
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-20 13:53:43 -07:00
Jonathon Reinhart
fd082addff
Fix incorrect case of ldap sync status string ( #9563 )
...
Fixes #9562
2021-05-12 19:15:39 -07:00
snipe
76897f3a3a
Make label printing from asset page more consistent with normal UI
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-12 17:08:53 -07:00
tbrconnect
a29ef73346
Feature #3088 Print labels from asset detail page ( #9559 )
...
This PR adds a "Generate Label" button to the detail asset page as
described in #3088 .
Fixes #3088
Co-authored-by: tilmann.bitterberg <tilmann@tbrglobal.com>
2021-05-12 13:38:26 -07:00
Brady Wetherington
62199f6255
Manually re-add support for Label Logos in Labels ( #9552 )
2021-05-07 17:01:32 -07:00
snipe
9aac3ae628
Fixed HTML causing two backup headers to appear
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-07 16:36:07 -07:00
snipe
ece627b3a3
Small fixes for location printing when relationships are missing/invalid, per #9521
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-05 10:23:46 -07:00
snipe
d8d3fa2293
Only show department if it’s valid
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-05 10:13:19 -07:00
snipe
57b9b571dc
Fixed #9531 - highlight search box when filled, add clear button ( #9534 )
2021-05-04 22:00:34 -07:00
snipe
32f043c5df
Set the body skin style if one was overridden by the user profile
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:25:39 -07:00
snipe
23376c317e
Use correct URL for css for subdirs
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:22:02 -07:00
snipe
b3b02933a5
Removed duplicate code
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:21:48 -07:00
snipe
1d43eda21f
Features: improved UI for importer ( #9467 )
...
* Small UI improvements for importer
Signed-off-by: snipe <snipe@snipe.net>
* And UI backup improvements
Signed-off-by: snipe <snipe@snipe.net>
2021-04-21 20:16:17 -07:00
snipe
90f79eaf83
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2021-04-21 10:23:46 -07:00
aranar-pro
5127727730
Fixed #9424 : import history adds asset model to assigned user and respects checkin date ( #9350 )
...
* Fixed #9294 : Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users.
* Fixed #9294 : Fixed asset import history to respect checkin and update user with checked out items.
* Fixed #9294 : whitespace and comment cleanup for merge
* Fixed #9294 : Fixed asset import history to respect checkin and update user with checked out items.
2021-04-20 21:25:17 -07:00
snipe
d10d090d33
Moved status label help text to headline
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:31:07 -07:00
snipe
aa6b1456b2
Added help text to custom fields headline
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:29:43 -07:00
snipe
b2de0d4ade
Changed “Asset Categories” to “Categories” since there are more than asset categories now
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-20 15:29:22 -07:00
Peter Sarossy
cacb707a7f
Added #9355 : include Accessories and Consumables on the location reports ( #9356 )
2021-04-20 14:53:04 -07:00
Supapong Areeprasertkul
b28b245acc
Update labels.blade.php ( #8441 )
...
- Make the qr_size bigger when no barcode printed.
- BUG: Missing unit of font size for .qr-text class.
- Reduce padding-right to remove the additional space above text when print from Google Chrome. (I do not know the cause. I tried "box-sizing: border-box" without success.)
2021-04-20 14:52:17 -07:00
Michael Pietsch
15e729f4b8
fix css when not runnin in webroot directory ( #9445 )
...
Co-authored-by: Michael Pietsch <skywalker-11@mi-pietsch.de>
2021-04-20 14:49:57 -07:00
Masudul Haque Shihab
f3831fe010
Fixed #9447 change route parameter name in locations view ( #9456 )
2021-04-20 14:49:05 -07:00
snipe
e4acf8d795
Merge remote-tracking branch 'origin/master' into develop
2021-04-20 14:44:01 -07:00
snipe
e8adf8d44c
One more category fix
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-14 16:57:55 -07:00
snipe
b693e5202b
Check for category name
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-14 16:54:36 -07:00
snipe
e1c6d4ced7
Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Requests/SettingsSamlRequest.php
2021-04-14 15:15:07 -07:00
Joly0
31b2287a57
Update print.blade.php ( #9426 )
...
Fixes #9418
2021-04-14 10:20:36 -07:00
Godfrey Martinez
5fab1d6f0d
FIxes Sum of purchase cost of components not taking quantity into account in Asset View > Components tab ( #9424 )
...
* git commit -m
* added text
2021-04-14 10:19:40 -07:00
Godfrey Martinez
246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings ( #9416 )
...
* new branch, added manager as an additional field. Currently having DB issues
* WIP DB Issue with eloquent
* added department to LDAP sync
* removed unused variables
2021-04-14 10:17:57 -07:00
Brady Wetherington
bf344fd707
Merge branch 'develop'
...
mix-manifest I just picked one.
version.php will get bumped by hand
bootstrap table seems to just be another copy? Added it back.
2021-04-14 09:58:21 -07:00
Ivan Nieto Vivanco
9cf5fbd675
Logic added to handle when a cloned user is imported via LDAP. ( #9429 )
2021-04-14 09:19:25 -07:00
Ivan Nieto Vivanco
3824a50e8b
Fixes an issue with CSS when the 'skin' value in settings table is empty. ( #9423 )
2021-04-12 20:37:02 -07:00
snipe
bf2479c5d9
Fixed url to user-ridden style
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 20:36:13 -07:00
snipe
ba92d751a3
Removed depreciated Input:: facade
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 20:28:05 -07:00
Brady Wetherington
792a31cc7f
Merge branch 'develop'
2021-04-06 20:10:22 -07:00
snipe
390403ddb7
Fixed #9370 - listbox custom fields not decryoted on edit
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-06 05:59:31 -07:00
Joel Pittet
af8509c4d0
Allow NPM packages to build for production ( #9171 )
...
* add back changes before compiling assets
* new css location and mix manifest
* update papaparse, most vunerabilities attached to it
* update axios and papaparse for security releases
* removing security fixes that still allow npm run production to work
* Update lodash
2021-04-05 22:01:11 -07:00
snipe
09887bdabd
Removed stray opening tag
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-05 21:54:31 -07:00
Godfrey Martinez
f9f8ce6df6
Auditing feature improvement Better mobile [ch14328] ( #9181 )
2021-04-05 21:53:19 -07:00
Tetrachloromethane250
157d9e4ebb
Added #5977 : Add permission to view files attached to licenses ( #9264 )
...
* Add permission to view and modify files for licenses
* Actually use the permission
2021-04-05 21:51:47 -07:00
snipe
b9bab05ac3
Merge branch 'master' of https://github.com/ajsy/snipe-it into ajsy-master
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/users/print.blade.php
2021-04-05 20:55:49 -07:00
Godfrey Martinez
5ea759f615
Fixed #7211 , #9197 , #7864 , [ch15504] - Added additional LDAP fields to sync ( #9318 )
...
* LDAP and Active Directory has plenty of other [ch15504]
* removed department id from ldap sync
* removed department id from ldap sync
* Update 2021_03_18_184102_adds_several_ldap_fields.php
2021-04-05 19:26:04 -07:00
snipe
6f4215cfac
Fixed label name for field_values
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-31 14:07:30 -07:00
snipe
b5f7cb534e
Fixed element name
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-31 14:02:25 -07:00
snipe
70a7a8f20b
WTF. This shit is haunted.
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-30 08:00:27 -07:00
snipe
a5b67965f2
Fixed CSS path
...
(Fixes RB #14746 )
Signed-off-by: snipe <snipe@snipe.net>
2021-03-30 07:49:30 -07:00
Nikolay Didenko
06e641b782
Do not override per table data-id-cookie-table attribute by current route name globally ( #7835 )
2021-03-29 20:05:24 -07:00
Marc Leuser
90b7d34c69
Added #6695 : add API endpoint for license seats ( #8058 )
...
* remove miselading comment line
* added dedicated API endpoint for license seats
* don't display a seat name via API
it makes no sense and we don't have any particular sorting order
so the numbering would be inconsistent anyway
* reduce amount of IFs
* add sanity checks to show()
* fix goofed logging logic
* add tests for action log entries
2021-03-29 19:41:26 -07:00
NMC
3e934a1b96
Add a way for a user to override the site skin setting + fix mislabeled comment. ( #6891 )
...
* Add a way for a user to override the skin setting.
* Add site setting to allow user to change the skin.
* Fix skin list.
Co-authored-by: NMC <info@nmc-lab.com>
2021-03-29 19:09:23 -07:00
Eli Young
97fa9663b1
Fixed #9299 : Use correct SVG MIME type for uploads ( #9300 )
...
The correct MIME type of SVG is image/svg+xml. Out of an abundance of
caution, I am leaving in image/svg to avoid potentially causing issues
on very old browsers, but this can likely be removed without issue.
2021-03-15 16:42:11 -07:00
Ivan Nieto Vivanco
9ed226a0af
Fixes links in Models Actions, and to view the fieldset assigned to that Model. ( #9232 )
2021-03-01 13:08:29 -08:00
Joel Pittet
c979779249
Fixes a couple blade templates for relative URLs ( #9170 )
...
* Switched branch name to master
* Production assets for better contrast in dark mode skins
* Fixed #9115 : Duplicate column name 'provider' (#9137 )
* Sigh. Real assets
* fix blade templates with missing url() function wrapper for relative URLs
* Develop to master (#9195 )
* Added saml custom setting retrieveParametersFromServer to enable fixing SLO issues with Azure AD (#9187 )
* [FIX] Lite test email won't use the mail component (#9092 )
* [FIX] Lite test email won't use the mail component
* Revert "[FIX] Lite test email won't use the mail component"
This reverts commit 6dab9aa1a8887dcc7bbc
2021-02-26 15:59:36 -08:00
snipe
f37d5d3d03
Fixed #9085 - asset models not showing proper pagination
...
Huge thanks to @inietov for catching this one
2021-02-25 16:43:38 -08:00
snipe
57e52f0ba4
Fixed extraneous closing </i>
2021-02-25 13:35:05 -08:00
Oliver Walerys
c3166d491a
[FIX] Lite test email won't use the mail component ( #9092 )
...
* [FIX] Lite test email won't use the mail component
* Revert "[FIX] Lite test email won't use the mail component"
This reverts commit 6dab9aa1a8887dcc7bbc
2021-02-23 14:49:40 -08:00
snipe
c8f6318aba
Fixed funky layout in asset model modal window (broken HTML)
2021-02-19 10:51:56 -08:00
snipe
9d50e0e8d0
Fixed weird table formatting in expected checkin report
2021-02-17 13:44:35 -08:00
snipe
9deb4204c8
Fixed #9116 - incorrect parameter name sent to hardware.show in expected assets report
2021-02-17 13:41:08 -08:00
Ivan Nieto
12ff465cdb
Added feature: Checkbox Custom Fields as list of values. ( #9112 )
...
* Added functionality for checkboxes in custom fields. Similar to how radio buttons work.
* Added the same functionality when the custom fieldset is encrypted.
* Added missing bits, so the edit custom assets view shows what values have been already stored in database
2021-02-16 17:20:29 -08:00
snipe
49415806e1
Nicer formatting of the page if custom logout [ch15660]
2021-02-03 14:56:26 -08:00
ThoBur
c40b8334fc
Update edit.blade.php ( #8876 )
...
Fix issue #8518
2021-02-03 11:59:05 -08:00
snipe
985193ffff
Fixed #9082 - allow deployable status type on checkout
2021-02-03 01:29:54 -08:00
snipe
fdb5b3baf1
Depreciation detail view fixes [ch15776] ( #9059 )
...
* Allow sorting by months for depreciation list view
* Added dataTableLayout to standardize the list display table
* Implement the dataTableLayout() on the list view blade
* Split the view into tabs so we can combine asset depreciations and license depreciations
* Updated depreciation view to use tabbed interface for assets and licenses
* Added asset models to depreciation details page
* Make asset model category sortable
* Added cateory as allowed to be sorted on
* Added category sort scope
* Removed offset variable
* Small fixes to asset modes display in depreciation to bulk edit models
2021-01-27 17:44:05 -08:00
Ivan Nieto
6772835efc
Added support for radio buttons in Custom Fields. ( #9053 )
2021-01-27 14:41:58 -08:00
snipe
fb482b0dd6
Fixed translation string in Depreciation view [ch15776]
2021-01-27 14:09:01 -08:00
snipe
0031fab0fe
Added termination date, depreciation in license column selection [ch14505] ( #9052 )
2021-01-27 01:34:32 -08:00
snipe
d19c6ab8e7
Use fadeIn/fadeOut for password reset page for nicer look
2021-01-26 20:05:01 -08:00
snipe
d14b1e3825
Added better visual cues for login ( #9051 )
...
* Added better visual cues for login
* Changed box header class to box-header with-border to match other screens
* Since we have all.js now, added class=“minimal” to use icheck
2021-01-26 19:57:39 -08:00
snipe
ba12ee9954
Specifically call out username in forgotten password
2021-01-26 18:00:50 -08:00
Lucas Pleß
f3a7467235
Added today as default Date for checkout Form. ( #8938 )
2021-01-26 12:06:58 -08:00
Ivan Nieto
2da6f9136f
Add 'Last Audit Date/Next Audit Date' filter to custom report ( #8989 )
...
* Add 'Last Audit Date/Next Audit Date' filter to custom report
* Added a constraint: cannot require a report with a Last Audit Date in the future.
2021-01-26 12:05:31 -08:00
snipe
75a8639a20
Fixed weird checkbox display
...
TODO: fix the 500 on the save
2021-01-12 18:16:42 -08:00
snipe
380c6171b7
Check if the asset is deployed before prompting for an expected checkin date
2021-01-12 18:02:10 -08:00
snipe
d36d6b8e07
Added expected_checkout as editable field in asset edit
2021-01-12 16:48:49 -08:00
snipe
c00a1fa21b
Added new generic datepicker partial
2021-01-12 16:48:32 -08:00
Ivan Nieto
72f9fe444d
Fix for default parameters in JS functions IE ( #8973 )
...
* Small fix for IE which doesn't support default parameters in the function definition
* Stylistic changes for better comprehension
2021-01-05 19:25:30 -08:00
Evgeny
bbf7fbcff4
Localization digit separator feature. ( #8915 )
...
Provides an ability to localize the purchase_cost field in front-end hardware index table.
Has two digit separator formats in admin settings with comma and dot.
2020-12-15 11:49:13 -08:00
snipe
c0aa6c153e
Better callout for warning on api token page
2020-12-09 08:19:04 -08:00
snipe
5f76e03616
Clarified API url info in account > api
2020-12-09 08:14:44 -08:00
snipe
82d8b2ab82
Fixed weird parsing in newer markdown
2020-12-08 20:04:01 -08:00
snipe
4ac15daee7
Fixed #8147 - allow webp image format for public file uploads
2020-12-01 19:06:53 -08:00
snipe
bfc60864dd
Fixed typo on route for licenses
2020-11-30 20:46:45 -08:00
snipe
4882b01787
Added purchase order and order number to user > licenses view
2020-11-30 12:54:15 -08:00
snipe
f475bdbb2d
Fixed #8797 - use html_entity_decode in fullName presenter for User
2020-11-25 08:54:23 -08:00
snipe
6f99ce2b07
Branding page UI improvements (image previews inline)
2020-11-25 00:45:46 -08:00
snipe
76ee5a679b
Fixed #8810 - email logo was not being used in emails
2020-11-25 00:05:02 -08:00
snipe
973eacf6c3
Small fixes for SAML
...
The SAML routes are in a service provide (sigh), so they did not have the `web` middleware group assigned to it.
I also added some additional checks so that the setup blade won’t fail (the migrations wouldn’t have been run yet, so outside of a try/catch, it would return an error since those tables don’t exist.)
2020-11-24 13:51:02 -08:00
snipe
b2660002b9
Fixed #8781 - added asset count by status type ( #8806 )
2020-11-24 12:15:07 -08:00
johnson-yi
0cdd83aabf
Fixes #8584 , #8654 , #8727 - fixes and improvements for saml ( #8795 )
...
* Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy
* Gracefully handle the case where openssl_csr_new fails when openssl.cnf is invalid/missing
* Improve ui of saml sp metadata by displaying it's url and a download button
2020-11-20 18:54:25 -08:00
snipe
57d6a7d35e
Fixed #8753 - create-asset-from-model did not preselect the model
2020-11-18 13:59:02 -08:00
snipe
2ea805b7ed
Added search/sort by Location OU, added to listing
2020-11-17 22:17:07 -08:00
snipe
68487e1200
Added img-responsive class to preview images
2020-11-17 16:15:25 -08:00
snipe
f19b9a44fc
Fixed #8773 - wrong path for suppliers image on suppliers edit
2020-11-17 16:10:54 -08:00
snipe
4898b58bdb
Fixed #8765 - UI not indicating model is required
2020-11-17 13:40:15 -08:00
Brady Wetherington
a97b15ec96
Re-add LDAP "test login" feature to LDAP settings (helps with #8751 ) ( #8757 )
...
* Start work on re-adding back the "Test LDAP logins" feature to develop
* Add back-end method to allow LDAP test users to try to log in.
2020-11-16 21:23:08 -08:00
snipe
fbaf6e2494
Fixed #8747 - upload path for uploaded images
2020-11-16 16:39:02 -08:00
snipe
1f5bcf2475
Added option to download activity report
2020-11-13 16:25:05 -08:00
snipe
0c0de5e351
Added clarity in language as to what the activated flag does on LDAP screens
2020-11-13 11:52:34 -08:00
snipe
10cadecd14
Moved a few of the user edit fields to make more sense (optional stuff further down)
2020-11-13 11:52:09 -08:00
snipe
07936ea901
Changed asset name to asset tag in maintenances
2020-11-13 03:38:31 -08:00
snipe
df5cc7525e
Merge remote-tracking branch 'origin/develop'
2020-11-12 23:39:09 -08:00
snipe
75b8c3455c
Fixed #8609 - custom fieldsets not draggable anymore (regression)
2020-11-12 23:38:12 -08:00
snipe
81d38a0ded
Fixed #8733 - typo in unaccepted assets report
2020-11-12 23:26:05 -08:00
snipe
b2a8af2fa9
Fixed #8647 - Added additional help info on importer page
2020-11-12 22:46:51 -08:00
snipe
9d2363741e
Improved 2FA reset layout
2020-11-12 22:25:07 -08:00
snipe
9db191f0b2
Fixes for #8732 - Flysystem paths, migrator script
2020-11-12 21:46:06 -08:00
snipe
7765c87387
Fixed #8669 - Allow application/xml in SAML upload in Safari
2020-11-12 18:47:19 -08:00
snipe
caeea9f530
Merge remote-tracking branch 'origin/develop'
2020-11-12 15:27:49 -08:00
snipe
0fdfd013e7
Fixed #8715 - wrong API url for unaccepted assets
2020-11-12 15:26:50 -08:00
Dampfklon
be114176a2
Refactor Expected Checkin Notification into markdown and enable translation ( #8236 )
...
Co-authored-by: snipe <snipe@snipe.net>
2020-11-12 15:09:40 -08:00
Dampfklon
1f9b04405c
Enable translation of accept-asset page ( #8237 )
2020-11-12 15:07:45 -08:00
Dampfklon
5fb31a5a3f
Use translated salutation from other notifications ( #8234 )
2020-11-12 15:05:22 -08:00
snipe
5098d69c05
Fixed stupid auto-indent
2020-11-12 14:20:54 -08:00
snipe
b12de13041
Fixed markdown in expiring licenses alert
2020-11-12 14:10:45 -08:00
snipe
6a2e21f502
More in depth error reporting on mail test failure
2020-11-12 13:22:49 -08:00
snipe
fd7c0bc5fb
Use newer blade facade for requests
2020-11-10 08:36:18 -08:00
snipe
8c19b11e73
Fixed #8448 - “undefined” when testing email from quickstart
2020-11-10 01:48:18 -08:00
snipe
178ed82dc4
Fixed [ch9336] - Removed time stamp in Depreciation report
2020-11-10 01:13:13 -08:00
snipe
6757df5a2d
Added Checkout Date Time to Asset Details Page [ch1418]
2020-11-10 01:02:08 -08:00
snipe
895a544d4c
Fixed [ch15347] - added status in Depreciation Report
2020-11-09 23:56:16 -08:00
snipe
1cdf6f8263
Fixed #8673 - added category to accessories listing on Account > Assigned Assets
2020-11-09 23:05:19 -08:00
snipe
ec14a117b7
Display on the API token page the expiration in years
...
TODO: Translate these strings
2020-11-09 22:55:27 -08:00
snipe
ede20523f2
Fixed #8680 - location image path
2020-11-09 21:08:19 -08:00
Brady Wetherington
a5423649f4
This is the smallest set of changes we can use to work around a change in functionality
...
in Bootstrap Tables. This should remedy some of the issues we've been having with large
GET strings being sent to the back-end by the Assets system.
2020-11-09 17:36:07 -08:00
snipe
df5972c4fa
Fixed send creds checkbox in create user form
2020-11-03 13:07:15 -08:00
snipe
44e5fec707
Fixed #8603 - Use correct CSS path for signature-pad.min.css
2020-11-03 10:01:55 -08:00
snipe
c800662f0c
Use username for forgotten password
...
Since emails are not required to be unique
2020-11-02 23:57:00 -08:00
snipe
a55694da2f
Added validation to disallow password to be the same as username, email, etc
2020-11-02 20:03:26 -08:00
snipe
33bda9b6d1
Added blade option for same_pwd_as_user_fields
...
Disallows password form value to be the same as username, email, first name or last name
2020-11-02 17:47:25 -08:00
snipe
8ee9e5e059
Fixed #8537 - wrong sorting on dashboard
2020-10-23 18:33:10 -07:00
snipe
f357d9fc90
Include audit settings text in settings overview so they get picked up by the filter box
2020-10-23 18:13:28 -07:00
snipe
2aa8e1e76b
Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes
...
Fixes #8462 - move accessory notes into pivot table
2020-10-23 14:19:51 -07:00
snipe
b9a9949570
Use the form partial for avatars
2020-10-23 12:09:20 -07:00
snipe
bf9e53fbe7
Updated markdown templates
2020-10-23 06:55:23 -07:00
snipe
f68580b482
Make the email table wider
2020-10-23 06:55:04 -07:00
snipe
aec2f2a249
Fixed #8576 - switch to HTML from markdown
...
This is really stupid. A markdown table with over 3 columns doesn’t render correctly. :(
2020-10-23 06:54:45 -07:00
snipe
831da2d6d1
New mail vendor files
2020-10-23 06:17:07 -07:00
snipe
2263dae8f4
Fixed HTML
2020-10-23 04:07:55 -07:00
snipe
88f03e6b55
Added last_checkout and notes from pivot for accessories
2020-10-23 00:44:26 -07:00
snipe
5d112be49a
Fixed #8585 - requested assets page blank
2020-10-22 20:08:33 -07:00
snipe
496b176d4e
Fixed #8589 - unable to accept asset
2020-10-22 19:46:40 -07:00
snipe
c71086d2f3
Fixed #8590 - unable to checkin and delete from user view
2020-10-22 19:32:51 -07:00
snipe
a6d0209e93
Fixed #8567 - don’t require model for custom report
2020-10-21 12:23:27 -07:00
Bennett Blodinger
132f296f03
Fix typo
2020-10-20 08:13:52 -05:00
snipe
c1443aa6eb
Pull licenses, accessories, etc - the qty is not accurately reflected
2020-10-19 16:22:55 -07:00
snipe
714ad071ca
Add API endpoint to API keys page
...
// TODO - localize it
2020-10-09 14:46:11 -07:00
snipe
c0f9a35dea
Fixed password reset blade with correct username
2020-10-08 18:47:42 -07:00
snipe
b49c5dbf06
Clarified language
2020-10-05 20:43:28 -07:00
snipe
6234c6e5fc
Fixed typo
2020-10-05 20:35:27 -07:00
snipe
0cd19c87bf
Added utility to delete barcode cache from labels/barcodes setting
2020-10-05 20:34:17 -07:00
snipe
dafac4ceb3
Disable ldap_enabled on demo, fixed some incorrect error messages
2020-09-25 19:04:38 -07:00
snipe
98246de4c7
Disable SAML on the demo
2020-09-24 19:25:28 -07:00
Bennett Blodinger
83dfa2a28c
Merge branch 'develop' into gmaps-8465
2020-09-22 17:41:38 -05:00
Blodinger
471e0fd2fc
Changes the Google Maps window to be a bit more detailed
2020-09-22 14:30:38 -05:00
Brady Wetherington
0e823a962b
Fix for #8424 - where the ldap_server setting was grayed out
2020-09-17 13:32:14 -07:00
snipe
002ca52c83
Standardize feature disabled messages in UI
2020-09-16 15:09:58 -07:00
Brady Wetherington
8331be05aa
Some fancy JS to enable/disable Slack-test based on field values
2020-09-16 13:15:39 -07:00
snipe
e8dfb71682
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
...
# Conflicts:
# resources/views/settings/slack.blade.php
2020-09-16 12:40:23 -07:00
snipe
7de685a1c1
Added demo disabled text on slack screen
2020-09-16 12:36:33 -07:00
snipe
b508482441
Merge pull request #8438 from snipe/features/nicer_slack_ui
...
Nicer slack settings UI
2020-09-16 12:29:58 -07:00
snipe
30f8431bfb
Added required field indicator
2020-09-16 12:29:20 -07:00
snipe
a3e738b283
Fixed #8442 - wrong CSS url path on /setup
2020-09-16 11:20:59 -07:00
snipe
74b96a7413
UI tweaks and updated JS to disable the save button if the settings are not correct
2020-09-15 23:14:10 -07:00
snipe
4fd5358aa8
Changed login attempts icon so it’s not the same as SAML
2020-09-15 20:27:01 -07:00
snipe
e8befe9afd
Increased favicon filesize max
2020-09-15 20:07:29 -07:00
snipe
d5f8e93d7c
Moved delete logo option higher for nicer layout
2020-09-15 19:52:34 -07:00
snipe
303388e1f5
Added a space between favicon help text blocks
2020-09-15 19:50:15 -07:00
snipe
9601bf6edd
Make “remove image” text clearer
2020-09-15 11:57:40 -07:00
snipe
3b6fb68ff1
Added space between padlock icon and demo warning text
2020-09-15 11:40:36 -07:00
snipe
bfd024fdfd
Merge pull request #8434 from inietov/bug/ch15182/make-all-of-the-this-feature-has-been-disabled
...
Thanks!
2020-09-15 11:21:35 -07:00
snipe
e464f0edf3
Small UI tweaks for kits
2020-09-15 10:15:14 -07:00
Ivan Nieto
291997c915
Change the class of a reusable element so the icon changes from a warning to a padlock
2020-09-15 01:32:46 -05:00
snipe
912401a0a0
Change warning icon to padlock icon
2020-09-12 12:07:56 -07:00
snipe
ec5daa387b
Better explanation for demo mode
2020-09-12 10:04:57 -07:00
snipe
e448b626e2
Removed pagaination from dashboard
2020-09-12 08:37:37 -07:00
snipe
ac2403e8fc
Fixed markdown issue in markdown notifications
2020-09-11 17:12:33 -07:00
snipe
cf545f0ed1
Fixed form layout on accessory checkin page
2020-09-11 16:20:56 -07:00
snipe
d3d64bd85c
Removed asset tag from accessory checkin markdown notification
2020-09-11 16:06:02 -07:00
snipe
0f22cf6807
Fixed #8428 - Added purchase cost column to user tabs
2020-09-11 11:48:51 -07:00
snipe
2f435a57c1
Fixed #8426 - show model number in custom fields model listing
2020-09-11 11:27:30 -07:00
snipe
82e0b1ffd8
Fixed [ch15130] - update the seeder to clear requested assets table
2020-09-08 18:29:02 -07:00
snipe
5b68a321a6
Added comapny formatter to asset maintenance report - fixes [ch15119]
2020-09-08 18:15:45 -07:00
snipe
251ef82741
Added company formatter to asset maintenance report
2020-09-08 18:14:21 -07:00
snipe
d9e7a457d4
Fixed regression on select menus [ch15093]
...
Custom report doesn’t pass an $item, so we have to check for that in that required check
2020-09-04 15:43:49 -07:00
snipe
249b9b7509
Fixed [ch15086] - [object object] in companies date displays
2020-09-03 19:40:17 -07:00
snipe
0eeeb24cae
Added data-validation=“required" to appropriate field partials
2020-09-03 16:59:42 -07:00
snipe
0503a51cae
Corrected validation to match model
2020-09-03 16:58:45 -07:00
snipe
c29ec6a100
Removed duplicate state field
2020-09-03 16:00:26 -07:00
snipe
a57ab29af6
Accessibility features for custom fields icons
2020-09-03 15:55:52 -07:00
snipe
b8ddbadd2b
Use icons for 2FA, LDAP, etc info on user view
2020-09-03 15:55:41 -07:00
snipe
3e120812e3
Removed 2FA reset button if the user is not enrolled in 2FA
2020-09-03 15:55:20 -07:00
snipe
3ea3e8b856
Updated user asset listing to use bootstrap-tables and asset endpoint [ch1389]
2020-09-03 15:12:51 -07:00
snipe
fb59405a87
User view can t be loaded [ch15079]
2020-09-03 14:07:30 -07:00
Ivan Nieto
3fcd83c499
Fixes some errors in forms using the deprecated Input:: facade
2020-09-03 13:42:33 -05:00
snipe
ed79eacb9d
Updated help text
2020-08-31 19:55:30 -07:00
snipe
a64e1be278
Fixed Input:: () vs request()
2020-08-31 17:18:09 -07:00
snipe
13216b8860
Fixed pGenerator (again)
2020-08-31 17:17:51 -07:00
snipe
453fc718d9
Merge branch 'develop' into integrations/2020-08-31-dev-into-master
...
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Models/Ldap.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/less/overrides.less
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# tests/unit/UserTest.php
2020-08-31 12:44:03 -07:00
snipe
9c8ca6af21
Squashed commit of the following:
...
commit e321aeabae8ec99ff4337568ae9e37568ae9ec01a83216932ad9050c#8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cf01a832169cbcad49ce73c6883489#8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489cbcad49ce79b5acca89d7e52919cf1b714576be429f3a5c48#8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f134e8e6fb9714576be45b999c50a2512899294#8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 51289929400291323502e0f6f9b839f1a6308002b999c50a2e9ca20e496e3906b245#8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9ca20e4964e0644dbbf456a74d88#8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c799c059070c62d43a778b725bd0faee0644dbbf65b6925b00004ecad05#8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00cdf17a859bf24c43056ba606b7e905dd73ddad4779a39cf721e7410b16838994f3e15#8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835e955c983ab09e7d19b#8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15ed23f1a77cae955c983a32fa17ac18eed41e454#8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b32fa17ac185b905154373b1e46f72#8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b0c1a1de2a220c9ae5818eed41e4549b750f4754fc17a06792a4f76cc6cfbb905154373Fixed #8247 - added notes field to user details display
commit daf748e531799a93c46a34aa12e22981a633288897757bd0#8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd04c7125c393781a63328896e563f6e4b5320f5c677f69ae953https://github.com/snipe/snipe-it
commit 5320f5c67c7f69ae953bc79f8c1ba17f6fbabf#8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfac79f8c1baf12c92e30b536401fe0#8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c912c92e30b7fd10b755b0dbbb7680d9cf0dd5bbad25e53d8c7fec6ed256f89d433b41#8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41ae2570ada6f45afe725a1536401fe0fec6ed256fb2aaa7bed2d339bdddc3cc9f1577a#8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a4ab1fe8be0c339bdddc3835b9cf4b707ccb41371e2e60a457bf2390d2160bb42801f6a00b051b8c#8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c705b3a9ad7e4fb880384f43042ad841a716382ac436c8f7f4f1b42801f6aede4934f21946129f20#8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f206b941ef1e08d1aa11ec89de4934f21daf06e4205b10076b01#8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015af06e420569a2440dc4bbeae8efb22ac1c1636#8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c004ecad059beae8efb21d14ab7e3e9839e5e56#8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566d14ab7e3e1#8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c1e97cf011b6ed23505054001e721530f886837668210da6e8#8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82f88683766be4385c0f8cFixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa7fb3a9b82c9a2ed804cecb1e87fe#8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6f43df5f04195cc48e4229a2ed804cad20fad28e5ae813ddf75bb42109c0cf46ecf8ec0b9e821c0e69ee28c75131a8ba067020fd232e70ee4d69b1chttps://github.com/snipe/snipe-it
commit 0fd232e70dee4d69b1c531c535094d1ad11194#8041 from alek13/patch-1
use supported package for slack
commit d1ad111949https://github.com/maknz/slack/issues/94
commit 31c53509417eb70e17e05bb4f271a3dfcb4699#7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb4699196eb96f964a2f08bd3bae009fbe59f5bb4f271aaFixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
snipe
e1cc003cec
Fixed backup urls for download
2020-08-28 18:22:37 -07:00
snipe
d25a05d748
Misc Flysystem/image upload request fixes
2020-08-26 11:53:36 -07:00
snipe
f385f3e928
Fixed user image upload
...
TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images
2020-08-26 02:30:23 -07:00
snipe
a90d2ba077
Fixed suppliers upload
2020-08-24 18:53:33 -07:00
snipe
232e3f30aa
Fixed accessories “current image” path in edit form
2020-08-24 14:30:55 -07:00
Michael Pietsch
4f5374b2e8
enable use custom file based saml certificate/private key
2020-08-14 12:25:00 +02:00
snipe
19d8d7b146
Updated components and consumables to use storage facade
2020-08-12 13:02:54 -07:00
snipe
5b6925b00c
Removed debugging :(
2020-08-04 21:00:37 -07:00
snipe
df17a859bf
Changed modal IDs so manager creation modal works on user creation main page
2020-08-04 20:59:54 -07:00
snipe
24c43056ba
Moved pGenerator script to default layout footer
...
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
2020-08-04 20:58:28 -07:00
snipe
4e0a9c7a94
Fart fix
...
I just…. don’t ask.
2020-08-03 12:35:34 -07:00
snipe
6a089f86f8
Fixed pathing for accessories
2020-08-03 11:17:56 -07:00
snipe
502b3c50a9
Fixed upload preview (fixed regression from #6736 )
...
This change appears to have been stomped on in one of the merges. :(
2020-07-31 14:36:50 -07:00
snipe
3e62a6ea2d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-07-31 11:01:35 -07:00
snipe
eed41e4549
Moved address down further, fixed broken HTML
2020-07-21 16:57:32 -07:00
snipe
b750f4754f
Added city to bulk user importer
2020-07-21 16:49:54 -07:00
snipe
b905154373
Fixed #8247 - added notes field to user details display
2020-07-20 14:29:32 -07:00
snipe
81a6332889
Removed license ID from seats table cookie info
...
This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses
2020-07-14 13:55:38 -07:00
Ivan Nieto
8fd4529fad
Change the form input name for serials in the view
2020-07-13 13:49:21 -05:00
snipe
12c92e30b7
Show whether or not the user was imported via LDAP in the view page
2020-07-10 16:21:27 -07:00
snipe
fd10b755b0
Removed the sr-only tag in table headers
...
It was breaking Bootstrap Tables column selector :(
2020-07-10 11:30:01 -07:00
Sean Borg
567a9639f4
Enhanced #5762 Able to bulk edit expected checkin date
...
In light of the need to edit 500+ devices #5762 (comment)
I added the expected checkin date to the bulk edit page for assets
2020-07-10 19:21:34 +01:00
Sean Borg
7a433f8598
Updated purchase date format in hardware/bulkedit
...
The Purchase date box in hardware/bulkedit was a different style
to the normal hardware/{id}/edit
It also prevents a strange bug I see in firefox when clicking the old datepicker
it presented 2 datepicker boxes
2020-07-10 19:21:22 +01:00
snipe
b941ef1e08
Pulled CSS font awesome styles out of the blade and into overrides.css
2020-06-22 20:41:40 -07:00
Godfrey M
b10076b015
corrected an error where font-size for labels were static in settings.
2020-06-22 17:04:39 -07:00
snipe
a7eb89f6b6
Misc fixes for flysystem paths
2020-06-16 16:06:25 -07:00
snipe
7a785b4952
Updated a few flysystem settings
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-28 01:54:29 -07:00
Godfrey M
9839e5e566
adjusted for all label text, removed local variable
2020-05-27 12:27:40 -07:00
snipe
5b4e4c8dcd
Merge pull request #8061 from Godmartinz/develop
...
fixed a table header error
2020-05-26 19:52:14 -07:00
Godfrey M
e7f74d94c1
Label_Woes
2020-05-26 17:22:45 -07:00
Godfrey M
e97cf011b6
Label_Woes
2020-05-26 17:15:39 -07:00
Godfrey M
ed23505054
Label_Woes
2020-05-26 17:10:45 -07:00
Daniel Meltzer
7ea862787c
Refactor controller to use one method that shows all modals based on name.
2020-05-23 15:24:00 -04:00
Daniel Meltzer
7a76cb08a0
We accept xlsx in uploads
2020-05-23 11:36:47 -04:00
Daniel Meltzer
8210da6e82
Fix Missing Category selection in Asset Model Modal dialog.
...
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
2020-05-20 10:29:27 -04:00
Daniel Meltzer
6a80f95769
Fix Missing Category selection in Asset Model Modal dialog.
...
A select html tag needs a full closing tag. <select /> is not valid.
This was causing the select2 js to barf and eat additional information.
2020-05-20 10:23:04 -04:00
Godfrey M
edd4797178
fixed a table header error
2020-05-19 16:59:09 -07:00
Daniel Meltzer
a6f90cb3fc
Assorted licenses UI fixes while testing.
...
* Rename licenses route checkin parameter to clarify it's purpose and
fix incorrect route in users view page.
* Checkin note can be nullable for checking in a license.
* License Seat view was only showing 20 license seats due to faulty
transformer logic.
2020-05-12 14:38:21 -04:00
snipe
9a2ed804ca
Fixed mismatched HTML header tags
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 20:28:42 -07:00
snipe
d20fad28e5
Use more modern request helper
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 20:28:24 -07:00
snipe
9ee28c7513
Switched to use info instead of danger on undeployable statuses
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-11 18:07:02 -07:00
Johnson Yi
572185ac96
Revised how saml sp info is displayed
2020-05-09 09:44:51 +10:00
Johnson Yi
b2930d6069
Added #542 : add saml authentication
2020-05-06 00:06:19 +10:00
snipe
8ecb7969df
Fixed incorrect route for saving groups
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-01 01:26:15 -07:00
snipe
31c5350941
Fixed incorrect route for groups edit
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-01 01:05:48 -07:00
snipe
8507bcd16b
Merge pull request #8008 from dmeltzer/component-checkinout-fixes
...
Component checkout/checkin fixes.
2020-04-30 17:49:22 -07:00
snipe
e47c44d055
Merge pull request #8007 from dmeltzer/permissions-form-cleanup
...
Permissions edit cleanups.
2020-04-30 17:48:24 -07:00
snipe
8bb3c01f78
Addressed merge issue for reset password for #7997
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-30 17:45:05 -07:00
Daniel Meltzer
bfba30058c
Fix incorrect routing.
2020-04-30 10:35:26 -04:00
Daniel Meltzer
debdccf5f1
Remove old help text translation that doesn't exist any more
2020-04-30 10:35:11 -04:00
Daniel Meltzer
358609720a
Component checkout/checkin fixes.
...
- Provide proper translated messages for checkin vs checkout
- Pass appropriate methods to the Checkout event, fixes an error on
checkin.
- Default to a value of 1 on checkin in UI to save a click sometimes.
2020-04-29 12:50:09 -04:00
Daniel Meltzer
42e1e9a0bd
Permissions edit cleanups.
...
- Make each section of permissions it's own tbody for better styling
- Remove extra separators when theres nothing to separate
- Vertically center radio buttons in header rows.
Still on the ideal list:
- Unify code between users and groups into one partial with
conditionals.
- Sticky header row or put the header row in each section.
2020-04-29 12:33:50 -04:00
Daniel Meltzer
bb50828ca0
Remove General serial field now that the serial is part of the multi asset creation.
2020-04-28 11:39:53 -04:00
snipe
c2f1fd4942
Make user form a little nicer looking
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-28 00:01:47 -07:00
snipe
412caebf69
Fixed logo uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 23:22:52 -07:00
snipe
b433b49469
Ficing webpack, CSS and JS (*whew* that sucked)
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 22:41:33 -07:00
snipe
f172747495
Handle parse error in custom fields edit per #7997
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 19:36:07 -07:00
snipe
6427f46a6b
Removed mix (switched to url()) for now until assets are fixed
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 19:35:21 -07:00
snipe
6847a331a7
Backport the column icon fix from master
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 05:55:38 -07:00
snipe
3dfcb46991
Minor formatting changes
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:41:08 -07:00
snipe
96eb96f964
Removed stray val (typo)
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:27:00 -07:00
snipe
a2f08bd3ba
Added comments
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:08:54 -07:00
snipe
e009fbe59f
Converted table heading icons in People to CSS glyphs
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 04:04:53 -07:00
snipe
5bb4f271aa
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 00:47:19 -07:00
snipe
bea3a7b982
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-24 00:39:32 -07:00
snipe
44962d1eb9
Switched to use Primary button
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:44:48 -07:00
snipe
e69461d797
Cleaned up LDAP sync blade
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:44:28 -07:00
snipe
b01e8720dc
Fixed ldap settings JS error
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 14:41:20 -07:00
snipe
c50b81ff19
Added resources
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:15:24 -07:00
snipe
b5cc845216
Removed vendor.js from setup blade
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 07:15:12 -07:00
snipe
3435485a46
Updated path to skin css
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-22 06:41:19 -07:00
snipe
82b6d2b31b
Fixed a few more tests
2020-04-21 21:13:00 -07:00
snipe
05e9861b71
Checkin/checkout fixes
2020-04-21 11:28:31 -07:00
snipe
cff2a65f62
Fixed broken if/else in view from bad merge
2020-04-21 11:13:29 -07:00
snipe
7a6ca5cb40
Tempt fix for css weirdness
...
TODO: figure out why overrides isn’t being compiled into css/dist/all.css
2020-04-21 11:03:32 -07:00
snipe
1d8c3a73ea
Use non-min version of skin until we can get the other webpack stuff sorted
2020-04-21 10:43:04 -07:00
snipe
e786ef8290
Pull branding back to develop normal
2020-04-21 10:42:37 -07:00
snipe
c38bbfc8bd
Removed title from more info link
2020-04-21 06:29:34 -07:00
snipe
be446eedb0
Updated html styles on settings index
2020-04-21 06:29:08 -07:00
snipe
dc6e329d96
Fixed name in comments
2020-04-21 06:18:24 -07:00
snipe
72b3228d82
Fixed HTML tags
2020-04-21 06:15:31 -07:00
snipe
cb71bcc4af
Switch to old() helper
2020-04-21 03:58:31 -07:00
snipe
58f6b2da5a
Fixing assets
2020-04-21 03:42:35 -07:00
snipe
b670371e0b
Ugggh… fixing a donked merge
2020-04-21 03:30:21 -07:00
snipe
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
snipe
7ebd21bc04
Added sr-only to the unstyles image upload button
2020-04-09 19:29:16 -07:00
snipe
83ee64f155
Added missing CSS class to text-only logo
2020-04-08 17:25:14 -07:00
snipe
a0f7fdc57a
Merge branch 'fixes/accessibility_fixes'
...
# Conflicts:
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
2020-04-08 11:19:42 -07:00
snipe
1a5785a8d3
Fixed dashboard header size
2020-04-06 21:30:28 -07:00
snipe
320d660e83
Updated chartjs
2020-04-06 21:17:26 -07:00
snipe
fb903b2fda
Added comments, better indenting
2020-04-06 21:05:42 -07:00
snipe
7bf398aca4
More settings filter fixes
2020-04-06 20:47:05 -07:00
snipe
f6bb655383
Prevent form submission
2020-04-06 20:17:44 -07:00
snipe
19f71face9
Added filtering to settings page
2020-04-06 20:11:13 -07:00
snipe
d82b94e281
Pull blue stylesheet if no skin was selected
2020-04-06 19:04:49 -07:00
snipe
a8032ac388
Switched to btn-primary for submit
2020-04-02 18:38:54 -07:00
snipe
21d8225696
Use button primary for higher contrast
2020-04-02 18:33:26 -07:00
snipe
766c2b22cb
Removed stray tag
2020-04-02 18:33:10 -07:00
snipe
bdddab5b8b
Added role=“option” to option items, additional icon font fixes
2020-04-02 18:17:21 -07:00
snipe
031adc3be4
Small display fixes to importer table
2020-04-01 19:51:36 -07:00
snipe
c906026acd
Merge branch 'master' into fixes/accessibility_fixes
2020-04-01 14:04:02 -07:00
snipe
56c2740b68
Radio button tweaks
2020-04-01 06:56:27 -07:00
snipe
4688d62b9f
Small UI fixes
2020-04-01 06:50:37 -07:00
snipe
99686bd73a
Added labels for bulk actions
2020-04-01 06:48:02 -07:00
snipe
120e224961
Add the ability to remove all group memberships in bulk
2020-04-01 06:35:13 -07:00
snipe
e27d69a31d
Remove viewport restrictions
2020-04-01 06:18:37 -07:00
Ivan Nieto
c492ba7245
Adding changes to 'upload-table' for being painted in CSS ( #7934 )
2020-04-01 05:24:05 -07:00
snipe
53658e365f
Removed duplicate HTML tag
2020-04-01 04:36:28 -07:00
snipe
4cfa0e36b1
Added labels to password reset
2020-04-01 04:30:54 -07:00
snipe
9d9b5d3885
Added form labels to auth screens
2020-04-01 04:29:54 -07:00
snipe
36f9905be0
Removed test code
2020-04-01 04:29:35 -07:00
snipe
2d2cd68061
Switched to h2 from h4
2020-04-01 03:51:08 -07:00
snipe
fd642e95eb
Hide success icons from screen readers
2020-04-01 03:25:07 -07:00
snipe
9ab3370be5
Hide icons in error messages
2020-04-01 03:21:15 -07:00
snipe
4dcc1ffdbc
More form labels
2020-04-01 02:22:24 -07:00
snipe
7718abaa72
Added aria-hidden
2020-04-01 01:26:44 -07:00
snipe
c3d2e8ff26
Added aria-hidden to inline form error text
2020-04-01 00:18:20 -07:00
snipe
be93b23488
Added aria-label to form fields
2020-04-01 00:15:33 -07:00
snipe
b079d0d6d5
Use btn-primary for submit button
2020-03-31 23:38:10 -07:00
snipe
c6c75cc11f
Fixed missing </h3 tags
2020-03-31 23:36:56 -07:00
snipe
b188285bc9
Fixed empty table headings
2020-03-31 23:02:24 -07:00
snipe
6d659a84b8
Removed extra div tag
2020-03-31 22:53:58 -07:00
snipe
3e3828229d
Removed _tab from tab names
2020-03-31 22:52:21 -07:00
snipe
bf6a0f8d2f
Added aria-hidden
2020-03-31 22:50:38 -07:00
snipe
3873c4b253
Added aria form labels to upload modal
2020-03-31 22:50:29 -07:00
snipe
6cc23f69f9
Added aria form labels
2020-03-31 22:50:14 -07:00
snipe
a467a6999e
Use upload modal
2020-03-31 22:50:07 -07:00
snipe
e0eb10ca1e
Added aria-hidden tags
2020-03-31 22:49:49 -07:00
snipe
99c4c73c09
Fixed aria labels on dropdowns
2020-03-31 21:53:26 -07:00
snipe
bde45cbb34
Fixed h3 to h2 for semantic header levels
2020-03-31 21:30:24 -07:00
snipe
bfa9c0c528
Updated dark skins with updated styles
2020-03-31 20:58:54 -07:00
snipe
fe2261c88d
A few more aria-hidden fixes
2020-03-31 19:34:01 -07:00
snipe
6aeb3c0a47
Use divs instead of layout table on view
2020-03-31 19:27:21 -07:00
snipe
dfaa1c9578
Use the same “no results” treatment for each tab
2020-03-31 18:45:43 -07:00
snipe
0ef1dfe061
Switched from layout tables to decorated divs for asset detail page
2020-03-31 18:39:58 -07:00
snipe
7854003ec2
Added sr-only text to “made with love” footer
2020-03-31 17:29:20 -07:00
snipe
c71dd9b68a
Added sr-only text
2020-03-31 17:29:06 -07:00
snipe
b8b9ac8a1b
Fixed mismatched <b>/<strong> tags
2020-03-28 18:00:46 -07:00
snipe
80ac2607cd
Added alt tags to assigned assets view
2020-03-28 18:00:19 -07:00
snipe
3552fb1fd8
Added alt tags to profile image
2020-03-28 18:00:05 -07:00
snipe
54a96b8453
Fixed <b> to <strong>
2020-03-28 17:30:17 -07:00
snipe
e9ddd1af81
Added th content on activity report
2020-03-28 04:00:26 -07:00
snipe
f0b9cd7820
Changed header for h2
2020-03-28 03:43:24 -07:00
snipe
59accca89d
Added form labelss
2020-03-28 03:43:08 -07:00
snipe
e72ebfb94b
Added placeholder text for modal header
2020-03-28 03:42:45 -07:00
snipe
0b7316d548
Changed side heading to h2
2020-03-28 03:42:27 -07:00
snipe
d0cf76989a
Fixed table headers for custom fields
2020-03-28 02:52:14 -07:00
snipe
5e4918579a
Added table headers
2020-03-28 02:41:27 -07:00
snipe
5a6c13e364
Added aria-hidden and sr-only tags to minus/collapse symbol
2020-03-28 01:37:49 -07:00
snipe
5c68353e62
Use non-min bs tables for now
2020-03-28 01:36:35 -07:00
snipe
53728e5c71
Removed whitespace
2020-03-28 01:36:22 -07:00
snipe
b965d170ab
Added accessibility features to bootstrap tables
2020-03-28 00:51:26 -07:00
snipe
a8f6bbd86a
Added alt text to image formatter in bootstrap tables
2020-03-27 22:01:24 -07:00
snipe
2a813244a2
Wrapped text in h5s, added aria hidden to icons
2020-03-27 21:45:27 -07:00
snipe
b50894fca1
Use a variable in the settings to determine what css classes to use
2020-03-27 21:44:50 -07:00
snipe
41fa2d1aa1
Added aria handlers and sr-only text
2020-03-27 21:44:32 -07:00
snipe
5858c90e71
Minor formatting change (spacing)
2020-03-27 15:50:01 -07:00
snipe
f0ef06ebe1
Added more alt tags
2020-03-27 15:35:29 -07:00
snipe
700f7de748
Added alt text to logo
2020-03-27 14:10:56 -07:00
snipe
af2ea7ac03
Added aria-hidden="true" to create dropdown in topnav
...
Since it’s technically duplicated content
2020-03-27 14:08:01 -07:00
snipe
690d8255c9
Removed the title attribute from the select2 output
...
It contains duplicate info since its auto-generated by select2
2020-03-27 14:07:30 -07:00
snipe
aded2193a2
Added aria-hidden="true" to top navigation elements
2020-03-27 13:29:00 -07:00
snipe
6d99b2a68c
Added “skip to content” link
2020-03-27 13:28:48 -07:00
snipe
55a619778f
Added language header
2020-03-25 16:32:33 -07:00
snipe
039f5da0e1
Add image upload to user edit [ch10508] ( #7877 )
...
* Use correct Request include
* Updated to use additional form request
* Added SVG sanitizer
* Added response method to form request
* Allow ImageUploadRequest to accept fieldname params, added SVG sanitization, fixed delete
* Fixed upload path for avatars
* Added fieldname variable to blade partial for image upload
* Added enctype="multipart/form-data" to form to allow uploads
* Added image field
* Updated Request::old() to use $request->old()
* Fixed derp in edit blade referring to $item when it should be $user
* Added svg+xml to image rule
2020-03-05 18:00:24 -08:00
snipe
d1a8d76d85
Set maxlength in password reset form to 250
2020-03-04 22:06:43 -08:00
snipe
03c5a42f5a
Fixes for flysystem paths :(
2020-02-11 20:22:55 -08:00
snipe
46a138c64b
Fixed id to statuslabel in sidenav
2020-02-10 12:36:48 -08:00
Fabian Grutschus
5becb93e6c
Added: allow appending of domain name to username when user tries to login ( #7790 )
2020-02-04 12:47:49 -08:00
Ivan Nieto
ab36784edd
Added a parameter that http://snipe-it.app/fields expected, without it that functionality was broken ( #7687 )
...
Nice!
2019-12-30 20:18:47 -08:00
snipe
b5db0b22f8
Switched to Request facade
...
I don’t know why my greps keep missing this shit.
2019-12-10 19:47:54 -08:00
snipe
296de34e8a
WIP: Upgrade develop to Laravel 6.6.1 ( #7637 )
...
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell.
* Upgraded framework to Laravel 6
### TO DO:
- Fix password restriction rules- the old library isn’t compatible with Laravel 6 :(
- Figure out why in-app API calls are returning “Unauthorized”
* More updates from Input:: to Request:: helper
* Switch to Request:: from Input
* Added passport config
* Fixed goofy password minimum in seeder
* Added laravel/helpers
* Changed ($item) to ($item->id) in forms
I have no idea why this is necessary
* Changed ($item) to ($item->id) in forms
* Updated API middleware to auth:api
* Updated with added laravel auth.php values
* FIxed *&!^$%^&$^%!!!! ajax issue
* Switch to Request::get from Input::get
* Switched to Request facade
* Added password security minimums back in
The package we were using has not been updated to Laravel v6, so I created custom validators instead
* Added language strings for error messages for password rules
* Fixed `($item)` issue in formActions for partials
2019-12-10 19:32:50 -08:00
snipe
88fb1370f0
Added slightly friendlier error handling for assets without models
...
This scenario should never happen, barring someone manually editing their data, but better to handle that scenario in a more user-friendly way.
2019-12-06 18:17:03 -08:00
snipe
de0b5a6149
Fixes #6440 - quote marks in the right place
2019-12-06 11:04:16 -08:00
Dustin B
8fd4e35244
Closes #6440 Print All Assigned - New Tab ( #7135 )
...
Should add the functionality to, by default open in a new tab and not reference back to the source page. Reduces overhead and should resolve #6440 .
Untested, need confirmation.
2019-12-06 11:00:01 -08:00
Valentyn Tulub
6ad1f51673
Added #6489 : show asset assignments under user assignments ( #7293 )
...
* Add a setting to show assets assigned to other assets #6489
* Update user's views to show assets assigned to other assets #6489
* Add ukrainian and russian translation for the feature #6489 in settings
2019-12-06 10:57:48 -08:00
snipe
88cf456386
Adding Dept to license seats ( #7609 )
...
* Adding Dept to license seats
* Added query scope to order by department
* Make license seat department sortable
* Disable license seat internal search - this never actually worked
2019-11-21 22:03:56 -08:00
snipe
d8049209ca
Fixed bug where deleted consumable would throw an error on print page
2019-11-21 21:43:54 -08:00
snipe
5290c47e2a
Merge branch 'develop' into v5-master-develop-integration
...
# Conflicts:
# .env.example
# .travis.yml
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Middleware/EncryptCookies.php
# app/Http/Requests/AssetRequest.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/AssetImporter.php
# app/Models/AssetMaintenance.php
# app/Models/Location.php
# app/Models/User.php
# composer.json
# composer.lock
# config/backup.php
# config/database.php
# config/version.php
# public/mix-manifest.json
# resources/lang/en-ID/general.php
# resources/lang/vi/admin/settings/general.php
# resources/views/accessories/edit.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
snipe
22d2ad9248
Fixes nested location selectlist ( #7483 )
...
* Rename child locations method
* Use Ajax dropdown for locations selectlist for edit/create
* Removed locations database call on edit/create blades for faster loading
* Updated locations controller to use the new iterator
* Increase pagination on locations controller to 500
We’re already loading all of that data up beforehand anyway, so no point in keeping the query smaller.
* Fixed the else to make codacy happy
* Improve the design and performance of the nested location selectlist (#7484 )
* Improve the design and performance of the nested location selectlist
* Fixed parse errors
* Removed debugging code/comments
2019-10-02 03:56:56 -07:00
Martin Berg
3dcef9aac9
Add support for custom remote user header ( #7370 )
2019-09-03 11:07:26 -07:00
Logan Swartzendruber
4c8b26f732
Implement #3088 : Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. ( #7388 )
...
* Implement #3088 : Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view.
* Add conditional for including the asset number in the URL of the barcode image.
* Change case of variables to pass Codacy PR review standards.
2019-09-03 11:02:55 -07:00
snipe
60bb385cf7
Make status label required
2019-08-14 23:46:09 -07:00
snipe
47724d7268
Make error text color match
2019-08-14 23:46:00 -07:00
snipe
c9f9a60354
Fixed asset tag error message alignment
2019-08-14 23:28:01 -07:00
snipe
441ae69f5c
Integrations/develop into master ( #7352 )
...
* Fixes #6204 - added email alerts and web/API access to assets due for audits (#6992 )
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
* Leave the activated state for users alone in normal LDAP synchronisation. (#6988 )
* Fixed #7003 - crash when warranty months or purchase date is null
* Fixed #6956 - viewKeys policy inconsistent (#7009 )
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
* Added API middleware to API routes to enable throttling
TODO: Figure out how to make this costumizable without touching the code
* Import locations from CSV via command line (#7021 )
* Added import locations command
* Small fixes to location importer
* Added country, LDAP OU
* Cleaned up comments, added more clarification to what the script does
* Added ability to update groups via API
Fixes [ch9139]
* Bumped version
* Fixed #6883 - remove escaping of fields on LDAP import
* Fixed #6880 - correctly encrypt encrypted fields via the API
* Fixes #5054 : LDAP users deactivated for none-ad (#7032 )
When using none-AD ldap, users are automatically deactivated every LDAP
sync. This commit changes the behaviour so that if the active flag isn't set,
the users are enabled.
Fixed #5054 , at least for 4.X
* Updated packages
- Updating erusev/parsedown (v1.7.2 => 1.7.3): Downloading (100%)
- Updating squizlabs/php_codesniffer (3.4.1 => 3.4.2): Downloading (100%)
- Updating symfony/polyfill-mbstring (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/var-dumper (v3.4.23 => v3.4.27): Downloading (100%)
- Updating league/flysystem (1.0.50 => 1.0.51): Downloading (100%)
- Updating symfony/translation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating nesbot/carbon (1.36.2 => 1.37.1): Downloading (100%)
- Updating symfony/debug (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/console (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/finder (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-ctype (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php70 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/http-foundation (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/event-dispatcher (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/http-kernel (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/process (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/routing (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/polyfill-util (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/polyfill-php56 (v1.10.0 => v1.11.0): Downloading (100%)
- Updating symfony/psr-http-message-bridge (v1.1.1 => v1.1.2): Downloading (failed)
Downloading (100%)
- Updating rollbar/rollbar (v1.7.5 => v1.8.1): Downloading (100%)
- Updating symfony/yaml (v3.4.23 => v3.4.27): Downloading (100%)
- Updating symfony/browser-kit (v3.4.23 => v3.4.27): Downloading (100%)
* Fixed #7044 - API update deleted custom fields if they are not re-presented
* Fixed XSS vulnerability when creating a new categories, etc via modal on create
Same fix as before, because of the weird select2 post-parsing ajax behavior
* Updated email strings
* Fixed #7046 - added user website url back into UI
* Updated language strings
* Bumped version
* Updated packages
* New backups config for spatie
* Removed debugbar service provider (autodiscovery)
* Use laravel v5.5 withCount manual aliases
* Added spatie language files
* Removed old laravel backups config
This config file was renamed in a newer version of spatie laravel-backup
* Set the serialization
* Added the command loader to console kernel
* Renamed fire() to handle()
* Updated withCount to use manual naming
* Updated backup path in backup admin
* Updated travis with new php versions
* Bumped laravel version in readme
* Fixed custom field edit screen
* Fixed baseUrl is undefined error
I literally cannot figure out how this ever worked before.
* Fix for included files in backup
* Bumped version
* Switch has() to filled()
* Change ->has() to ->filled()
* Removed cosole log
* Bumped packages
* Use getReader instead of fetchAssoc for CSV parser
https://csv.thephpleague.com/9.0/upgrading/
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Handle JSON validation errors like 5.4
* Trying to fix ajax asset validation
This I think gets us closer, but still not handling the validation on the asset properly.
When I do a print_r of the validation in the other items, its looking for an error bag that looks something like this:
```
Illuminate\Support\MessageBag Object
(
[messages:protected] => Array
(
[name] => Array
(
[0] => The name field is required.
)
[seats] => Array
(
[0] => The seats field is required.
)
[category_id] => Array
(
[0] => The category id field is required.
)
)
[format:protected] => :message
)
```
Currently the Assets ajax returns:
```
[2019-05-24 06:52:06] develop.ERROR: array (
'messages' =>
array (
'model_id' =>
array (
0 => 'The model id field is required.',
),
'status_id' =>
array (
0 => 'The status id field is required.',
),
'asset_tag' =>
array (
0 => 'The asset tag field is required.',
),
),
)
```
So not sure why it’s not working.
* Fixed missing asset validation
* Check that a model exists before trying to fiddle with fieldsets
* Tidied up license check
* Removed extra escaping on checkin
* Updated importer to work with newer CSV Reader::getRecords() method
* Fixed field mapping
* Small fix for reordering fields
Fixes Illuminate\Database\QueryException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'order' cannot be null (SQL: insert into `custom_field_custom_fieldset` (`custom_field_id`, `custom_fieldset_id`, `order`, `required`) values (12, 7, , 0)) [ch1151]
This needs revisiting for a more solid fix, especially for data that was already entered bad.
* Fixed bug where sorting by company name in Users API did not work
Fixes [ch9200]
* Removed custom fields from AssignedSearch to prevent confusing data in selectlist
Fixes [ch9193]
* Removed alert-danger from tests
* Fixed missed consumables_count withCount() statement
* Fixed Undefined variable user in $backto if checked out to a non-user
Fixes [ch9194]
* Check for valid model before attempting to access fieldsets
Fixes [ch1249]
* Only build the log upload destination path if there is a matching record
Fixes [ch1232]
* Fixed free_seats_count variable name
(I forgot that Laravel switched camel case to snake case for their old 5.4 withCount variables)
* Only gtry to delete the file if a record is found in the log
* Only try to get fieldset if model is valid
* Fixed more camel-casing -> snake-casing
* Only display the file if the log record can be found
* Fixed casing in sync command
* Updated README
* Derp - typo
* Added link to Atlassian plugin
* More Atlassian clarifications
* Show accessory image on view page
* Increased image size to 800px, added lightboxes
* Fixed #7083 - Removed user_exists constraint on department save
If the user has been deleted, this prevented the department from being successfully saved on edit
* Updated branch in version file
* Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084 )
* bump up to php7.1
& change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect`
* AND modapache ><
* 2 updates required to get software-properties+ppa
* Bumped version
* Bumped release again :(
* Missed one
* Fixed #7098 - updated backup config for deleteFile() method
* Fixed #7092 - handle weird port forwarding/port numbers for baseUrl
* Bumped version
* Fixed #7099 - set email to null by default for backup notifications
* Removed old comments
* Fixed #7100 - Check if $user isset on checkin
* Increased throttle to 120 requests per minute
* Added Filipino, corrected order for Spanish variations
* Update language strings
* Bumped hash
* Changed has to filled to fix bulk asset editing
* Bumped point version
* Small fixes for phpleague CSB reader v9
* Improved error checking in locations importer
* Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility
* Reduce minimum group name length to 2 (from 3)
eg: IT
* Back in time fix FOR #7145 for new installs on MySQL 8+
* Fixed permission insert
//TODO
Handle this via model
* Possible fix for reporting/admin migration back in time
* Fixed #7164 - change table name to permission_groups
* Fixed LDAP password blanking on save
* fixing previous commit's actual wiping of password (#7183 )
replaced Input::fille('ldap_pword') with _filled_. Should be good to go.
https://github.com/snipe/snipe-it/issues/7179
https://github.com/snipe/snipe-it/issues/7169
* Bumped version
* Downgrading rollbar for Laravel 5.5
* Spelling Correction (#7206 )
Fixed Spelling for the word reqrite, to be rewrite.
* Fix #6910 : Add logic to manipulate the eloquent query. (#7006 )
* Added company_id to consumables_users table
* Added logic to manage when a pivot table doesn't have the column company_id trough a join with users
* Remove a migration that tries to fix this problem, but is not longer necessary
* Addresses #7238 - add PWA code to layout
Needs additional UX testing
* Better log message for bad LDAP connection
* Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed
* Comment clarification on #7186
* Check for valid seat on hardware view
* Added space between footer and custom message
* Cap warranty months to three characters
Filles rollbar 209
* Cap warranty months to 3 on the frontend blade
* Fixed countable() strings on user destroy
* Check that the user has assets and that the aset model is valid
* Bumped hash
* Caps asset warranty to 20 years
* Command to fix custom field unicode conversion differences between PHP versions (#7263 )
* Fixes #7252 form request changes (#7272 )
* Fixes for #7252 - custom fields not validating / no validaton messages in API w/form requests
* Removed debug info
* More fixes for #7252
This is mostly working as intended, if not yet the way Laravel wants us to do it.
Right now, the API returns correctly, and the form UI will return highlighted errors, with the input filled in ~sometimes~. I’m not sure why it’s only sometimes yet, but this is potentially progress.
* Removed experimental method
* Check for digits_between:0,240 for warranty
* Removed debug code
* Apply fix from PR #7273 to master
* Bumped hash
* Fixed #7250 - permission issue for API fieldsets and fields endpoints
This applies the change from #7294 to master
* Add @mskrip as a contributor
* Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name
* CORS for api (#7292 )
* Added CORS support to API
* Changed order so CORS will still work if throttle hit
* Added APP_CORS_ALLOWED_ORIGINS env option
* Fixed typo
* Clarified header comments
* More clarification
* DIsable CORS allowed origins by default to replicate existing behavior
* Change variable name to be clearer
* Bumped version
* Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317 )
* Added comments to the ByFilter query scope for clarity
* Added accessories checkout/checkin API endpoint
* Fixed CVE-2019-10742
https://nvd.nist.gov/vuln/detail/CVE-2019-10742
* Update README.md (#7334 )
Add reference to CSV importer.
* Group related variables in .env
* History importer fixes
* Fixes to history importer
2019-08-14 21:48:14 -07:00
snipe
8b4a9aa382
Fixes to history importer
2019-08-13 18:15:42 -07:00
snipe
0e93495ca2
Check that the user has assets and that the aset model is valid
2019-07-17 17:51:35 -07:00
snipe
77a6f6f400
Cap warranty months to 3 on the frontend blade
2019-07-17 12:15:15 -07:00
snipe
fecf8015a1
Added space between footer and custom message
2019-07-17 12:09:32 -07:00
snipe
79ab0d8dc2
Check for valid seat on hardware view
2019-07-17 12:09:18 -07:00
snipe
6736b1c4e7
Addresses #7238 - add PWA code to layout
...
Needs additional UX testing
2019-07-15 13:49:56 -07:00
snipe
087cdd859e
Fixed #7092 - handle weird port forwarding/port numbers for baseUrl
2019-05-29 14:57:58 -07:00
snipe
2dd31544fe
Increased image size to 800px, added lightboxes
2019-05-24 19:11:08 -07:00
snipe
237acdcff0
Show accessory image on view page
2019-05-24 18:22:57 -07:00
sreyemnayr
f85ac97d8c
Feedback for Kits; Fix checkins for accessories ( #7060 )
...
* Kits feedback
* Fix accessory checkin
2019-05-23 19:39:30 -07:00
snipe
f6ef139111
Fixed baseUrl is undefined error
...
I literally cannot figure out how this ever worked before.
2019-05-23 16:56:22 -07:00
snipe
b2eacb147b
Fixed #7046 - added user website url back into UI
2019-05-21 18:55:12 -07:00
Ivan Nieto
e40a5a70a5
RTF support added ( #7024 )
...
* Added the Gatte Facade to AssetsController
* Added the filetype RTF in the modal to upload files
* Added validation of RTF files
2019-05-15 15:47:40 -07:00
snipe
d016076806
Fixed #6956 - viewKeys policy inconsistent ( #7009 )
...
* Fixed #6956 - Added additional gates show showing/hiding license keys
* Modified gate to allow user to see licenses if they can create or edit the license as well
2019-05-08 08:14:49 -04:00
snipe
407445456a
Merge branch 'features/6204_email_audit-alerts' into develop
...
# Conflicts:
# app/Console/Commands/LdapSync.php
# app/Console/Kernel.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/LicensesController.php
# composer.json
# composer.lock
# config/version.php
# resources/views/auth/two_factor_enroll.blade.php
2019-05-06 08:45:13 -04:00
snipe
e5c2d77c7d
Fixes #6204 - added email alerts and web/API access to assets due for audits ( #6992 )
...
* Added upcoming audit report
TODO: Fid diff/threshold math
* Added route to list overdue / upcoming assets via API
* Controller/API methods for due/overdue audits
We could probably skip this and just handle it via view in the routes…
* Added query scopes for due and overdue audits
* Added audit due console command to kernel
* Added ability to pass audit specs to main API asset search method
* Added audit presenter
* Added bootstrap-tables presenter formatter to display an audit button
* Added gated sidenav items to left nav
* Added audit due/overdue blades
* Cleanup on audit due/overdue console command
* Added language strings for audit views
* Fixed :threshold placeholder
* Removed unused setting variable
* Fixed next audit date math
* Added scope for both overdue and upcoming
* Derp. Wrong version
* Bumped version
(I will release this version officially tomorrow)
2019-05-05 22:32:52 -04:00
snipe
e4a298ca2a
Added scope for both overdue and upcoming
2019-05-05 22:13:30 -04:00
snipe
00a8a2aff3
Fixed next audit date math
2019-05-05 20:00:05 -04:00
snipe
7d416d1175
Fixed :threshold placeholder
2019-05-05 19:57:23 -04:00
snipe
e9b9301efb
Added language strings for audit views
2019-05-05 19:35:20 -04:00
snipe
4369d6adc6
Added audit due/overdue blades
2019-05-05 19:21:48 -04:00
snipe
69614a7db4
Added gated sidenav items to left nav
2019-05-05 19:21:26 -04:00
snipe
8154d1116c
Added bootstrap-tables presenter formatter to display an audit button
2019-05-05 19:21:06 -04:00
snipe
e46cccdf90
Added upcoming audit report
...
TODO: Fid diff/threshold math
2019-05-04 17:52:17 -04:00
ajsy
0cdc7af611
Update print.blade.php
2019-05-03 15:22:01 +03:00
snipe
ce16eae508
Merge branch 'master' of https://github.com/snipe/snipe-it
2019-05-02 15:20:52 -07:00
snipe
dc73dbfbfd
Fixed #6911 - note must be a string on license checkin
2019-05-02 15:20:47 -07:00
ajsy
878cfee5a2
Revert "Delete print.blade.php"
...
This reverts commit a0721412fa
2019-04-20 09:28:48 +03:00
ajsy
a0721412fa
Delete print.blade.php
2019-04-19 15:50:05 +03:00
ajsy
52add03e56
Update print.blade.php
...
replace string in serial number with x except last five character
2019-04-19 15:43:40 +03:00
ajsy
c974968821
Update view.blade.php
2019-04-19 14:03:09 +03:00
ajsy
f2242fa32e
Update view.blade.php
2019-04-19 13:20:41 +03:00
snipe
420e8bc85a
Allow phone number to be changed in Profile
2019-04-18 14:13:50 -04:00
snipe
ded1a59914
Removed help text for email images (since we embed them by default now)
...
Added help text for username format
2019-04-02 18:22:31 -07:00
snipe
37b8029d04
Fixed parse error on label settings
...
Also fixed [ch1362] - moving left/right
2019-04-02 18:04:31 -07:00
snipe
d01f9a701c
Fix double-encoding issue?
...
I assume there’s something new in Laravel 5.7/5.8 that’s causing the double escaping. I’m not seeing it everywhere, which is more confusing, TBH. :-/
2019-03-20 04:12:03 -07:00
snipe
bca82684a1
Merge branch 'hotfixes/2fa_qr' into develop
...
# Conflicts:
# .all-contributorsrc
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/ImportsController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Requests/ItemImportRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# composer.json
# composer.lock
# config/app.php
# config/version.php
# docker/startup.sh
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
2019-03-20 02:17:02 -07:00
snipe
da015ec4a8
Fixed #6834 and #6402 - use inline QR code generation for 2FA ( #6840 )
...
* Fixed #6834 and #6402 - use inline QR code generation for
* Update auth controllers to use translations
* Updated composer lock
* Added comments
* Moar comments
* Typo
2019-03-20 01:24:31 -07:00
snipe
a874dbb0d0
Working attempt, but will try with old library for mininal footprint
2019-03-19 23:18:16 -07:00
snipe
0e1289f12f
Fixes #6821 - fixed 2 fa active for users list ( #6822 )
...
* Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced
I also updated the language in the user’s listing table to clarify what “activated” means
* Added login enabled info to user view
* Clarified comments
* Added info about 2FA on user profile
Because why not
* Added nowrap to table, and added 2FA reset for superadmins
2019-03-18 11:59:02 -07:00
snipe
7b33f95e83
Fixes/import permissions mask ( #6826 )
...
* Check for empty headers in import
* Added import permission
* Fixed model path in docblock
* Added import gate to default blade
* Check if the user is an admin OR idf they have import permissions
* Walked back that admin permission
Since admins are bound by full company support, it makes less sense to let admins have this permission by default, versus having them specifically designated to the import permission
2019-03-18 11:58:08 -07:00
Tim Farmer
5893e25b43
Label bugs in alerts settings ( #6808 )
...
* Label bugs in alerts settings
Found another label bug where the alert_email label should be alerts_enabled.
* Update alerts.blade.php
2019-03-14 10:53:05 -07:00
snipe
0b927623e8
Added “record created” string for clarification in asset/license history
2019-03-13 22:06:57 -07:00
Ivan Nieto
c7f48951a9
Valo/checkin date in history of asset ( #6733 )
...
* To see checkin/checkout Date in History of Asset
* Added some logic to get today's date if the checkin_at input is blank
* Updating the action_date taking the value from the action_log table
* Hide created_at field and rename 'Action Date' as only 'Date'
2019-03-13 21:36:32 -07:00
snipe
55f727ef28
Fixed HTML labels on alerts setting page
...
Originally https://github.com/snipe/snipe-it/pull/6808/ by @timothyfarmer - I also updated the error class logic in the same block
2019-03-13 19:53:23 -07:00
snipe
6c71e72dcd
Fixed labels labels (wha?)
...
Wrong HTML labels for some fields in the Settings > Labels page.
Originally https://github.com/snipe/snipe-it/pull/6809 by @timothyfarmer but it was made against the wrong branch
2019-03-13 19:50:35 -07:00
snipe
1b0d855c00
Added translation, removed commented out code
2019-03-13 12:15:48 -07:00
ajsy
03c5b8e4ab
Create print.blade.php
2019-03-09 11:36:42 +03:00
ajsy
a958d56590
Update view.blade.php
2019-03-09 11:29:06 +03:00
snipe
7e8d337ed5
Moved kit icon
2019-03-08 16:49:05 -08:00
snipe
400907cc40
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2019-03-08 16:24:12 -08:00
snipe
61afdeac2e
Merge branch 'develop' of https://github.com/VELIKII-DIVAN/snipe-it into VELIKII-DIVAN-develop
2019-03-08 16:18:48 -08:00
Martin Meredith
55cbbf2b00
Fixes #6794 : Fix URLs to access some 'missing' images ( #6795 )
...
* Fix image path for Model view
* Fix URLs for images in account view
* Fix Supplier view Image URL
2019-03-08 12:47:37 -08:00
Martin Meredith
daf6d98a3b
Remove test data for Pie ( #6793 )
2019-03-08 12:46:47 -08:00
Tim Farmer
7deab0f53b
Label bugs in general settings ( #6801 )
...
* checkbox label bug
The checkbox label in general settings for require_accept_signature was set to full_multiple_companies_support instead so when you click the label for require accept signature it would check the wrong box.
* Update general.blade.php
* Update general.blade.php
Another label that is wrong in general settings
2019-03-08 12:24:24 -08:00
Steffen
e1907e30b1
Allow multiple upload fields and add logo option to labels ( #6736 )
...
* Change upload js to work with multiple upload elements on a single page
* Change uploadFile in upload modal and form partial
* Change uploadFile to js-uploadFile to avoid potential issues in the future
* Remove duplicate style attribute causing webpack to fail
* Missed a css class in rename to js- prefix
* - Move logo uploads to partial for eaiser usage
- Add label logo
- Add css classes to label elements
- Change label prefix text (M: S: ...) to css::before content for easy removal in config
* Add more css classes to labels
* Allow unescaped " (quot) in css ouput
* Add max size param to partial, set defaults for allowedType and size
2019-03-01 15:25:42 -08:00
Dmitrii Minaev
16bb784e78
Codestyle & bug fixes
2019-02-28 01:37:58 +03:00
snipe
c47fa5ad1c
Fixed missing @endcan
2019-02-26 19:14:28 -08:00
Dmitrii Minaev
5f3a0bdea5
app\Services\PredefinedKitService.php rename to app\Services\PredefinedKitCheckoutService.php
...
add accessories and consumables tables
add selectlist api to:
app\Http\Controllers\Api\AccessoriesController.php
app\Http\Controllers\Api\ConsumablesController.php
app\Http\Controllers\Api\LicensesController.php
templates for selectlist
apply kit to user works
2019-02-19 22:19:00 +03:00
snipe
0000f487ac
Merge remote-tracking branch 'origin/fixes/password_confirmation_6703' into develop
...
# Conflicts:
# config/version.php
2019-02-13 23:02:21 -08:00
snipe
35ebe33e4e
Fixed #6703 - fixes password confirmation ( #6711 )
...
* Fixed #6703 - fixes password confirmation
* Removed debugging
* Fixed tests
* I guess we use 10 as the settings for password min in tests
* One more try to fix tests - confirmation won’t validate until password validates
2019-02-13 23:01:19 -08:00
snipe
230c9da1df
Fixed #6703 - fixes password confirmation
2019-02-13 21:30:15 -08:00
snipe
35898e4ca0
Added asset tag to maintenances report
2019-02-13 07:09:16 -08:00
snipe
533649f24e
Merge branch 'develop' into dev-master-integration
...
# Conflicts:
# .gitignore
# .travis.yml
# app/Console/Commands/LdapSync.php
# app/Console/Commands/SendExpectedCheckinAlerts.php
# app/Console/Commands/SendExpirationAlerts.php
# app/Console/Commands/SendInventoryAlerts.php
# app/Console/Kernel.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/Auth/ResetPasswordController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/UsersController.php
# app/Http/Transformers/AssetMaintenancesTransformer.php
# app/Importer/Importer.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/License.php
# app/Models/Location.php
# app/Models/Recipients/AlertRecipient.php
# app/Models/User.php
# app/Providers/AppServiceProvider.php
# composer.json
# composer.lock
# config/trustedproxy.php
# config/version.php
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/lang/ar/admin/settings/general.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/passwords.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/passwords.php
# resources/lang/es-ES/passwords.php
# resources/lang/es-MX/passwords.php
# resources/lang/es-VE/passwords.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/id/admin/settings/general.php
# resources/lang/id/passwords.php
# resources/lang/ja/passwords.php
# resources/lang/nl/passwords.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/passwords.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/passwords.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/admin/statuslabels/table.php
# resources/lang/ru/passwords.php
# resources/lang/sr-CS/general.php
# resources/lang/sr-CS/mail.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/passwords.php
# resources/lang/vi/admin/models/message.php
# resources/lang/vi/admin/users/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/views/importer/import.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/view.blade.php
# tests/unit/ImporterTest.php
2019-02-13 06:42:52 -08:00
snipe
2768ea692e
Removed extraneous js call
2019-02-13 04:24:37 -08:00
snipe
35e60fd151
Updated languages
2019-02-13 03:56:18 -08:00
herroworrd
3f7d2aebc7
Fixed #6634 : Asset Import History fixes and optimizations ( #6657 )
...
* Starting work on asset history importer.
* Starting work on asset history importer.
* Added checkin target.
* Last change... importing history should also probably be an admin only task.
* Added caching for user and asset queries.
* Updated cache keepalive time to DateTimeInterface
* Updated cache keepalive time to DateTimeInterface
2019-02-08 16:05:56 -08:00
Dmitrii Minaev
e01e0c5596
Add licenses, accessories and consumables table presenters app\Presenters\PredefinedKitPresenter.php resources\views\partials\bootstrap-table.blade.php
...
Add refresh licenses, accessories and consumables tables refresh when add a new element resources\assets\js\snipeit_modals.js
Some design fixes resources\views\kits\edit.blade.php
Add default value to form (template) resources\views\modals\kit-model.blade.php
New routes for kit accessories and kit consumables routes\api.php
New routes for kit models, kit accessories and kit consumables routes\web\kits.php
New templates
2019-01-27 23:19:24 +03:00
snipe
9d21fc85bc
Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report
2019-01-25 20:59:54 -08:00
snipe
194d0733d4
Fixed #6644 - asset name not linked in Reports > Asset Maintenance Report
...
This report will likely be deprecated.
2019-01-25 20:57:14 -08:00
Ivan Nieto
7d982c9ea6
Import page is blank [ch90] ( #6636 )
2019-01-24 15:34:50 -08:00
Ivan Nieto
310ed0f1d3
Fix an issue when trying to checkin a license seat. [ch46] ( #6599 )
...
* Fix an issue when trying to checkin a license seat.
* Minor changes in the checkin view, so it can returns to the expected place where the checkin is launched.
2019-01-17 20:36:40 -08:00
snipe
1eace04ad9
Handle asset maintenances that do not have a valid asset associated
2019-01-16 02:26:42 -08:00
snipe
c055e3af21
Only try to return the asset tag link if a valid asset id has been passed
2019-01-16 02:19:35 -08:00
omyno
f0500e9797
Show user's signature in print view ( #6471 )
2019-01-15 14:03:40 -08:00
Wes Hulette
3e19509a49
Fixed : #6395 - Adjusted graph size ( #6518 )
...
* Fixed missing oauth tables during setup.
* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop
* Merge remote-tracking branch 'snipe-it-upstream/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
* Fixed Pie Graph sizing on dashboard
Updated chart.js to 2.7.3
Added height to canvas
2019-01-15 14:02:49 -08:00
snipe
394d265b96
Added XML to uploadable file type - re: #6099
2018-12-12 16:45:09 -08:00
Wes Hulette
b38d07064b
Fixed : #5896 Custom fields of type "CUSTOM REGEX" are always saved as "ANY" ( #6381 )
...
* Fixed missing oauth tables during setup.
* Custom fields of type "CUSTOM REGEX" are always saved as "ANY"
Fixes #5896
* Updated per PR
Fixed spelling
* Fixed logic error
Moved conditional code from view to controller
Added getFromatType function for dropdown
2018-12-06 20:05:04 -08:00
Wes Hulette
34246ee4ef
[WIP] v5 Develop: New LDAP implementation ( #6352 )
...
* Fixed missing oauth tables during setup.
* WIP New LDAP implementation
* WIP New LDAP implementation
* WIP New LDAP implementation
Merge remote-tracking branch 'origin/WIP_LDAP' into WIP_LDAP
* WIP New LDAP implementation
Added Adldap2 to handle ldap intergration.
* Updated per PR quality review
* Added specific LDAP settings method
* Corrected version number
* Added return documentation
* Added imports
* Changed class to be injected into controller
* Updated with PR suggestions
2018-12-06 14:05:43 -08:00
snipe
09c4dd4891
Added ability to upload favicon and email logo
...
todo: refactor the image upload/resize for less copypasta
2018-12-05 19:56:12 -08:00
Minaev Dmitriy
0bbe499414
Kits checkout. But only with models.
2018-11-13 20:33:32 +03:00
Evgeny
dd7db95135
A couple hardcoded strings replaced in according with #6406 ( #6412 )
...
Hardcoded strings was replaced with corresponding placeholders.
Log statuses mentioned in #6406 wasn't translated cause it needs more separate complicated development
2018-11-08 15:20:44 -08:00
snipe
ea91d59ffc
Use username instead of email address in password reset ( #6382 )
...
* Switch to use username instead of email
* Fixed indenting
* Updated password language
* Updated blades to reflect username instead of email
* Changed password/reset controllers to use username instead of email
* Redirect to login page instead of repeating the password reset form
2018-10-31 18:03:24 -07:00
snipe
ce8d47b2b4
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-31 15:19:18 -07:00
snipe
65aef11ae3
Fixed #5879 - added user department filter for custom report
2018-10-31 15:19:13 -07:00
Tim Bishop
7835cc34c8
Insert audited items to the top of the list. ( #6376 )
...
When doing a large number of items they soon disappear off the bottom of
the screen. It's handy to be able to check the result as it's happening
so adding them to the top of the list keeps the most recent items visible.
Move the "Processing..." spinner to the header so it stays at the top.
2018-10-31 11:13:08 -07:00
snipe
2cecd5e056
One more fix for #6175 (non-accessories)
2018-10-31 10:23:47 -07:00
snipe
5da9120870
Fixed #6175 - crashing when accessory has been deleted
...
My guess would be this crash (reported in #6175 ) was happening because of deleted accessories/accessory rows.
2018-10-31 10:23:32 -07:00
Minaev Dmitriy
9d5cd27575
New save mechanic
2018-10-31 16:06:38 +03:00
snipe
5faf8bfcd0
Fixed error on unaccepted asset report
2018-10-29 14:39:42 -07:00
snipe
f0e6a5c905
Fixed error on asset creation
2018-10-29 14:35:34 -07:00
snipe
e443a576f7
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-19 16:46:53 -07:00
snipe
20b26effdb
Fixed #6349 - add view permission for print all assigned
2018-10-19 16:46:46 -07:00
snipe
1a10aa0dda
Fixed #6349 - add view permission for print all assigned
2018-10-19 16:43:28 -07:00
Minaev Dmitriy
f1f7694835
Merge remote-tracking branch 'remotes/upstream/develop' into develop
2018-10-19 19:00:53 +03:00
Minaev Dmitriy
0e66c3cb56
Predefined kits test
2018-10-19 17:30:25 +03:00
Wes Hulette
465b69516d
Fixed : #6259 - Remove remote JS/CSS file loading ( #6330 )
...
* Fixed missing oauth tables during setup.
* Remove remote JS/CSS file loading
Updated gravatar to return to default image
* Updated default avatar path to user url
Removed local html5shim & response js files.
Removed copying html5shim & respond js file to public directory
2018-10-17 12:52:01 -07:00
snipe
2ded2ff53a
Make dashboard snapshots clickable
2018-10-15 18:19:30 -07:00
snipe
74c20e62d5
Fixed - suppress the asset create button if the user is not allowed to create assets
2018-10-15 17:57:47 -07:00
snipe
0dbce93d1b
Better logic for disallowing company selection when user is not a superadmin and FCS is enabled
2018-10-15 17:57:28 -07:00
snipe
9797412d23
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-15 17:02:39 -07:00
snipe
6b6cf06530
Display asset name if one exists and the user cannot edit
2018-10-15 17:02:31 -07:00
snipe
539c3023b9
Added - check whether the user can edit an asset before allowing them to change the name on checkout
2018-10-15 16:52:45 -07:00
Joe Ferguson
704209de9c
Fixed #6301 : Do not allow duplicate asset tags ( #6324 )
...
* Fixed #6301 : Do not allow duplicate asset tags
* Display error message for single asset_tag failure
2018-10-11 17:15:09 -07:00
snipe
835b461d7d
Fixed #6323 - typo in link for low inventory
2018-10-11 15:31:10 -07:00
snipe
b8f8d49927
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-10-11 15:29:48 -07:00
snipe
63a2727077
Fixed #6323 - typo in link for low inventory
2018-10-11 15:29:38 -07:00
Ivan Nieto
5516978f2e
#5696 proposed fix ( #6314 )
...
* Another 'or' caught in a blade template
* Added the requireAcceptance() method in LicenseSeat.php. Changed the permission in checkout-license mail to view.
* Getting right the permission in the view checkout-license
2018-10-11 14:08:09 -07:00
Wes Hulette
19ee62f704
Fixed: Missing JS file import ( #6320 )
...
* Fixed missing oauth tables during setup.
* Fixed missing JS import
2018-10-11 13:51:37 -07:00
snipe
c7596e7741
Fixed image not uploading on asset create
2018-10-09 17:31:52 -07:00
Wes Hulette
d715ecf41d
Fixed: Tooltips ( #6309 )
...
* Fixed missing oauth tables during setup.
* Fixed missing tooltips
Updated spelling in bootstrap-table.blade.php to use bootstrap data element.
Using custom jquery-ui without tooltips to fix conflict issue.
* Removed custom jQuery ui file added fix in bootstrap.js file
2018-10-09 15:20:27 -07:00
Wes Hulette
6818901f7d
Fixed: Admin LTE left menu bar not working ( #6308 )
...
* Fixed missing oauth tables during setup.
* Updated per AdminLTE upgrade guide.
2018-10-09 15:20:12 -07:00
snipe
a516e4278e
Remove company select option if the user is not an admin and FCS is enabled
2018-10-05 07:30:42 -07:00
snipe
c21524f240
Fixed NaN when no asset tag is provided
2018-10-05 05:42:28 -07:00
snipe
ecb8204c3c
Associate serials with multiple asset creation
2018-10-05 05:30:13 -07:00
snipe
476b58632b
Handle array of asset tags
...
TODO: figure out how to display validation errors more sanely
2018-10-05 04:34:47 -07:00
snipe
d4a97d0431
Increase max fields in multi-asset creation
2018-10-05 04:18:06 -07:00
snipe
ade9a0c995
Removed server-side validation right now
...
Getting an unexpected keyword ‘export’ error. I’ll come back to this.
2018-10-05 03:47:58 -07:00
snipe
7e33051c7a
Remove console logging
2018-10-05 03:44:30 -07:00
snipe
4a448ba5f9
Increment tag based on first
2018-10-05 03:43:40 -07:00
snipe
8e90ed00d8
Added alt tags to logo
2018-10-05 03:43:16 -07:00
snipe
81d8c1cc52
Fixed remove-asset-tag javascript on asset edit, added server side validation support
2018-10-05 02:51:14 -07:00
snipe
4920dced6e
Enabled toggleDisabled on form validator
2018-10-05 01:12:14 -07:00
snipe
4a4fc38c43
Style updates
2018-10-05 00:57:18 -07:00
snipe
907d1d0f61
Validate if name is required
2018-10-05 00:46:27 -07:00
snipe
6f71abd0e0
Fixed improper html nesting
2018-10-05 00:45:58 -07:00
snipe
c1b0b8dee2
Move validator to main layout
2018-10-05 00:45:45 -07:00
snipe
a6449fa16e
Added jquery-form-validator
2018-10-04 23:50:57 -07:00
snipe
4cc1351bdd
More JS tweaks (WIP)
2018-10-04 23:37:52 -07:00
snipe
701beeac2a
Merge branch 'develop' into features/create_multiple_asset_tags_on_asset_create
2018-10-04 22:08:18 -07:00
snipe
6489081cd6
Pass variable to edit-form to determine whether we should have a top submit button
...
This is just so very short forms don’t look too silly
2018-10-04 21:19:25 -07:00
snipe
408f9978e9
More help text updates
2018-10-04 21:14:45 -07:00
snipe
db765e4a0b
Reformatted help popover
2018-10-04 20:51:50 -07:00
snipe
54d916fd05
Pulled “more info” popover header into translated string
2018-10-04 20:41:09 -07:00
snipe
8d680d071b
Create help translation file
2018-10-04 20:37:49 -07:00
snipe
252341fd5c
Pulled help icon text into its own blade
2018-10-04 20:35:07 -07:00
snipe
3843764d15
Added save button at top of form as well
2018-10-04 20:24:53 -07:00
snipe
accafbf1eb
Added basic JS to edit blade
2018-10-04 19:28:56 -07:00
snipe
0a72751b37
Fixed issue where admin users could disable activation when editing their own profile
2018-10-04 02:23:12 -07:00
snipe
7a44da85a0
Fixed issue where admin users could disable activation when editing their own profile
2018-10-04 02:18:20 -07:00
snipe
90b8acdd3b
Merge branch 'V5_cleanup_js' of https://github.com/jwhulette/snipe-it into jwhulette-V5_cleanup_js
...
# Conflicts:
# public/mix-manifest.json
2018-10-03 00:56:09 -07:00
snipe
c8bff3ef38
Features/add manager and dept to importer ( #6277 )
...
* Ignore the simlink for public storage
* Added manager and department to user import
* More UI importer tweaks
* Fisxed typos
2018-10-02 15:43:54 -07:00
Wes Hulette
1742867df1
Removed inline signature.css
...
Added to webpack
2018-10-01 08:20:31 -04:00
Wes Hulette
ce0a40a20c
Merge branch 'develop' into JS_Cleanup
2018-10-01 08:07:07 -04:00
snipe
79367642b1
[WIP] Added #5957 - Flysystem support ( #6262 )
...
* Added AWS url to example env
* Upgrader - added check for new storage path and attempt to move
* Ignore symlink
* Updated paths for models
* Moved copy methods
* Added AWS_URL support
For some reasin, Flysystem was generating the wrong AWS url (with a region included)
* Switch to Flysystem for image uploads
* Nicer display of image preview
* Updated image preview on edit blades to use Flysystem
* Twiddled some more paths
* Working filesystems config
* Updated Asset Models and Departments to use Flysystem
* Janky workaround for differing S3/local urls/paths
* Try to smartly use S3 as public disk if S3 is configured
* Use public disk Storage options for public files
* Additional transformer edits for Flysystem
* Removed debugging
* Added missing use Storage directive
* Updated seeders to use Flysystem
* Default logo
* Set a default width
We can potentially override this in settings later
* Use Flysystem for logo upload
* Update downloadFile to use Flysystem
* Updated AssetFilesController to use Flysystem
* Updated acceptance signatures to use Flysystem
* Updated signature view to use Flysystem
This isn’t working 100% yet
* Use Flysystem facade for displaying asset image
* Set assets path
Should clean all these up when we’re done here
* Added Rackspace support for Flysystem
* Added Flysystem migrator console command
* Added use Storage directive for categories
* Added user avatars to Flysystem
* Added profile avatar to Flysystem
* Added the option to delete local files with the migrator
* Added a check to prevent people from trying to move from local to local
* Fixed the selectlists for Flysystem
* Fixed the getImageUrl method to reflect Flysystem
* Fixed AWS copy process
* Fixed models path
* More selectlist updates for Flysystem
* Updated example .envs with updated env variable names
* *sigh*
* Updated non-asset getImageUrl() methods to use Flysystem
* Removed S3 hardcoding
* Use Flysystem in email headers
* Fixed typo
* Removed camera support from asset file upload
We’ll find a way to add this in later (and add that support to all of the other image uploads as well)
* Fixed path for categories
* WIP - Switched to standard handleImages for asset upload.
This is currently broken as I refact the handleImages method. Because the assets store/create methods use their own Form Request, the handleImages method doesn’t exist in that Form Request so it wil error now.
* Fixed css URL error
* Updated Debugbar to latest version (#6265 )
v3.2 adds support for Laravel 5.7
* Fixed: Missing CSS file in basic.blade.php (#6264 )
* Fixed missing CSS file in basic.blade.php
* Added
* Changed stylesheet import for authorize.blade.php
* Updated composer lock
* Added AWS_BUCKET_ROOT as env variable
* Use nicer image preview for logo upload
* Removed AssetRequest form request
* Removed asset form request, moved custom field validation into model
* Added additional help text for logo upload
* Increased the size of the image resize - should make this a setting tho
* Few more formatting tweaks to logo section of branding blade preview
* Use Flysystem for asset/license file uploads
* Use Flysystem for removing images from models that have been deleted
* Enable backups to use Flysystem
This only handles part of the problem. This just makes it so we can ship files to S3 if we want, but does not account for how we backup files that are hosted on S3
* Use Flysystem to download license files
* Updated audits to use Flysystem
2018-09-29 21:33:52 -07:00
Wes Hulette
fc8096f8dc
Fixed: Missing CSS file in basic.blade.php ( #6264 )
...
* Fixed missing CSS file in basic.blade.php
* Added
* Changed stylesheet import for authorize.blade.php
2018-09-29 14:15:25 -07:00
snipe
153a711de4
Fixed css URL error
2018-09-28 23:18:16 -07:00
Wes Hulette
c090a2f0b6
Fixed script imports in setup.blade.php
2018-09-28 17:28:49 -04:00
Wes Hulette
11f128a84f
Moved chart.js library into vendor.js
2018-09-28 17:28:49 -04:00
Wes Hulette
e80dfc886e
Added admin-lte-options file, moved pGenerator to main js file
2018-09-28 17:27:06 -04:00
Wes Hulette
b84eb836f4
Cleaned up JS
...
Removed unnecessary JS files
Moved JS to app & vendor, so neither file is so large, plus they can be downloaded concurrently.
2018-09-28 17:27:06 -04:00
Wes Hulette
ecf77e60df
Added: #6246 - CSS Cleanup ( #6247 )
...
* Streamlined CSS by using NPM
Removed unnecessary CSS files
Merged CSS files into one file
* Streamlined CSS by using NPM
Removed unnecessary CSS files
Merged CSS files into one file
* Removed override.less
* Moved bootstrap-color-picker css to file
Removed inline calls
* Changed css import on setup.blade.php
* Updated signature-pad.css import
* NPM Prod compile
* Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
snipe
a5abb3e6a6
Fixes #6252 - activated flag not checked when editing active user
2018-09-28 11:19:43 -07:00
snipe
ff824ec4db
Fixes #6252 - activated flag not checked when editing active user
2018-09-28 11:18:33 -07:00
Ivan Nieto
309f102745
Weird syntax in layout.blade.php. Change the use of 'or' operator to the null coalesce operator ( #6240 )
2018-09-26 22:33:34 -07:00
snipe
115f718cd9
Fix view if model doesnt have a manufacturer
2018-09-24 19:10:24 -07:00
Brady Wetherington
c97db3259f
Merge pull request #5913 from tilldeeke/refactore-checkout-checkin-notification-sending
...
Refactor: Decouple checkin/checkout notifications from logging
2018-09-21 18:18:27 -07:00
snipe
e45b4efa1a
Better info buttons on audit
...
TODO: translated strings instead
2018-09-07 18:08:18 -07:00
snipe
827295a989
Fixed tooltips
2018-09-07 05:39:56 -07:00
snipe
ff879e2018
Added the ability to update asset location when auditing - per #5854
2018-09-07 05:39:41 -07:00
snipe
e89b33f865
Enable popovers
2018-09-07 05:09:24 -07:00
snipe
77cdb2f409
Added console command to send inventory reports to users
2018-09-07 02:24:41 -07:00
snipe
84cc90e427
Added alt text to email headers
2018-09-05 18:57:36 -07:00
Wes Hulette
a865f79d5e
Fixed dashboard tables not showing data ( #6143 )
...
Needed data-pagination="true" set
2018-08-29 12:29:47 -07:00
Wes Hulette
bfb5920677
Added #5956 - Moved bootstrap-tables to npm ( #6139 )
...
Created single bootstrap-tables js and css file.
2018-08-28 13:10:27 -07:00
patrict
cf2d2ecdfc
Depreciation Report: ( #6135 )
...
* Added monthly depreciation column
* Right aligned amount column headings
* Added monthly depreciation heading text for en, en-GB & af
2018-08-28 12:40:06 -07:00
Dmitriy Minaev
bc8fa31eb2
Add depreciation with half-year convention. Fixed #1237 ( #6128 )
...
* Add half-year convention in depreciation for Models/Depreciable.php
* Add a setting for the depreciation method
* Integrate half-year convention inside working output
* fix: add more checks at Depreciable.php
* depreciation value rounding
* Codestyle fix
2018-08-28 12:32:46 -07:00
liquidhorse
678ba228cb
Fixed #6079 : QR Code unnecessarily squished. ( #6080 )
...
* Fixed 2D barcode from being squished unnecessarily when 1D barcode is omitted.
Added one character of whitespace for code readability.
2018-08-28 12:29:50 -07:00
snipe
0b8d70c7ec
Fixed #6124
2018-08-23 21:06:04 -07:00
snipe
522dc1db2a
Fixed #6124
2018-08-23 21:05:10 -07:00
snipe
f6971b8ab2
Fixed #6082 - don’t show expected checkin in email if none given
2018-08-16 14:30:06 -07:00
snipe
5294489b0e
Fixed HTML typo
2018-08-14 18:14:29 -07:00
Till Deeke
8648d53d25
Adds checkout acceptances
...
A checkout acceptance gets generated for every item that needs to be checked out. This resource tracks the user user who can accept the item and their signature
2018-08-06 14:47:26 +02:00
Till Deeke
830a6cf67e
Adds accepting/declining to new controller
2018-08-06 14:46:10 +02:00
snipe
1a660911e7
Check for minimum PHP version in setup
2018-08-02 21:36:18 -07:00
snipe
134bddf4c7
Fixed #6029 - model number not appearing in checkin/checkout emails
2018-08-02 11:43:11 -07:00
snipe
ffed306ecd
Removed old emaol templates ( #6026 )
...
Still testing this to make sure it doesn’t break anything else :)
2018-08-01 20:56:32 -07:00
snipe
6f8680efa6
Added external link formatter to BS tables
2018-08-01 18:01:31 -07:00
snipe
b2c99c88bb
Fixed #6028 - added supplier url to list view
2018-08-01 17:37:58 -07:00
snipe
a4019c9f63
NIcer UI for activated user + email credentials
2018-08-01 14:18:37 -07:00
snipe
694166862e
Added attempted logins admin screen ( #6018 )
...
* Added attempted logins admin screen
* Smaller table spacing
2018-08-01 03:51:59 -07:00
snipe
a209a92de8
Fixed #6011 - use correct file created at date
2018-08-01 02:43:08 -07:00
snipe
b1b5eeecba
Fixed #6013 - add accessory checkout notes to detail page
2018-07-31 16:00:38 -07:00
snipe
006a3adea0
Added ability to trigger forgotten password emails for users
2018-07-30 20:31:02 -07:00
snipe
b267b34762
Make sure there is a settings value
2018-07-25 19:02:35 -07:00
snipe
708b1a962c
Split out custom_css from custom_header
...
This makes it so that the custom_css will still be respected even if there is no custom header
2018-07-25 19:01:47 -07:00
snipe
a5daee811b
Split out custom_css from custom_header color
2018-07-25 19:00:03 -07:00
snipe
2e92ef7d77
Removed HTML colspan for bootstrap table in files display
2018-07-25 07:40:04 -07:00
Daniel Meltzer
64d649be7f
Monster: Cleanup/Refactor http controllers. ( #5916 )
...
* Extract a handlesimages trait to centralize logic for parsing/storing images on upload in create/edit methods.
* Use same image upload/layout in accessories as consum+components.
* Monster: Cleanup/Refactor http controllers.
This cleans up docblocks, pulls most non-crudy actions into their own
controllers, and does general cleanup/logic refactoring. There /should/
be no functional changes, but we all know how should works..
Extract checkin/checkout functions to a separate controller for accessories.
Move controllers to subdirectory.
Cleanup AssetModelsController
Extract component checkin/checkout
Assorted cleanups/doc/formatting in controllers.
Refactor LicenseController.
Refactor UsersController
Update viewassetscontroller.
* Codacy cleanups
* More codacy cleanups. Extract a LicenseCheckout Form request as well.
* A bit more refactor/cleaning of the license checkout method.
* Review Related Cleanups
* Fix most of the item_not_found translations. In many cases, the
string being generated did not even use the id parameter. Where it
does, pass it as id instead of as a different value.
* Remove some old $data arrays from when we manually sent emails from
the controllers. This has been superseeded by the notification system
(yay!)
* Bugfix: Only log the checkin of an accessory if the checkin completes sucessfully.
2018-07-24 19:35:26 -07:00
snipe
e320d2ba05
Fixed #5944 - added logo option for print-assets page ( #5950 )
2018-07-24 13:37:02 -07:00
snipe
376eb52f00
Fixed #5938 - added “self location edit” as permission
2018-07-24 12:42:16 -07:00
snipe
8ecceeacda
Fixed weird display for self options
2018-07-24 12:41:58 -07:00
Azerothian
66c3f5432d
implemented specific seat checkout ( #5887 )
2018-07-23 20:28:45 -07:00
snipe
bd581d01a3
Use full row width for image field
2018-07-19 10:40:07 -07:00
snipe
de2ebba577
Category add/edit UI tweaks
2018-07-19 10:40:07 -07:00
Sam
2a4fef6a61
adds select-id as an option for the asset-select partial. allows you to manually override the ID of an element. currently, the bulk-checkout partial has two asset-selects, with conflicting IDs. attempts to resolve #5882 ( #5883 )
2018-07-18 19:55:13 -07:00
snipe
9daeeeb851
Features/nicer notifications ( #5886 )
...
* Improved expiring licenses notification
* Improved expiring assets notification
* Nicee low inventory notification
* Refactored stupid language strings
* Oops
* Use settings variable
2018-07-18 19:15:45 -07:00
snipe
0f85d6810b
Added login log
2018-07-16 23:49:08 -07:00
snipe
bf761946da
Fix activated check for login
2018-07-16 23:48:46 -07:00
snipe
d9fa2f0e91
Fixed #5842 - added components to location detail view
2018-07-16 21:50:14 -07:00
snipe
a4799a495a
Fixes #5859 - add file name/size to file upload UI ( #5861 )
...
* Fixes #5859 - add file name/size to file upload UI
* Reverting assetcontroller
Not sure exactly what happened here…
* Production assets
2018-07-16 20:09:53 -07:00
Daniel Meltzer
638a7b2d91
Assetcontroller cleanup ( #5858 )
...
* Extract method/cleanup
* Remove apiStore method that is unusued since api controllers.
* Use proper model exception
* Remove old user importer. This is now supported by the general importer framework.
* Refactor AssetsController methods.
This is a giant diff without many functional changes, mostly cosmetic.
I've pulled a number of methods out of assetscontroller, preferring
instead to create some more targetted controllers for related actions.
I think this cleans up the file some, and suggests some places for
future targetted improvement.
Fix weird missing things.
* Fix Unit test failing after date changes.
* Pass valid string to be translated.
* Some method cleanup for codacy.
* Extract trait for common checkout uses and codacy fixes.
2018-07-16 17:44:03 -07:00
Daniel Meltzer
b6b93550fe
Remove old helpers ( #5843 )
...
* Cleanup model bulk-edit
Use the general partials where appropriate, as well as display a list of
what models we are editing in the bulk edit.
* Use new api based fetch/display for modal select2.
This is just copy/pasting the code currently because I'm not entirely
sure how the two pieces of code interact.
* Remove old helper functions that are no longer necessary with our populating of select2 dropdowns via ajax.
2018-07-16 14:22:25 -07:00
Till Deeke
240e642fe9
Removes the unused bulk operations for components ( #5840 )
2018-07-16 14:11:38 -07:00
Till Deeke
07a92d20d7
Fixing #5773 : Refactoring the "clearing" of select2 lists ( #5839 )
...
* adds select2 placeholders to select lists
To allow us to clear the selection on „select2“ selects, we need a placeholder attribute
See: https://select2.org/placeholders
* Removes empty option from multiple select
select2 requires an empty option value on singular selects, but not on multiple selects.
When selecting multiple options, this empty option would be shown as selectable otherwise, not clearing the selection.
* Adds the option to clear select2 instances
Sets the correct options to allow clearing of out select2 instances. The empty placeholder is required, since clearing only works when a placeholder ist set (event an empty one).
See: https://select2.org/placeholders
* Removes the „Clear selection“ option from select lists
Since we can clear the select2 lists with their native clearing method, we can remove this hack
* Updates generated assets (css/js)
2018-07-16 14:10:54 -07:00
Till Deeke
27699aa99c
Adds permission checks for custom fields and custom fieldsets ( #5645 ) ( #5795 )
...
* adds permission checks to custom fields
* adds permission checks to custom fieldsets
* adds separate permissions for custom fieldsets
* check for permissions in views
* Removes custom fieldsets from permissions config
* Proxy the authorization for custom fieldsets down to custom fields.
This allows us to use the existing permissions in use and have more semantically correct authorization checks for custom fieldsets.
* simplifies the authorization check for the custom fields overview
* removes special handling of custom fieldsets in base policy
I just realised that this code duplicates the logic from the custom fieldset policy.
Since we are checking for the authorization of custom fields anyway, we can just use the columnName for the fields.
* cleanup of unused imports
2018-07-12 18:28:20 -07:00
Jason
98b20fc1cd
Added option to include model information on asset labels. ( #5301 )
...
* Added option to include model information on asset labels.
Cleaned up label page to fix skewed label alignment on last row per page.
* Changes made per Snipe's direction
changed type from tinyint to boolean in DB
changed labels back to initials
2018-07-12 18:23:12 -07:00
snipe
0e88a6b268
Fixed bug in branding image upload size text
2018-07-09 19:04:18 -07:00
Till Deeke
c1e870528e
Fixes the label association ( #5510 ) ( #5790 )
2018-07-09 14:51:17 -07:00
snipe
35fc001c58
Fixed #5742 - create_function() is deprecated
2018-07-05 20:49:01 -07:00
snipe
339263a295
Fixed #5751 - added option for unique constraint on serial
2018-07-05 19:30:36 -07:00
snipe
f3526eccb9
Merge branch 'features/textarea-custom-field' into develop
...
# Conflicts:
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
2018-07-05 12:37:07 -07:00
snipe
8732f299e6
Added logo class for logo override in custom CSS
2018-07-02 18:47:30 -07:00
Arunas Skirius
b30aac536a
fixed the alignment of a couple navbar icons ( #5764 )
2018-07-02 18:10:25 -07:00
snipe
d7dc4ae0c0
Added manager to custom report
2018-06-27 00:45:09 -07:00
snipe
80dda198c5
Parse line breaks in the detail view
2018-06-21 09:44:10 -07:00
snipe
9442736518
Adds textarea as a custom field type
2018-06-21 09:35:04 -07:00
snipe
1ee394aa69
Added Select2 to class for dropdowns
2018-06-21 07:40:30 -07:00
Djamon Staal
32e3f748d8
Make version footer configurable. ( #5730 )
2018-06-21 07:12:16 -07:00
Richard Ray Thomas
e7bc18dad4
Fixed inconsistent or incorrect comment labels ( #5691 )
...
Accessories table was labeled 'Checked out License table' likely just a duplicate of the above comment for the actual licenses table. Very minor.
2018-06-11 20:11:58 -07:00
snipe
62e4eabab0
Fixed #5693 - don’t truncate license key
2018-06-11 18:47:02 -07:00
snipe
086683319a
Fixed #5172 - autosum on assets detail view for components tab
2018-06-02 06:21:51 -07:00
snipe
1a64879b65
Only allow remote user settings to be saved if the app is not in demo mode
2018-05-31 10:55:48 -07:00
snipe
01857fb056
Added created_at to file upload UI, added header/footer to files modal, fixed string for actions
2018-05-29 16:38:23 -07:00
snipe
3afe4938f9
Fixed #5616 - removed duplicate call to ekkoLightbox on asset view
...
It’s already in the default blade
2018-05-29 16:36:42 -07:00
snipe
9e0544e735
Fixed #5617 - incorrect url to fieldset editing
2018-05-29 10:41:46 -07:00
snipe
3993c6ad6b
Use custom header color in emails
2018-05-29 10:23:39 -07:00
Brian Monroe
649563457d
Added notes field to acessories and consumable checkout pages. Resolves request #5607 . ( #5608 )
2018-05-28 14:30:18 -07:00
snipe
15916e6668
Allow checkout to non-user objects even if the object requires checkout
2018-05-21 17:35:04 -07:00
Doeke Zanstra
f84ab2beda
Fixed bug #5540 ( #5550 )
...
Error message with button "Test LDAP" is empty #5540
2018-05-18 16:04:34 -07:00
lea-mink
233fb23cb8
Create asset maintenance - Added orange bar for required asset to edit view ( #5520 )
...
* Added orange bar for required asset to edit view
* disable redirection to asset maintenances view
* Update - disable redirection to asset maintenances view
2018-05-16 19:23:23 -07:00
Tim Bishop
1f299ed73e
Fix padding on next page with Chrome. ( #5509 )
...
It looks like Chrome (and probably other browsers) is optimising the
next-padding div out since it has no content. This means the margin
doesn't apply. Adding the nbsp, and making sure it takes up no space
itself, is enough to make the margin do the right thing.
I also tried using padding instead of margin, but this results in an
extra page at the end of the output (there'd need to be a way to stop
page-break and next-padding appearing at the end of the document). I also
tried setting a min-height on next-padding, but this had the same issue.
2018-05-09 17:00:36 -07:00
snipe
f405511b6b
Fixed #5501 - regression disallowing license files to be downloaded
2018-05-08 14:24:51 -07:00
snipe
cca97341e9
More flexible date range in datepicker for expected checkin filter on custom reports
2018-05-08 07:37:18 -07:00
snipe
13195d06fd
Fixed #5491 - added default location filter for custom report
2018-05-08 07:34:14 -07:00
snipe
65cf7527b0
Added model name to expected checkin reminders
2018-05-08 05:59:34 -07:00
snipe
28e7ca5a84
Formatting tweaks to email notifications
2018-05-08 05:39:11 -07:00
snipe
8f64da5bc7
Added admin alert on expiring notifications
2018-05-08 05:27:03 -07:00
snipe
e56a46882d
Include EULA/acceptance in license interfaces
2018-05-08 03:47:28 -07:00
snipe
47a0400a72
Fixed comment typo
2018-05-08 03:14:25 -07:00
snipe
83b546c1c5
Disable privacy policy link in footer if in demo mode
2018-05-08 01:07:15 -07:00
snipe
04709dc1df
Fixed #5477 - added GDPR privacy policy link in email and webpage
2018-05-08 00:50:13 -07:00
snipe
f48171dcab
Add category to licenses
2018-05-08 00:14:38 -07:00
snipe
7b8362b64c
Added license categories
2018-05-04 21:01:38 -07:00
snipe
3a1b432234
Fixed #5472 - show_in_email for custom fields missing in edit field UI
2018-05-03 08:06:28 -07:00
snipe
0be69f57ac
Improved files display
2018-05-02 14:13:06 -07:00
snipe
3662a58ad8
Removed unusued parameters in BS table formmatters
2018-05-01 21:35:07 -07:00
snipe
c8cf46f62b
Fixed #5431 - category widget error on dashboard
2018-05-01 21:33:03 -07:00
snipe
71708e349c
PHP7.2 count fixes ( #5427 )
...
* PHP 7.2 count() fixes
* Re-enable php travis 7.2
2018-04-29 06:10:49 -07:00
snipe
d6d498bc8f
Fixes incorrect gate for “new” button for status labels on asset create/edit form
2018-04-26 16:35:08 -07:00
snipe
e5121b33e6
Shorter syntax for demo disabled
2018-04-25 19:23:03 -07:00
snipe
5fb4eacf5b
Disable history importer on the demo
2018-04-25 19:18:05 -07:00
Hannah Tinkler
c4c520c1a3
Fixes #4445 : prevents assigned assets from being checked out in bulk checkout ( #5421 )
...
* Fixes #4445 : prevents assigned assets from being checked out in bulk checkout
* Updates data attribute to more versatile 'data-asset-status-type'
* Fixes broken unit test
2018-04-25 02:39:23 -07:00
snipe
a2fef11016
Use Bootstrap Tables on custom fields screens for column selector
2018-04-24 16:25:10 -07:00
snipe
5acd225f0f
Fixed #5423 - removed required text on preflight
2018-04-24 12:48:58 -07:00
snipe
1ef4cc9fc2
Fixed #4301 - added image upload to audit
2018-04-24 02:54:54 -07:00
lea-mink
c8cbc55b59
Bulk Checkout to Assets and Location ( #5385 )
2018-04-23 21:24:49 -07:00
Hannah Tinkler
8d501e1c24
Feature/custom fields default values ( #5389 )
...
* Fixes CustomFieldsetsController::fields() which I think is not used anywhere else and don't think ever worked as you can't call get() on a Collection.
Have tested extensively and doesn't seem to affect anywhere else?
* Adds default value functionality
* Adds built assets
* Fixes assignment to asset_model_id which should have been evaluation and alters route so it sits more in line with existing work
* Updates built assets
* Remove silly docker.env file; fix Dockerfile to preserve Oauth keys (#5377 )
* Added department to custom asset export
Updates build assets
* Adds translation support for 'add default values' checkbox label
2018-04-23 21:16:55 -07:00
lea-mink
16a7409ce1
Matched Asset currency and Asset Maintenance currency in Asset Maintenance view ( #5386 )
...
* Matched Asset currency and Asset Maintenance currency in Asset Maintenance editing view
* Cleaning code & add condition on currency of an asset location
2018-04-20 14:03:31 -07:00
snipe
5948a0b235
Added department to custom asset export
2018-04-16 20:10:38 -07:00
Hannah Tinkler
48254a93f0
Fixes #5338 - mark required setup fields during setup ( #5359 )
2018-04-13 14:52:32 -07:00
snipe
365c8c18d7
Fixed #5319 - signature pad too small on mobile
2018-04-06 19:19:31 -07:00
snipe
bbc0695a8f
Added count of checkins, checkouts, requests ( #5314 )
...
* Added count of checkins, checkouts, requests
* Removed old commented items
* Use actionlog instead of redefining the relationship
2018-04-06 16:23:39 -07:00
snipe
1d0f8f01f2
Fixed #5266 - small scroll window for EULA accept screen
2018-04-06 15:50:45 -07:00
snipe
2253439940
Added default location/address to custom report
2018-04-05 17:33:25 -07:00
snipe
8a6713d5c0
WIP - Improved requested assets ( #5289 )
...
* WIP - beginning of improved requested assets
- Use Ajax tables for faster loading
- Use new notifications for requesting an asset
TODO:
- Use ajax tables for requestable asset models
- Use new notifications for canceling an asset request
- Expire requests once the asset has been checked out to the requesting user
* Only show asset name in email if it has one
* Refactor requested method to only include non-canceled requests
* Refactored requestable assets to log request and cancelation
* Added softdeletes on checkout requests
* Differentiate between canceling and deleting requests
* Added asset request cancelation notification
* Added timestamps and corrected unique key on requests table
* Improved requests view
* Re-use blade for cancel/request email
* Refactored BS table formatter for requested assets
* Location name min reduced to 2
* Added PAT test as maintenance option
This needs to be refactored into database-driven options with a UI
* Better slack message
* Added getImageUrl method for assets
* Include qty in request notifications
TODO:
- Try to pull requested info from original request for cancelation, otherwise it will default to 1
* Removed old asset request/cancel emails
* Added user profile asset request routes
* Added profile controller requested assets method
* Added blade link to requested assets for profile view
* Sort user history desc
* Added requested assets blade
* Added canceled at to checkoutRequest method
* Include qty in request
* Fixed comment, removed allowed_columns
* Removed Queable methods, since we don’t use a queue
* Fixed return type in method doc
* Fixed version number
* Changed id to user_id for clarity
2018-04-04 17:33:02 -07:00
snipe
116cad88a0
Fixed #5279 - [regression] edit button not appearing in asset view
2018-03-29 11:28:37 -07:00
snipe
115d6e29df
Added location address to custom asset report export
2018-03-26 15:59:09 -07:00
snipe
0134ec7b04
Added asset presenter, fixed asset maintenances button in asset view
2018-03-26 14:49:49 -07:00
snipe
46f5f21368
Notification improvements ( #5254 )
...
* Added “show fields in email” to custom fields
* Added “show images in email” to settings
* Added nicer HTML emails
* Break notifications out into their own, instead of trying to mash them all together
* Remove old notification for accessory checkout
* Janky fix for #5076 - “The asset you have attempted to accept was not checked out to you”
* Add method for image url for accessories
* Added accessory checkout email blade
* Make accessory email notification on checkout screen consistent with assets
* Added native consumables notifications
* Fixes for asset notification
* Updated notification blades with correct-er fields
* Updated notifications
* License checkin notification - does not work yet
Need to figure out whether the license seat is assigned to a person or an asset before we can pass the target
* Added alternate “cc” email for admins
* Only try to trigger notifications if the target is a user
* Fix tests
* Fixed consumable URL
* Removed unused notification
* Pass target type in params
* Show slack status
* Pass additional parameters
There is a logic bug in this :( Will send to slack twice, since the admin CC and the user are both using the same notification. Fuckity fuck fuck fuck.
* Pass a variable to the notification to supress the duplicate slack message
* Slack is broken :( Trying to fix
Will try a git bisect
* Put preview back into checkout
* Pulled old archaic mail
* Removed debugging
* Fixed wrong email title
* Fixed slack endpoint not firing
* Poobot, we hardly knew ye.
* Removed old, manual mail from API
* Typo :-/
* Code cleanup
* Use defined formatted date in JSON
* Use static properties for checkin/checkout notifiers for cleaner code
* Removed debugging
* Use date formatter
* Fixed target_type
* Fixed language in consumable email
2018-03-25 13:46:57 -07:00
snipe
04af1f3c97
Moved remote user stuff below password security stuff
2018-03-22 14:00:35 -07:00
David Kaatz
53735f2026
Authentication via REMOTE_USER (clean repull) ( #5204 )
...
- Implementation in Login
- Configuration
- Database migration
2018-03-14 12:48:07 -07:00
snipe
c4db8d37c2
Fixed #5168 - users without superadmin could not see custom fields UI even if granted
2018-03-07 13:37:37 -08:00
snipe
1e22b8e567
Fixed #5138 - added default_label flag to status labels
2018-03-05 22:04:16 -08:00
snipe
36cd63836e
Fixed #5151 - added asset tag to maintenances
2018-03-05 16:26:40 -08:00
snipe
f7784b6543
Fixed #2402 - add ability to restore manufacturers
2018-03-03 18:46:19 -08:00
snipe
06805d70fe
Fixed incorrect settings HTML
2018-03-03 17:07:28 -08:00
fordster78
68a9855506
New First Admin Notification ( #5147 )
...
* New First Admin Notification
* Include Last name in Welcome and First admin Notifications
2018-03-03 14:37:42 -08:00
fordster78
688a3251a9
New Welcome Notification ( #5146 )
...
* New Test Notification
Created Test Notification.
Updated Vendor Mail message.blade files.
Updated api settings controller to use Notification Façade.
* Add show URL in Emails condition
* New Welcome Notification
2018-03-03 12:44:41 -08:00
snipe
41a9e5f710
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2018-03-02 18:01:41 -08:00
snipe
31790e0bb7
Tweaks to theme settings
2018-03-02 18:01:36 -08:00
fordster78
4e0c8e218d
New Test Notification ( #5137 )
...
Created Test Notification.
Updated Vendor Mail message.blade files.
Updated api settings controller to use Notification Façade.
2018-03-02 18:01:20 -08:00
Geoff Young
4fe4c0c72a
Add viewKeys permission check on Asset page ( #5141 )
2018-03-02 18:00:22 -08:00
snipe
f171357e36
Removed unused skin files, added skin setting option
2018-03-02 17:50:40 -08:00
snipe
b4f704d7f1
Fixed 2FA reset button
2018-02-26 15:43:49 -08:00
snipe
0e48837eec
Fixed assets checked out to assets listing table
2018-02-23 05:53:00 -08:00
snipe
103974cae4
Fixed statuslabel detail view table
2018-02-23 05:09:14 -08:00
snipe
bfb11d249e
Tweaked slack test UI
2018-02-22 21:47:48 -08:00
snipe
e3144c3093
Added Slack test button
2018-02-22 16:35:34 -08:00
snipe
e01f1ae8ed
Partial fix for #2892 - Added export for license seat assignments
2018-02-21 17:28:55 -08:00
snipe
f8151284ee
Fixed - removed extra components table
2018-02-21 16:20:46 -08:00
snipe
5d8c91b687
Fixed regression - Added sum footer back into accessories
2018-02-21 15:54:16 -08:00
snipe
ca50ea190f
Applied master changes to develop
...
Wrong branch :(
2018-02-21 15:51:04 -08:00
snipe
6ffad6043f
Fixed issue where bootstrap tables didn’t use a default page size
2018-02-21 05:44:41 -08:00
snipe
f5e51897e3
Added - sort by color on status labels
2018-02-21 05:29:50 -08:00
snipe
0cf9cdd3b1
Make department columns sortable
2018-02-21 05:04:20 -08:00
snipe
d28c2af7de
Fixed bootstrap table issue if per page was set to 10
2018-02-21 04:41:44 -08:00
snipe
f7eb013935
Reverse order on activity report
2018-02-20 15:42:44 -08:00
snipe
1c28f893e7
Fixed #5027 - remove link to non-existant reports page
2018-02-20 14:44:29 -08:00
snipe
d2403cdadb
Added image preview for uploads
2018-02-17 00:51:22 -08:00
snipe
502e4d672a
Use image upload partial in asset edit/create
2018-02-16 22:08:49 -08:00
snipe
b3d673b0aa
Fixed #5037 - use line breaks in notes in table view
2018-02-16 21:38:56 -08:00
snipe
d8fc50c351
Fixed #5033 - use PHP’s max filesize for image uploads
2018-02-16 21:17:41 -08:00
snipe
ba5057181e
Check for model in asset view
2018-02-16 18:04:11 -08:00
snipe
3744a68daf
Features/better table options ( #5018 )
...
* Added CSS for table toolbar
* Use maintenances API for table listings
* NIcer layout for allowed_columns in maintenances API
* Fixed #5014 - bootstrap cookie issues
* Fixed #5015 - bug when saving settings
* Refactored datatable code to use data attributes
* Updated dashboard with new table code
* Added - Order by group user count
* Updated groups to use new table attributes
* New license listing table code
* More bootstrap table implementations
* More BS table refactoring
* Improved bootstrap assigned assets
* New bootstrap for reports
* Misc BS fixes
* FIxed small issue with asset history display
* Removed multisort option
* JS refactor
2018-02-16 13:22:55 -08:00
dl1l
c209b7bb5d
Update edit.blade.php ( #5019 )
2018-02-15 14:59:54 -08:00
snipe
0d11e32523
Fixed issue where group with no permissions would crash view page
2018-02-13 17:14:30 -08:00
Sean McIlvenna
cc5d36f8be
Addng "Category" column to "view assets" and re-organizing columns ( #4970 )
2018-02-05 17:36:35 -06:00
snipe
813106efd3
Default to only changing default location in bulk edit
2018-02-02 09:42:34 -06:00
snipe
08d129c2ea
Fixed #4951 - updating asset location in bulk edit
2018-02-02 09:36:40 -06:00
snipe
d86fb098a8
Fixed sort ordering on dashboard
2018-02-02 09:31:43 -06:00
snipe
b3a6ec2804
Fixed #4938 - default sort order
2018-02-01 17:17:56 -06:00
snipe
2f9fff7130
Do not try to show depreciation report if no depreciations are set up
2018-01-25 13:16:49 -06:00
snipe
76f52dd89b
Fixed #4872 - Check for assigned in depreciation table
2018-01-25 11:02:46 -08:00
snipe
eddcc0fbbd
Fixed cookie issue on hardware
2018-01-24 14:23:19 -08:00
snipe
739d3c72b7
Fixed #4902 - include last name in checkin email
2018-01-24 10:59:34 -08:00
snipe
60c38a0c47
Added setting to choose what appears in model select list - Fixes #4879
2018-01-24 10:43:46 -08:00
Tim Bishop
bc14f225af
Only use location currency if it's actually set. ( #4904 )
...
This changes the depreciation report to only use the currency on a
location if it's actually set to something. Previously, if an asset had
a location it would use the currency even if it was blank rather than
falling back to the default.
2018-01-24 08:55:51 -08:00
snipe
765295136a
Added - ability to add custom footer text, hide user’s manual/support links
2018-01-24 07:02:30 -08:00
snipe
7579333ad3
Disallow LDAP settings if in demo mode
2018-01-24 05:50:31 -08:00
snipe
543ea28b72
Added qty to asset components - fixed #4876
2018-01-24 05:25:01 -08:00
snipe
fefd6d60f6
Fixed #4899 - sorting in user history
2018-01-24 04:48:00 -08:00
snipe
a7b8b4bf55
Added: ability to change actual location from bulk edit assets
2018-01-24 04:38:25 -08:00
CronKz
dcc379c3fa
Adding missing translations. ( #4896 )
2018-01-23 18:13:55 -08:00
vcordes79
f4e9d245d0
Status labels ( #4895 )
...
* fix statuslabels
* fix statuslabels
2018-01-23 18:08:54 -08:00
snipe
c75a2051ff
Hide mfg button if no permissions to create
2018-01-22 14:02:23 -08:00
CronKz
691ec164b1
Added Translations ( #4880 )
2018-01-22 13:14:52 -08:00
snipe
99e55f84f0
Fixed misc UI permissions elements
2018-01-20 04:39:31 -08:00
Brady Wetherington
dfb2b9b569
Major overhaul for modals, and a fix for #4820 ( #4866 )
...
Changes how the various modals work, and allows for specifying
category_type when inline-creating categories.
2018-01-20 00:42:29 -08:00
snipe
5d4bbc393e
Fixed #4837 - link phone numbers
2018-01-20 00:20:45 -08:00
snipe
6eb8acf319
Swich to panel box for dashboard message
2018-01-19 20:49:02 -08:00
snipe
95a9742571
Fixed #4768 - adds dashboard message option to settings
2018-01-19 20:43:55 -08:00
snipe
782813ab49
Check for valid category before checking acceptance
2018-01-19 18:17:23 -08:00
snipe
2a959edeba
Added - Setting to allow archived assets in List All
2018-01-17 19:18:48 -08:00
fordster78
138313dcb9
Setup changes ( #4813 )
...
* Add Asset Tag settings to Setup
* Add Locale Settings to Setup
* Add multiple company support to setup
* Changed the locale label name from 'site_name' to locale
Added default value for language to 'en' and multiple companies support
to 0 (false)
Switched out the old Input facade to the preferred $request->input
method for the setup page.
2018-01-17 10:58:03 -08:00
snipe
24b356dba4
Fixed typos in default blade that cause components to not show up for non-superadmins
2018-01-17 06:27:23 -08:00
snipe
409f5cc4fd
Added - display asset model category on hardware view page
2018-01-16 16:26:24 -08:00
snipe
3b5e4c44eb
Fixed depreciation report not showing assigned to
2018-01-16 07:46:34 -08:00
snipe
69a7ea63e2
Pass nopages to dashboard stuff
2018-01-16 07:37:20 -08:00
snipe
aac379daeb
If nopages is passed, hide page numbers
...
This seems weird since we’re checking for a negative, but there are only a few spots where we wouldn’t want page numbers, namely the dashboard sruff
2018-01-16 07:37:06 -08:00
snipe
66a590b774
Account for user’s that have been deleted in the requested list
2018-01-16 07:36:03 -08:00
snipe
dc4472e9e9
Misc export table fixes
2018-01-15 21:03:46 -08:00
snipe
6bfd428c2e
Use real status label names, even if deployed
2018-01-15 21:03:26 -08:00
snipe
f4623bd277
Add user group membership to user view page
2018-01-15 20:31:10 -08:00
snipe
68f1fa0340
Added - ability to sort by asset count in models
2018-01-11 15:21:51 -08:00
snipe
a4b32e2328
Improved - use presenters on model detail
2018-01-11 15:17:10 -08:00
snipe
d109ca30e2
Improved - allow searching on most detail views with additional tables
2018-01-11 15:16:53 -08:00
snipe
a4ac53e2e9
Improved - Using presenters for column headers in location detail
2018-01-11 15:16:09 -08:00
snipe
0789eb8b07
Improved - using presenters for column headers in manufacturer detail
2018-01-11 15:12:48 -08:00
snipe
7f674fdd35
Require implicit search
2018-01-11 13:18:06 -08:00
snipe
500aa37e3c
Fixed switchable attributes on table headers
2018-01-11 13:17:55 -08:00
snipe
55b9f1207d
Updated bootstrap tables
2018-01-10 22:53:54 -08:00
snipe
c31362655c
Refactored BS tables include for clearer separation of simple v not simple
2018-01-10 20:34:36 -08:00
snipe
c6a956382f
Fixed #4784 - cookie not always being set correctly for ajax tables
2018-01-10 20:04:41 -08:00
snipe
bab0bda174
Added custom formatter for license seats (WIP)
2018-01-10 18:58:55 -08:00
snipe
bb52a8417c
Switch view code to AJAX table
2018-01-10 18:58:41 -08:00
snipe
254234b0dc
Fixed #4787 - don’t try to display category if it is invalid
...
This shouldn’t be needed, but in case data got weird (manual editing, etc)
2018-01-10 06:33:59 -08:00
snipe
e6259eb6e1
Fixed #4774 - show assets assigned to assets in asset view
...
Todo: Fix text search on the asset to asset tab. It’s currently broken so I’ve disabled it.
2018-01-10 05:44:11 -08:00
snipe
eeb3d1eb42
Use language strings for tab text
2018-01-10 05:42:34 -08:00
snipe
79295f6434
Use dataTableLayout for table
2018-01-10 05:33:45 -08:00
snipe
285e4e2e52
Allow bulk language update in user edit
2018-01-10 05:33:26 -08:00
snipe
5587b64d64
Fixed #4770 - broken licenses, etc on company view, added users and components
2018-01-10 03:52:21 -08:00
snipe
f0f2a5aa67
Workaround for #4784 - make changes tab always visible
...
Not sure why the cookie isn’t cookie-ing
2018-01-10 01:56:24 -08:00
Brady Wetherington
061317866b
Changes to Models in the asset-edit screen maintain chosen values ( #4781 )
...
Fixed for #2195
2018-01-09 23:45:20 -08:00
snipe
0abab2107c
Fixed #4779 - show selected filename on filepicker
2018-01-09 20:12:07 -08:00
snipe
afc7116260
Fixed #4778 - added notes to asset model view
2018-01-09 20:00:06 -08:00
Geoff Young
0b3d2b46e0
Add attributes to delete asset file button ( #4336 )
...
This adds attributes to the delete file buttons on the View Asset page.
The attributes will fill the confirmation modal that prompts users
before deleting. They also activate a tooltip on the button.
2018-01-03 17:25:50 -08:00
snipe
8864f81402
Fixed manufacturer error on printable user page
...
Manufacturer is not required for accessories, so need to account for that
2017-12-26 16:49:01 -08:00
snipe
71ba1af647
Fixed button class on asset view
2017-12-26 16:48:28 -08:00
snipe
37d4cf3afb
Fixed #4647 - requestable model button not clickable
2017-12-19 20:48:26 -08:00
snipe
b716db225f
Added “new” buttons for manufacturer and category in asset model creation
2017-12-19 20:30:46 -08:00
snipe
fbe093705d
Fixed #4640 - add username to user detail
2017-12-19 13:42:34 -08:00
snipe
608bb1b5b1
Fixed #3416 - bulk delete asset models
2017-12-12 09:10:05 -08:00
snipe
1d82f80e73
Improved - used “checked out to” string in asset model listing to reflect new polymorphic options
2017-12-12 07:20:06 -08:00
snipe
e21fa37254
Added - bulk actions to model asset listings
2017-12-12 07:15:51 -08:00
snipe
4ce91a4f5d
Fixed namespace gate for components - related to #4282
2017-12-12 06:26:37 -08:00
snipe
aff93d8f2b
Fixed #4589 - Licence deployed to asset issue
2017-12-12 05:43:06 -08:00
snipe
e4ab4024c5
Added - changelog searchable in history tab
2017-12-12 05:10:13 -08:00
snipe
612f23f6e0
Added #2893 - track changes on asset edits
2017-12-12 04:59:28 -08:00
snipe
1d543f83d4
Added line spacing between unstyled lists
2017-12-12 04:31:53 -08:00
snipe
c816870083
De-norm last audit date so we can display it in the asset listing
2017-12-12 03:03:43 -08:00
snipe
d91e8bfee5
Fixed select2 on setup
2017-12-12 02:31:36 -08:00
snipe
2b3e5c8800
Moved “deleted” alert banner higher on page
2017-12-12 02:31:26 -08:00
snipe
557714e7b7
Fixed #2810 - checkin fix for licenses
2017-12-08 13:19:10 -08:00
snipe
a062769672
Check for array key before checking selected state
...
This is necessary for pre-created groups that don’t have all keys present
2017-12-07 13:21:30 -08:00
snipe
023910472c
Fixes #2415 - only allow gif, png jpg, svg image uploads
2017-12-06 14:33:52 -08:00
snipe
dfb0c09c51
Fixed #4581 - renamed print method
2017-12-06 11:17:42 -08:00
snipe
3d0525bc51
Removed debugging info
2017-12-05 18:11:59 -08:00
snipe
808cd0f728
Nicer groups permission edit UI
2017-12-05 18:11:06 -08:00
snipe
f5b3df697c
Better select/unselect all javascript for permissions
2017-12-05 18:10:35 -08:00
snipe
ec131a7416
Updated account licenses
2017-12-05 16:27:02 -08:00
snipe
3da49ceb60
Standardize hidden key format
2017-12-05 16:26:39 -08:00
snipe
60f6895919
Remove version from asset table to persist column selections
2017-12-05 14:50:38 -08:00
snipe
deba4d2b81
Added consumables tio printable output
2017-12-05 12:37:42 -08:00
snipe
a8cc29f062
Added #2562 - print view of all assigned inventory
2017-12-05 12:34:16 -08:00
snipe
7efa7ec03f
Starter print template for all assets assigned to a user
2017-12-05 01:55:24 -08:00
snipe
174e3e720a
Fixed #4521 - profile location not selected
...
This is kind of a janky way to handle this - I created a new dropdown select, instead of adding even more convoluted code to the partial. The reasoon for this is because there may be situations where $user is passed in *addition* to $item, and we don’t want to erroneously use that location if we’re not supposed to be.
2017-12-04 20:30:57 -08:00
snipe
912ee20f3c
Better supplier/location flow for suppliers/locations without data
2017-12-01 21:58:00 -08:00
snipe
f2d25ff777
Added device image to supplier
2017-12-01 21:06:36 -08:00
snipe
dec9d959db
Added additional user/asset fields to location view
2017-12-01 21:06:16 -08:00
snipe
c6b02cdc02
Location layout tweaks
2017-12-01 20:35:15 -08:00
snipe
f0c825a9b3
Improved suppliers view (use ajax tables)
2017-12-01 20:29:51 -08:00
snipe
79c035da11
Added map alt tag
2017-12-01 20:29:04 -08:00
snipe
cbc09f3a12
Fixes #4508 - adds image to location view (and google map, if address and API key exist)
2017-12-01 19:12:35 -08:00
snipe
22c4d79cfb
Fixed #4345 - Disallow future date for checkin date, disallow past date for expected checkin
2017-12-01 17:52:56 -08:00
snipe
71b9a15c9c
Moved User menu down
2017-12-01 17:50:01 -08:00
snipe
db328e1ce5
Fixed granular hash resetting cookie
2017-12-01 17:49:44 -08:00
snipe
a5bcf53146
Pass $required variable to display requiredness
2017-12-01 16:51:22 -08:00
snipe
9f97b4aefd
Added created_at status, and manufacturer filter to custom report
2017-12-01 16:50:56 -08:00
snipe
62468199af
Wider column for checkboxes
2017-12-01 16:50:16 -08:00
snipe
c220315cb0
Check if item is set before trying to look up selected
2017-12-01 16:49:51 -08:00
snipe
14874d8e8a
Fixes #4495 - missing field in Download CSV, added filter options on custom report
2017-12-01 14:47:52 -08:00
snipe
ff793f1cb5
Added variable to determine if “new” modal button should be displayed
2017-12-01 14:37:11 -08:00
snipe
500f6d7baf
Set requiredness of select2 ajax fields
2017-12-01 14:36:27 -08:00
snipe
e9fdf06bf6
Improved display of asset status and meta status
2017-11-30 16:40:37 -08:00
snipe
0a5b72e71e
Fixed #4517 - order number not visible if no purchase cost given on asset view
2017-11-30 16:39:59 -08:00
snipe
ece8ae3adc
Fixed #4542 and #4482 - default asset location not updating on biulk edit
2017-11-30 13:31:46 -08:00
snipe
92afd5f232
Removed debugging console code
2017-11-30 11:48:59 -08:00
snipe
cdfd720c65
Fixed custom fields edit behavior with cutom format always selected
2017-11-27 22:10:46 -08:00
snipe
31a967e072
Use general order_number string to mean order number
2017-11-27 21:16:51 -08:00
snipe
0b56ebf291
Fixed radio button selector to provide correct default value in checkout
2017-11-27 21:16:25 -08:00
snipe
77076e02e8
Fixed - mark supplier as requried in maintenance
2017-11-22 15:22:44 -08:00
snipe
c6a761a5ad
Fixed - supplier is not required on asset creation/edit
2017-11-22 15:20:46 -08:00
snipe
980be65193
Added ability to turn items on/off in checkout-selector
2017-11-22 07:07:18 -08:00
snipe
964c594c4c
Added ItemFormatter for acrtivity report
2017-11-22 06:21:06 -08:00
snipe
9430c4bf43
Added sanity checks in BS tables formatter
2017-11-22 06:20:51 -08:00
snipe
538757317b
Fixed #4411 - broken activity report if purge didn’t remove relationship entries
2017-11-22 06:20:28 -08:00
snipe
d98d06377e
Fixed #4098 - autolink URL and email addresses in listing
2017-11-21 22:34:53 -08:00
snipe
0adebd1ec8
Add sorting and additional category types to dashboard categories
...
BREAKING CHANGE: Category type now reports as `category_type`, instead of `type`
2017-11-21 20:33:30 -08:00
snipe
f4aa812d96
Changed twitter handle to @snipeitapp
2017-11-21 19:02:15 -08:00
snipe
4696e799ed
Fixes #4491 and #4483 - handle pre-selected asset on checkout, better checkout-to selection UI ( #4501 )
...
* Added form checkout selector partial
* Stupid stash
* Added radio button checkout selector javascript
* New compiled production assets
* Added $style override in form partials for select2 ajax lists
* Added checkout-to radio button selector
TODO: Fix for accessibility - currently cannot tab-select this radio button
* Added new checkout-to selector to hardware edit
* Added new checkout-to selector to asset checkout form
* Refactored postCheckout to use radio button submission
This defaults to user checkout if nothing is passed for some reason
* Better visual feedback on whether or not an asset is deployable in edit screen
2017-11-21 15:58:31 -08:00
snipe
38eb16dfea
Fixed #4408 - requestable assets not working
2017-11-16 11:09:24 -08:00
snipe
edcd3afc3e
Fixes #4457 - use un-escaped CSS for custom CSS styles
...
We are already escaping the CSS in the show_custom_css() method
2017-11-15 14:27:21 -08:00
snipe
0396267388
Fixed #4412 - use select2 ajax list for asset maintenances
2017-11-12 17:22:16 -08:00
snipe
65bd33c274
Make sure the user isn’t deleted before trying to display the name
2017-11-09 14:42:03 -08:00
snipe
566fd4d2e1
Only format purchase date if one exists
2017-11-09 11:06:37 -08:00
madd15
172c7c75a8
Fixed #4374 - Add option to display company names to labels ( #4405 )
...
* Migration - Labels Display Company Name setting
* Add Company Name to Labels
Add company name if it is turned on in settings and asset has a valid company
* Add Company Name checkbox to Label settings
* Add Company Name Lang
* Add display company name to postLabels
* Revert Add Company Name Lang
* Fix display company name in postLabels
* Change tinyInt to boolean for display company name
* Simplify checking for company and getting the name
* Change to square brackets for array notation
* Move divs inside if statements on optional fields
2017-11-08 20:05:39 -08:00
snipe
65353fa422
Nicer styling for purchase cost in edit form
...
Made it more consistent with the warranty months foeld below it
2017-11-08 18:06:51 -08:00
snipe
4f4920615c
Format expected checkin as Y-m-d in form
2017-11-08 18:06:14 -08:00
snipe
ffae537400
Check that the models are valid being trying to return a value in the ajax partials
2017-11-08 17:07:57 -08:00
snipe
5ce7882bf5
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-11-08 17:01:50 -08:00
snipe
b36594f508
Check that the company is valid in select ajax
2017-11-08 17:01:46 -08:00
madd15
59c9c22a59
Small UI Changes ( #4404 )
...
* Small ui change to settings nav
* Remove min-height
Removed min-height from Assets by Status
* Add min-height to box-body
2017-11-08 13:12:03 -08:00
snipe
b567ffdcfe
Fixed #2855 - checkin for components
2017-11-08 06:06:05 -08:00
snipe
9d44607b8f
Added UI fade out when bootstrap alerts are dismissed
2017-11-08 03:13:18 -08:00
snipe
35ee52212f
Added ability to disable the alert icon in the top menu
2017-11-08 03:08:17 -08:00
snipe
6c130ce8ac
Apply patch #4354
2017-11-08 02:46:33 -08:00
snipe
fb6a545cc6
Slightly nicer styling
2017-11-08 02:11:33 -08:00
snipe
e5c1e41966
Nicer icheck for user menu
2017-11-08 01:52:35 -08:00
snipe
61617a2629
Slightly less fugly groups permission styling
2017-11-08 01:19:20 -08:00
snipe
0589652edb
Fixed #4392 - select2 + fastclick incompatibility
...
This is a workaround fix - should upgrade both to latest after testing extensively
2017-11-06 17:17:48 -08:00
snipe
b96d4dcf1f
Don’t show ANY in custom regex field if empty
2017-11-06 16:43:27 -08:00
snipe
8e17714c12
Fixed #4384 - bulk checkout of assets
2017-11-06 12:19:22 -08:00
snipe
32fc052c3b
Fixed #4391 - companies now listing correct assets
2017-11-06 12:01:54 -08:00
snipe
8572a9771b
Only return location name if find is valid
2017-11-06 10:55:20 -08:00
snipe
04ab522ee3
Fixes #4236 - validate the regex custom validation ( #4380 )
...
* More helpful text on how the custom validator works
* Clarified language of custom format, fixed regex example
* Fixed regex example in placeholder
* Added comments to custom fields
* Added regex validation string
* Added valid_regex validator in format requirements
* Removed useles comments
* Fixes #4236 - validate the regex custom validation
2017-11-04 17:06:14 -07:00
snipe
15d4344efb
Comments in the JS
2017-11-04 00:15:23 -07:00
snipe
88dff754b1
Fixed swapped asset total headings
2017-11-03 20:10:16 -07:00
snipe
279ad6d80a
Updasted fieldname in locations table
2017-11-03 19:40:04 -07:00
snipe
b3b8ab493e
Switch to the reply_to address
2017-11-03 14:58:49 -07:00
snipe
733921f1f9
Added optional required parameter
2017-11-03 12:17:41 -07:00
snipe
1659c3f1a6
Fixed inconsistent color type on checkin/checkout
2017-11-02 20:42:07 -07:00
snipe
caa8ec3178
Fixed checkout on license view page
2017-11-02 20:23:17 -07:00
snipe
27d795508d
Fixed n+1 query, changed checkout behavior to just ask for a license ID
...
We’re offloading the freeSeat() to the checkout page now
2017-11-02 19:16:09 -07:00
snipe
0a5e4b9b7b
Fixed inconsistent required field indicator
2017-11-02 17:13:06 -07:00
snipe
d21c92f91b
Changed assetloc to location
2017-11-02 12:50:34 -07:00
snipe
28a4293a0b
Fixed #4370 - user’s listing flashing then no results
2017-11-02 11:19:34 -07:00
snipe
27875c2dac
Improved to use trans() facade instead of lang
2017-11-02 10:27:53 -07:00
snipe
fd74e4308b
Don’t show request if the user or the asset/model has been deleted
2017-11-02 08:11:04 -07:00
snipe
48207fc695
Added model number in box header
2017-11-02 04:36:04 -07:00
snipe
3dae464c34
Added nicer formatting for model details
2017-11-02 04:33:53 -07:00
snipe
0c524e0830
Use model image if it’s a requestable model
2017-11-02 04:29:05 -07:00
snipe
a844d5b018
Added pagination, nicer formatting for requested assets
2017-11-02 04:17:14 -07:00
snipe
a9e5ad0df1
Added link to requested assets in sidenav
2017-11-02 03:12:12 -07:00
snipe
81ca0ac91d
Added better styling for user upload
2017-11-01 23:46:21 -07:00
snipe
3ca5d39c66
Hide upload button if app is locked
2017-11-01 23:44:31 -07:00
snipe
379274deff
Check for multiple variable (for bulk checkout)
2017-10-31 04:48:40 -07:00
snipe
4bb546a882
Pull assigned asets preview into its own blade for re-use
2017-10-31 04:47:59 -07:00
snipe
e44e573a3c
Fixed requestable assets reference to assetloc
2017-10-30 19:40:35 -07:00
snipe
7f1b962e56
Improved use of de-normed locations fields
2017-10-30 19:21:35 -07:00
snipe
4eee7f8d97
Added address for users - fixes #4323
2017-10-30 18:57:00 -07:00
snipe
3b498efee1
Fixes indefined item in user select blade
2017-10-28 15:42:55 -07:00
snipe
39c68214e9
More ajax menu fixes
2017-10-28 11:17:52 -07:00
snipe
6a3716a06d
Added new ajax dropdown menus for components, consumables, etc editing/creating
2017-10-28 09:21:39 -07:00
snipe
95b6e0d2d8
Fixed assetloc to location
2017-10-28 08:40:27 -07:00
snipe
5d890fb139
Added more defaults for selected values
2017-10-28 08:38:19 -07:00
snipe
2172e6cc25
Added suppliers ajax list
2017-10-28 08:37:47 -07:00
snipe
04130a568c
Fixes check for help_text
2017-10-28 07:41:13 -07:00
snipe
3d7fd5cf04
Fixed references to assetLoc in hardware view
2017-10-28 07:29:32 -07:00
snipe
5737de2e22
Added help text to location partial
2017-10-28 07:29:14 -07:00
snipe
1e21cef218
Set max page size to 500
2017-10-28 07:29:03 -07:00
snipe
ad7a2da9bd
Add help text that explains location override
2017-10-28 07:28:49 -07:00
snipe
0f5e0dcd4f
Added nobr for nicer formatting of bs tables status and deployed to
2017-10-28 07:12:47 -07:00
snipe
1399ebb133
Nicer formatting on 503
2017-10-28 07:01:45 -07:00
snipe
890012f6c4
Update references to assetloc to location
2017-10-28 02:58:38 -07:00
snipe
3991f79115
Use new location method for hardware view
2017-10-28 02:37:59 -07:00
snipe
c616041876
Use form selector
2017-10-28 01:51:10 -07:00
snipe
cfd1925625
Nicer display of notifications on checkout
2017-10-28 01:00:26 -07:00
Daniel Meltzer
3cea12565b
Add missing policies ( #4330 )
...
* Add Authorizable trait and interface to our user model so we have access to User::can/User::cant. We should take a look at where else our user model has diverged from Larvel since it was created...
* Policy cleanup/fixes.
This commit adds policies for the missing backend/"settings" areas. The
permissions were implemented a while back but the policies did not, so
authorizing actions was failing.
In addition, this condenses a lot of code in the policies into base
classes. Most of the files were identical except for table names, so we
move all of the checks into a base class and override the table name in
each policy.
* Use a better name and permission for the check in the default layout.
2017-10-27 18:01:11 -07:00
snipe
00d910ddbc
Added manufacturers and categories select lists
2017-10-26 22:09:08 -07:00
snipe
f13836eb55
Use select2 partials
2017-10-26 21:52:00 -07:00
snipe
76c4c19b3e
Fixed small issues with select2 partials
2017-10-26 21:51:53 -07:00
snipe
1d212b59bd
Added model select2 partial
2017-10-26 21:51:27 -07:00
snipe
9c29ee9c6d
Fixed datepicker in asset checkout
2017-10-26 19:51:29 -07:00
snipe
bdb95e4e3d
Added companies ajax select2 endpoint
2017-10-26 16:37:41 -07:00
snipe
ea07517ad5
Added more ajax select2 boxes to checkouts, remove helper ->with() methods
2017-10-26 03:43:28 -07:00
snipe
82690e1fd7
Integrate ajax select2 menus in all asset checkouts
2017-10-26 02:28:17 -07:00
snipe
75b527ab59
Features/image uploads ( #4320 )
...
* Locations API support for image
* Added manufacturers API support for image
* Added manufacturers API support for image
* Added image support for locations add/update
* Added manufacturer image upload support to controller
* General image string
* Added blade support for image uploads/delete image
* Added $request support (from Input::)
* Added image support in API transformers
* Added image to Manufacturers presenter for data table
* Migration to create image fields
* Ignore the contents of the new image directories
* Create new image upload directories
* Created components/consumables uploads directory
* Fixed missing textSearch scope from companies
* Added ignore for companies uploads directory
* Added blade support for image upload
* Fixed path to upload directory on edit
* Added company image upport to transformers, controllers
* Added image support for categories
* Added support for images in Departments
* Added support for image in Consumables
* Added image support for components
2017-10-25 22:35:58 -07:00
snipe
d4bb4d2edd
Added state-save for open/cloed sidenav
2017-10-25 20:10:41 -07:00
snipe
d008334f2d
Fixed #2857 - better CSS for requestable assets page when no results
2017-10-25 20:07:10 -07:00
snipe
db5968f95a
Fixed larger button size
2017-10-25 18:13:55 -07:00
snipe
d97a1edeb4
Moved style sheet call back into page content
2017-10-25 18:13:41 -07:00
snipe
687cf44d3d
Use inline style for logo
2017-10-25 16:15:50 -07:00
snipe
0b7864b09c
Fixed model number not saving in modal
2017-10-25 13:17:35 -07:00
snipe
ede16eec3c
Fixed #4308 - checkin and delete from user page
2017-10-25 11:11:32 -07:00
snipe
17d58d9cc5
Added snazzy rich user selection menu
...
TODO:
- Abstract this out so it can be used by other select2 menus
- Write a select2 transformer to standardize output
2017-10-24 19:24:35 -07:00
snipe
c605984db0
Added nicer table formatting for “assets checked out to this user” table
2017-10-24 19:21:53 -07:00
snipe
4628c15813
Fixed typo in comments
2017-10-24 16:57:04 -07:00
snipe
8d68bb7a57
Sticky headers for bootstrap tables
2017-10-24 05:22:26 -07:00
snipe
17b271918f
Fix date picker for custom fields
2017-10-23 19:47:43 -07:00
snipe
c0f8b3773c
Temp fix for markdown stuff
2017-10-20 20:22:14 -07:00
snipe
fd210c6439
Fixes #4267 - email notifications showing model name as number
2017-10-20 18:58:11 -07:00
snipe
f7e23cf7c8
Fixes #4272 - adds serial to assigned assets view
2017-10-20 18:51:14 -07:00
snipe
b215924b1a
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-10-20 17:18:13 -07:00
snipe
341ddec9d8
Adds built-in mail notification vendor templates
2017-10-20 16:52:12 -07:00
Nicolai Essig
abcce78944
use translation for "All" in sidebar menu ( #4268 )
2017-10-20 00:20:33 -07:00
snipe
4215a3257b
Fixes #1044 - adds suppliers and image to accessories ( #4266 )
...
* Ignore accesories uploads
* API: Allow searching accessories by supplier id
* Adds suppliers and image upload to accessories
* Allow sorting by counts for suppliers
* Validate supplier image uploads
* Remove purchase_date from protected accessory array, it was converting it to datetime in datepicker
2017-10-19 16:25:24 -07:00
snipe
2fc46746e2
Adds translation string placeholders for new LDAP functionality
2017-10-19 12:22:54 -07:00
snipe
e185dc68af
Fixes #4240 - allows admins to use custom password reset URL
2017-10-19 12:22:27 -07:00
snipe
287b150b7f
Show disabled delete button if thing can’t be deleted
2017-10-19 11:29:58 -07:00
snipe
b379656d55
Adds more consistent visual display of status label types
2017-10-19 11:06:55 -07:00
snipe
2e11a983c8
Nicer card display of status type explanations
2017-10-19 10:52:30 -07:00
snipe
a9753eb646
Include asset count in status labels overview
2017-10-19 10:48:15 -07:00
snipe
7153013fb0
Fake sending the test email if the app is in demo mode
2017-10-19 08:33:46 -07:00
snipe
2b826c3adc
Merge branch 'features/mail_test_button' into develop
2017-10-19 08:19:24 -07:00
snipe
cd193ce8bb
Fixes #4036 - adds test email button to general settings
2017-10-19 08:18:56 -07:00
snipe
cb50142ba3
Update @thakilla as a contributor
2017-10-19 06:16:03 -07:00
Robin Temme
068308ef56
Change changepassword menu icon to fixed width ( #4262 )
2017-10-19 06:04:02 -07:00
Nicolai Essig
1e65c7bf9a
load custom css also on login page ( #4260 )
2017-10-19 06:01:41 -07:00
snipe
44c649c3c8
Fixes #4256 - double encoding on user bulk checkin and delete blade
2017-10-19 03:17:55 -07:00
snipe
2b803a6a6c
Fixes #4257 - use admin url when editing groups
2017-10-19 02:22:05 -07:00
snipe
9c06912efd
Small tweaks to prevent Chrome autofill
2017-10-19 01:59:13 -07:00
snipe
c5893b4445
Fixes #4249 - display deployed location in listing
2017-10-19 01:30:40 -07:00
snipe
bd376a4992
Possible fix for #4227
2017-10-18 07:02:18 -07:00
snipe
5cd2857d5d
Use footer sumformatter for cost totals
2017-10-18 06:24:36 -07:00
snipe
585fcfb7d4
Use maintenances report API to populate the maintenances report
2017-10-18 05:47:47 -07:00
snipe
ed4aa7dec2
Account for deleted suppliers in asset maintenances report
...
This should all be reworked via the API though anyway
2017-10-18 04:48:52 -07:00
snipe
34442362ca
Fixes bad route for new groups
2017-10-18 02:35:30 -07:00
snipe
b80d3ce50d
Hopefully fixes #4218
2017-10-18 00:36:52 -07:00
snipe
c069829b33
Fixes #906 - groups view
2017-10-17 21:43:57 -07:00
Geoff Young
665a113ed8
Update account history query ( #4237 )
...
This will limit the action_log records displayed when a user is viewing
their own assets and history since both target_type and target_id must
be set for a where condition to be added to the history query.
2017-10-17 20:39:49 -07:00
snipe
dc91d10395
More possible fixes for #4210
2017-10-17 17:35:48 -07:00
snipe
668a88bc86
Add autocomplete=off to settings forms for #4210
2017-10-17 17:18:17 -07:00
snipe
160fd1c86a
Added setting to let admin decide whether footer text should link back to site
2017-10-17 13:54:03 -07:00
snipe
b46cbac911
Fixes #4230 - adds model name and manufacturer to emails
2017-10-17 13:30:32 -07:00
snipe
9e9a5b7a53
Changed checkin/checkout buttons to different colors for easier visibility
2017-10-17 11:32:09 -07:00
snipe
e7fe91c9d4
Depreciation view
2017-10-17 11:20:05 -07:00
snipe
02db0f9f9d
Handle deleted assets in maintenance
2017-10-16 21:28:05 -07:00
snipe
e0668b7507
Handle references to suppliers that have been deleted
2017-10-16 21:19:06 -07:00
snipe
f64382aa00
Nicer error display in LDAP tests
2017-10-16 10:10:11 -07:00
snipe
c61bed52c8
Removed danger class
2017-10-16 09:38:09 -07:00
snipe
aeb5152789
Removed extranneous class for danger text
2017-10-16 09:04:38 -07:00
snipe
45c2af80a3
More LDAP testing US refinements
2017-10-16 09:00:51 -07:00
snipe
1fbf3753bc
More small LDAP test improvements
2017-10-16 07:07:21 -07:00
snipe
b107280b7b
Slightly nicer UI for LDAP login test
2017-10-16 06:39:36 -07:00
snipe
f1a6926ad9
LDAP test login
2017-10-16 06:34:04 -07:00
snipe
59a126c47c
Small tweaks to LDAP test
2017-10-16 05:52:18 -07:00
snipe
a98d94ccdc
Pass token to LDAPtest
2017-10-16 05:22:37 -07:00
snipe
c0b39701cc
Fixes #4170 - asset maintenance type not showing
2017-10-14 16:17:14 -07:00
madd15
e2bac62e36
Fix #4205 ( #4213 )
...
* Fixing various UI items
* Revert css change
* Dashboard icon CSS up 4px
2017-10-14 00:14:22 -07:00
snipe
6d4574130f
Clearer indication of whether or not the user will be emailed a eula
2017-10-11 14:44:25 -07:00
madd15
4ee7765403
Change Save buttons to Checkout and add Cancel ( #4202 )
...
Bringing components and consumables checkout page inline with other
checkout pages
2017-10-11 13:29:22 -07:00
Daniel Meltzer
e9f10dd74e
Maybe Fix #4052 . Missed an absolute URL. ( #4187 )
2017-10-09 13:04:38 -07:00
snipe
d7c9fcc8df
Small manufacturer display tweaks on license view to make text clearer, link phone
2017-10-07 08:27:56 -07:00
snipe
907b909223
Fixed language on settings page
2017-10-07 07:44:08 -07:00
snipe
ed8efbe759
Add dateFormatter to components view
2017-10-07 06:57:02 -07:00
snipe
df4cb7d351
Don’t reload the page if the API returns a 500
2017-10-06 18:15:13 -07:00
Richard Hofman
f2be409914
LDAP sync improvements and DB query fix. ( #4148 )
...
* Set 'ldap_ou' Location field to NULL when an empty string is submitted.
* Consolidate LDAP user import logic in LdapSync.php.
2017-10-06 16:15:14 -07:00
snipe
a054cec7c9
Supress output if no title is given
...
This should never happen, but….
2017-10-05 22:51:33 -07:00
madd15
7b10213b3a
Small UI Tweaks to Accessories ( #4149 )
...
* Small UI Change
Changing Save button for Checkout button and adding Cancel button
* Small UI Change
Move buttons to match checkout page and remove extra save button
2017-10-04 23:28:13 -07:00
snipe
eaf55f5e79
Hide table toolbar id models are deleted
2017-10-03 18:12:30 -07:00
snipe
32b01b8f38
Toggle button deleted/not for models
2017-10-03 18:06:41 -07:00
snipe
6dd4282f1f
Fixes #4130 - show deleted asset models
2017-10-03 17:53:08 -07:00
snipe
3f44987799
Small logo size tweaks
2017-10-03 14:15:03 -07:00
snipe
b4fec068d0
Use asset url for favicon on login blade
2017-10-03 13:44:50 -07:00
snipe
fcb1283a14
Added missing deployed page title
2017-10-03 12:49:53 -07:00
snipe
c8bed867da
Export PDF as landscape
2017-10-03 07:32:18 -07:00
snipe
aab635154a
Default to turning CSP off until we can fix vue/CSP issues
2017-10-02 13:29:14 -07:00
Geoff Young
169dc779fd
Fix box title in Label settings view ( #4111 )
2017-10-02 13:00:32 -07:00
snipe
d28e882f5d
Fixed form close tag
2017-10-02 12:57:01 -07:00
snipe
e26d038589
Fixed license checkin form UI
2017-10-01 15:08:32 -07:00
Daniel Meltzer
a2453be573
Pass urls to passport vue components to make work in subdirectories. ( #4090 )
2017-10-01 13:59:07 -07:00
Daniel Meltzer
c2616412c0
Add laravel routes to javascript ( #4092 )
...
* Add laravel routes to javascript
This will clean up a lot of passing of urls. Adds a route() helper and
everything...
This commit also moves the customfield fetching to only be fetched once
and shared with each file, rather than once for each file.
* Try to fix travis unit test things.
* Downgrade doctrine/inflector for php5
* Attempt to occasional seeder issues on travis if the asset does not generate validatable data.
* Update sql dump for functional tests.
* Try to fix api tests.
2017-10-01 12:59:55 -07:00
Daniel Meltzer
23ca2d9a0b
Minor fixes ( #4091 )
...
* Fix old urls.
Still had some /admin/ urls floating around, which was causing bad
redirects in some instances. Should fix #4085
* The modal seems to be confusing license upload. be more explicit in the route we redirect to.
* Fix #4039 . Use proper methods for location assets.
This also fixes a bunch of n+1 issues in the transformer. Also: curious
to know what Location::assets() does, because it doesn't do what I want
it to :)
2017-10-01 12:57:04 -07:00
snipe
7d5b08446a
Missing colon in status explanations
2017-09-29 17:52:43 -07:00
Daniel Meltzer
655ca78633
Adjust the import controller to return a url to the process path to enable processing an uploaded file without refresh. ( #4080 )
2017-09-29 17:49:35 -07:00
snipe
24cad588bd
Added preceding icons in polymorphic formatter
2017-09-29 17:32:16 -07:00
snipe
fe644c76c5
Better explanations of how status label metas work
2017-09-29 17:03:21 -07:00
snipe
43ff66e4d9
More UI tweaking for meta statuses
2017-09-29 15:24:33 -07:00
snipe
2ea91266c0
Init lightbox
2017-09-29 14:26:00 -07:00
snipe
5223ec1dbb
Clearer status listing in the sidenav
2017-09-29 12:13:15 -07:00
snipe
fe1975067a
Hopefully clearer status label meta info
2017-09-29 12:03:02 -07:00
snipe
b9e79c27a8
Added nonce to basic blade
2017-09-29 05:49:26 -07:00
snipe
b8ed6a53b6
For #3998 - Added nonce to all.js
2017-09-29 04:53:24 -07:00
snipe
9ce2d1f560
Merge branch 'csp-middleware' into develop
2017-09-29 04:14:33 -07:00
snipe
7fe2a1f802
Fixes #4051 - use delete method for deleting user files
2017-09-29 01:48:16 -07:00
snipe
aab409dec2
Fixes #4061 - bulk checkout error
2017-09-28 22:22:21 -07:00
snipe
42c2a66946
Small UI tweaks for accessories
2017-09-28 21:18:16 -07:00
snipe
4d32f2b337
Fixes #4059 - accessories view
2017-09-28 21:18:00 -07:00
snipe
46d87849f4
Added content security middleware
2017-09-28 19:45:15 -07:00
snipe
507f1f196c
Added integrity hashes
2017-09-28 18:46:16 -07:00
snipe
adac5ac544
Check for valid asset
2017-09-28 17:32:37 -07:00
snipe
915c19ebda
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-09-28 16:03:41 -07:00
snipe
7fded367c4
Adds rel="noopener" to footer links
2017-09-28 16:03:36 -07:00
Daniel Meltzer
0a4743210c
Pass urls to vue. Should fix subdirectory issues. ( #4054 )
2017-09-28 16:03:04 -07:00
snipe
3d7277398c
Fixes #4057 - sig file in lightbox
2017-09-28 15:13:05 -07:00
snipe
979ecf961d
Added back button to oauth page
2017-09-27 16:33:51 -07:00
snipe
13dcdf41b8
Fixes #4045 - missing back button
2017-09-27 16:32:37 -07:00
snipe
d844734b6c
Use named login route
2017-09-27 16:22:02 -07:00
snipe
d1112bbc99
Fix created_at date display for groups index
2017-09-27 15:28:02 -07:00
snipe
bd0498aa69
Fixes #4016 - signature file missing from history tab
2017-09-27 12:58:08 -07:00
gizzmojr
f2a62857cb
Clear audit input field ( #4010 )
2017-09-25 22:15:29 -07:00
snipe
f2ee7dcabb
Fixes #4001 - license checkout not working
2017-09-25 21:40:43 -07:00
snipe
0a0661bf41
Additional fixes for #3995 in atypical blades
2017-09-25 15:41:02 -07:00
snipe
6ee939d29b
Allegedly fixes #3995 - subdirectory issues with JS/CSS
2017-09-25 15:39:18 -07:00
snipe
34dfcb5add
Merge branch 'develop'
2017-09-22 17:23:38 -07:00
snipe
30019a144a
Disable login note editing on demo
2017-09-22 17:23:22 -07:00
snipe
3e222b674a
Merge branch 'develop'
...
# Conflicts:
# resources/views/hardware/view.blade.php
2017-09-22 17:04:43 -07:00
snipe
e316444c63
Show suppliers link - force cache break?
2017-09-22 17:03:57 -07:00
snipe
b29d7beb3a
Merge branch 'develop'
...
# Conflicts:
# .gitignore
# Dockerfile
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/AssetsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/GroupsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/UsersController.php
# app/Http/routes.php
# app/Models/Depreciation.php
# app/Models/Location.php
# config/version.php
# resources/views/account/view-assets.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/modals.blade.php
# resources/views/reports/custom.blade.php
# snipeit.sh
2017-09-22 16:12:18 -07:00
Daniel Meltzer
922d6937ae
Custom field import repair ( #3968 )
...
* There is no notes field on accessories. Fixes Importer Test.
* Fix notification test. We should see a checkout not allowed exception when trying to check out to a location if the asset requires acceptance.
* Fix Custom field import.
Add a test for custom field import, and fix a few issues related to
importing custom fields. This will restore v3 functionality.
* Add UI support for mapping custom fields.
This still requires the field mappings to be created/assigned in
advance, but will fetch all custom field names and allow them to be
selected when setting up custom field mappings.
This commit also updates laravel-mix to v1.4.3 and other node
dependencies to fix some build issues.
* Fix some requestable asset page/assetloc issues. I'd love to know why laravel expections relationships to be in lower case... but thats a question for another day.
2017-09-18 12:29:08 -07:00
snipe
e7d72beb88
Also check for $snipeSettings in the first place
...
Since the preflight also uses this basic blade
2017-09-12 13:08:43 -07:00
snipe
01e3f4a4db
Use site name if provided in the settings table for basic template
2017-09-12 13:01:51 -07:00
snipe
81e358a01d
Small maintenance fixes
2017-09-08 17:49:01 -07:00
snipe
47909b93f7
Fixed deleted users/restore users view
2017-09-06 17:11:43 -07:00
snipe
472658b2fe
Fixes #3924 - missing/donked language string
2017-09-06 17:11:23 -07:00
Daniel Meltzer
ae0573b3da
Fix asset create ( #3929 )
...
* Fix accidental commit of ImporterTest.
* Move the name() method to the presenter
This fixes some weird collisions between laravels voodoo and our
presenter voodoo that confused php. It's also probably a cleaner place
to put it. Should fix #3927
* Add missing parenthesis
* Add heading to tables on locations/view page.
2017-09-06 16:24:43 -07:00
Daniel Meltzer
987536930c
Assorted fixes ( #3923 )
...
* Fix some n+1 problems
* Use route in notification dropdown to make sure we link to correct page
* Work on better UI support for checkout to non-user. Fix links on index bootstrap table, work towards eliminating assignedUser
* Remove Asset::assigneduser() relationship. Instead add a checkedOutToUser() method and/or port to using assignedTo()
* Adjust string to fit new reality
* Fix #3780 . Move the consumables getDataView method to the ApiController. Not entirely RESTful, but it's a weird method that probably doesn't need its own controller and the functionality would be strange to stack on the userscontroller...
* Fix file uploads to assets and restore the delete route.
* Add asset maintence edit action to index.
* Suppliers asset list should link to the related asset, not to the supplier with same ID.
* Asset models page should use polymorphic formatter on assigned to to better handle assorted item types.
* Comment out more assigneduser fallacy until we figure out the query builder approach to searching for location text.
2017-09-05 17:54:58 -07:00
snipe
10f322198f
Move audited count to top of table
2017-08-31 21:31:07 -07:00
snipe
c92eed2b3e
Small HTML email tweaks
2017-08-31 21:17:02 -07:00
snipe
0054ce3071
Fixes #3907
2017-08-31 13:45:48 -07:00
Daniel Meltzer
bb874012d9
Progress towards better email notifications ( #3911 )
...
Working mail from notification. Still requires testing/cleaning
Add tests around checkout notification.
This also removes the ability to check out an asset to a location|asset
that requires acceptance/a Eula. For 4.1 we may think about how to
support such a thing, but at present it seems to make sense to only alow
such assets to be checked out to users, who can be responsible for the
items.
2017-08-31 11:14:21 -07:00
snipe
22233e3ba6
Bulk asset audit form (needs more testing)
2017-08-29 16:00:22 -07:00
snipe
42175782a5
Only pull logo if there is a value
2017-08-26 17:43:00 -07:00
snipe
d98ffd94f9
Localized modal titles with correct headers
2017-08-26 16:16:41 -07:00
Brady Wetherington
6ad5da44f3
Formalize modals ( #3898 )
...
* Refactor Modal JS into standalone file, remove duplicated JS and HTML
* Finish fixing Bulk-checkout and checkout
2017-08-26 16:06:52 -07:00
snipe
479f422e68
Added default if no audit settings are in place
2017-08-26 15:27:50 -07:00
snipe
fba3949530
Fixes #3888 - broken preview of existing assets
2017-08-26 15:21:10 -07:00
snipe
abc3dea8ac
Fixed wonky datepicker on bulk checkout
2017-08-26 14:16:16 -07:00
snipe
51d74ac06d
Auduting improvements
2017-08-25 18:40:20 -07:00
snipe
bd02b9ed62
Audit tweaks
2017-08-25 10:18:18 -07:00
snipe
16f57e16cb
Fixes #1190 - added basic audit workflow
2017-08-25 10:04:19 -07:00
snipe
af6f208c43
Reordered settings nav
2017-08-25 10:03:05 -07:00
snipe
1448229cd2
Fixes location user route
2017-08-25 06:30:00 -07:00
snipe
08f3e78d26
Merge branch 'checkout-to-location-v2' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-location-v2
...
# Conflicts:
# app/Http/Controllers/Api/UsersController.php
# app/Http/Transformers/LocationsTransformer.php
# resources/views/locations/view.blade.php
# routes/api.php
# tests/_data/dump.sql
2017-08-25 06:04:22 -07:00
snipe
62227ec27d
Link to location in user view
2017-08-25 05:48:32 -07:00
Brady Wetherington
a37cb616eb
Add Error DIV's to all modals ( #3886 )
2017-08-24 22:43:05 -07:00
Brady Wetherington
c1dcc22217
Refactor and improve Modal support for Assets ( #3884 )
2017-08-24 22:24:02 -07:00
snipe
ca78b3ed7c
Fixes models on create asset
2017-08-23 13:08:42 -07:00
snipe
6e30fa6922
Fixes custom fields in asset listing where no custom fields were assigned
2017-08-23 03:28:13 -07:00
snipe
2958630923
Fixed some settings text
2017-08-22 22:11:26 -07:00
snipe
06c5bce3c7
Fixes #3865 - employee number mislabeled in list output
2017-08-22 21:40:35 -07:00
snipe
9bda62d295
ADDED: Password rules for complexity, min length, rejecting common passwords
2017-08-22 20:32:39 -07:00
snipe
1d7e243d0a
Fixes #3790 - parent display on locations index
2017-08-22 15:02:31 -07:00
snipe
6310670835
Fixes #3869 - asset maintenances API endpoints
2017-08-22 13:52:06 -07:00
snipe
15bb30acd6
Fixes #3873 - show groups correctly on user listing page
2017-08-22 12:29:46 -07:00
snipe
71c1c74164
Fixes #3085 - adds “change password” functionality back to user accounts
2017-08-22 12:09:04 -07:00
snipe
25dc26aac3
Added 30 as page selector value for label printing
2017-08-21 22:31:37 -07:00
snipe
101a09b421
Removed chart (for now)
2017-08-09 19:00:54 -07:00
snipe
cb1e3b7978
Fixed encryption warning on custom fields
2017-08-09 18:40:45 -07:00
snipe
a2d63dd3e4
Fixes #3776 - adds Company to Dept UI
2017-07-29 16:42:17 -07:00
Donald M
f0bbe38c71
fixes #3725 in develop branch ( #3800 )
...
added button for create Asset Model to index.blade.php in develop branch.
2017-07-29 15:33:16 -07:00
snipe
ee7348d0d5
Better fix for javascript formatter for employee number
2017-07-26 16:47:47 -07:00
snipe
ac29b142dc
Adds max thumbnail width to asset listings, settings
2017-07-25 19:36:38 -07:00
snipe
978a906513
Fixes undefined error when validation fails on asset save
2017-07-25 19:32:09 -07:00
snipe
dfa0714d44
Fixes #3770 - account update not saving correctly
2017-07-25 12:28:11 -07:00
snipe
0fbf9236f4
Fixes #3742 - add employee number to asset listing
...
Also removes asset report, since it’s basically the exact same output as the asset listing
2017-07-25 01:17:23 -07:00
snipe
c64ca76b3d
Fixes API route
2017-07-25 01:16:31 -07:00
snipe
ae0b639d0c
Added link to AGPL
2017-07-25 00:24:22 -07:00
snipe
7c6143bbb8
Fixes #3754 - incorrect language translation location for supplier
2017-07-17 16:39:19 -07:00
snipe
346156bae1
Added colored icons to indicate status types versus status labels
2017-07-17 16:19:52 -07:00
snipe
9bcfe0748b
Make custom fields into their own JSON array
2017-07-08 18:44:28 -07:00
snipe
0cc9c214aa
Added tooltip for undeployable items
2017-07-08 13:39:07 -07:00
snipe
c48bcb7ed1
Added tooltips for checkin/checkout
2017-07-08 13:36:37 -07:00
snipe
09de201027
Removed question mark on delete title
2017-07-08 13:36:25 -07:00
snipe
6ce2127d75
Fixes incorrect link on dashboard
2017-07-08 13:36:06 -07:00
snipe
e79260a0d4
Fixes #3732 - broken tooltips and weird select2 option text behavior
...
The solve here was a few things - first, load jquery-ui before bootstrap. They have conflicting tooltips. Second, initiate the tooltips in the wenzhixin/bootstrap-table formatter using `data-tooltip=“true”`, and thirdly, add some JS that tells BS table to inititalize tooltips within the table using that `data-tooltip=“true”` business
2017-07-08 13:21:13 -07:00
snipe
b02148f59e
Updated formatter for location display
2017-07-08 02:24:30 -07:00
snipe
6046063666
Updated LDAP icon
2017-07-08 02:24:20 -07:00
snipe
fd57617c8e
Check that the LDAP extension is loaded and functions are available
2017-07-08 01:48:29 -07:00
snipe
44569558e9
Remove admin label
2017-07-08 01:41:07 -07:00
snipe
814bf18a4b
Updated phpinfo title
2017-07-08 00:23:28 -07:00
snipe
33557f3792
Nicer formatting for phpinfo output
2017-07-08 00:22:30 -07:00
snipe
c2927c4a2e
Added phpinfo page if debugging is enabled
2017-07-08 00:09:39 -07:00
snipe
ab2b2f3043
Updated UI for Admin Settings
2017-07-07 23:44:48 -07:00
snipe
0e598702f8
Fixed error field name in settings > login note
2017-07-07 19:56:14 -07:00
snipe
9894edb008
Added login note to settings
2017-07-07 19:54:10 -07:00
snipe
c2e8803d1e
Addec clone button back to models, assets, licenses, etc
2017-07-07 18:45:49 -07:00
snipe
7e1f7297b3
Settings tweaks
2017-07-07 18:06:31 -07:00
snipe
31cabaa4db
Fixes #3724 - adds edit/delete button back to companies listing
2017-07-07 17:10:06 -07:00
Daniel Meltzer
61c6160b98
Importer mapping - v1 ( #3677 )
...
* Move importer to an inline-template, allows for translations and easier passing of data from laravel to vue.
* Pull the modal out into a dedicated partial, move importer to views/importer.
* Add document of CSV->importer mappings. Reorganize some code.
Progress.
* Add header_row and first_row to imports table, and process upon uploading a file
* Use an expandable table row instead of a modal for import processing. This should allow for field mapping interaction easier.
* Fix import processing after moving method.
* Frontend importer mapping improvements.
Invert display so we show found columns and allow users to select an
importer field to map to. Also implement sample data based on first row
of csv.
* Update select2. Maintain selected items properly.
* Backend support for importing. Only works on the web importer currently. Definitely needs testing and polish.
* We no longer use vue-modal plugin.
* Add a column to track field mappings to the imports table.
* Cleanup/rename methods+refactor
* Save field mappings and import type when attempting an import, and repopulate these values when returning to the page.
* Update debugbar to fix a bug in the debugbar code.
* Fix asset tag detection.
Also rename findMatch to be a bit clearer as to what it does.
Remove logging to file of imports for http imports because
it eats an incredible amouint of memory.
This commit also moves imports out of the hardware namespace and into
their own webcontroller and route prefix, remove dead code from
AssetController as a result.
* Dynamically limit options for select2 based on import type selected, and group them by item type.
* Add user importer.
Still need to implement emailing of passwords to new users, and probably
test a bit more.
This also bumps the memory limit for web imports up as well, I need to
profile memory usage here before too long.
* Query the db to find user matches rather than search the array. Performance is much much better.
* Speed/memory improvements in importers.
Move to querying the db rather than maintaining an array for all
importers. Also only store the id of items when we import, rather than
the full model. It saves a decent amount of memory.
* Remove grouping of items in select2
With the values being set dynamically, the grouping is redundant. It
also caused a regression with automatically guessing/matching field
names. This is starting to get close.
* Remove debug line on every create.
* Switch migration to be text field instead of json field for compatibility with older mysql/mariadb
* Fix asset import regression matching email address.
* Rearrange travis order in attempt to fix null settings.
* Use auth::id instead of fetching it off the user. Fixes a null object reference during seeding.
2017-06-21 16:37:37 -07:00
snipe
5b9bcd8fa2
Add next auto-increment to settings form
2017-06-20 12:23:16 -07:00
Daniel Meltzer
5d4920c741
[WIP] Improvements to unit tests. ( #3574 )
...
* Improvemenets to unit tests.
* Break up modelfactory into multiple files, populate many states.
* Begin testing validation at the unit test level, test relationships.
* Add tests for Asset::availableForCheckout.
* Model factories now generate all needed relationships on demand,
which allows us to unit test with a empty database.
* To faciliate the empty database, we move to using sqlite in memory as
the unit testing database.
* Fix bug with logs of checkouts to non users.
* Fix location finding for assets. Also Fix location show page to show users associated with location. Still need some work to show assets.
* More test and generator improvements
* More unit test fixes. PermissionsTest is borked still.
* More Updates
* Rewrite permissionstest. Check that we have access on the model level rather than via web requests. Also test delete permissions.
* Fix seeders.
* Make the default asset model factory generate assets that are rtd for testing.
* Save progress.
* Rebase tests, fix department unit test, update database for functional tests.
* Update functional and api tests to use new modelfactory signatures.
2017-06-12 17:39:03 -07:00
Daniel Meltzer
dfea47a272
Fix location view display. Migrate to api controller methods and fix missing bits to make this happen. Show manager on the location view page.
2017-06-12 18:24:20 -05:00
Daniel Meltzer
f0d78091d2
Add a manager field to locations.
...
This is round one of the rethink of checkout-to-everything. A location
now has a manager field, and the manager (by default) be responsible for
assets checked out to the location.
2017-06-12 18:23:50 -05:00
snipe
3046d7d33c
Fixes #3644 - broken datepicker
2017-06-09 18:53:19 -07:00
snipe
0aa76bd946
PHPStorm lag strikes again
2017-06-09 16:49:55 -07:00
snipe
ad816264e9
WIP import mapper #3639
...
@dmeltzer, I’m not sure how much extra work this will be to integrate.
2017-06-09 16:29:42 -07:00
snipe
408bb6476f
Removed some unneeded styles
2017-06-09 14:57:57 -07:00
snipe
e387673e74
Fixes #3651 - backups not working
2017-06-09 12:44:11 -07:00
snipe
0bc709206f
Fixes #3652 - missing groups UI element in user edit view
2017-06-09 12:19:12 -07:00
snipe
269997a1fb
Push v3.6.5 changes into v4
2017-06-09 00:35:23 -07:00
snipe
041b794e1f
Fixes #3634 - use new routes for groups
2017-06-08 20:24:26 -07:00
snipe
da2d9b2374
Fixes presenter issue on user history
2017-06-08 19:09:42 -07:00
snipe
a59db7062d
Fix license datatable on license view
2017-06-08 18:59:53 -07:00
snipe
2aaa635345
Fixes crash on asset detail view
2017-06-08 18:26:55 -07:00
snipe
8269aec71a
Removed erroneous file
2017-06-08 17:51:30 -07:00
snipe
d62896f945
Fixes #3414 - bulk update for asset models
2017-06-08 17:48:48 -07:00
snipe
a717ca683c
Fixes #3648 - missing endif in blade
2017-06-08 16:16:49 -07:00
snipe
d7827fedd9
Fixed dashboard size element
2017-06-06 15:19:19 -07:00
snipe
fbcc40a145
Commented out dashboard chart until proper data provided
2017-06-06 02:51:29 -07:00
snipe
12a7309ecd
Note that the chart doesn’t work, to clear things up
2017-06-06 02:40:50 -07:00
snipe
1c056d1a59
Updated asset urls
2017-06-06 02:35:26 -07:00
snipe
240a07b108
Formatting for error pages
2017-06-06 02:32:04 -07:00
snipe
01cc00c832
Fixing webpack. Again
2017-06-06 01:39:53 -07:00
snipe
9338b37b74
Try to fix the datepicker :(
...
Webpack has fucked everything. I hate everything.
2017-06-06 00:51:41 -07:00
snipe
9cd2881ad0
Initiate datepicker
2017-06-06 00:29:52 -07:00
snipe
0238dd59a3
Fixes #3600 - wrong route for hardware
2017-06-01 20:34:01 -07:00
snipe
461ca53289
Fixes #3603 - Depreciation report crashes
2017-06-01 20:31:44 -07:00
snipe
ccc0063556
Fixes #3604 - company view not displaying assets on page load
2017-06-01 20:28:09 -07:00
snipe
cc5192c91e
Updated asset url
2017-05-31 13:57:23 -07:00
snipe
66eaff739a
More npm/css/js updates
2017-05-31 12:34:05 -07:00
snipe
1992906790
Use laravel mix asset call
2017-05-31 09:41:52 -07:00
snipe
b0fc2489f6
Almost fixes user history table
...
Something is still fucky here
2017-05-31 09:39:52 -07:00
snipe
b13726880e
Fixes #3601 - HTML instead of username for manager in user view
2017-05-31 09:39:30 -07:00
snipe
748aba3c48
Add assets dashboard feature
...
- also a really broken sample graph
2017-05-31 05:23:54 -07:00
snipe
d950ddbda7
Changed go button to primary class
2017-05-31 05:23:09 -07:00
snipe
fd0da6ecf0
Ignore the icon column in exports
2017-05-31 02:03:09 -07:00
snipe
92052442e3
Include department in user info
2017-05-31 01:17:30 -07:00
snipe
3c167c9d33
Remove debugging frowny-face
2017-05-23 15:06:43 -07:00
snipe
5e0cc93ba2
Use new formatters in bootstrap table
2017-05-23 14:33:19 -07:00
snipe
3724442318
Exclude some BS table calls if it’s just a simple ajax table with no sorting/searching
2017-05-23 14:32:58 -07:00
snipe
610a773620
Use activity report for view-assets
2017-05-23 14:32:21 -07:00
snipe
a1c7d2922e
Tweaks to dashboard API calls
2017-05-23 14:32:02 -07:00
snipe
76926c97c1
Updated dashboard to use new API activity report and added category summary
2017-05-23 09:25:45 -07:00
snipe
6775c39a5e
Added simple_view to use compact, no pagination view of tables
2017-05-23 09:25:20 -07:00
snipe
fba7f1ccf6
Fixes #3605 - missing table close tag causing page layout bonking
2017-05-23 03:20:50 -07:00
snipe
9d45375b8a
Added dept to user edit/create/bulk edit views
2017-05-23 02:51:09 -07:00
snipe
d3b07411da
Added depts to bootstrap-table javascript formatters
2017-05-23 02:50:51 -07:00
snipe
d17d3a2ef0
Dept views
2017-05-23 02:50:27 -07:00
snipe
b0479923b1
Add link to departments
2017-05-22 21:31:58 -07:00
snipe
b81dd18576
Fixed delete_at
2017-05-19 03:00:19 -07:00
snipe
dac4b58892
Show warning on deleted items
2017-05-19 02:58:55 -07:00
snipe
dcfc434075
Added suppliers back to new side menu (oops)
2017-05-15 20:55:53 -07:00
snipe
23be188a49
Fixes #3579
2017-05-15 19:28:26 -07:00
snipe
54a2c46101
Fixes #3491 - adds supplier info to assets listing
2017-04-22 19:14:28 -05:00
snipe
7305169b79
Removed extra comments
2017-04-06 21:18:42 -07:00
snipe
c3cc2c924f
Updated route for asset display
2017-03-11 12:14:41 -08:00
snipe
70761b8157
Status label view
2017-03-11 12:14:19 -08:00
snipe
e475ccc1d4
Use new presenter for colum headers
2017-03-11 12:13:14 -08:00
snipe
542adfa926
Updated sidenav to use proper status labels
2017-03-11 12:12:10 -08:00
snipe
79197a719e
Fixes BS tables for items that don’t have a checkin
2017-03-11 12:11:24 -08:00
snipe
742e3d044e
API improvements
...
Components still need some work here
2017-03-11 10:05:50 -08:00
snipe
a4697f046e
Some model/manufacturer cleanup
2017-03-11 08:53:02 -08:00
snipe
9027bd1d9d
Added in/out to model view display
2017-03-11 08:01:22 -08:00
snipe
23b1a4ca34
Higher per page
2017-03-11 04:39:35 -08:00
snipe
875d0dd343
Added advanced search to assets
2017-03-11 04:26:01 -08:00
snipe
d799ab2a9c
Narrowed down the accessories, consumables, etc APIs for manufacturer filtering
2017-03-11 02:49:24 -08:00
snipe
c511073bc2
Fixes checkin/checkout for assets on manufacturers detail page
2017-03-11 02:03:13 -08:00
snipe
c132036f5c
Fixes #3311 - more fields for manufacturers
2017-03-10 22:08:59 -08:00
snipe
73f5457b1b
Fixed subnav permissions in Asset Menu for expanded permissions
2017-03-10 20:48:58 -08:00
snipe
f1fd152513
Fixes #3335 - added additional pagination at top of table
2017-03-10 20:35:03 -08:00
snipe
bf99534f8d
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-03-10 20:07:49 -08:00
snipe
ad510cecd5
Fixes #2422 - Adds bulk edit for select user attributes
2017-03-10 20:07:44 -08:00
Karol
4af2a8eb35
Update user(view) for support multilanguage ( #3383 )
...
Update user(view) for support multilanguage. Added lang var. and strings
2017-03-10 16:58:29 -08:00
snipe
fee60ec8dc
Fixes #3145
2017-03-10 16:49:26 -08:00
snipe
69b014a342
Switch to URL
2017-03-03 19:07:57 -08:00
snipe
5d8faa934b
Fixed link in error pages
2017-03-03 19:06:34 -08:00
snipe
878f4f868d
Added date formatter to consumables
2017-03-03 19:04:54 -08:00
snipe
2e274b5f21
Fixed user upload route
2017-03-03 18:41:13 -08:00
snipe
b5424462c9
Moved non-superadmin settings into sidebar
2017-03-03 17:30:12 -08:00
snipe
dc38e575d9
Allow date/time formatting selection in settings
2017-03-03 17:29:41 -08:00
snipe
161bd7acce
Fixed double-encoding of ampersand
2017-03-03 17:17:51 -08:00
Andrea Bergamasco
e7f7d739ed
Bugfixes based on functional tests ( #3338 )
...
* Toggles the disabled state of auto_increment_prefix
To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate. Fixes #1390
* Delete asset image: made checkbox more visible
Related to #3153
* Added personal-access-token component
* Created basic API testing configuration
* First version of /components endpoind cest
* On-the-fly bearer token generation
* Completed testing of PATCH and PUT methods
* Added /components/{id}/assets route with tests
* Updated route and dataTable in view
* Completed test assertion
* Added links to assets in ComponentsAssets view
* Linked Company in AssetView page
* Bugfixes based on functional tests
* Removed unused function
* Marked tests as incomplete
* Added check for existence in groups/edit.blade.php
2017-02-22 22:49:19 -08:00
snipe
7cf42ecf9e
New side menu for “other stuff”?
...
Need to figure out what to call this
2017-02-22 22:21:17 -08:00
snipe
904be03ffd
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2017-02-22 22:20:32 -08:00
snipe
ebbc2a60c3
Fix JS error when there is no row.update/delete defined
2017-02-21 15:40:25 -08:00
Andrea Bergamasco
fde46251de
Components Assets view + stubbed API tests ( #3325 )
...
* Toggles the disabled state of auto_increment_prefix
To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate. Fixes #1390
* Delete asset image: made checkbox more visible
Related to #3153
* Added personal-access-token component
* Created basic API testing configuration
* First version of /components endpoind cest
* On-the-fly bearer token generation
* Completed testing of PATCH and PUT methods
* Added /components/{id}/assets route with tests
* Updated route and dataTable in view
* Completed test assertion
* Added links to assets in ComponentsAssets view
* Linked Company in AssetView page
2017-02-21 14:26:46 -08:00
Andrea Bergamasco
4f73a13c6b
Hotfix/translate row delete msg ( #3305 )
...
* Toggles the disabled state of auto_increment_prefix
To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate. Fixes #1390
* Delete asset image: made checkbox more visible
Related to #3153
* Added missing translation to bootstrap table partial
The "Are you sure to delete" confirmation was hardcoded. Added translation row to all locales and other small corrections to it/general lang file.
2017-02-21 14:25:46 -08:00
snipe
8fe8ff71e8
Category improvements
2017-02-16 00:32:33 -08:00
snipe
a18e90c22a
Fix delete modals
2017-02-15 23:04:49 -08:00
Andrea Bergamasco
d9fe39c00e
Delete asset image: made checkbox more visible ( #3293 )
...
Related to #3153
2017-02-15 21:52:10 -08:00
Andrea Bergamasco
9975d55249
jQuery script to toggle the disabled state of auto_increment_prefix ( #3292 )
...
* Toggles the disabled state of auto_increment_prefix
To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate.
* Toggles the disabled state of auto_increment_prefix
To insert a prefix you had to toggle the checkbox, save the settings and reload. With this script it is immediate. Fixes #1390
2017-02-15 21:51:30 -08:00
snipe
c67b44b3d5
Moving license index to new API format
2017-02-10 18:43:30 -08:00
snipe
959fafe04b
Expanded checkin/checkout buttons formatter
2017-02-08 18:21:03 -08:00
snipe
86198badbb
Added more company_id filtering, more transformers
2017-02-08 08:48:41 -08:00
snipe
2986747fd7
Fixed sidenav status type filtering
2017-02-08 03:51:52 -08:00
snipe
6d40a98a16
User assets presenter for column headers
2017-02-06 18:49:08 -08:00
snipe
1751a8c0e0
Switched to presented for ugly BS table column headers
2017-02-03 22:20:11 -08:00
snipe
d37b9fe169
Use hardrware listing for status labels detail link
2017-02-03 20:34:09 -08:00
snipe
8b0066cbad
Fixed user link formatter on models detail
2017-02-03 20:22:41 -08:00
snipe
98e0ecbd88
Added manufacturer sorting on models
2017-02-03 20:20:03 -08:00
snipe
2c0df6159f
Added formatting for Suppliers index
2017-02-03 20:19:54 -08:00
snipe
9cae6066a0
Added asset by manufacturer listing
2017-02-03 19:52:00 -08:00
snipe
1e2a23e955
Use main assets API to pull view pages for assets listings
2017-02-03 19:34:24 -08:00
snipe
a69090c91c
Moved import to top level sidenav
2017-02-03 19:33:40 -08:00
snipe
85d5b75de6
Removed console debugging messages
2017-02-03 03:55:43 -08:00
snipe
cddd3cdb81
Added spinner icon to loading message
2017-02-03 03:54:38 -08:00
snipe
bb4c443cd9
Added notes to custom report
2017-02-03 02:20:56 -08:00
snipe
729b709de2
Include notes in custom asset report
2017-02-03 02:16:37 -08:00
snipe
6c1a827ed0
Added warranty info to listing
2017-02-03 01:45:12 -08:00
snipe
f9bed9264f
Removed oops state if model has no fields
2017-02-02 19:11:10 -08:00
snipe
498dc9da43
Removed duplicate header
2017-02-02 18:54:31 -08:00
snipe
18e2db24bd
Updated groups index route name
2017-02-01 19:13:17 -08:00
snipe
f1a83bd007
Fixed bulk delete
2017-02-01 19:07:39 -08:00
snipe
12c5ca67ff
Pulled accidental debugging exit
2017-02-01 18:56:47 -08:00
snipe
00f7cc028b
Fix dumb icon bug
2017-02-01 18:54:43 -08:00
snipe
bf919e133c
Center boolean results in the list
2017-02-01 18:53:27 -08:00
snipe
541a5e6776
Groups API starter
...
Edit/Create still broken for some reason
2017-02-01 18:50:28 -08:00
snipe
464c524375
Depreciations API
2017-02-01 17:59:03 -08:00
snipe
7086ac8a8b
Tweaks to status labelas listing display
2017-02-01 17:48:28 -08:00
snipe
7642d17fb8
Fix category listing
2017-01-26 21:11:27 -08:00
snipe
a80af854ba
Switch companyName to company
2017-01-26 21:05:33 -08:00
snipe
99d837fa50
Added API methods and UI to view assets associated with a particular model
2017-01-26 21:02:59 -08:00
snipe
231f4dce07
Basic components API
2017-01-26 19:16:06 -08:00
snipe
5e9e6da577
Basic consumables API
2017-01-26 18:46:18 -08:00
snipe
5d3568136e
Added some printer-friendly stuff
2017-01-26 06:20:53 -08:00
snipe
b4c6d0c897
Added optional help text field to custom fields
2017-01-26 04:52:11 -08:00
snipe
5e9c69711b
Set trimonsearch to false to prevent weird trimming on search queries
2017-01-26 04:48:22 -08:00
Daniel Meltzer
5ba2ec881c
Vue importer ( #3235 )
...
* Begin work on vueifying the importer
* Beginning work on migrating the importer to use a vue/components for future interactivity
Update JS
More importer work. Move to a vue based modal, begin handling of processing. Still need to port error messages.
More importer work. Move to a vue based modal, begin handling of processing. Still need to port error messages.
Update importer. Add error display. Fix modal, update vue-strap to vue2
More progress. Add select2 vue bits.
* Move to querying the db to find importer matches. It scales better on large datasets.
Fix select2 related issues. We were trying to initialize it twice, which led to the custom data being overwritten.
* Better error handling on uploads and deletion of files. Restore progressbar on upload.
* Add support for generic exception reporting if app.debug is enabled.
* Handle Http 500 errors better. Display errors if debug is enabled. Assorted cleanups.
* Fix codacy issues, remove unused methods.
* Only bind vue to the importer for now.
* Load vue for passport as well.
2017-01-25 21:29:23 -08:00
snipe
a9bf34cf61
Minor transformer cleanup
2017-01-25 21:01:00 -08:00
snipe
de869c7ed0
Switched to labels for clearer UI on fieldsets
2017-01-25 05:14:39 -08:00
snipe
ec88d54a5b
Prevent demo users from deleting/creating API keys
2017-01-25 05:03:30 -08:00
snipe
b1a80f8ed8
Fixes #1684 - Allow editing of custom fields
...
@uberbrady can finally get out of the sea
2017-01-25 04:34:11 -08:00
snipe
7350514a0d
Moved custom fields blades to fit the rest of the app convention
2017-01-25 04:31:18 -08:00
snipe
5f49e7c1a7
Accessories API routes
...
Still a bit of a WIP
2017-01-25 02:19:26 -08:00
snipe
75d35273c9
Pull image formatter out of dynamic loop, pass full url to formatter
2017-01-24 22:46:07 -08:00
snipe
04bb180a80
More bootstrap tables formatting
2017-01-24 22:25:17 -08:00
snipe
8f12486f6c
More generic javascript formatters, updated api routes
2017-01-24 21:04:38 -08:00
snipe
f13719bf32
Updated named route for consumables
2017-01-24 19:24:59 -08:00
snipe
945d910ca2
Added columns to be ignored on export
2017-01-24 19:24:33 -08:00
snipe
e8310c8f3c
Additional API routes for licenses, manufacturers
2017-01-24 18:58:07 -08:00
snipe
d0f062458e
Additional API transformers, formatters
2017-01-24 17:07:00 -08:00
snipe
6d2a37fa80
Remove google font from maintenance mode template
2017-01-24 17:03:48 -08:00
snipe
ad4bf83aaa
Add ability to view assets by status label
...
This should be refactored. Lots of copypaste from the assets views here
2017-01-18 20:41:40 -08:00
snipe
19cb428fb0
Asset and status formatters
2017-01-18 19:46:43 -08:00
snipe
bebb653a70
Pull common formatters into partial
2017-01-18 19:28:35 -08:00
snipe
5d14acaac4
Fixed bulk actions using native bootstrap-tables checkall
2017-01-18 07:40:40 -08:00
snipe
47cf734f72
Hide the app div
...
This will need to be fixed later, but the flash of unstyled content on the non-api pages was making me cray
2017-01-18 05:02:00 -08:00
snipe
297034c037
APIified custom fields reorder
2017-01-18 04:58:56 -08:00
snipe
db7b1b586c
Fixed custom fields improprly nested form tags
2017-01-18 04:58:31 -08:00
snipe
eac025263b
Basic hardware bootstrap table formatter
2017-01-18 04:16:25 -08:00
snipe
8a4a4264cd
Formatters for bootstyra-tables users listing
...
We should probably abstract these out, since we use similar or the same fields imn other places
2017-01-18 04:12:13 -08:00
snipe
9bc10edc8d
Rervet that for now - still need to only enable dropdown if more than one is selected
2017-01-13 21:05:02 -08:00
snipe
e284e9900a
Use native boostrap tables check-all
2017-01-13 21:02:55 -08:00
snipe
acd8eafc8c
VERY basic example of dynamic buttons in table
2017-01-13 20:58:17 -08:00
snipe
89edda2c23
Manufacturers API
2017-01-13 09:37:06 -08:00
snipe
14ddcc56a2
Categories API
2017-01-13 09:01:10 -08:00
snipe
edca6ad19d
Make eol, notes sortable on asset model
2017-01-13 08:41:17 -08:00
snipe
ae540af2a9
Additional fields for asset models
2017-01-13 08:39:02 -08:00
snipe
c7e1b426e7
Additional API routes and controllers for models, suppliers, users, locations and status labels
2017-01-13 04:50:20 -08:00
snipe
bc5fcf8736
Fixed dashboard chart
2017-01-13 03:19:39 -08:00
snipe
58b1ac5f0f
Some route/transformer edits
2017-01-13 00:13:57 -08:00
snipe
a35323131f
Updated documentation link
2017-01-12 23:43:20 -08:00
Richard Hofman
c506f30562
Add support for location-specific LDAP OUs. ( #3176 )
...
* Add support for location-specific LDAP OUs.
* Shortened variable names as suggested by Codacy review.
2017-01-11 23:37:14 -08:00
snipe
900e6e2419
Starter asset API
2017-01-11 18:14:06 -08:00
snipe
ff2c489af4
Fixed javascript conflicts, fixing select2 and icheck
2017-01-11 17:07:27 -08:00
snipe
55d0f8c0df
I think this is necessary for the Vue.js version?
2017-01-11 15:21:33 -08:00
snipe
73d45e9a14
Fixed CSRF on create asset ajax
2017-01-11 15:03:04 -08:00
snipe
c7167fc73c
Only allow users to create a new user via modal if they have users.create permission
2017-01-11 14:54:39 -08:00
snipe
dbf3a074f7
Fix CSRF issue on bootstrap tables
2017-01-11 14:52:05 -08:00
snipe
86926675ce
Fixed passport token generation
2017-01-11 08:44:34 -08:00
snipe
41f58efb70
Font-awesome for bower
2017-01-11 06:53:49 -08:00
snipe
e2d5401f3a
Stop double-loading jquery
2017-01-11 05:51:13 -08:00
snipe
57d0eba58f
API blade cleanup
2017-01-11 04:05:32 -08:00
snipe
a02f406fa6
Removed personal access token from settings api page
2017-01-11 03:58:09 -08:00
snipe
19fcda5c25
Basic API management
...
I’m getting a 500 on personal token creation, but there’s nothing in the logs, so I have no idea what’s wrong
2017-01-11 03:55:47 -08:00
snipe
b5ddd9ab0a
More vue/api work
2017-01-11 03:38:55 -08:00
snipe
33ffc58ffe
Fixed vue issue with api
2017-01-11 01:27:02 -08:00
snipe
11d86d83b6
Fixing JS to actually use vue
2017-01-11 01:02:32 -08:00
snipe
4b3edbd2f5
Fixed #3130 - model ID not being saved weith model info on modal for create asset
2017-01-10 19:02:13 -08:00
Daniel Meltzer
44683c784f
Importer: Add License Importer and refactor ( #3143 )
...
* Major code simplification of the importers.
Move towards using Model::fill and Model::update rather than reinventing
the wheel. This makes the updating/creating logic a lot clearer, and
allows for the deletion of a lot of code. Also allows for supporting of
more fields in the future really easily.
* Cleanup constructors and use setters instead.
* Set the LC_MONETARY locale, and use it to strip currency symbols in Helper::parseFloat()
* Move licenseseat creation/deletion logic into an event handler on the model rather than the controller.
* Move the logging of parsed values to array_smart_fetch rather than writing it out everywhere
* Move to storing dates as carbon rather than strings. Allows for the parsing of more arbitrary strings from the importer
* Add a license importer with support for checking out to users or assets.
* Make a directory for sample/mock import csvs and populate it
* Adjust how we store/retrieve dates to fix some issues the tests found.
2017-01-10 16:19:18 -08:00
Daniel Meltzer
6ce20c32b1
Component Importer and various Importer Fixes ( #3132 )
...
* Importer fix: we were trimming the wrong part of the classname when creating a category. This led to categories not being recognized.
* Add a component importer. Uses same fields as consumable importer. Only trick: If an asset_tag is present, we checkout a component to that asset on import
Enable component importer. Also calculate the importer classname in a cleaner fashion.
* Fix comparisons. find can return an index of 0, which is falsy.
2017-01-05 15:45:12 -08:00
Daniel Meltzer
816d2fd095
More minor fixes ( #3126 )
...
* Update composer phpcs
* Minor Fixes found while working.
ALlow user_id to be nullable in category model validation
Point to the correct route in accessoriespresenter datatable. Also add name() method
Add a translated category name
Fix typo in translation
* Add a method to the asset presenter to show deployed when asset is deployed. Fixes #3114
2017-01-03 16:55:43 -08:00
Daniel Meltzer
8a782bf34a
Present assetlogs ( #3112 )
...
* Set user if asset is checked out to user. fixes email problems.
* Use sometimes validation to ignore this when no values are present.
* Move Actionlog details to a presenter and port the activity table to use it. Still need to port other parts of the application, but this consolidates a lot of logic.
* Attempt test fix
* Port users,licenses, and assets view to use the presenter to generate table values.
2016-12-29 22:23:36 -08:00
Daniel Meltzer
4ad9c3623e
Show a glyph in the assets datatable. ( #3111 )
2016-12-29 18:12:27 -08:00
snipe
4c5fce847b
Removed user “new” buttons next to non-user options
2016-12-29 17:41:39 -08:00
snipe
16bd78fb3f
Removed stray poop
2016-12-29 17:26:21 -08:00
snipe
221cf1f9c8
Merge branch 'checkout-to-things-v1' of https://github.com/dmeltzer/snipe-it into dmeltzer-checkout-to-things-v1
...
# Conflicts:
# app/Http/Controllers/AssetsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/UsersController.php
# app/Presenters/AssetPresenter.php
2016-12-29 16:20:17 -08:00
snipe
51ceaedfaf
Small phpcbf cleanup
2016-12-29 14:02:18 -08:00
Daniel Meltzer
aa2d3cf026
The assets method was renamed to assignedAssets in User class. Adjust places to reflect that
2016-12-29 11:45:37 -05:00
Daniel Meltzer
13b51bc934
Allow checkout of item to things on create page. Need to test validation better and maybe extract code to one place for checkout.blade and edit.blade
2016-12-29 11:10:52 -05:00
Daniel Meltzer
7ccd71978c
Cleanup checkedout to part of asset view.
2016-12-29 09:56:19 -05:00
Daniel Meltzer
8cc695b65f
Port more assignedUser to assignedTo.
2016-12-29 09:31:16 -05:00
snipe
fd805bde50
Fixes #1247 - allow SVG logo upload
2016-12-27 17:31:53 -08:00
Daniel Meltzer
d262aec4c3
Save Progress.
2016-12-27 19:24:41 -05:00
Daniel Meltzer
13cf11368f
Reformat all view files. ( #3105 )
...
* Reformat all view files. Check for matching tags and rearrange to make everything line up.
* Fix regression on asset create where the log was no longer saved.
2016-12-27 12:03:47 -08:00
Daniel Meltzer
cafafe851c
Notification rework ( #3103 )
...
* Move slack integration to laravel5.3 style notifications, part 1.
* Fix consumable tab when active.
* Move the slack notifiable to the settings model. Move all slack notifications into logCheckout/logCheckin. Should think about refactoring this as an event at some point still. Move Asset checkin/checkout to use the general loggable trait rather than it's own solution.
* Fix a logic error where assets with a non deployable status would show checkin instead of no button at all.
* Fix an html formatting error that resulted in us not closing a form. This would cause the checkin page to try to submit a delete request (related to the modal form) rather than the desired checkin request. Also fix formatting in this file.
2016-12-26 15:19:04 -08:00
Daniel Meltzer
fd450e2773
Two asset maintence related fixes ( #3101 )
...
* Fix maintenances create button, and post to the proper route in maintences edit
* Fix consumable tab when active.
* Fix an html formatting error that resulted in us not closing a form. This would cause the checkin page to try to submit a delete request (related to the modal form) rather than the desired checkin request. Also fix formatting in this file.
* Use log mail driver for testing, should fix the functional issue. Disable acceptance tests on travis for now.
* Fix Category edit page.
* EOL Can be null.
2016-12-26 15:17:12 -08:00
Daniel Meltzer
61543f3a04
Add presenters for models. ( #3098 )
...
* Add presenters for models. Move bootstrap table JSON generation to these presenters, which cleans up controllers a lot. Move view specific modifications from the models to the presenters as well.
* Fix some issues found by travis and codacy
* Fix a few more issues found while testing.
* Attempt another acceptance test fix
* Try something else
* Maybe..
2016-12-23 17:52:00 -08:00
snipe
94a6b555a8
Darker red for warning
2016-12-22 21:21:10 -08:00
snipe
fc18aa7f6d
Fixes bug #3086 - unabel to create asset from asset model screen
2016-12-22 17:08:42 -08:00
snipe
d6b7036518
NOT FINISHED: Added case for component import
...
This is not finished. The actual component creation isn’t written yet
2016-12-22 16:06:55 -08:00
snipe
2fe984013b
Fixes #3092 - user location not being exported correctly
2016-12-22 15:53:34 -08:00
Daniel Meltzer
cd8c585377
Discussion: Moving to policies for controller based authorization ( #3080 )
...
* Make delete routes work. We put a little form in the modal that spoofs the delete field.
* Fix route on creating a user.
* Fix redundant id parameter.
* Port acceptance tests to new urls.
* Initial work on migrating to model based policies instead of global gates. Will allow for much more detailed permissions bits in the future.
* This needs to stay for the dashboard checks.
* Add user states for permissions to build tests.
* Build up unit tests for gates/permissions. Move accessories/consumables/assets to policies instead of in authserviceprovider
* Migrate various locations to new syntax. Update test to be more specific
* Fix functional tests.
Add an artisan command for installing a settings setup on travis-ci
* Try a different id... Need to come up with a better way of passing the id for tests that need an existing one.
* Try to fix travis
* Update urls to use routes and not hardcode old paths. Also fix some migration errors found along the way.:
* Add a environment for travis functional tests.
* Adjust config file to make travis use it.
* Use redirect()->route instead of redirect()-to
* Dump all failures in the output directory if travis fails.
* Cleanups and minor fixes.
* Adjust the supplier modelfactory to comply with new validation restrictions.
* Some test fixes.
* Locales can be longer than 5 characters according to faker... fex gez_ET. Increase lenght in mysql and add a validation
* Update test database dump to latest migrations.
2016-12-19 11:04:28 -08:00
Daniel Meltzer
ae2cb5fe68
Make delete routes work. ( #3077 )
...
* Make delete routes work. We put a little form in the modal that spoofs the delete field.
* Fix route on creating a user.
* Fix redundant id parameter.
* Port acceptance tests to new urls.
2016-12-19 10:42:33 -08:00
snipe
9ea05bacf3
User resource routes
2016-12-15 20:52:39 -08:00
snipe
76344a8c9b
Misc view rounte cleanups
2016-12-15 20:09:51 -08:00
snipe
f832b15cf3
Components routes
2016-12-15 19:59:42 -08:00
snipe
e685e0f019
Cleaned up custom fields controllers, views, names, etc
2016-12-15 19:17:07 -08:00
snipe
040774d646
One more /admin fix
2016-12-15 18:25:39 -08:00
snipe
d6b41759f0
Updated manufacturers, suppliers, depreciations for new route resources
2016-12-15 18:18:13 -08:00
snipe
406b828b4e
Updated named location routes in hardware
2016-12-15 17:18:22 -08:00
snipe
c308fbce0d
Updated resources, named routes, tests for Locations
2016-12-15 17:12:22 -08:00
snipe
3e4be6671e
Updated categories with resty routes
2016-12-15 16:42:47 -08:00
snipe
aab0933856
Use url() helper over URL::to
2016-12-15 16:41:36 -08:00
snipe
c6ab34faee
Updated Companies for #3059
2016-12-15 15:48:30 -08:00
snipe
cf2b57cb15
More for #3057
2016-12-15 15:15:11 -08:00
snipe
ad1bf86a08
And still more license route updates
2016-12-15 13:07:34 -08:00
snipe
bea1a93e9b
More license route updates
2016-12-15 12:48:15 -08:00
snipe
0c5d3d1c74
Updated license routes
2016-12-15 11:57:19 -08:00
snipe
456e4a633e
Corrected route for license view
2016-12-15 11:41:08 -08:00
snipe
a6b975b168
More updates for #3060 , #3058
2016-12-15 06:11:03 -08:00
snipe
b17e380aae
Removed stray echo tag
2016-12-15 04:27:33 -08:00
snipe
9b167d87d2
Updated to use named routes ( #3060 ), some FORM spoofing for PUT ( #3061 )
...
(Updating assets isn’t currently working - investigating that)
2016-12-15 04:27:17 -08:00
snipe
38eb910999
Updated email template with signoff and Site Name
2016-12-14 10:54:22 -08:00
snipe
a80ece9b84
New passport views
2016-12-14 10:17:07 -08:00
snipe
37c847ea08
Clearer/updated/named custom fields routes
...
This is still broken
2016-12-14 09:56:23 -08:00
snipe
863e200430
Hopefully fixes tons of PEBKAC where users have the wrong app.url
2016-12-14 08:20:05 -08:00
snipe
8e5977ad84
Updated maintenance views
2016-12-14 07:56:01 -08:00
snipe
93ba90e837
Merge remote-tracking branch 'origin/develop'
2016-12-12 19:24:00 -08:00
snipe
dd28c5709e
Add action=“” to form (possible IE11 fix)
2016-12-12 19:23:41 -08:00
snipe
fc70d79a17
Merge remote-tracking branch 'origin/develop'
2016-12-12 19:07:07 -08:00
snipe
95f1a98b96
Removed extraneous closing label tags
2016-12-12 19:03:45 -08:00
snipe
84317f7f50
Fixes #2990 - disabled autocomplete on login
2016-12-06 11:50:20 -08:00
snipe
4df53bdf8d
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
# resources/views/account/view-assets.blade.php
2016-12-01 06:10:50 -08:00
snipe
d49a1ea304
More graceful error message if log doesn’t exist
2016-12-01 06:05:14 -08:00
snipe
2ab0594530
Prevent errors if company support conflict prevents viewing the item
2016-12-01 05:54:14 -08:00
snipe
8a81b29901
Fixed missing closing angle bracket
2016-12-01 05:53:20 -08:00
snipe
59617cc7d3
Updated version in settings
2016-12-01 02:57:47 -08:00
snipe
1be22cf051
Improved versioning script
2016-12-01 02:53:41 -08:00
snipe
d03c167d3b
Switch string to product key
2016-12-01 00:15:48 -08:00
snipe
2ec7c0bf1d
Hide edit actions from asset sidebar if user cannot edit assets
2016-12-01 00:00:48 -08:00
snipe
7513c99dd0
Fixed supplier string in hardware view
2016-11-30 23:19:13 -08:00
snipe
b614470b21
Updated serial text to product key
2016-11-29 21:45:49 -08:00
snipe
f5e100a6a5
Only allow asset files to be deleted, maintenances to be added if user has assets.edit permission
2016-11-29 13:37:45 -08:00
snipe
abcc01f5e0
More language string corrections
2016-11-29 12:48:00 -08:00
snipe
4dbe8fad30
More language string fixes
2016-11-29 08:46:33 -08:00
snipe
92ace8582d
Fixed notes column header language string
2016-11-29 07:57:02 -08:00
snipe
507040976a
Fixed incorrect license field text strings
2016-11-29 07:52:00 -08:00
snipe
eb340b0fa9
Add fieldset to asset model listing
2016-11-29 06:06:52 -08:00
Daniel Meltzer
263f19bdad
Fix error in partializing with creating an asset maintenance. ( #2987 )
2016-11-29 05:02:48 -08:00
snipe
c72954b671
Fixes #2959 - fixed error with custom fields not populating correctly
2016-11-29 01:59:18 -08:00
snipe
7393f0bbea
Fixes snipeSettings error if the user was created but the settings table isn’t populated yet
2016-11-29 01:20:51 -08:00
snipe
0d6b160b61
Fix mail test script
2016-11-29 01:19:05 -08:00
snipe
ba23952852
Add red banner if app is in production mode and debugging is turned on
2016-11-29 00:08:20 -08:00
Daniel Meltzer
b8cbf0022e
Log fixes ( #2972 )
...
* Make sure we set target_type when creating an accept asset log, and add a migration to fix older ones.
* On a declined log, we don't have an assigned user.
Guard against this conditional (which realistically should never be hit?)
Should fix #2940
* Fix codacy issues with migration.
2016-11-24 12:48:14 -08:00
Daniel Meltzer
7214920563
Update index.blade.php ( #2963 )
...
Asset maintences should be searchable.
2016-11-23 06:15:40 -08:00
Daniel Meltzer
8c549c47e4
Update bootstrap-table.blade.php ( #2964 )
...
Fix error when search is not passed through.
2016-11-23 05:56:08 -08:00
snipe
45c789021e
Add employee number option to custom report
2016-11-23 05:17:54 -08:00
snipe
d8eb68af83
Merge branch 'hotfixes/accessory_model_number' into develop
...
# Conflicts:
# resources/views/accessories/edit.blade.php
2016-11-17 20:01:01 -08:00
snipe
dcc000284f
Add accessory model to accessories
2016-11-17 20:00:08 -08:00
snipe
d0d9d82579
Add model number to accessories
2016-11-17 19:57:53 -08:00
Daniel Meltzer
d722ed3823
Partialize forms ( #2884 )
...
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
2016-11-16 16:56:57 -08:00
snipe
84e06f4642
Add postal code to locations listing
2016-11-16 08:22:54 -08:00
snipe
37a6599978
Adds expected checkin to custom reports
2016-11-15 01:55:27 -08:00
snipe
49ce630bb8
Make company name sortable
2016-11-11 19:33:13 -08:00
snipe
a914dacf8e
Adds drawn signature to asset acceptance ( #2846 )
...
* Adds digital signature to asset acceptance
This is still a little broken - the history is displaying “Deleted user”, since there is no item type listed. Saving the item_type as App\Models\User tries to update accepted on the users table, which obviously doesn’t exist.
* Use asset facade for folks in subdirs
* Possible fix for weird accepted/declined display
* Display signature in modal popup if sigs are required
* Wrap that display file in auth middleware, just to be sure.
It shoudl fail if you’re not authorized since you’re not logged in, but better safe than sorry
* Fixed header section of layout
* Removed extra drop from migration rollback
2016-10-31 21:00:30 -07:00
snipe
26d14b2338
Let superadmins edit their own groups
2016-10-31 19:18:06 -07:00
snipe
8323ed27c2
Do not makes group editable if the user is not an admin
...
This fixes a bug where the field was (correctly) disabled if the editing user isn’t a superadmin, but because the field was disabled, it would clear the permission groups.
2016-10-31 18:57:35 -07:00
snipe
25bd1acab5
Fixes permission for non-superadmin assigning user permissions
2016-10-31 18:19:55 -07:00
snipe
7c6bdcb6b2
Fix width of warning message
2016-10-31 18:15:00 -07:00
snipe
13450aa961
Include asset status type in asset detail view
2016-10-31 17:44:39 -07:00
snipe
0595867500
Fixes #2856 - add status to asset detail view
...
(Not sure how we missed this… oops)
2016-10-31 17:41:15 -07:00
snipe
a4ae3b0091
Show whether device is enabled and/or 2FA is active
2016-10-31 17:16:26 -07:00
snipe
cbfcf959f9
Allow certain users to override 2FA with permission
2016-10-31 16:52:25 -07:00
snipe
41defb312b
Moved CSRF token
2016-10-31 13:25:50 -07:00
snipe
fe041b66c6
Adds two-factor to users listing
2016-10-29 07:21:34 -07:00
snipe
32c439d979
Tidy up login form
2016-10-29 06:45:24 -07:00
snipe
2f6fcadd05
Fixes #2838 - removed duplicate requestabe field in asset models
2016-10-29 05:53:50 -07:00
snipe
cea255995c
Fixes #106 - adds Google Authenticator support ( #2842 )
...
* refactor to clean up LDAP login, and make the login method easier to handle.
* Login refactor cleanup
* Google 2FA package
* Adds Google Authenticator two-factor
* Removed unused blade
* Added optin setting in profile
* Removed dumb comments
* Made lock_passwords check more consistent
* Additional two factor strings
* Lock passwords check
* Display feature disabled text if in demo mode
* Two factor admin reset options
* Translation strings
2016-10-29 05:50:55 -07:00
snipe
a929b635ff
Fixes #2809 - adds serial number to components
2016-10-27 15:33:48 -07:00
snipe
9c3c611b37
Fixes #2825 - columns misaligned when older display_asset_name field set to 1
2016-10-27 15:02:32 -07:00
snipe
3e701c6dd1
Fixes #2814 - adds job title to users listing display
2016-10-27 14:29:07 -07:00
snipe
e4140f4c48
Fixes #2817 - adds EOL to custom report
2016-10-27 14:20:55 -07:00
snipe
d7222ae1f0
Fix for defaultLoc in asset view
2016-10-26 10:12:16 -07:00
snipe
0728a991a8
Merge branch 'hotfixes/datepicker_for_date_custom_field' into develop
...
# Conflicts:
# resources/views/models/custom_fields_form.blade.php
2016-10-25 05:18:55 -07:00
snipe
33a0c2087a
Use datepicker if custom field format is a date
2016-10-25 05:16:41 -07:00
snipe
d24c4b1152
Merge branch 'hotfixes/export_all_users' into develop
2016-10-25 02:42:20 -07:00
snipe
30f0f6f527
Export users to CSV
...
Bypasses the weird limit bug in the javascript
2016-10-25 02:41:34 -07:00
snipe
219ef23126
Fixes #2713 - error displayed with license checked out to asset
2016-10-12 14:32:21 -07:00
snipe
31898d0f85
Fixes #2751 - asset tag added to asset maintenance report
2016-10-12 14:18:51 -07:00
snipe
1e82058f4d
Fixes #2763 - added missing translations methods for dashboard
2016-10-12 13:01:29 -07:00
snipe
b3329135df
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-10-12 12:50:35 -07:00
snipe
2350c1c15c
Fixes #2352
2016-10-12 12:50:30 -07:00
snipe
8f4e016c01
Fixes #2768 and #2753
2016-10-12 12:48:37 -07:00
Daniel Meltzer
2e0a7abbe9
Rework permissions view ( #2756 )
...
* Early layout work on a cleaner permissions interface
* Cleanup layout. Make new permissions view work. Still needs some css and javascript improvements. Also need to do the same thing to the group view.
* Improve styling, add javascript to toggle an entire group of permissions if choosing the permission on the header row. Would be nice to add collapsing of sections in the future.
* Toggle viewing sections.
* Special case places where we only have one item in a group to only display the item once.
* Filter getCreate the same way.
2016-10-12 12:06:28 -07:00
Matthias Frei
4b6ba6cb30
BugFix: Asset name was not included in custom report ( #2733 )
...
* BugFix: Asset name was not included in custom report
* BugFix: Custom Asset Report did not escape commas in custom fields. So the csv file is inconsistent, if a custom field containes a comma. Added an escape function which escapes the commas with a backslash.
A csvreader can be configured to handle the escape character.
2016-10-12 12:05:49 -07:00
Daniel Meltzer
b92d26f3c4
When checking out a consumable, don't say asset ( #2718 )
2016-09-29 22:20:58 -07:00
Brady Wetherington
7ca7877740
Fix mismerged code. ( #2705 )
2016-09-28 22:57:19 -07:00
snipe
8cb4954f8a
Apply encrypted fields patch from develop
2016-09-28 14:58:01 -07:00
snipe
9091385182
Merge branch 'hotfixes/purchase_cost' into develop
...
# Conflicts:
# app/Http/Controllers/ReportsController.php
# config/version.php
2016-09-27 19:13:21 -07:00
snipe
f1c458185d
Client-side pagination on asset report for faster loading
2016-09-27 14:56:05 -07:00
snipe
fa72e64b98
Add checkout date to asset report
2016-09-27 08:42:48 -07:00
snipe
e9f3d622f5
Add company name to custom asset report
2016-09-27 07:19:52 -07:00
snipe
1e3244b2b3
Merge branch 'hotfixes/eol' into develop
...
# Conflicts:
# app/Http/Controllers/AssetModelsController.php
2016-09-27 07:04:45 -07:00
snipe
a92bfe8ade
Default EOL to null, not 0, if no value entered
2016-09-27 06:53:59 -07:00
Andrés Núñez
40f00665b3
Translate emails ( #2652 )
...
* commit temporal
* final translation commit -- added email translations
* final translation commit -- removed file for spanish translations
* final translation commit -- removed file for spanish translations
* added missing translations
* method overrided and config files back to default
* config files back to default
* config files back to default
2016-09-26 14:13:07 -07:00
snipe
937192f7ce
Ugh… git… why?
2016-09-23 14:13:41 -07:00
snipe
8ba19632cf
Removed new badge
2016-09-23 13:13:42 -07:00
snipe
7fdd4fbe98
Updates to the history importer to make it a little less brittle and provide better feedback
2016-09-20 09:22:49 -07:00
snipe
2ab91fed01
Fixes #2607 - non-encrypted now visible to non-admins with asset access
2016-09-20 03:48:38 -07:00
snipe
aa92b93bd1
Fixes #2622 - add depreciation to license report
2016-09-20 02:58:08 -07:00
snipe
6dc143d95d
Use Ajax activity report for dashboard to prevent data duplication
2016-09-20 00:46:46 -07:00
snipe
d8753a7d86
Use Ajax for activity report
2016-09-20 00:46:24 -07:00
snipe
71be73781b
Add company name option to reports
2016-09-19 22:27:34 -07:00
snipe
04898c49b2
Fixed wrong translation from PR
2016-09-15 20:03:47 -07:00
Karol
eeff305b02
Update dashboard.blade.php ( #2593 )
2016-09-15 19:59:01 -07:00
Daniel Meltzer
2d8269ddcd
Checkout Improvements, and initial support for requesting an asset model ( #2573 )
...
* Create a new action_log table to replace asset_log. Use Polymorphism to generalize class and targets. Port everything I can find to use it. Add a migration to port the asset_logs table to action_logs.
* Initial work on requestable asset models
* Backend work for polymorphic requests table to store checkout requests.
* Add missing files
* Add a record to the db when requesting items. Build up a testing route for interfacing with this.
* Users can now toggle requests of items on the request page. Reformat page to use the same tab layout we use elsewhere
* Polymorphic request function. Implement requesting of asset models. Need to port mail/slack to notifications still.
* Implement requesting of asset models. Build up emails and notifications to support it. Allow specifying a quantity of model to request.
* Add view to show currently requested assets. Needs some work and cleanup, but it isn't accessible from anywhere yet.
2016-09-15 19:58:27 -07:00
snipe
391c9a77ef
Misc debug template for use with debugging CSV exports, etc
2016-09-12 14:05:31 -07:00
Daniel Meltzer
e86adccf19
Actionlog Class: Improvements and polymorphism ( #2561 )
...
* Save progress
* Create a new action_log table to replace asset_log. Use Polymorphism to generalize class and targets. Port everything I can find to use it. Add a migration to port the asset_logs table to action_logs.
* Allow accepted_id to be nullable.
* Comment out the thread_id migration, because it b0rks on a new database with the move. I'm unsure if the thread_id does anything...It doesn't seem to be used
* Clean up all old methods from Actionlog model. Port everything to use new cleaner interface.
* Port the actionlog factory to fix travis.
* Adjust code to work on php5. Also fix lurking adminlog call.
* Remove weird code
* Port the pave command. Also fix dangling adminlog
2016-09-06 19:39:42 -07:00
snipe
d4dc1830ec
Fixes #2527 - honor the setting for whether Snpie-IT can access the outside world
2016-08-30 12:58:08 -07:00
snipe
04e9ca0942
Fixes #2399
2016-08-30 12:34:23 -07:00
snipe
5090468357
Fixes #2510 and #2488 - CSS class added to images in views
2016-08-30 07:20:07 -07:00
snipe
213cda8cf4
Fixes #2525
2016-08-30 07:03:22 -07:00
snipe
8816c481af
Added HTML for generating passwords in asset user creation modal
2016-08-30 06:48:23 -07:00
snipe
3ed0cf2be8
Moved import errors up higher on the screen, fixed some weird formatting bugaboos
2016-08-30 06:48:00 -07:00
snipe
25902db659
Generate password from modal
2016-08-30 06:47:18 -07:00
snipe
35a67ab18a
Fixes #2516 - listbox error on new asset
2016-08-29 23:49:23 -07:00
Daniel Meltzer
276e0a7114
Importer: Implement item update and interface improvments ( #2507 )
...
* Add support for updating assets to the importer.
If an asset with a matching asset tag is found, and the --update flag is
passed to the importer, we edit the matching asset with any
asset-specific values, and persist to the database. Any missing/blank
values are skipped.
TODO: Add to web interface, add support in consumables/accessories
* Allow deleting of files on the import page.
* Extend web interface to allow updating of imported items.
This adds a modal dialog to the import process. Currently the dialog
allows the choice of update vs ignore, and choosing the item type to
import (Accessory, Asset, Consumable).
Also use Helper::ParseFloat() for purchase_cost processing. It exists,
and fixes issues on my end at least.
* Implement editing of consumables and accessories.
* Rename getProcessImportFile to postProcessImportFile to reflect how it's now used
* Fix copy-pasta error.
2016-08-29 15:49:32 -07:00
snipe
0d088f3031
Fixes #2491 - show asset tag on dashboard
2016-08-25 21:28:46 -07:00
snipe
d473432436
Show encryption in fieldset list
2016-08-25 21:04:25 -07:00
snipe
96eb832fd3
Only decrypt if the user is an admin
2016-08-25 21:03:24 -07:00
snipe
122f0b9cba
Custom fields form in asset edit view
2016-08-25 18:35:28 -07:00
snipe
c49f10c9bb
Removed line break
2016-08-25 18:35:16 -07:00
snipe
b76ad5ea88
Reverted name of form field
2016-08-25 17:08:39 -07:00
snipe
61aa9beddb
Added new fields to custom fields views
2016-08-25 16:36:00 -07:00
snipe
f38912a5cf
Custom fields additions
2016-08-23 18:52:54 -07:00
snipe
ad22293f4b
Added show in nav for status label views and controller
2016-08-23 18:52:42 -07:00
snipe
90d2d0c7e1
Fixes #2469 - corrected config app.url
2016-08-23 16:04:22 -07:00
snipe
9407b4e28c
Removed console warning
2016-08-23 15:53:18 -07:00
snipe
7b8403cdb9
Pass status ID to ajax
2016-08-23 15:52:10 -07:00
snipe
e52a0f65bb
Update asset report to show deployed if asset is checked out
2016-08-23 11:36:34 -07:00
snipe
d9f2e7bf58
If custom field is type URL, display it as a link
2016-08-18 12:44:55 -07:00
snipe
923352537c
Moved column for in/out
2016-08-18 07:06:55 -07:00
snipe
4419dc7434
Merge branch 'fix-double-format' of https://github.com/dmeltzer/snipe-it into dmeltzer-fix-double-format
...
# Conflicts:
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/LicensesController.php
# resources/views/hardware/view.blade.php
2016-08-16 18:53:45 -07:00
Daniel Meltzer
ac63642224
Add manufacturer to licenses ( #2436 )
...
* Add manufacturer to licenses. Shows in table and edit. Need to improve manufacturer view to show lists beyond assets still.
* Remove extra closing tags, formatting
* Work on making the manufacturer view show more options. Need to figure out how to change the table dynamically.
* Cleanup formatting and fix a few weirdities in hardware/view.blade.php
* Standardize on two-space tabs in this file, as it seems the most
* common.
* Fix a few places where we call number_format without guaranteeing the
* item is a number and not a string.
* Show a "No Results" message on components page if there are no
* components.
* Show table of licenses on manufacturer view page.
This reworks the ManufacturersController::getDataView method to delegate
the view to a sub method (currently assets or licenses, but plan to
extend to consumables/accessories/components as well). We then put tabs
at the top of the view to show multiple tables. This just duplicates
the table layout from licenses/index.blade, but I wonder if theres a way
to centralize that code, maybe through partials, over time..
The only known missing part of manufacturers for licenses would be adding it
to the importer, but the license importer should probably migrate to
object importer before doing too much more...
* Add manufacturer to accessory.
* Add consumables to the manufacturer view page.
2016-08-16 18:49:54 -07:00
Daniel Meltzer
5959f83de3
Rename parseCurrencyString to formatCurrencyOutput to clarify what it does better.
2016-08-16 20:47:53 -05:00
Daniel Meltzer
0c912bcf49
Fix more number_format madness.
...
This does two main things:
1) The importer now imports as numbers, not parsed strings. This allows
is to format values on output instead of input, which is what was
happening in most places.
2) Add a Helper::parseCurrencyString method and port everything to use
this. This checks to see if the value is numeric or empty, and returns
the appropriate value in all cases. Should fix all known occurances of
number_format expections.
2016-08-16 20:41:28 -05:00
snipe
7edf1db101
Small tweaks to history
2016-08-12 19:03:32 -07:00
snipe
5e9740e0b4
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-08-12 17:10:10 -07:00
snipe
41a20d8f66
Tidied up some debugging code, better explanation
2016-08-12 17:10:03 -07:00
snipe
06fcf3e07d
Import history blade
2016-08-12 16:01:34 -07:00
Daniel Meltzer
cc15a4f018
Use showAssetName instead of asset->name to include the asset tag ( #2437 )
2016-08-11 23:56:40 -07:00
snipe
4c787891e4
Use custom maintenance middleware
2016-08-11 19:22:26 -07:00
snipe
7992258b46
Updated UI with new required indicator
2016-08-11 15:44:01 -07:00
snipe
869da1da78
Add maintenance notes to maintenances tab in hardware view
2016-08-11 15:40:41 -07:00
snipe
1d3255a00b
Allow admin to turn LDAP password sync off.
...
This is added to handle customers/users with a security policy that prohibits third-parties or external databases from storing LDAP passwords.
2016-08-04 14:29:28 -07:00
snipe
29eadb10ae
Fixes #2387
2016-08-02 17:03:15 -07:00
snipe
1ca5f8bee5
Removed asterisks, use orange bar for req fields in locations
2016-08-02 16:40:38 -07:00
snipe
75e0c5565c
Add username and custom fields option to custom report
2016-08-02 15:04:10 -07:00
snipe
098e7e4feb
Hide email address if there is no value
2016-08-02 15:03:45 -07:00
snipe
ca8ca89955
Added custom color to status labels, only show status labels if there are results
2016-08-02 13:25:50 -07:00
snipe
03c2c267bc
Added favicon explicit link
2016-08-02 12:39:49 -07:00
snipe
a76fe98b2d
Only show a logo if a logo is uploaded
2016-08-02 12:34:08 -07:00
snipe
9e43a44d20
Better styling for forgotten password screens
2016-08-02 12:30:22 -07:00
snipe
17d5e40e02
Fixes #2383
2016-08-02 09:54:31 -07:00
snipe
0e5209e80f
Few more dashboard fixes
2016-08-02 05:06:17 -07:00
snipe
cbc42f3e59
Fix for deleted users display
2016-08-02 04:45:48 -07:00
snipe
ef6fb69cee
Fix translation
2016-08-02 04:26:07 -07:00
snipe
39929c7d89
Better handling for deleted users
2016-08-02 04:23:13 -07:00
snipe
23e23bab90
Remove display of port number since it’s ignored anyway
2016-08-02 03:26:38 -07:00
snipe
6204969639
Fixed requestable link
2016-08-02 02:12:18 -07:00
snipe
283bb4ae4b
Fixes #2381
2016-08-02 01:36:14 -07:00
snipe
8246a319a2
Fixes #2363 and #1097
2016-08-02 00:54:38 -07:00
snipe
27dee1b793
Removed comment
2016-08-01 20:15:25 -07:00
snipe
cdeccb399f
Hide extra options if superadmin is checked
2016-08-01 20:11:54 -07:00
snipe
eac6abe60a
Fixes #2378 - disallow admins to create/edit superadmins
...
Also disables admins from being able to edit groups, since that can grant superadmin access.
2016-08-01 18:43:11 -07:00
snipe
139325d8ba
Small tweaks for bad data
2016-08-01 10:17:46 -07:00
snipe
1f30bdee99
Fixes #2361
2016-07-30 17:27:08 -07:00
snipe
46eca54b44
Moved bulk checkout into assets nav
2016-07-29 14:17:59 -07:00
zjean
fcb1d6ac15
Fixed feedback on #2349 ( #2359 )
2016-07-29 13:59:50 -07:00
snipe
a53346be1f
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-07-29 12:15:14 -07:00
snipe
fd94c76874
Fixes asset created_at
2016-07-29 12:15:09 -07:00
zjean
108a3c9dad
Updated view for #2324 ( #2357 )
2016-07-29 11:55:16 -07:00
snipe
85232c47da
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-07-28 21:31:58 -07:00
snipe
47f6635992
A few more permissions tweaks
2016-07-28 21:31:53 -07:00
Daniel Meltzer
eef8d1609e
Small fixes ( #2350 )
...
* components.view should point to view, not create
* Fix comment
* Rename variable to accurately reflect its responsibility
* Fix line breaks in serial key, remove places where adding line breaks makes no sense. Fixes #2344
2016-07-28 20:59:42 -07:00
snipe
8a9307f357
Wordwrap license key
2016-07-28 18:56:02 -07:00
snipe
f31637adb4
Fixes #2346
2016-07-28 08:39:28 -07:00
snipe
3e5d2b5385
Ability to remove field from fieldset
2016-07-28 08:10:15 -07:00
snipe
0ee5dea1a1
Fixes #2344
2016-07-28 06:43:31 -07:00
snipe
9fbe6c68ac
Fixes #2304
2016-07-27 21:30:38 -07:00
snipe
eb508901c5
Zerofilling for auto-increment
2016-07-27 21:28:00 -07:00
snipe
3fd5fb836f
Restore linebreaks in notes
2016-07-27 20:24:09 -07:00
Daniel Meltzer
b4e54225a2
Fix exports ( #2338 )
...
* Update tableexport.js to the new version.
* Give the export file in each table a useful name.
The name takes the form of tabletype-export-YYYY-MM-DD.extension.
2016-07-27 19:45:45 -07:00
snipe
eec22c5aeb
Removed port stuff, since LDAP ignores it anyway :-/
2016-07-22 16:21:16 -07:00
snipe
b03330aae0
Added TLS option in settings for LDAP
2016-07-22 16:00:37 -07:00
snipe
ba25972b49
Add LDAP port number option
2016-07-22 15:09:49 -07:00
snipe
cc6b2a0081
FIxes #2280
...
This shouldn’t ever happen though. Bad data somwhere, I’m guessing.
2016-07-22 07:48:46 -07:00
snipe
128290bd82
Cleanup checkin blade
2016-07-22 02:34:25 -07:00
snipe
114540d836
Cleanup checkout form
2016-07-22 02:20:05 -07:00
snipe
0b57f74e36
Check for model name (this should never be blank, but…)
2016-07-22 02:14:12 -07:00
snipe
03d7d01e12
Fixes #2300
2016-07-22 02:12:04 -07:00
snipe
a1640d7fe3
Form cleanup
2016-07-22 02:11:57 -07:00
snipe
297820d347
Newer required style
2016-07-22 01:33:55 -07:00
snipe
78fda31379
Helper method to introspect into the model level validation to see if the field is required
...
(This does not yet handle form request validation)
2016-07-22 00:29:23 -07:00
snipe
3a04686ade
Nicer demo mode message
2016-07-22 00:28:22 -07:00
snipe
ca5d3e3006
Nicer license form display
2016-07-22 00:25:41 -07:00
snipe
e256bdc9f7
Clearer version in footer
2016-07-21 21:39:23 -07:00
snipe
b0dc5b4183
Fixes #2290
2016-07-21 21:28:17 -07:00
snipe
f6a4d4aaab
Better display for some features disabled for demo mode
2016-07-21 19:40:23 -07:00
Daniel Meltzer
c2f6e0cfd8
Don't escape html in default eula. Fixes #2277 ( #2279 )
2016-07-20 19:39:48 -07:00
Daniel Meltzer
ba6f26cef9
If a category has items in it, disable changing the category type ( #2288 )
2016-07-20 19:27:33 -07:00
Daniel Meltzer
68d8e6a3a9
Importer again ( #2260 )
...
* Quote item names when displaying in error table.
* Remove the danger class as well as the warning class when uploading a file. Fixes a display error if a file is successful after a file fails upload.
2016-07-18 15:46:03 -07:00
snipe
616f922306
Fixes #2254
2016-07-14 19:50:00 -07:00
snipe
99a42dfc38
More AD fixes
2016-07-14 16:27:32 -07:00
snipe
0cf8ac1d95
Add AD domain to settings
2016-07-14 15:52:52 -07:00
snipe
e6b872299d
Possible fix for #2246 - needs AD testing
2016-07-13 15:18:29 -07:00
snipe
a00198abc7
Added spinner for LDAP test
2016-07-13 07:34:54 -07:00
snipe
ab6e2a7301
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-07-13 05:50:45 -07:00
snipe
ff6c3cfa17
Added LDAP settings check in settings page
2016-07-13 05:47:23 -07:00
Daniel Meltzer
bf88cd8233
Check for variables to exist and not null rather than assuming it does. Fixes #2247 . ( #2248 )
2016-07-12 21:03:23 -07:00
Daniel Meltzer
f683c78a69
Fix adding an image to an asset when public/uploads/assets does not exist ( #2240 )
...
* Fix adding an image to an asset when public/uploads/assets does not exist.
First check to see if we can create directory and do so. If any errors occur, display the error string as an error on the page.
* Add the public/uploads/assets directory to new installs.
* Add some comments explaining this code so I remember what it does next time.
2016-07-10 18:43:00 -07:00
snipe
6bdc88cfea
Removed extra space
2016-07-09 18:20:14 -07:00
snipe
5e8d8d6df0
Nicer date display
2016-07-07 02:07:31 -07:00
snipe
f2ddc7b0ae
Added purchase cost and purchase date to listing
2016-07-07 02:07:21 -07:00
snipe
a7a748385f
Longer cookie
2016-07-01 01:05:22 -07:00
snipe
0c65b6cad1
Nicer bulk delete layout
2016-06-29 04:30:21 -07:00
snipe
0c98390eef
Hide bulk actions, checkbox and checkout/in if deleted
2016-06-29 04:19:37 -07:00
Daniel Meltzer
52c89ca889
Hide Delete action if user is deleted. ( #2205 )
...
Issue: 1493
2016-06-28 11:50:11 -07:00
Daniel Meltzer
d484636bba
Add model number column to the hardware list. ( #2204 )
...
* Add model number column to the hardware list and allow searching based on model number. Column is hidden by default.
* Fix sorting. Add scope to order by model number.
2016-06-27 22:32:40 -07:00
snipe
0cf563ae5b
Show admin in maintenances
2016-06-22 17:04:47 -07:00
snipe
e5a5de6a0d
Just use inline validation instead of form request, since it's a one-off
2016-06-22 15:59:00 -07:00
snipe
0ca85f8a8a
Updates to components
2016-06-22 14:55:17 -07:00
Daniel Meltzer
43e64a5f8c
Store a list of errors associated with each field instead of overwriting the error if multiple occur. Also Adjust the importer to extract the asset tag earlier in the process so all asset related errors are associated with the asset tag rather than some being tied to the name.
2016-06-22 15:13:01 -04:00
snipe
dd1241f964
Fix in case crated_at is blank
2016-06-21 17:19:46 -07:00
snipe
e9227f77b6
Fixes #2163 - put model image in view if no asset image
2016-06-21 12:20:22 -07:00
snipe
6165d804f9
Merge pull request #2145 from dmeltzer/disable-select2-on-ios
...
Disable select2 on ios.
2016-06-17 17:15:47 -07:00
snipe
161c6fe2e6
Merge pull request #2173 from twistedR/fix-password-login
...
Use app.url for password reset instead of hard coded one.
2016-06-17 17:15:05 -07:00
snipe
1c51db876c
Merge pull request #2172 from ddreier/v3-label-changes
...
Center 1D Barcode and include Custom CSS in barcodes view
2016-06-17 17:14:28 -07:00
snipe
48595e3d76
Merge pull request #2135 from YetAnotherCodeMonkey/v3
...
Swap bgutter and sgutter as they seem to be reversed.
2016-06-17 17:12:47 -07:00
Raveesh
bb3d88cce5
Use the full app.url for the password link
2016-06-17 17:52:14 -04:00
Daniel Dreier
52084a2c24
Add CSS to center the 1D barcode and add PHP to include the custom CSS from Settings.
2016-06-17 14:38:50 -05:00
snipe
412756b651
Fix link to view manufacturer in hardware view
2016-06-15 21:14:26 -07:00
snipe
87352470c0
Added sortable created_at to assets and users
2016-06-15 21:06:17 -07:00
snipe
6a277a5391
Added inheritance back into users/groups
2016-06-15 20:45:45 -07:00
snipe
1efa69e51f
Fixes #2158
2016-06-15 11:50:57 -07:00
snipe
3ca81f4d73
Fixes #2140
2016-06-13 12:07:01 -07:00
snipe
dec95c3e06
Updated blade for box panel
2016-06-13 11:39:57 -07:00
snipe
2daed3c271
Fix for custom fields not saving
2016-06-10 16:36:46 -07:00
Daniel Meltzer
2159d77fc2
No longer necessary.
2016-06-10 07:46:38 -05:00
Daniel Meltzer
9c4c91063f
Merge branch 'v3' into Fix-Asset-Creation-with-old-data
2016-06-10 07:35:30 -05:00
Daniel Meltzer
4e74c553bd
Fix editing of assets. This also uses the asset form request for validation.
2016-06-10 07:33:33 -05:00
snipe
7a9cfb1a8f
Fixed label weirdness when no serial
2016-06-10 04:43:17 -07:00
snipe
4e1472f66d
Merge remote-tracking branch 'origin/v3' into v3-master
2016-06-10 00:48:33 -07:00
Daniel Meltzer
25c10c43dd
Disable select2 on ios. It's terribly slow, doesn't register click events, and has forces focus to the search bar by default (which makes the keyboard popup and take over the screen. The latter issue might justify disabling it for all mobile devices, but the performance issues certainly justify it on iOS.
2016-06-09 20:31:23 -05:00
Daniel Meltzer
044695cb02
Fix hardware creation error making old input disappear. This should be redone to dynamically update on the client side based on a JSON response instead of flashing and reloading, but that's a lot of change for v3 at this point.
2016-06-09 20:28:49 -05:00
snipe
66adffe6d9
Moved include
2016-06-09 14:41:58 -07:00
snipe
a04d6293d1
Proper hypenation of Snipe-IT in footer
2016-06-09 03:08:42 -07:00
snipe
2b5fb04ba9
Allow admin to add user on checkout screen
2016-06-09 00:36:52 -07:00
Drew Wilkinson
7f22d3f486
Fix margin for bottom to not be equal to side gutter, looks like a typo
2016-06-07 13:03:21 -04:00
Drew Wilkinson
c9d6857c73
Swap bgutter and sgutter as they seem to be reversed. I assume s=side=horizontal and b=bottom=vertical...
2016-06-07 12:39:53 -04:00
Daniel Meltzer
9648c6f1d3
Fix license Checkout.
...
A mistake in the sqlite porting led to "Please select an asset"
disappearing. This centralizes that code in Helper, and uses the code
in Licensescontroller and componentscontroller.
Also use the proper name on the components checkout page.
AssetMaintencesController reuses the same underlying code as
licensescontroller, but we don't want "Please select an asset" to be an
option there, so I'm not changing that code.
2016-06-07 07:58:08 -05:00
snipe
6de6052185
Hardcoded page number to prevent error
2016-06-02 17:17:50 -07:00
snipe
402c955f1c
Fixed title
2016-06-02 17:17:42 -07:00
snipe
485fb26393
Fixes #1985 - disallow checkin/checkout if the asset is not in a deployable status
2016-06-02 14:04:54 -07:00
snipe
9551c07528
Fixes #2087 - bad route to maintenance edit
2016-06-02 11:18:17 -07:00
snipe
a3e9b3df86
Updated error page title
2016-06-02 02:39:44 -07:00
snipe
89e656e709
Switched to can/cannot for blade
2016-06-02 02:39:36 -07:00
snipe
4998b5ab1b
Fixes #2080
2016-06-02 00:15:38 -07:00
Daniel Meltzer
37b416d5c7
Fix my git terrribleness.
2016-06-01 23:00:29 -05:00
Daniel Meltzer
c7e695d3fe
Revert "Move the breadcrumb thingy back inside the header. Remove it from a list item because it wasn't part of a list"
...
This reverts commit 9c77de6473
2016-06-01 22:55:37 -05:00
Daniel Meltzer
a152b0ae54
Center the logo text on small screens. It's looking more reasonable by the week...
2016-06-01 22:52:25 -05:00
Daniel Meltzer
9c77de6473
Move the breadcrumb thingy back inside the header. Remove it from a list item because it wasn't part of a list
2016-06-01 22:41:11 -05:00
Daniel Meltzer
71ca17649c
Improvements?
2016-06-01 22:30:12 -05:00
Daniel Meltzer
d85d3b14f7
More layout fixes for small devices.
2016-06-01 21:37:03 -05:00
Daniel Meltzer
5d206f2c20
Fix navbar spacing on screen and mobile. Move the items on the left of the navbar to their own list. Style fixes. Move breadcrumb to outside navbar because it was breaking things and I think it looks better
2016-06-01 20:10:19 -05:00
Daniel Meltzer
2ff1ee4d33
Fix some indentaiton and a missing tag, no functionality changes here.
2016-06-01 20:10:19 -05:00
snipe
d786be4fc0
Use local fontawesome and added select2
2016-06-01 15:43:55 -07:00
snipe
8a7a659a87
Added email domain, email format and username format to settings/setup form
2016-06-01 15:43:39 -07:00
snipe
45d3d90c94
Merge pull request #2067 from dmeltzer/ajax-mobile-upload-PR
...
Mobile-Friendly image capture/upload + Ajax rewrite of asset create
2016-06-01 11:34:42 -07:00
snipe
a9870db83f
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-05-31 21:16:40 -07:00
snipe
697ed0d53c
Fixes UAT for User
...
Needed to specify form name to prevent focus in asset tag search from being submitted
2016-05-31 21:16:30 -07:00
Daniel Meltzer
b3454b1c24
Fix bug in image process logic that wouldn't resize the height. Also make it possible to choose files from android as well as pictures directly.
2016-05-31 19:50:58 -05:00
Daniel Meltzer
fcc79456fd
Play with a mobile friendly capture-image-from device when adding an asset. This also involved rewriting the upload to be all ajaxy and stuff
2016-05-31 19:50:58 -05:00
Daniel Meltzer
dab2a50982
Only display errors in import table if things actually prevent the asset from being created. Also some table formatting improvements.
2016-05-31 18:04:01 -05:00
snipe
c9d00b1f06
Merge branch 'v3' of github.com:snipe/snipe-it into v3
2016-05-31 14:27:39 -07:00
snipe
9bb258bb99
Updated alt tag
2016-05-31 14:27:33 -07:00
Daniel Meltzer
004c63cd5d
Improve web imported. Show a list of all items with that were not imported correctly after import. Modify ObjectImporter and add a web-import parameter that causes it to spit out json errors exclusively. Long term I want to separate the console command and the logic so we aren't calling the console command directly, but rather a class that does everything. This would allow for easier progress reports and ajaxification.
2016-05-26 21:29:29 -05:00
snipe
c89f357e4a
Fixes #2082
...
LOL whoops
2016-05-25 13:32:33 -07:00
snipe
8a968b4dfb
Responsive dashboard table
2016-05-24 19:04:56 -07:00
snipe
9aff515c0a
More mobile fixes
2016-05-24 18:50:54 -07:00
snipe
5f91329397
Some responsive fixes
...
Still needs work tho :(
2016-05-24 17:59:02 -07:00
snipe
84edc9cf25
New generated JS
2016-05-24 16:10:04 -07:00
snipe
5bceb5ce52
Display escaped parsedown note
2016-05-24 10:21:45 -07:00
snipe
f844bf4b41
Nicer focus handling for asset search
2016-05-24 01:10:05 -07:00
snipe
6e006a6873
Redundant top nav
2016-05-24 00:58:59 -07:00
snipe
fb35e40342
Search by asset tag
...
Compatible with barcode scanners
2016-05-20 17:02:28 -07:00
snipe
b796e72faf
Remove old search
2016-05-20 16:01:23 -07:00
snipe
7fd6051514
Fixes #2062 - old permissions masks to new
2016-05-20 12:23:31 -07:00
snipe
975b266cb0
Icon display on recent activity
2016-05-20 01:17:00 -07:00
snipe
6b5d0a5abf
Translations and nicer formatting for login/password reset
2016-05-20 00:25:45 -07:00
snipe
3d1f051e16
Remove demo login info
2016-05-19 23:21:01 -07:00
snipe
66beeeb26d
Added notes back to asset file uploads
2016-05-19 23:12:27 -07:00
snipe
cbcc155f27
Settings tweaks
2016-05-19 19:49:25 -07:00
snipe
15eb6df1db
Add settings for alert interval threshold and inventory threshold
2016-05-19 19:33:53 -07:00
snipe
29e54830e1
Added 2D barcodes to labels
2016-05-19 19:12:42 -07:00
snipe
b2b3b3d5ad
Hide bulk attributes for components (for now)
2016-05-18 20:39:53 -07:00
snipe
5333c7083a
More dashboard fixes
2016-05-18 19:48:19 -07:00
snipe
c1c7fa143d
Components display on assets page
2016-05-18 19:26:50 -07:00
snipe
fb26188e41
Fixed dashboard for components
2016-05-18 19:16:43 -07:00
snipe
47c70141c7
Gross copypasta fix for #1932
2016-05-18 19:08:16 -07:00
snipe
4ba2b89940
Add MS Excel as export
...
Excel does not work in Safari - known webkit issue, no fix :(
2016-05-18 18:14:40 -07:00
snipe
0780f97807
Add multisort to assets
2016-05-18 16:48:46 -07:00
snipe
b0b7cfa999
Better handling for show/hide columns in depreciation report
2016-05-18 16:06:29 -07:00
snipe
7ee13113e0
Add depreciation name and months to depreciation report
2016-05-18 15:59:54 -07:00
snipe
e552c36a0a
Add model_no, item_no, and manufacturer to consumables
2016-05-16 17:11:31 -07:00
snipe
5b829884b8
Remove commented out js
2016-05-14 15:06:27 -07:00
snipe
8b0393ab52
Fontawesome animations
2016-05-14 15:06:16 -07:00
snipe
f4490b14f8
[Feature] Re-order custom fields (drag and drop)
2016-05-14 14:06:59 -07:00
snipe
72d54bdb88
Fixed formatting on license checkin/checkout
2016-05-12 21:03:53 -07:00
snipe
a726934cde
Fixed bulk delete+checkin for users
2016-05-12 21:01:31 -07:00
snipe
ae0e7b9078
Updatd documentation links, use https
2016-05-12 18:06:19 -07:00
snipe
b9b8149234
Minor backups fixes
2016-05-12 16:20:23 -07:00
snipe
6d91774943
[Feature Request] Fixes #2030 - allow asset name change on checkin
2016-05-12 12:34:44 -07:00
snipe
a96947efa9
Possible fix for #2037
...
via https://github.com/laravel/framework/issues/8565#issuecomment-151171239
2016-05-12 12:06:22 -07:00
snipe
ae8a03fec3
Add manufacturer name/sorting/searching on assets
2016-05-12 10:38:57 -07:00
snipe
c56c398d4c
Fixes #1996 - replace old Sentry methods with laravel native
2016-05-09 15:40:27 -07:00
snipe
d40289fbc9
Fixes #1997 and #1996 - replace sentry functions
2016-04-28 21:59:43 -07:00
snipe
e6cbafe5ff
Suppress console warning
2016-04-28 20:19:31 -07:00
snipe
449163c875
Fixes #1995 - updated group admin to use native permissions
2016-04-28 14:03:54 -07:00
snipe
97a91e2d83
Fix setting namespace
2016-04-25 12:15:41 -07:00
snipe
898d9ad025
[Feature] Added Supplier and Assigned to in asset email alert
...
[Bugfix] Fixed escaping for email templates for L5.2
2016-04-23 04:04:03 -07:00
snipe
b250e2b5f0
[Bugfix] Fixed escaping for email templates for L5.2
2016-04-23 04:03:26 -07:00
snipe
1b5ef695f2
Add custom fields to modals in create asset
2016-04-23 03:12:31 -07:00
snipe
30c6657fc1
Fixes date selector box
2016-04-23 02:36:08 -07:00
snipe
66a5050143
Fixed field name on checkin form
2016-04-23 02:06:57 -07:00
snipe
b02cb91ae6
Tighter form display (offset-2)
2016-04-21 22:15:09 -07:00
snipe
c9252989a1
Added red highlight back to superadmins
2016-04-21 21:59:50 -07:00
snipe
e72d61d896
Checkin and Delete button
2016-04-21 21:56:28 -07:00
snipe
d009c66c8b
Fixed bulk user delete display
2016-04-21 21:53:31 -07:00
snipe
4b6f657739
Nicer purge box design
2016-04-21 21:53:22 -07:00
snipe
8900672181
Nicer select2 box
2016-04-21 21:00:45 -07:00
snipe
e1cca75f57
Updated from alert to callout
2016-04-21 20:52:53 -07:00
snipe
2284a0783f
Improved user UI for user view
2016-04-21 20:26:56 -07:00
snipe
4c3dada8e4
More responsive UI for small screens
2016-04-21 19:45:42 -07:00
snipe
c39e27cc5e
Fixes #1955 - searching within locations
2016-04-19 20:23:04 -07:00
snipe
5c99f9da15
Change certificate icon to floppy disk icon
2016-04-19 19:42:16 -07:00
snipe
f2d883e711
Removed box header
2016-04-19 07:43:49 -07:00
snipe
679a6a5522
Partial - add support for drag+drop reordering
2016-04-19 07:19:12 -07:00
snipe
b72429a303
Suppress console log
2016-04-19 07:17:57 -07:00
snipe
3e84d66c80
Re-use settings to prevent 1001 queries
2016-04-19 06:11:20 -07:00
snipe
49c09dd356
Added ability to purge soft-deletes from admin
2016-04-19 04:36:07 -07:00
snipe
30b82f61ec
I don't think we need all this for the login page
2016-04-13 05:01:13 -07:00
snipe
0e6b8a8358
Switch to use trans from Lang::get for laravel 5.2
2016-04-07 02:51:57 -07:00
snipe
64d36a9e64
Fixes #1922 - sort by license name
2016-04-04 22:16:24 -07:00
snipe
6f9bad1005
Use lightbox for images in asset file listing
2016-03-25 20:38:27 -07:00
snipe
41384dc62f
Fixes #1845 - remove ability for users to change their email and password
2016-03-25 18:20:57 -07:00
snipe
27543d16f6
Additional escaping
2016-03-25 15:24:12 -07:00
snipe
f1bdaeaf95
Escaped input on listing page
2016-03-25 14:24:27 -07:00
snipe
fb84ba2878
Add color picker just to settings
2016-03-25 04:18:01 -07:00
snipe
82d6a4e025
Fixed Asset namespace
2016-03-25 04:16:32 -07:00
snipe
eb95f5ca4f
Cleanup js and CSS elixir stuff
2016-03-25 03:36:37 -07:00
snipe
fe00b0e401
Version 3 - hold onto your butts
2016-03-25 01:18:05 -07:00
