DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-23 17:27:51 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11042 commits 89 branches 265 tags 291 MiB
Commit graph

11042 commits

This branch
This branch
All branches
Author SHA1 Message Date
Quentin Aymard fc6c5eadd7
Fix missing ldap packages 
This should provide LDAPS support out of the box, and fix #13129
 2023-06-09 11:14:41 +02:00
Lukas Jung 9fca8c2438 Fixed #12434: Include Docker Specific Paths for dompdf chroot 2023-06-09 11:00:46 +02:00
snipe 924d0b25e8 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2023-06-08 08:53:22 +01:00
snipe c78c69700f Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-08 08:49:55 +01:00
snipe 4775eef392
Merge pull request #13140 from snipe/security/misc_libraries 
Updated libraries and dev assets
 2023-06-08 08:48:55 +01:00
snipe 14727700ab Updated libraries and dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-08 08:48:18 +01:00
snipe a6b1320b39 Add @stefanstidlffg as a contributor 2023-06-08 08:11:34 +01:00
snipe 4672f6a699
Merge pull request #13139 from snipe/security/updated_webpack 
Updated webpack, added new dev assets
 2023-06-08 08:11:07 +01:00
snipe 03233465c7 Updated webpack, added new dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-08 08:10:12 +01:00
snipe 8a72056bfd
Merge pull request #13123 from osterr-forschungsforderungsges-mbh/fix-slack-notifications 
fix slack channel notifications
 2023-06-08 05:51:08 +01:00
Marcus Moore 7672861b96
Scaffold test before removing scopeCompanyables call from DashboardController 2023-06-07 17:38:23 -07:00
Marcus Moore 6f5252449e
Scaffold test before removing scopeCompanyables call from UsersController 2023-06-07 16:25:18 -07:00
Marcus Moore 0f6051bbe5
Inline method call 2023-06-07 16:18:02 -07:00
Marcus Moore abaf59c990
Extract and use helper methods 2023-06-07 16:16:30 -07:00
Marcus Moore 27d4d107bb
Scaffold test before removing scopeCompanyables call from DepartmentsController 2023-06-07 16:10:29 -07:00
Marcus Moore 8e6e525b47
Remove scopeCompanyables call from LicensesController 2023-06-07 16:09:45 -07:00
Marcus Moore a18f5e7fc0
Remove scopeCompanyables call from ConsumablesController 2023-06-07 14:22:22 -07:00
snipe adb2757532 Add @NojoudAlshehri as a contributor 2023-06-07 16:52:22 +01:00
snipe b57730ee9d Added missing assets_fields declaration 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-07 15:52:18 +01:00
snipe 9335bf7033
Merge pull request #13122 from marcusmoore/fixes/increase-consumable-factory-name-length 
Fixes potentially invalid name in consumable factory
 2023-06-07 11:43:13 +01:00
snipe 45b76c4c75
Merge pull request #13127 from NojoudAlshehri/fixes/typo-in-a-html-tag 
Fix of typo in an HTML tag
 2023-06-07 09:21:51 +01:00
NojoudAlshehri d06bdc2db4
Fix of typo in an HTML tag 2023-06-07 13:46:17 +07:00
Marcus Moore 48850f3597
Remove scopeCompanyables call from ComponentsController 2023-06-06 18:02:18 -07:00
Marcus Moore 4fb86ad2fb
Get name as a string and not an array 2023-06-06 16:31:26 -07:00
Marcus Moore 42a4941ad2
Ensure consumable name is valid in factory 2023-06-06 16:31:26 -07:00
Marcus Moore 6585aa0cf0
Add unit tests for company scoping 2023-06-06 16:31:14 -07:00
Stefan Stidl ad8c36a51a fix: slack channel 2023-06-06 10:30:01 +02:00
Marcus Moore d3a0bacb98
Get name as a string and not an array 2023-06-05 12:57:09 -07:00
Marcus Moore 371d11305b
Ensure consumable name is valid in factory 2023-06-05 12:17:44 -07:00
snipe fc5b02e392 Merge remote-tracking branch 'origin/develop' 2023-06-01 19:51:49 +01:00
snipe 7ae260b489 More license translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-01 19:51:06 +01:00
snipe ff480a7247
Merge pull request #13114 from inietov/fixes/broken_sorting_manufacturers 
Fixed Broken order by manufacturer in Assets table [sc-23313]
 2023-06-01 19:40:16 +01:00
Ivan Nieto Vivanco f9a20bc917 Replace join with left join in pertinent eloquent query 2023-06-01 12:08:51 -06:00
ak-piracha daf6bcb6d5 follow best practices when working with blade and javascript 2023-06-01 11:07:21 +09:30
snipe 18eda15ec1 Merge remote-tracking branch 'origin/develop' 2023-05-31 16:19:34 +01:00
snipe e431cd5146
Merge pull request #13085 from inietov/fixes/checkboxes_not_holding_value 
Fixed #12978 Custom Field Checkboxes not holding assigned values
 2023-05-31 10:55:37 -04:00
snipe 35942361b6 Add @ak-piracha as a contributor 2023-05-31 15:51:39 +01:00
snipe 596b510a25
Merge pull request #13108 from ak-piracha/fixes/component_delete_showing_in_assest 
Fixes: issue #13073: deleted component addearing in asset component t…
 2023-05-31 10:50:34 -04:00
ak-piracha 1cdf089306 Fixes: issue #13073: deleted component addearing in asset component tab fixed 2023-05-31 00:11:11 +09:30
snipe c05a4452bc Merge + update assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2023-05-29 18:20:12 -04:00
snipe 13e8f91a59 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-29 18:18:46 -04:00
ak-piracha 825a9a384d Fixed 2023-05-29 14:07:53 +09:30
NojoudAlshehri 980cb53efa
Added asset_tag column in requestable assets page 2023-05-27 07:05:59 +07:00
snipe 60d2046b6d Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:13:33 -07:00
snipe 67e0eb3193
Merge pull request #13046 from Godmartinz/asset_info_overflow 
Added Asset info overflow-wrap
 2023-05-24 16:13:01 -07:00
snipe 44cbb0c2e9
Merge branch 'develop' into asset_info_overflow 2023-05-24 16:11:34 -07:00
snipe a3a64be19b Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2023-05-24 16:06:26 -07:00
snipe fb5e33c50f Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:03:15 -07:00
snipe d7f4fa146b Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:02:28 -07:00
snipe 064dbdd3d4 Fixed missing brace from conflict 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:02:23 -07:00