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
a92bb80055
Upgraded jquery-UI
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-18 17:27:54 -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
d458973649
Removed unneeded JS
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-07 15:58:37 -07:00
snipe
9c86b4bf88
Fixes padlock icon
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-07 15:57:33 -07:00
snipe
b98af0f50f
Upgrade font-awesome to v6
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-07 14:22:08 -07:00
snipe
18c37c97b8
Dark skin prod assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 19:14:12 -07:00
snipe
3a8786fdb7
Updated assets for prod
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:27:31 -07:00
snipe
f4c346a57c
Small fixes to default blue skin
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 18:11:42 -07:00
snipe
4b9ec9218d
Upgraded/updates assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-22 15:54:58 -07:00
snipe
a758e825ed
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-15 13:45:33 -07:00
snipe
5fe1078013
Squashed commit of the following:
...
commit a011b07d99b392ed2696059e9e11#11315 from snipe/features/adds_fullscreen_option_to_tables
Added fullscreen option to tables
commit b392ed269b693043e64e6d792bdf#11316 from snipe/fixes/smaller_padlock_on_table_header
Tweaked CSS for smaller padlock
commit 6059e9e119e6d792bdf7
2022-06-14 17:54:18 -07:00
snipe
7cd35a80b6
Updated assets for production
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 20:52:47 -07:00
snipe
eaecf8137a
Updated assets for develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 19:52:27 -07:00
snipe
61a6c83418
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/mix-manifest.json
2022-05-18 17:21:32 -07:00
snipe
319eae7810
Recompiled dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 16:21:04 -07:00
snipe
937472feb0
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
2022-05-18 13:37:31 -07:00
snipe
f14a4d3bc7
Recompiled dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 13:35:38 -07:00
snipe
4b21d9e7f4
Rebuild production assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 11:13:18 -07:00
snipe
3bf2328db2
Regenerated dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 11:11:34 -07:00
snipe
bf028adcc3
Updated production assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-17 19:33:50 -07:00
snipe
be5be7a8b9
Bumped packages
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-17 19:30:57 -07:00
snipe
3dc4f56fb4
Update constraints to allow up to 8.2
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-16 17:23:41 -07:00
snipe
ce5ae80755
Regenerated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 13:44:51 -07:00
snipe
c0868a68fb
Removed console.log cruft
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 13:44:38 -07:00
snipe
13d81f0a0c
Updated prod assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 11:55:19 -07:00
Brady Wetherington
35450aebdd
Update Livewire assets, and make Composer auto-update Livewire assets as needed
2022-05-11 14:00:10 -07:00
snipe
5dfdf73e01
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 17:28:06 -07:00
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
snipe
a5760cfe7b
Update BS tables and table export to latest
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 12:22:20 -07:00
snipe
809fe7f6d8
Compiled assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-12 19:28:58 +01:00
snipe
5314ef97e5
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-11 15:08:39 +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
snipe
80dff41c00
Merge pull request #10843 from ahpaleus/features/add_codeql_to_sdlc
...
[Feature] Adds CodeQL to the SDLC process
2022-03-29 12:07:44 +01:00
Maciej Domanski
e09516d69b
codeql sa
2022-03-17 12:10:44 +01: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
4435ea95fd
removes changes to mix-manifest
2022-03-03 09:47:11 -08:00
Godfrey M
f115385243
C&P mix-manifest to be tracked
2022-03-03 09:32:05 -08:00
Godfrey M
708dc08b4f
mixes color contrast on dropdown menu from navbar
...
on file
2022-03-03 09:27:52 -08:00
snipe
ed43d36895
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-24 14:47:09 -08:00
snipe
24ce34c8d7
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-24 14:19:27 -08:00
snipe
bf194d7794
Regenerate JS assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-09 14:43:30 -08:00
snipe
99c4fd8f84
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-01 18:56:18 -08:00
snipe
ee47a02792
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-21 12:33:49 -08:00
snipe
0721ab8bbf
Regenerated production assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-20 11:01:04 -08: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
303fc39966
Regenerated assets to pikc up #10089 changes
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-11 14:38:17 -08:00
