DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9895 commits 96 branches 267 tags 296 MiB
Commit graph

9895 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brady Wetherington f515bd2dc8 Add index across username and deleted_at to improve large directory sync performance 2022-06-28 17:12:14 -07:00
snipe f3075facb4 Added delete button 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 16:25:22 -07:00
snipe ed95adb45c Show model files on hardware page 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 16:17:46 -07:00
snipe 95d4f7c62e Added models router to BS tables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 15:56:18 -07:00
snipe c90ed9f25f Allow models uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 15:50:07 -07:00
snipe 7f664a7971 Layout changes for file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 12:32:12 -07:00
snipe 14c6879f06 Merge remote-tracking branch 'origin/develop' 2022-06-28 11:41:56 -07:00
snipe d8d12d4590
Merge pull request #11408 from uberbrady/add_filter_option_to_ldap_sync 
Add a new `--filter` option to Artisan ldap-sync command
 2022-06-28 09:50:48 -07:00
Brady Wetherington be3388d647 Add a new --filter option to Artisan ldap-sync command 2022-06-27 19:49:59 -07:00
snipe 242836719d Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 19:32:10 -07:00
snipe 393c32558b Gotta bump that hash up 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 19:31:26 -07:00
snipe 94e723a88f
Merge pull request #11404 from snipe/features/fix_transliteration 
Fixed custom field transliteration
 2022-06-27 17:42:02 -07:00
snipe 14d8fb66aa
Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value 
Only care about the custom field's converted name when updating the custom field itself
 2022-06-27 17:36:26 -07:00
snipe ae73d4cc7c
Merge pull request #11407 from snipe/features/disclosure_arrows_on_user_screen 
Added disclosure arrows for lesser used options on user screen
 2022-06-27 17:33:31 -07:00
snipe bf08e73f8f Removed comments and server side cookie info 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 16:36:09 -07:00
snipe 4a3f56acf2 Removed old cooke stuff 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 16:35:54 -07:00
snipe e33a4c2ef2 Added disclosure arrows to use screen 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 16:35:44 -07:00
snipe 52bd7d0d68 Merge remote-tracking branch 'origin/develop' 2022-06-27 14:25:38 -07:00
snipe baad3b9d58 Only care about the converted name when updating the custom field itself 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 14:17:07 -07:00
snipe 131edb611e Refine output and checks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 13:54:21 -07:00
snipe 518395bbc7
Merge pull request #11403 from uberbrady/remember_disclosure_triangles 
Remember the state of the disclosure triangles in Assets
 2022-06-27 13:28:14 -07:00
Brady Wetherington 34b4499178 Remember the state of the disclosure triangles in Assets 2022-06-27 12:57:19 -07:00
snipe 8f900fb4e1 More UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 12:15:11 -07:00
snipe 9355689dd4 Nicer output for custom fields error 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 11:52:51 -07:00
snipe 0909feaa6b Few more UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 11:01:19 -07:00
snipe 7f18180105 Fixed toggle 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 10:26:37 -07:00
snipe bee694e605 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 09:57:20 -07:00
snipe 08525a3c20 Few more changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 09:43:32 -07:00
snipe d70b36750c
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset 
Fixes #8155 -  improve the workflow during asset creation
 2022-06-24 18:53:07 -07:00
snipe 8c85d7bc97
Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating 
Adds validation to custom fields' default values
 2022-06-24 18:11:16 -07:00
snipe cb225cb1ce Merge remote-tracking branch 'origin/develop' 2022-06-24 18:00:21 -07:00
snipe 7e7ae3bb95 Really reverting this time 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 17:55:34 -07:00
snipe 838579e9a8 Reverting :( 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 17:30:56 -07:00
snipe a99896618d Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	composer.json
#	composer.lock
 2022-06-24 17:21:57 -07:00
snipe 24cb13d52b Upgraded guzzle (not broken this time) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 17:18:34 -07:00
snipe cc7513e202
Merge pull request #11392 from snipe/security/upgrade_guzzle 
Upgraded guzzle to 7.4.5
 2022-06-24 17:04:17 -07:00
snipe c0b6d5aa2c Upgraded guzzle to 7.4.5 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 17:01:24 -07:00
snipe 5788038b49
Merge pull request #11391 from snipe/security/upgrade_webpack 
Upgrade webpack from 5.72.1 to 5.73.0
 2022-06-24 16:41:59 -07:00
snipe fbf0815b16 Upgrade webpack from 5.72.1 to 5.73.0 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 16:41:19 -07:00
snipe e2c227f02b Merge remote-tracking branch 'origin/develop' 2022-06-24 16:21:10 -07:00
snipe be0f0fc421
Merge pull request #11388 from snipe/features/disable_purge_in_env 
Disallow purge backup deletion by default and, enable via .env
 2022-06-24 16:12:00 -07:00
snipe a03075b6ea
Merge pull request #11389 from uberbrady/errmagerd_the_gerneral 
Typo of 'general' was in the migration blade a few places
 2022-06-24 16:05:40 -07:00
Brady Wetherington 3b3f1a817e Typo of 'general' was in the migration blade a few places 2022-06-24 16:00:15 -07:00
snipe 601f7a6994 Moved new variables in example env 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 16:00:05 -07:00
snipe 75d19d815d Still show the purge button even if not allowed to avoid confusion 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:59:40 -07:00
snipe d167d2a10f Disallow backup deletion and log attempt if not allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:49:22 -07:00
snipe fce4f0dc0e Disable delete button if not allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:49:07 -07:00
snipe 657039882c Added purge and backup strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:48:46 -07:00
snipe cf99d42413 Added backup delete to app config 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:48:37 -07:00
snipe f483eafae9 Added backup delete env 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:44:11 -07:00