52848ca8d8
Fixed checkin/checkout notification crashing
2020-09-11 16:10:18 -07:00
a91e81fc42
Added checkin_email to category listing
2020-09-11 16:06:38 -07:00
e750b2b2da
Added envelope css to overrides for table header
2020-09-11 16:06:19 -07:00
d3d64bd85c
Removed asset tag from accessory checkin markdown notification
2020-09-11 16:06:02 -07:00
514e7ca072
Added boolean has_eula to categories
2020-09-11 16:05:42 -07:00
0f22cf6807
Fixed #8428 - Added purchase cost column to user tabs
2020-09-11 11:48:51 -07:00
2f435a57c1
Fixed #8426 - show model number in custom fields model listing
2020-09-11 11:27:30 -07:00
f949a95cfb
Merge pull request #8423 from snipe/fix_ldap_test_php74
...
Fix ldap test php74
2020-09-09 14:38:26 -07:00
f3f7d714a6
Fix ldap test button for php 7.4 (suppressing errors)
2020-09-09 14:18:05 -07:00
b258f34bce
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop
2020-09-09 12:27:01 -07:00
3d4e1d4641
Merge pull request #8419 from snipe/fixes/ldap_init_fix_for_migrations
...
Hopefully fixes #8418 - migrations on new install go wonky because of…
2020-09-09 12:26:01 -07:00
cb5104c27d
Hopefully fixes #8418 - migrations on new install go wonky because of LDAP service provider
2020-09-08 21:13:24 -07:00
5e3ccd1004
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
2020-09-08 18:29:38 -07:00
82e0b1ffd8
Fixed [ch15130] - update the seeder to clear requested assets table
2020-09-08 18:29:02 -07:00
251ef82741
Added company formatter to asset maintenance report
2020-09-08 18:14:21 -07:00
327583f055
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop
2020-09-04 16:24:17 -07:00
acd15bc3e4
Fixed DB seeder to truncate the asset_maintenances table
...
This wouldn’t have affected anything in production, but could cause some weird behavior if re-seeding often, since the suppliers table gets stomped on but the old maintenances remained, leaving ghost entries and associating the wrong (old, now defunct) supplier with the maintenance as new supplier IDs get generated.
2020-09-04 16:23:58 -07:00
aabf9b6f9c
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop
2020-09-04 16:02:38 -07:00
10648de9af
Bulk Checkin and Delete also edit users [ch15107]
2020-09-04 16:02:25 -07:00
97743160ef
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop
2020-09-04 15:45:03 -07:00
1bea83ee5a
Fixed missing setting call
...
This is still broken further down the line in the event handler for license checkin, but this gets us closer
2020-09-04 15:44:37 -07:00
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
5f5b80acae
Added maintained and reassignable to license listing
2020-09-04 10:02:04 -07:00
ba06507e10
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop
2020-09-03 19:47:50 -07:00
69d7000922
Fixed [ch15085] - duplicate use statements in Consumables controller
2020-09-03 19:47:15 -07:00
96abe54aad
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop
2020-09-03 19:41:09 -07:00
249b9b7509
Fixed [ch15086] - [object object] in companies date displays
2020-09-03 19:40:17 -07:00
25cb489b76
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop
2020-09-03 17:00:26 -07:00
0eeeb24cae
Added data-validation=“required" to appropriate field partials
2020-09-03 16:59:42 -07:00
0503a51cae
Corrected validation to match model
2020-09-03 16:58:45 -07:00
2e0f7921a8
Removed commented out javascript
2020-09-03 16:58:16 -07:00
c29ec6a100
Removed duplicate state field
2020-09-03 16:00:26 -07:00
a57ab29af6
Accessibility features for custom fields icons
2020-09-03 15:55:52 -07:00
b8ddbadd2b
Use icons for 2FA, LDAP, etc info on user view
2020-09-03 15:55:41 -07:00
3e120812e3
Removed 2FA reset button if the user is not enrolled in 2FA
2020-09-03 15:55:20 -07:00
d0124b900a
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop
2020-09-03 15:14:06 -07:00
3ea3e8b856
Updated user asset listing to use bootstrap-tables and asset endpoint [ch1389]
2020-09-03 15:12:51 -07:00
0ace7d16fb
Merge branch 'integrations/rc5-4-2020-08-31-dev-into-master' into develop
2020-09-03 14:08:01 -07:00
fb59405a87
User view can t be loaded [ch15079]
2020-09-03 14:07:30 -07:00
3fcd83c499
Fixes some errors in forms using the deprecated Input:: facade
2020-09-03 13:42:33 -05:00
9820bc6a58
Merge branch 'integrations/intermediate-2020-08-31-v5-rc' into develop
...
# Conflicts:
# config/version.php
# public/css/build/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/vue.js
# public/js/dist/all.js
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/users/index.blade.php
2020-09-03 09:40:38 -07:00
ed79eacb9d
Updated help text
2020-08-31 19:55:30 -07:00
408435057e
Small vue fixes
2020-08-31 19:41:05 -07:00
7cab9f48e5
Use darker red for errors
2020-08-31 19:40:49 -07:00
addb2bde23
Merge pull request #8392 from snipe/integrations/rc5-4-2020-08-31-dev-into-master
...
Integrations/rc5 4 2020 08 31 dev into master
2020-08-31 17:24:44 -07:00
a64e1be278
Fixed Input:: () vs request()
2020-08-31 17:18:09 -07:00
13216b8860
Fixed pGenerator (again)
2020-08-31 17:17:51 -07:00
2a5cd58ad9
Added gitignore to cache dir
2020-08-31 17:15:21 -07:00
6a90ce523b
Bumped version
2020-08-31 15:38:40 -07:00
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