snipe
c5530104ff
Fixed #11549 - dark skin dropdowbn menu fixes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-22 15:36:51 -07:00
snipe
58499c2322
Fixed #11508 - font size in alert menu
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-15 17:09:17 -07:00
snipe
9c86b4bf88
Fixes padlock icon
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-07 15:57:33 -07:00
snipe
75a631b91f
Merge pull request #11375 from Godmartinz/bootS_dropdown_menu_fix
...
fixes dropdown column select font color in bootstrap tables
2022-06-23 18:31:36 -07:00
snipe
ea254ccc04
Tweaked default @blue
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:10:14 -07:00
snipe
06d5b5f4b1
Small change to color in overrides
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:10:03 -07:00
snipe
2536b02ace
Fixed some colors on default skin
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:09:52 -07:00
Godfrey M
541ae919d9
fixes dropdown column select font color in bootstrap tables
2022-06-23 09:38:44 -07:00
Godfrey M
3a879bda4a
more adjustments
2022-06-15 11:08:42 -07:00
Godfrey M
a6852cf4d2
fixes non-dark mode black theme
2022-06-15 10:20:25 -07:00
snipe
e6d792bdf7
Tweaked CSS for smaller padlock
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 17:43:12 -07:00
snipe
d4a7811078
Merge pull request #11282 from Godmartinz/new_Yellow_skin
...
redone none dark mode yellow skin
2022-06-13 19:48:24 -07:00
snipe
cb8dbcc172
Merge pull request #11281 from Godmartinz/chore_dark_mode_color_clean_up
...
cleans up dark modes
2022-06-13 19:48:15 -07:00
Godfrey M
b3559ac74e
redone none dark mode yellow skin
2022-06-08 13:59:46 -07:00
Godfrey M
4252bd2348
cleans up dark modes
2022-06-08 13:17:16 -07:00
Godfrey M
8c1843b351
updates colors in light color modes
2022-06-06 11:40:57 -07:00
snipe
a55adfc0a1
Merge pull request #11152 from Godmartinz/link_inconsistentcies
...
Thanks!
2022-05-18 15:45:30 -07:00
Godfrey M
0ed59753da
updated less files for license details to adhere to dark skin themes
2022-05-18 10:55:57 -07:00
Godfrey M
75f5f3a0a8
fixes inconsistencies with links styling
2022-05-18 09:37:53 -07:00
snipe
c0868a68fb
Removed console.log cruft
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 13:44:38 -07:00
snipe
780222d372
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# resources/views/users/print.blade.php
2022-05-10 17:26:26 -07:00
snipe
89fee23d32
Commented out console log that was pooping up the joint
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 08:34:30 -07:00
snipe
8195a664a9
Merge pull request #10883 from inietov/fixes/update_existing_value_import_develop
...
Fixes Importer always update existing values develop
2022-04-05 21:11:24 +01:00
Brady Wetherington
6756dd193e
SCIM integration using the 're-do-the routes' approach, which seems like a dead-end
...
Cleaning up routes to match laravel-scim-server's recommended implementation
Some actually *working* changes for SCIM support?!
Whoops, forgot my route file
Fix public SCIM routes
Removed Ziggy, removed old generated file, yanked Ziggy references
Resolves the first set of comments for SCIM
Ensure all /api routes have baseUrl prepended
Fix the parent:: call to be, uh, actually correct :P
Clarify the route-ordering, as it is quite tricky
This gets it so that users can actually be saved..
Work around the lack of callbacks with some inheritance
Mapped a bunch more fields from SCIM into Snipe-IT's user table
More baseUrl shenanigans since we yanked Ziggy :/
Properly map job title and work with some other necessary attributes
Map more fields...
Finalized basic mapping for core and enterprise namespaces
Latest tuned settings for SCIM config to work with Azure (and others)
2022-04-05 20:26:37 +01:00
Ivan Nieto Vivanco
1a448cc4b6
Take the values from the importer form to configure the used importer
2022-03-29 17:31:43 -06:00
snipe
54d6a4d978
Fixed #10825 - selectlists in modals b0rked
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 08:23:50 -07:00
snipe
84aa26dd50
Merge pull request #10728 from Godmartinz/gh10191-css-dropdownmenu
...
Fixed #10191 - font color contrast on mobile menu
2022-03-10 13:02:45 -08:00
snipe
b876d0abb0
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
2022-03-03 21:59:38 -08:00
Godfrey M
14bd07e97d
gerge branchevelop' into gh10191-css-dropdownmenu
2022-03-03 10:14:30 -08:00
Godfrey M
708dc08b4f
mixes color contrast on dropdown menu from navbar
...
on file
2022-03-03 09:27:52 -08:00
Ivan Nieto Vivanco
64fa7e23fc
Separate notes on assets and asset models
2022-02-24 16:05:03 -06:00
Ivan Nieto Vivanco
577dc6b02c
Separate notes on assets and asset models
2022-02-24 15:50:59 -06:00
Ivan Nieto Vivanco
6d79c9f3e2
Save the default values for custom fields with same format than Assets do for actual values
2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco
a36957dd77
Finish the implementation of custom fields default values for checkboxes
2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco
2f3499e4b9
Show checkboxes a little less assy, actually save the data checked by them
2022-02-09 10:49:10 -06:00
Ivan Nieto Vivanco
796a0ebdaa
Add initial support for default values in checkboxes customfields
2022-02-07 22:17:40 -06:00
snipe
5fded57ec6
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/ProfileController.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# app/Models/License.php
# app/Providers/AppServiceProvider.php
# app/Services/LdapAd.php
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/lang/ar/button.php
# resources/lang/de/admin/companies/general.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/groups/titles.php
# resources/lang/de/admin/hardware/form.php
# resources/lang/de/admin/hardware/general.php
# resources/lang/de/admin/hardware/message.php
# resources/lang/de/admin/hardware/table.php
# resources/lang/de/admin/kits/general.php
# resources/lang/de/admin/locations/table.php
# resources/lang/de/admin/reports/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/de/admin/users/general.php
# resources/lang/de/general.php
# resources/lang/de/mail.php
# resources/lang/en/admin/asset_maintenances/message.php
# resources/lang/en/admin/asset_maintenances/table.php
# resources/lang/en/admin/companies/general.php
# resources/lang/en/admin/companies/message.php
# resources/lang/en/admin/custom_fields/general.php
# resources/lang/en/admin/depreciations/general.php
# resources/lang/en/admin/groups/titles.php
# resources/lang/en/admin/hardware/form.php
# resources/lang/en/admin/hardware/general.php
# resources/lang/en/admin/hardware/table.php
# resources/lang/en/admin/kits/general.php
# resources/lang/en/admin/locations/table.php
# resources/lang/en/admin/reports/general.php
# resources/lang/en/admin/settings/general.php
# resources/lang/en/admin/settings/message.php
# resources/lang/en/admin/users/general.php
# resources/lang/en/button.php
# resources/lang/en/general.php
# resources/lang/en/help.php
# resources/lang/en/mail.php
# resources/lang/en/passwords.php
# resources/lang/hu/admin/hardware/general.php
# resources/lang/hu/admin/hardware/table.php
# resources/lang/hu/admin/locations/table.php
# resources/lang/is/admin/locations/table.php
# resources/lang/ko/admin/custom_fields/general.php
# resources/lang/ko/general.php
# resources/lang/nl/admin/hardware/general.php
# resources/lang/nl/admin/hardware/message.php
# resources/lang/nl/admin/hardware/table.php
# resources/lang/nl/admin/locations/table.php
# resources/lang/nl/admin/statuslabels/message.php
# resources/lang/nl/admin/users/general.php
# resources/lang/no/admin/companies/general.php
# resources/lang/no/admin/custom_fields/general.php
# resources/lang/no/admin/depreciations/general.php
# resources/lang/no/admin/depreciations/table.php
# resources/lang/no/admin/groups/titles.php
# resources/lang/no/admin/hardware/form.php
# resources/lang/no/admin/hardware/general.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/locations/table.php
# resources/lang/no/admin/reports/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/admin/settings/message.php
# resources/lang/no/admin/statuslabels/message.php
# resources/lang/no/admin/users/general.php
# resources/lang/no/button.php
# resources/lang/no/general.php
# resources/lang/no/mail.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/companies/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/pl/admin/depreciations/general.php
# resources/lang/pl/admin/depreciations/table.php
# resources/lang/pl/admin/groups/titles.php
# resources/lang/pl/admin/hardware/form.php
# resources/lang/pl/admin/hardware/general.php
# resources/lang/pl/admin/hardware/table.php
# resources/lang/pl/admin/kits/general.php
# resources/lang/pl/admin/locations/table.php
# resources/lang/pl/admin/reports/general.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/admin/settings/message.php
# resources/lang/pl/admin/users/general.php
# resources/lang/pl/button.php
# resources/lang/pl/general.php
# resources/lang/pt-PT/admin/companies/general.php
# resources/lang/pt-PT/admin/custom_fields/general.php
# resources/lang/pt-PT/admin/depreciations/general.php
# resources/lang/pt-PT/admin/depreciations/table.php
# resources/lang/pt-PT/admin/groups/titles.php
# resources/lang/pt-PT/admin/hardware/form.php
# resources/lang/pt-PT/admin/hardware/general.php
# resources/lang/pt-PT/general.php
# resources/lang/pt-PT/help.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/admin/companies/general.php
# resources/lang/ro/admin/custom_fields/general.php
# resources/lang/ro/admin/groups/titles.php
# resources/lang/ro/admin/hardware/form.php
# resources/lang/ro/admin/hardware/general.php
# resources/lang/ro/admin/hardware/message.php
# resources/lang/ro/admin/hardware/table.php
# resources/lang/ro/admin/locations/table.php
# resources/lang/ro/admin/settings/message.php
# resources/lang/ru/admin/companies/general.php
# resources/lang/ru/admin/custom_fields/general.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/general.php
# resources/lang/ru/validation.php
# resources/lang/sk/admin/settings/general.php
# resources/lang/sk/button.php
# resources/lang/sk/general.php
# resources/lang/tr/admin/hardware/form.php
# resources/lang/tr/admin/hardware/table.php
# resources/lang/tr/admin/kits/general.php
# resources/lang/tr/admin/locations/table.php
# resources/lang/tr/admin/reports/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/admin/settings/message.php
# resources/lang/tr/admin/statuslabels/message.php
# resources/lang/tr/admin/users/general.php
# resources/lang/tr/button.php
# resources/lang/tr/general.php
# resources/lang/zh-CN/admin/companies/general.php
# resources/lang/zh-CN/admin/custom_fields/general.php
# resources/lang/zh-CN/admin/depreciations/general.php
# resources/lang/zh-CN/admin/depreciations/table.php
# resources/lang/zh-CN/admin/groups/titles.php
# resources/lang/zh-CN/admin/hardware/form.php
# resources/lang/zh-CN/admin/hardware/general.php
# resources/lang/zh-CN/admin/hardware/message.php
# resources/lang/zh-CN/admin/hardware/table.php
# resources/lang/zh-CN/admin/kits/general.php
# resources/lang/zh-CN/admin/locations/table.php
# resources/lang/zh-CN/admin/reports/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/admin/settings/message.php
# resources/lang/zh-CN/admin/statuslabels/message.php
# resources/lang/zh-CN/admin/users/general.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-CN/general.php
# resources/lang/zh-CN/mail.php
# resources/views/depreciations/edit.blade.php
2022-02-01 18:53:05 -08:00
snipe
a65fb63b6b
Merge pull request #10511 from inietov/features/audit_date_in_importer
...
Adds audit dates in the asset importer
2022-01-27 10:58:53 -08:00
Ivan Nieto Vivanco
c86ed892ab
Add Zip field in the User Importer
2022-01-19 13:52:15 -06:00
Ivan Nieto Vivanco
1fc71a4111
Add Zip field in the User Importer
2022-01-19 13:35:54 -06:00
Ivan Nieto Vivanco
949fe2a14a
Adds last_audit_date and next_audit_date in the asset importer
2022-01-13 15:14:20 -06:00
snipe
43c57c8461
Merge master into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Http/Controllers/BulkAssetModelsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ModalController.php
# app/Http/Transformers/GroupsTransformer.php
# config/version.php
# package-lock.json
# public/css/build/app.css
# public/css/build/overrides.css
# 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/assets/less/overrides.less
# resources/lang/en/admin/hardware/message.php
# resources/lang/en/admin/settings/general.php
# resources/views/partials/bootstrap-table.blade.php
# routes/web.php
2022-01-12 20:51:33 -08:00
snipe
b18b3812df
Back to master: Added some BS tables style overrides for mobile
...
This repeats 06e8e826
2022-01-10 15:23:43 -06:00
snipe
8be6d10dbe
Fixed #10467 - Safari only font-awesome bug
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-24 12:30:34 -08:00
snipe
f4ef828332
Fixex js table export
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-24 11:17:36 -08:00
snipe
312200bf44
Removed duplicate "department" entry in importer, pulls #10460 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-21 13:37:20 -08:00
Ivan Nieto Vivanco
e03a8cc721
Delete an extra entry for Departments when importing Users via GUI
2021-12-21 14:42:51 -06: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
05c6254fdc
Updated snipeit.js with "restore" modal code
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-09 22:39:33 -08:00
snipe
76cc46c419
Merge pull request #9814 from 01ste02/importMinAmt
...
Improved Consumable Import: Import min_amt for consumables
2021-10-28 17:49:44 -07:00
