DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 15:09:40 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6162 commits 101 branches 268 tags 288 MiB
Commit graph

6162 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 9fb911146f Update demo photos of iPhones to be more [ch16531] 2021-07-19 12:26:04 -07:00
snipe b307d2858c
Merge pull request #9809 from uberbrady/fix_saml_custom_settings 
The custom settings section of SAML sometimes has bad linefeeds
 2021-07-08 17:16:37 -07:00
Brady Wetherington 0ec2884c29 The custom settings section of SAML sometimes has bad linefeeds 2021-07-08 17:00:01 -07:00
snipe 8ea3acc943 Fixed route ordering (FIFO) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-08 16:05:07 -07:00
snipe f785c3e759 Default to 1 if no qty is passed 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-08 16:04:52 -07:00
snipe 0a2a8932d4
Merge pull request #9808 from inietov/bug/ch15453/selected_maintenance_history_columns_not_remembered 
Fixes [ch15453] Maintenance/History columns not remembered.
 2021-07-08 12:15:53 -07:00
Ivan Nieto Vivanco d2e94dfc1c Added cookie option to assets Bootstrap Table to save the state of the table. 2021-07-08 14:05:40 -05:00
snipe 11d9b1ba45 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-07-06 15:09:03 -07:00
snipe 2f10d946ec Merge branch 'bug/ch16594/table-striping-on-dark-mode-skins-is-too' of https://github.com/Godmartinz/snipe-it into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/mix-manifest.json
 2021-07-06 15:08:20 -07:00
snipe 6e0355fa34
Merge pull request #9778 from inietov/fixes/users_departments_not_being_imported 
Fixes #9730. Remove an else statement that doesn't allow to continue the importer flow.
 2021-07-06 14:59:42 -07:00
Ivan Nieto Vivanco 131a285e2f Fixes Vue issue with the import process. 2021-07-06 15:59:45 -05:00
Ivan Nieto Vivanco 5545457536 Remove an else statement that doesn't allow to continue the importer flow. 2021-07-01 14:26:03 -05:00
snipe 19994e2097
Merge pull request #9774 from uberbrady/snipeit_restore_php73 
Better debugging output, and remove non-PHP-7.3-compatible option
 2021-06-30 15:22:48 -07:00
Brady Wetherington 102591b009 Better debugging output, and remove non-PHP-7.3-compatible option 2021-06-30 14:53:08 -07:00
snipe 868419b35b Components checkin/checkout via API 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-30 01:02:44 -07:00
snipe df7e0e5630 Fixed company resource route 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-29 23:46:25 -07:00
snipe 86b3f8349a
Merge pull request #9768 from svpernova09/vagrant-ansible-fix 
Fix APP_ENV/APP_DEBUG typo overwriting the APP_ENV in Vagrant Playbook
 2021-06-29 07:57:14 -07:00
Joe Ferguson fbf5c705db
Fix APP_ENV/APP_DEBUG typo overwriting the APP_ENV in Vagrant Playbook 2021-06-29 08:12:01 -05:00
Godfrey M aba912001d Table striping on dark mode skins is too [ch16594] 2021-06-28 20:41:56 -07:00
snipe 15b82997ca
Merge pull request #9764 from uberbrady/develop 
Regenerate assets after repairing Vue integration
 2021-06-28 16:58:05 -07:00
Brady Wetherington dce1dd41c8 Regenerate assets after repairing Vue integration 2021-06-28 16:38:05 -07:00
snipe 9ba7e7a0f3
Merge pull request #9761 from snipe/features/9745_add_notes_to_statuslabels 
Added #9745 - adds searchable, sortable notes to statuslabels index
 2021-06-28 13:09:24 -07:00
snipe 30297e479e Hide notes field by default 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 13:08:32 -07:00
snipe 19413a63da Make notes field searchable on status labels 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 11:53:17 -07:00
snipe a4fd0c9c6d Fixed #9745 - added searchable, sortable notes field to status labels 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 11:52:57 -07:00
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
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 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 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 1808986bf5 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-23 16:06:30 -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 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 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
Godfrey M 154adeb9b2 corrected a link color in the dark mode yellow skin 2021-06-23 14:06:36 -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
Petri Asikainen ae2c77f97f Allow to bulk update min_amt 2021-06-17 00:36:04 +03: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