DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 18:44:10 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12647 commits 96 branches 267 tags 296 MiB
Commit graph

12647 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 917005ceb4
Merge pull request #13342 from Loemnk/develop 
Fixes #13341: Clean up correct seats on license delete
 2023-07-20 13:05:31 +01:00
Tobias Franzius 90a344af0b Fixes #13341 Clean up correct seats on license delete 
Before this, we checked for the `id` collumn in the `license_seats` table, insteasd of
using `license_id` for this.

This way, we ensure that we only alter seats belonging to the correct license.
 2023-07-20 13:48:57 +02:00
Ivan Nieto Vivanco ecf522243b Add the new rule to proper views and also in the Asset Transformer 2023-07-19 19:52:03 -06:00
Ivan Nieto Vivanco 705411eb4d Create the Gate that goes with the permission 2023-07-19 19:44:59 -06:00
Ivan Nieto Vivanco 3b4a2b0f5b Add permission to view and modify encrypted custom fields 2023-07-19 14:57:57 -06:00
snipe a19a508a80
Merge pull request #13197 from akemidx/current_value_for_assets 
Current value added to asset index page
 2023-07-19 19:06:15 +01:00
akemidx 9e2987e680 changing book value to be NOT searchable or sortable 2023-07-19 13:44:31 -04:00
snipe b54e7dc3ee Fixed #13336 - Save unhashed password if no password provided 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-19 17:44:40 +01:00
snipe 1e1aea2eb0
Merge pull request #13299 from ubc-cpsc/bugfix/CVE-2023-37260 
Update league/oauth2-server for CVE-2023-3726
 2023-07-19 13:14:35 +01:00
snipe 33fd904c18
Merge pull request #13330 from akemidx/merge_users_typo 
merge users page typo fix
 2023-07-19 10:26:57 +01:00
snipe 74a5bcd490 Merge remote-tracking branch 'origin/develop' 2023-07-19 09:01:19 +01:00
snipe dc20305db6
Merge pull request #13333 from snipe/fixes/strtolower_on_catgories 
Added strtolower for category type
 2023-07-19 09:00:55 +01:00
snipe a0a5ca1f40 Added strtolower for category type 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-19 08:56:17 +01:00
akemidx 064e696521 merge users page typo fix 2023-07-18 15:33:33 -04:00
snipe c1949ffb0d
Merge pull request #13319 from marcusmoore/chore/user-search-test-cases 
Added test cases around user search
 2023-07-18 13:27:22 +01:00
snipe bc91181917 Merge remote-tracking branch 'origin/develop' 2023-07-18 13:27:05 +01:00
snipe 18e2ec4dad
Merge pull request #13310 from marcusmoore/bug/sc-23478 
Fixed the inability to load location select when editing profile
 2023-07-18 13:26:30 +01:00
snipe 92e7e79faf Merge remote-tracking branch 'origin/develop' 2023-07-18 13:25:34 +01:00
snipe 6f8c3ca167
Merge pull request #13322 from uberbrady/fix_ldap_location_3 
Fix to ldap_location attribute
 2023-07-18 13:24:59 +01:00
snipe 1fa703387a Merge remote-tracking branch 'origin/develop' 2023-07-18 11:30:53 +01:00
snipe cbdce994b8
Merge pull request #13318 from inietov/fixes/employee_id_not_importing 
Fixed Employee Number no longer importing [sc-23497]
 2023-07-18 11:08:43 +01:00
Brady Wetherington 051830dff4 Fix to ldap_location attribute 2023-07-17 20:42:02 +01:00
Marcus Moore 2eaab6d9fb
Change message to a callout 2023-07-17 12:23:31 -07:00
Marcus Moore fa0a88289a
Add tests around user search 
Follow up to #13311
 2023-07-17 11:29:22 -07:00
Ivan Nieto Vivanco 88c40c9c14 Change the field name to the same the model uses 2023-07-17 12:08:10 -06:00
snipe 3203f8f97c Merge remote-tracking branch 'origin/develop' 2023-07-15 10:48:09 +01:00
snipe f15e14f905
Merge pull request #13315 from snipe/features/add_warranty_link_even_if_no_warranty_set 
Moved warranty into manufactuer’s section
 2023-07-15 10:47:44 +01:00
snipe c21a7db3c1 Moved warranty into manufactuer’s section 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-15 10:45:36 +01:00
snipe 8bc8ecfc67 Merge remote-tracking branch 'origin/develop' 2023-07-14 09:39:26 +01:00
snipe bb0eaf8b8d
Merge pull request #13312 from snipe/features/add_show_hide_option_on_custom_fields 
Added ability to show/hide custom fields in list views by default
 2023-07-14 09:38:35 +01:00
snipe 3078cab7ee Added ability to show/hide custom fields in list views by default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 09:09:43 +01:00
snipe db8c37cd5b Merge remote-tracking branch 'origin/develop' 2023-07-14 08:26:12 +01:00
snipe 15bb943210
Merge pull request #13311 from snipe/fixes/deleted_users_showing_in_current_users 
Fixed: deleted users showing in current users
 2023-07-14 07:47:36 +01:00
snipe f51dd15893 Moved deleted scope down 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 07:44:19 +01:00
Marcus Moore 346ace9444
Allow users that have permission to edit their own location to see locations in select list 2023-07-13 17:37:46 -07:00
Ivan Nieto Vivanco ecac4718fe Add date casting to the SQL query, so the BETWEEN range doesn't care about time of day in custom report datetimes 2023-07-13 16:02:47 -06:00
snipe 4027acee46
Merge pull request #13184 from akemidx/department_in_side_bar 
User department now visible in side pane of asset view page
 2023-07-13 21:01:48 +01:00
snipe 43d419f051 Merge remote-tracking branch 'origin/develop' 2023-07-13 13:18:52 +01:00
snipe 5aa99a15d8
Merge pull request #13288 from snipe/fixes/line_based_markdown 
Added Inline markdown method
 2023-07-13 13:16:50 +01:00
snipe 016502f637 Added notesFormatter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-13 13:14:10 +01:00
snipe 66875ff0dc Merge remote-tracking branch 'origin/develop' 2023-07-13 12:59:30 +01:00
snipe 5d1f294f0e Added parseEscapedMarkedownInline to accessories API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-13 12:03:01 +01:00
snipe 981c3a430d
Merge pull request #13301 from uberbrady/better_auto_increment_tags 
Better auto increment asset-tags [FD-32892]
 2023-07-13 09:49:44 +01:00
Joël Pittet 24adcdb586 Revert lock file changes for PHP 7 support 2023-07-12 17:58:52 -07:00
akemidx 1163af3c10 change to make sure department actually exists 2023-07-12 15:57:44 -04:00
snipe 232e84acf7
Merge pull request #13302 from snipe/features/env_setting_for_bs_tables 
Fixed #13256 - Added option to switch to localStorage instead of cookies
 2023-07-12 20:10:33 +01:00
snipe 5d60a38a0e Added comment with link 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 20:08:20 +01:00
snipe c1c2c38995 Fixed #13256 - Added option to switch to localStorage instead of cookies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 20:06:17 +01:00
snipe 8c74e906ef Merge remote-tracking branch 'origin/develop' 2023-07-12 19:22:49 +01:00
snipe 3a6d8ef684 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2023-07-12 19:22:34 +01:00