DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 20:14:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
6041 commits 97 branches 267 tags 296 MiB
Commit graph

6041 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ivan Nieto Vivanco 36bc47c61c
Handle regex format when assigned from API (#9443) 2021-04-20 14:44:47 -07:00
snipe e4acf8d795 Merge remote-tracking branch 'origin/master' into develop 2021-04-20 14:44:01 -07:00
snipe b562f38729 Removed printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer" 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-19 10:51:29 -07:00
snipe e8adf8d44c One more category fix 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 16:57:55 -07:00
snipe b693e5202b Check for category name 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 16:54:36 -07:00
snipe 415ae5854f Add @Skywalker-11 as a contributor 2021-04-14 15:15:57 -07:00
snipe e1c6d4ced7 Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Requests/SettingsSamlRequest.php
 2021-04-14 15:15:07 -07:00
snipe 252b2ee1b4 Add @Jelle-S as a contributor 2021-04-14 15:07:40 -07:00
snipe 39b0f464d2 Adds ID columns to tables that don’t have them - reproduces #9363 
This reproduces #9363 without the PK in custom fields

Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 15:07:11 -07:00
snipe 2c0438bdcb Add @andreaci as a contributor 2021-04-14 11:18:13 -07:00
snipe 2986765a68 Implements #9373 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 11:17:59 -07:00
snipe f19595f525 Add @deivishome as a contributor 2021-04-14 10:27:08 -07:00
snipe 465ec054d3 Add @limeless as a contributor 2021-04-14 10:22:58 -07:00
theburger 785b1ad5a6
Update snipeit.sh php version from 7.1 to 7.4 (#9407) 
Snipe-it 5.2.x is required PHP 7.4 or above,
update script to install PHP 7.4 instead of 7.1

## Changed
- PHP to install in script is changed to 7.4 from 7.1
- Add `''`at DB_PASSWORD when configuring `.env` file
 2021-04-14 10:22:31 -07:00
snipe ab8f7e7b84 Add @Joly0 as a contributor 2021-04-14 10:21:18 -07:00
Joly0 31b2287a57
Update print.blade.php (#9426) 
Fixes #9418
 2021-04-14 10:20:36 -07:00
Godfrey Martinez 5fab1d6f0d
FIxes Sum of purchase cost of components not taking quantity into account in Asset View > Components tab (#9424) 
* git commit -m

* added text
 2021-04-14 10:19:40 -07:00
Godfrey Martinez 246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings (#9416) 
* new branch, added manager as an additional field. Currently having DB issues

* WIP DB Issue with eloquent

* added department to LDAP sync

* removed unused variables
 2021-04-14 10:17:57 -07:00
snipe ce1d3284b0 Buld assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 10:12:14 -07:00
Brady Wetherington bf344fd707 Merge branch 'develop' 
mix-manifest I just picked one.
version.php will get bumped by hand
bootstrap table seems to just be another copy? Added it back.
 2021-04-14 09:58:21 -07:00
Ivan Nieto Vivanco 9cf5fbd675
Logic added to handle when a cloned user is imported via LDAP. (#9429) 2021-04-14 09:19:25 -07:00
Ivan Nieto Vivanco 3824a50e8b
Fixes an issue with CSS when the 'skin' value in settings table is empty. (#9423) 2021-04-12 20:37:02 -07:00
snipe b6006769c3 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 21:02:05 -07:00
snipe bf2479c5d9 Fixed url to user-ridden style 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 20:36:13 -07:00
snipe 7ddcc97e79 Generated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 20:35:58 -07:00
snipe ba92d751a3 Removed depreciated Input:: facade 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 20:28:05 -07:00
Brady Wetherington 6b86e2a58f Rebuilt all assets after all commits had landed 2021-04-06 20:16:59 -07:00
Brady Wetherington 792a31cc7f Merge branch 'develop' 2021-04-06 20:10:22 -07:00
snipe e47e2e3754 Fixed #9404 - include note in accessory API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 10:57:30 -07:00
snipe 105f57e059 Possible fix for Docker failing on master 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 06:09:04 -07:00
snipe 390403ddb7 Fixed #9370 - listbox custom fields not decryoted on edit 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 05:59:31 -07:00
snipe 7da32443ff Move develop fixes to master 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-06 05:05:16 -07:00
Brady Wetherington 72806cf8db
Fix up docker build on develop branch (#9401) 2021-04-05 22:13:31 -07:00
Serkan 0e34e43abb
The return early pattern applied to improve readability. (#8894) 2021-04-05 22:03:15 -07:00
snipe 981b503653 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-04-05 22:01:35 -07:00
Joel Pittet af8509c4d0
Allow NPM packages to build for production (#9171) 
* add back changes before compiling assets

* new css location and mix manifest

* update papaparse, most vunerabilities attached to it

* update axios and papaparse for security releases

* removing security fixes that still allow npm run production to work

* Update lodash
 2021-04-05 22:01:11 -07:00
snipe abddda2ab8 Add @kajes as a contributor 2021-04-05 21:56:45 -07:00
Lars Kajes 49532e1cd6
Add option to force TLS connection (#9327) 
Co-authored-by: Lars Kajes <lars.kajes@iusinnovation.se>
 2021-04-05 21:56:25 -07:00
snipe 09887bdabd Removed stray opening tag 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-05 21:54:31 -07:00
snipe ff0e526021 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-04-05 21:53:47 -07:00
Godfrey Martinez f9f8ce6df6
Auditing feature improvement Better mobile [ch14328] (#9181) 2021-04-05 21:53:19 -07:00
snipe 55692bfe98 Add @Tetrachloromethane250 as a contributor 2021-04-05 21:52:14 -07:00
snipe 5c5fe2bd87 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-04-05 21:52:01 -07:00
Tetrachloromethane250 157d9e4ebb
Added #5977: Add permission to view files attached to licenses (#9264) 
* Add permission to view and modify files for licenses

* Actually use the permission
 2021-04-05 21:51:47 -07:00
snipe 20a3028386 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-04-05 21:48:01 -07:00
snipe 3ffa3534a0 Use environmental variables in memory limits 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-05 21:47:57 -07:00
Jan Kiesewetter d61d189328
Change owner while copy (#7552) 
* Change owner while copy

Copy all files and chown them in a 2nd layer leads to a larger image.
See layer 22 and 26 of https://hub.docker.com/layers/snipe/snipe-it/v4.7.8/images/sha256-67c865d91df1b90cef1112f12bbc9c64402dfeafde0bdb160c4f07e785ee0bcc

* Copy docker.env as user docker
 2021-04-05 21:15:54 -07:00
Earl Ramirez 6a8d5282ef
Add support for Debian 10 (#7414) 2021-04-05 21:06:53 -07:00
snipe f147c43dd4 Add @t3easy as a contributor 2021-04-05 21:04:39 -07:00
snipe c9ec15101c Add @ajsy as a contributor 2021-04-05 20:56:39 -07:00