DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14924 commits 97 branches 266 tags 291 MiB
Commit graph

205 commits

Author SHA1 Message Date
snipe 0b3ac2a9cd Updated phpinsights 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-14 12:08:49 +01:00
Marcus Moore c60bc5cdbe
Change indents back to 2 2024-08-06 13:51:44 -07:00
Shift 984840dc82
Bump PHPUnit dependencies 2024-08-06 20:25:18 +00:00
Marcus Moore d4861a74df
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-25 10:15:50 -07:00
snipe f97a15c5c3 Updated PHPunit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 17:33:01 +01:00
snipe 856aee0a72 Updated laravel-backup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 12:57:35 +01:00
Marcus Moore 30dd8bcf2b
Update Livewire 2024-06-18 15:10:59 -07:00
Marcus Moore f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-18 15:10:46 -07:00
snipe ce338c632d Reverted debugbar back into require vs require-dev 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 16:06:38 +01:00
Marcus Moore 1bd0ab7389
Move barryvdh/laravel-debugbar from require to require-dev 2024-06-17 16:28:08 -07:00
Marcus Moore 8799276c6e
Bump debugbar from v3.13.0 to v3.13.5 2024-06-17 16:25:39 -07:00
Marcus Moore 7d1acd3d79
Update Livewire via composer 2024-05-29 12:04:06 -07:00
Brady Wetherington e271711c5b Added the clock-lts repo which allows use on php8.1-8.3 2024-05-28 22:50:09 +01:00
Brady Wetherington 8f2843bfcf Merge branch 'develop' into snipeit_v7_laravel10 
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
 2024-02-21 20:22:28 +00:00
Brady Wetherington 7d136f9970 Initial rough stabs at prefix removal and SQL sanitization 2024-02-13 12:16:15 +00:00
Godfrey M f452204d62 applies a conditional to have the the integration test button function properly 2024-01-31 10:47:25 -08:00
Godfrey M 87bce0c097 adds google notifs for asset check in and out 2024-01-30 12:38:17 -08:00
Brady Wetherington 8a2f3405d5 Merge branch 'develop' into snipeit_v7_laravel10 
A lot of changes here, but hopefully this works?
 2024-01-29 22:12:58 +00:00
Godfrey M cdcd868162 formats check in message for MS Teams 2024-01-17 17:31:23 -08:00
Brady Wetherington f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +00:00
Brady Wetherington 16da994e28 Add LDAP as 'recommended' requirement; flesh out LDAP tests 2023-11-30 14:00:20 +00:00
Brady Wetherington 8e8b1068ff Beginnings of LDAP test suite 2023-11-27 14:50:43 +00:00
Marcus Moore 042a15d294 Set minimum PHP version to 8.1 2023-11-09 14:41:13 -08:00
Brady Wetherington aacfed40f8 Switch back to our fork of laravel-scim-server 2023-09-07 20:16:03 +01:00
Brady Wetherington ec1059e74c Merge branch 'develop' into snipeit_v7_laravel10 2023-09-07 20:11:41 +01:00
Marcus Moore 5828d29952 Remove Dusk 2023-08-30 16:43:18 -07:00
Brady Wetherington 8b52bad16f Merge branch 'develop' into snipeit_v7_laravel10 2023-08-15 21:25:16 +01:00
snipe 96b616be89 Downgraded TCPDF 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:11:56 +01:00
snipe 697dc10d76 More label tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:03:32 +01:00
Brady Wetherington 4654f7aa37 Porting Snipe-IT v7 to Laravel v10 2023-07-31 14:07:12 +01:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
Brady Wetherington ba8d8a6f05 Merge branch 'develop' into snipeit_v7 2023-07-20 17:16:04 +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
Brady Wetherington 605d267fe8 Merge branch 'develop' into snipeit_v7 2023-07-19 11:47:51 +01:00
Marcus Moore d8f22880d6
Allow installing on PHP 7.4 2023-07-10 17:35:21 -07:00
Joël Pittet a4a676ef0b Update league/oauth2-server for CVE-2023-3726 and lcobucci/clock to semver to allow dependencies to update 2023-07-10 11:19:54 -07:00
Brady Wetherington 8f2a17585e Merge branch 'develop' into snipeit_v7 
Had to do a lot of conflict work here, so this could get ugly :(
 2023-07-10 16:53:35 +01:00
Marcus Moore 3f09e6017b
Install paratest to allow for parallel test running 2023-06-26 16:22:28 -07:00
Brady Wetherington a9c7dbd17a Shift PHP version requiremeents for Snipe-IT v7 to be php 8.0-8.2 2023-05-17 17:51:02 -07:00
Brady Wetherington 09fdc946a0 Merge branch 'develop' into snipeit_v7 
Had to do some asset rebuilds, and a composer update
 2023-05-17 17:37:10 -07:00
snipe c52b48c383 Google oauth login 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:14:28 -07:00
Marcus Moore 48ef8443f5
Restrict PHP to >=7.4.3 <8.2 2023-05-02 12:01:09 -07:00
Brady Wetherington 9793130f6c Merge branch 'develop' into laravel_v9 2023-04-18 11:01:00 -07:00
Godfrey M b6d105c4f4 removes help text from general integrations 2023-03-13 10:49:41 -07:00
Brady Wetherington 645bba96cd WIP: First stabs at getting Laravel Vite to work; no luck so far :( 
Probably going to back out all the 'vite' stuff anyways :/
 2023-02-21 19:35:37 -08:00
Brady Wetherington 3a2b54fd47 Add libsodium shim, and mark the sodium extension as 'optional' 
Trying to handle some composer.lock conflicts, as savely as possible.
 2023-02-15 18:16:39 -08:00
snipe f4617d8d5b Added larastan and psalm to composer dev 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-07 11:01:21 -08:00
snipe aeb8dfb07d Added phpinsights 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:39:55 -08:00
Marcus Moore 2aa50859b3
Bump Dusk version to fix broken macOS chrome driver link 2023-01-10 17:01:03 -08:00
Cram42 35536b5dbd Require tecnickcom/tcpdf 2022-11-01 19:47:59 +08:00