lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
7520 commits 1 branch 0 tags 220 MiB
Commit graph

7520 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Nieto Vivanco
e1927aa154 Update Assets locations when user's location changes whey they got bulk-edited 2022-04-06 19:23:49 -05: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
snipe
7385a0765e
Merge pull request #10889 from uberbrady/scim_squashed_grok_library 
SCIM integration using laravel-scim-server library
 2022-04-05 20:32:16 +01:00
Brady Wetherington
599d725d55 Just needed to adjust the hash so that the composer.lock is correct 2022-04-05 20:31:34 +01:00
Brady Wetherington
9bd04eb8c9 Use our forked version of the Laravel-SCIM-Server package (hopefully temporary) 2022-04-05 20:26:40 +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
56ee5c50a9
Merge pull request #10897 from ubc-cpsc/develop 
Security updates to enshrined/svg-sanitize and guzzlehttp/psr7
 2022-04-05 20:19:26 +01:00
snipe
91e6acbfd9 Add @veenone as a contributor 2022-04-05 18:52:17 +01:00
snipe
08588a2e6a
Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view 
Fixes #10898 (invalid consumable date time info in user view)
 2022-04-05 18:30:23 +01:00
Achmad Fienan Rahardianto
231a34ace3 FIX: #10898 (invalid consumable date time info in user view) 2022-04-05 15:31:27 +07:00
Joël Pittet
472c94ef89 Security updates to enshrined/svg-sanitize and guzzlehttp/psr7 2022-04-04 12:31:27 -07: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
f7cd21a007 Sigh. 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 22:59:52 +01:00
snipe
8ccf148799 Fixed #10881 - bad merge with bootstrap-tables changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 22:57:00 +01:00
snipe
b2056816c9 Use the same string for both radio buttons in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 16:45:55 +01:00
snipe
67b0e731e5
Merge pull request #10879 from snipe/rcs/merge_master_into_develop 
Merge master back down into develop
 2022-03-29 16:40:31 +01:00
snipe
a937bd34f6 Merge master back down into develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 16:28:43 +01:00
snipe
7941a88623
Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets 
Fix #10810 unaccepted assets
 2022-03-29 12:10: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
snipe
b5f3a357e2
Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync 
This looks good, thanks!
 2022-03-29 12:06:01 +01:00
snipe
e207a5043e
Merge pull request #10737 from Godmartinz/feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf 
Fixed #7891, #3019 and #8260 [sc-15014] - added asset acceptance and signed eula as pdf
 2022-03-24 20:52:41 +00:00
Godfrey M
a1429ce86b removed manager_name from user files 2022-03-24 11:47:13 -07:00
Godfrey M
c1f8252388 adds manager field to LDAP sync 2022-03-24 11:24:39 -07:00
snipe
edcf109b0f
Merge pull request #10861 from andreaci/develop 
next_audit_date error on saving asset
 2022-03-23 18:44:21 +00:00
andreaci
ff5a95a6a4
next_audit_date error on saving asset 
Solved error 500 when saving new Asset and no next_audit_date  is defined
 2022-03-23 17:23:53 +01:00
Godfrey M
55680762de Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync 2022-03-22 16:33:58 -07:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf 2022-03-22 10:10:56 -07:00
Godfrey M
3e01981576 clean up 2022-03-22 10:07:08 -07:00
Godfrey M
bc30eef23e clean up 2022-03-22 10:04:54 -07:00
Godfrey M
62352ef1a1 completes accessory eula agreement blade 2022-03-22 10:04:22 -07:00
snipe
e9a59f55ab
Merge pull request #10855 from inietov/fixes/exception_boolean_field_check_no_customfields 
Validate custom fieldset only if the asset have one
 2022-03-22 15:58:01 +00:00
Ivan Nieto Vivanco
98b78837e1 Validate custom fieldset only if the asset have one 2022-03-22 09:38:57 -06:00
snipe
26cababc43
Merge pull request #10851 from inietov/fixes/licenses_assigned_to_assets_dont_follow_users 
Fixes #10753 Licenses assigned to assets don't follow users
 2022-03-21 21:22:41 +00:00
Ivan Nieto Vivanco
319d816002 Update in the license seat the user that the asset with that license have assigned 2022-03-21 15:06:43 -06:00
Godfrey M
4956eb0410 WIP: needs to be tested. adds ldap_manager field to ldap sync 2022-03-21 11:15:39 -07:00
Godfrey M
220df9710e adds most of the fields for an accessory eula agreement pdf 2022-03-21 09:18:29 -07:00
snipe
820f0a7f04
Merge pull request #10849 from snipe/fixes/10769_return_to_due_for_audit 
Fixes #10769 - return to Due for Audit screen after auditing
 2022-03-21 14:28:13 +00:00
snipe
df60729140 Fixed #10769 - redirect user back to due for audit page 
This could probably take a little reworking, since if you are auditing from the Overdue for Audit page, we’d want to take you back *there* instead of the Due for Audit page.

Signed-off-by: snipe <snipe@snipe.net>
 2022-03-21 14:27:18 +00:00
snipe
c01cc48482
Merge pull request #10848 from snipe/fixes/10819_use_full_url_for_barcodes_in_label_view 
Fixed #10819 - use full url for label barcodes
 2022-03-21 14:00:56 +00:00
snipe
760b78b584 Fixed #10819 - use full url for label barcodes 
I don’t know when/why this would really be necessary, since it would be weird to call /hardware/123/label, but this fixes the broken barcodes

Signed-off-by: snipe <snipe@snipe.net>
 2022-03-21 13:57:18 +00:00
Maciej Domanski
d53750d389 LdapSync 2022-03-21 10:37:14 +01:00
Maciej Domanski
565f4eb6a1 LdapSync 2022-03-21 10:36:15 +01:00
Maciej Domanski
4a9ff86941 revert LdapSync 2022-03-21 10:31:21 +01:00
Maciej Domanski
70b22784fe
Delete LdapSync.php 2022-03-21 10:04:42 +01:00
Maciej Domanski
374bed3f0c info update codeql 2022-03-21 09:51:29 +01:00
snipe
ada0932e80
Merge pull request #10841 from snipe/fixes/default_id_suppliers 
Fixed #10840 - defaulting to 0 on supplier ID if no value provided
 2022-03-19 23:20:36 +00:00
snipe
e04ae63d02 Apply the fix to API controller too :( 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-19 23:12:48 +00:00
snipe
7db252ade3 Fixed #10840 - defaulting to 0 on supplier ID if no value provided 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-19 23:11:42 +00:00
snipe
42220cc566
Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving 
Fixes Customfields with boolean format not saving [ch-9973]
 2022-03-19 22:10:54 +00:00
Maciej Domanski
41e89123e1 revert from develop 2022-03-17 12:22:37 +01:00