Marcus Moore
|
49136a4d67
|
Add tests for color helper
|
2023-11-08 12:35:42 -08:00 |
|
akemidx
|
4382adce85
|
typo in error log message
|
2023-11-08 15:29:29 -05:00 |
|
|
akemidx
|
2051ac785d
|
adding in error logging and code comments
|
2023-11-08 13:44:46 -05:00 |
|
|
akemidx
|
9cc89911f7
|
possibilitieeeeeeeeessss
|
2023-11-08 13:29:32 -05:00 |
|
|
akemidx
|
495521b70e
|
adjusting for less than 0 possibility
|
2023-11-08 12:51:51 -05:00 |
|
|
akemidx
|
154e71de74
|
shifting wrap around logic back into 0-265
|
2023-11-07 17:43:51 -05:00 |
|
Godfrey M
|
0eb50ceb3d
|
removes commented code
|
2023-09-11 09:36:38 -07:00 |
|
|
Godfrey M
|
e56628499c
|
fixed lost changes
|
2023-08-24 11:45:23 -07:00 |
|
|
Godfrey M
|
2b7a899ef8
|
removed unnecessary code
|
2023-08-24 11:43:44 -07:00 |
|
|
Godfrey M
|
011c09a3dd
|
working on getting notifications
|
2023-08-24 10:35:40 -07:00 |
|
snipe
|
443adc50da
|
Fixed unclosed brace
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-15 18:12:25 +01:00 |
|
Grant Le Roux
|
b1464e028c
|
Merge branch 'develop' into develop
|
2023-07-31 07:57:29 +08:00 |
|
|
snipe
|
a0a5ca1f40
|
Added strtolower for category type
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-19 08:56:17 +01:00 |
|
|
snipe
|
6d3bf1e5f5
|
Added additional method for inline
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-11 11:41:58 +01:00 |
|
|
snipe
|
9b5a67e31f
|
Use $Parsedown->line instead of $Parsedown->text
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-11 11:33:29 +01:00 |
|
|
snipe
|
150a2b572e
|
Use single “accessory” translation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-24 07:14:02 -07:00 |
|
|
snipe
|
6bc0df73e8
|
Merge pull request #12661 from Godmartinz/gh12655_missing_translations
Adds translations for category types to index and edit of categories
|
2023-03-24 07:09:40 -07:00 |
|
Ivan Nieto Vivanco
|
fbb3684022
|
Add a condition to 'restart' the color index for the status pie chart
|
2023-03-23 12:43:02 -06:00 |
|
|
snipe
|
473211397f
|
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent
Livewire importer without subcomponent
|
2023-03-21 23:07:04 -07:00 |
|
|
snipe
|
41eb2464e2
|
Forgot the static method declaration - derp
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-21 21:21:01 -07:00 |
|
|
snipe
|
647f47cdfe
|
Check for demo mode in the clear method for the controller
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-21 19:27:05 -07:00 |
|
|
snipe
|
a14d1b981d
|
Switched singleton to static helper method
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-21 19:22:18 -07:00 |
|
|
snipe
|
5217141dfb
|
Yuck, but added helper function to return the demo mode form warning
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-21 18:59:34 -07:00 |
|
|
Godfrey M
|
371e142bae
|
removes unnecessary function
|
2023-03-15 15:57:45 -07:00 |
|
|
Godfrey M
|
576b8f8c48
|
adds translations to edit and index of categories
|
2023-03-13 13:33:03 -07:00 |
|
|
snipe
|
f4bd307421
|
Added comments, removed gthe AgeFormat() helper method
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-08 16:47:27 -08:00 |
|
|
snipe
|
059ead5af5
|
Added comments (not related to this, sorry)
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-08 16:47:08 -08:00 |
|
|
snipe
|
02dd0669dc
|
Added comments
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-08 16:36:08 -08:00 |
|
|
snipe
|
b3b9efbaff
|
New helper method to return icon type
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-08 16:34:04 -08:00 |
|
|
cram42
|
c2c009a018
|
Merge branch 'develop' into develop
|
2023-01-24 09:53:42 +08:00 |
|
|
Godfrey M
|
3206929ee4
|
adds AgeFormatter, not working yet
|
2022-11-29 09:51:42 -08:00 |
|
Cram42
|
7c355cef2d
|
Add helper to convert between units of measurement
|
2022-11-01 19:49:57 +08:00 |
|
|
snipe
|
9cf5f30c77
|
Set safeMode to true and use helper for all parsedown
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-29 11:26:47 -07:00 |
|
|
Ivan Nieto Vivanco
|
c055c91739
|
Change db query for an existing method
|
2022-08-04 09:20:20 -05:00 |
|
|
Ivan Nieto Vivanco
|
ea8f12579d
|
Calculate the proper amount of assigned components
|
2022-08-04 07:58:25 -05:00 |
|
|
snipe
|
d31f185cce
|
Display the actual value
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 15:36:52 -07:00 |
|
|
snipe
|
5901182885
|
Removed stray character
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 15:30:34 -07:00 |
|
|
snipe
|
f033aeda83
|
Fixed typo in comments
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 15:28:00 -07:00 |
|
|
snipe
|
53f9e2bc7a
|
Wrap the Carbon method in a try/catch to prevent crashing on bad data
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 15:25:39 -07:00 |
|
|
Godfrey M
|
160a147a58
|
removed line breaks and deadspace
|
2022-05-23 09:35:19 -07:00 |
|
|
Godfrey M
|
23891054dc
|
removed dead space and unused namespace
|
2022-05-18 13:11:20 -07:00 |
|
|
Godfrey M
|
cfc4c58da3
|
fixes the Settings Tree menu to remain active when opened
|
2022-05-18 13:06:06 -07:00 |
|
|
snipe
|
3a31104b5c
|
Fixed #11052 - add file sizes to upload displays
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 19:33:14 -07:00 |
|
|
snipe
|
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 |
|
Brady Wetherington
|
f3338667c7
|
Create new ParseCurrency helper and use it in the appropriate controllers
|
2021-09-28 18:20:39 -07:00 |
|
|
snipe
|
dbe93d91cd
|
Updated fontawesome icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:07:46 -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 |
|
|
Ivan Nieto Vivanco
|
137f55e4ce
|
Change condition to return the actual max upload size allowed to files
|
2021-08-25 15:27:25 -05:00 |
|
|
Ivan Nieto Vivanco
|
4207858a14
|
Fix the count in StatuslabelsController@getAssetsCountByStatuslabel() function that allows it to pass the correct index
Also edit the default color for assets with the Pending label, so it match the color in the docs
|
2021-08-18 14:08:35 -05:00 |
|
|
snipe
|
cce808c784
|
Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]
Duplicates d4e46ee41f but on v5
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-17 21:59:33 -07:00 |
|