DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
6305 commits 101 branches 268 tags 288 MiB
Commit graph

6305 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 6521f16b80 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 11:00:34 -07:00
snipe 9b2cb19f22 Fixed #9743 - Vue screens not loading 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 10:59:34 -07:00
Petri Asikainen e0c5205e9b save images 2021-06-28 08:11:33 +03:00
Petri Asikainen 695bf1e15f save images 2021-06-28 07:58:08 +03:00
Petri Asikainen 0e2efb6573 Merge branch 'develop' of github.com:snipe/snipe-it into feature/api-image-uploads 2021-06-27 14:38:55 +03:00
snipe 3ca3de9e4f Merge remote-tracking branch 'origin/develop' 2021-06-23 20:05:38 -07:00
snipe 174d53aff9 Fixed #9729 - order number maxlength updated to 200 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 20:05:22 -07:00
snipe 22152f0a8c Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 17:55:38 -07:00
snipe b5a75206fe Merge remote-tracking branch 'origin/develop' 2021-06-23 17:19:48 -07:00
snipe 3f39cff225
Merge pull request #9738 from Godmartinz/bug/ch16594/table-striping-on-dark-mode-skins-is-too 
corrected a link color in the dark mode yellow skin
 2021-06-23 16:39:02 -07:00
Godfrey M a37edd5c5b darkened back-sub-alt more 2021-06-23 16:34:41 -07:00
snipe 6f3e156be6 Merge remote-tracking branch 'origin/develop' 2021-06-23 16:34:34 -07:00
snipe 7d1c2199ed Attempted to re-bound to lowest php version possible 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 16:29:43 -07:00
Godfrey M f199098a59 undid the color change for links, darkened the back-sub-alt 2021-06-23 16:29:21 -07:00
snipe 335f4e50a5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-06-23 16:07:01 -07:00
snipe 1808986bf5 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 16:06:30 -07:00
snipe bc0c887812 Merge remote-tracking branch 'origin/develop' 2021-06-23 16:05:19 -07:00
snipe d8191f738c Updated flysystem to 1.1.4 for critical security update 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 16:04:42 -07:00
snipe 7b51bf4f51 Merge remote-tracking branch 'origin/develop' 2021-06-23 14:41:27 -07:00
snipe 450183c55c Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-06-23 14:41:10 -07:00
snipe e44a25126d
Merge pull request #9676 from inietov/fixes/asset_checkin_api_doesnt_send_notification 
Fixes #9666 Asset checkin via api doesn't send notification.
 2021-06-23 14:35:07 -07:00
snipe c801305c9b
Merge pull request #9681 from tulsaschoolsdata/9680-fix-statuslabels-asset-count 
Fixed #9680: Use Eloquent’s `withCount` method to count Statuslabel assets
 2021-06-23 14:34:34 -07:00
snipe 4db5a8f62b
Merge pull request #9695 from Joly0/master 
Update print.blade.php
 2021-06-23 14:33:25 -07:00
snipe 7b4cc5044b Add @derdeagle as a contributor 2021-06-23 14:31:48 -07:00
snipe 1c1ebdf44d
Merge pull request #9706 from derdeagle/develop 
Fixes #9705: Prevent syntax error in startup.sh
 2021-06-23 14:31:32 -07:00
snipe c684e5f481 Add @PetriAsi as a contributor 2021-06-23 14:31:16 -07:00
snipe 7b5a6a0085 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/partials/forms/edit/company-select.blade.php
 2021-06-23 14:30:31 -07:00
snipe 1bc4d1b997
Merge pull request #9717 from PetriAsi/fix/accessories-bulk-set-min-amt 
Added #9716: Allow to bulk update accessories min_amt
 2021-06-23 14:28:59 -07:00
snipe ac52ea3463 Porting PR #9720 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 14:27:15 -07:00
snipe a521ef706f
Merge pull request #9720 from bmkalle/patch-1 
Update company-select.blade.php
 2021-06-23 14:26:29 -07:00
Godfrey M 154adeb9b2 corrected a link color in the dark mode yellow skin 2021-06-23 14:06:36 -07:00
Petri Asikainen 491a788cd0 testing image upload via api 2021-06-23 11:22:41 +03:00
snipe a67ce965ec
Update version.php 2021-06-22 20:13:03 -07:00
snipe 3e102bf57b Be more specific in accessory query 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-19 16:49:13 -07:00
snipe cdcb153b1e Merge remote-tracking branch 'origin/develop' 2021-06-19 16:20:35 -07:00
snipe 0153c6ae96 Do not try to add the notes column if it already exists on accessories_users 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-19 16:20:22 -07:00
bmkalle a330dca7d4
Update company-select.blade.php 
select should be disabled if full multiple companies is activated and the user isn't a superuser. otherwise the user get the ability to choose all companies.
 2021-06-17 10:51:00 +02:00
Petri Asikainen ae2c77f97f Allow to bulk update min_amt 2021-06-17 00:36:04 +03:00
GMS ICT 2 ea7f18d0e6 add CompanyableTrait 2021-06-15 15:32:44 +07:00
Joly0 9a429952ff update print.blade.php 2021-06-15 08:52:01 +02:00
Johannes Münch 8f4b88a877 Fixes #9705 Prevent syntax error in startup.sh 
If SESSION_DRIVER is not defined it leads to a syntax error.
 2021-06-12 20:21:43 +02:00
Joly0 72f27ccc5b Update print.blade.php 2021-06-11 11:05:39 +02:00
snipe 8cd78b2790 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2021-06-10 17:44:17 -07:00
snipe aae6a8fc6c Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-10 17:42:29 -07:00
snipe ace7abc1ad Merge remote-tracking branch 'origin/develop' 2021-06-10 15:18:24 -07:00
snipe c567ad0617 Add @travismiller as a contributor 2021-06-10 15:18:02 -07:00
snipe 4c007ae085 Merge remote-tracking branch 'origin/develop' 2021-06-10 15:17:19 -07:00
snipe 54cb6c050a
Merge pull request #9679 from tulsaschoolsdata/serial-number-indexes 
Fixed #8486: Add index for asset serial number
 2021-06-09 17:36:06 -07:00
snipe 851e5ca96e
Merge pull request #9683 from tulsaschoolsdata/9682-company-id-indexes 
Thanks!
 2021-06-09 17:35:37 -07:00
Travis Miller 103c4325ce Fixed #9682: Add indexes for company_id 2021-06-09 14:29:00 -05:00