snipe 784bf4d784 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .github/ISSUE_TEMPLATE/feature_request.yml # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ReportsController.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/users/print.blade.php # webpack.mix.js		2022-05-06 01:52:43 -07:00
..
accessories	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
account	adds most of the fields for an accessory eula agreement pdf	2022-03-21 09:18:29 -07:00
asset_maintenances	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
auth	Customize login page when REQUIRE_SAML is enabled	2022-04-29 15:35:40 +00:00
categories	Merge master down into develop	2021-12-16 14:26:24 -08:00
companies	Added localized strings for admin/companies	2021-11-02 10:23:15 +01:00
components	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
consumables	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
custom_fields	Added UI elements for is_unique	2022-02-16 13:47:48 -08:00
departments	Add a hidden field to handle departments inside Full Company Support config	2021-07-29 13:28:57 -05:00
depreciations	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
errors	More fa icons	2021-09-24 07:21:30 -07:00
groups	Added localized strings for groups	2021-11-02 12:03:41 +01:00
hardware	Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf	2022-03-22 10:10:56 -07:00
importer	Added localized strings for improter, added en structure	2021-11-02 14:09:22 +01:00
kits	Added localized strings for kits	2021-11-02 14:25:21 +01:00
layouts	Merge remote-tracking branch 'origin/master' into develop	2022-05-06 01:52:43 -07:00
licenses	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
livewire	Merge branch 'develop' into remove_old_ldap	2022-01-03 12:56:58 -08:00
locations	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
manufacturers	Updated more fa icons	2021-09-26 01:11:08 -07:00
modals	Merge pull request #9 from snipe/develop	2022-01-04 10:48:51 +01:00
models	Merge remote-tracking branch 'origin/master' into develop	2022-05-06 01:52:43 -07:00
notifications	Prevents showing double values	2022-02-25 08:19:46 +01:00
paginator	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
partials	This disables the display of HTML content during exports, without enabling XSS attacks	2022-04-07 16:37:32 +01:00
reports	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00
settings	WIP: needs to be tested. adds ldap_manager field to ldap sync	2022-03-21 11:15:39 -07:00
setup	changed model for default currency requirement check	2022-02-07 09:51:35 -08:00
statuslabels	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
suppliers	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
users	Merge remote-tracking branch 'origin/master' into develop	2022-05-06 01:52:43 -07:00
vendor	🧑‍🔧 Added 2 breaks in message.blade.php	2022-02-18 10:27:12 +01:00
dashboard.blade.php	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
notifications.blade.php	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