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

8829 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe
b73542664b
Merge pull request #10919 from Godmartinz/gh10866-checkin_time_always_show_12am 
Fixed #10866 - Checkin time always shows 12am
 2022-04-07 19:40:11 +01:00
snipe
6c1bb89776
Merge pull request #10920 from Godmartinz/Fixed_#10866_-_Checkin_time_always_shows_12am-master 
Fixed #10866 - action_date for check-in not including H:i:s
 2022-04-07 19:39:59 +01:00
Godfrey M
3eb7a87a66 fixes action_date for check-in not including H:i:s 2022-04-07 11:24:12 -07:00
Godfrey M
1325628039 fixes typo 2022-04-07 11:18:16 -07:00
Godfrey M
8498082f21 fixes typo 2022-04-07 11:16:40 -07:00
Godfrey M
6dc45c189b removed deadspace 2022-04-07 11:10:36 -07:00
Godfrey M
5d0a1ebb7a fixes action_date for check-in not including H:i:s 2022-04-07 11:08:43 -07:00
snipe
30a5d57ce5
Merge pull request #10917 from uberbrady/bs_tables_export_without_html_develop 
This disables the display of HTML content during exports
 2022-04-07 16:44:36 +01:00
snipe
0cb4caa4cf
Merge pull request #10918 from uberbrady/bs_tables_export_without_html_master 
This disables the display of HTML content during exports (cherry-picked for master)
 2022-04-07 16:44:21 +01:00
Brady Wetherington
4db7cb0e21 This disables the display of HTML content during exports, without enabling XSS attacks 2022-04-07 16:37:32 +01:00
Brady Wetherington
5a776af091 This disables the display of HTML content during exports, without enabling XSS attacks 2022-04-07 16:27:06 +01:00
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
Ivan Nieto Vivanco
6529a75683 Update Assets locations when user's location changes whey they got bulk-edited 2022-04-06 19:12:02 -05:00
snipe
4b255ada70 Removed first() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-06 12:08:51 +01:00
snipe
01342ca266 Fixed activity report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-05 22:58:25 +01:00
Ivan Nieto Vivanco
b5378eff64 Fix several typos 2022-04-05 16:12:31 -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
87fc856361
Merge pull request #10902 from snipe/fixes/added_primary_key_to_custom_fields_pivot 
Fixed #10892 - MySQL 8 compatibilty requires primary key
 2022-04-05 20:35:14 +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
snipe
3dd7c00a0b Update migration back in time 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-05 20:31:17 +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
0c31e840c4
Merge pull request #10903 from inietov/fixes/erroneous_checkout_date_in_print_all_assigned_report 
Fixes Dates in Print All Assigned report doesn't match to history
 2022-04-05 20:19:10 +01:00
snipe
c12ef19fcc Fixed #10892 - MySQL 8 compatibilty requires primary key 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-05 18:58:14 +01:00
Ivan Nieto Vivanco
2d213a9c77 Make the report take the dates of pivot table instead of asset log 2022-04-05 12:57:49 -05: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
snipe
0882cfede2
Merge pull request #10895 from ubc-cpsc/master 
Security fixes to master branch
 2022-04-05 18:29:25 +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
Joël Pittet
96cd90f842 Security fixes to master branch 2022-04-04 11:04:06 -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
d56552a8af
Merge pull request #10876 from snipe/fixes/huntr_ebc26354_logout_user_when_deactivated 
Logout user when their activated status is switched to off
 2022-03-29 15:57:24 +01:00
snipe
bdabbbd4e9 Logout user when their activated status is switched to off 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 13:44:53 +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
ab18ceb2f9 Add @QveenSi as a contributor 2022-03-29 11:54:51 +01:00
snipe
e046db6d1e
Merge pull request #10874 from QveenSi/patch-1 
Fix problem with static paths
 2022-03-29 11:52:32 +01:00
Yevhenii Huzii
863ea62551
Fix problem with static paths 2022-03-27 23:12:38 +03:00
snipe
70059f6f80
Merge pull request #10873 from uberbrady/fix_dashboard 
Don't crash JS when there are no data-export-options (as is true in Dashboard) Fixes #10872
 2022-03-27 07:21:34 +01:00
Brady Wetherington
e50ad8a442 Don't crash JS when there are no data-export-options (as is true in Dashboard) 2022-03-27 07:18:12 +01:00
snipe
639409fb3f Backporting #10829 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-25 13:00:16 +00:00