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

8223 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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
snipe 77bf28bcb6 Disallow purge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 20:11:43 -07:00
snipe 6c2d06efb9 Merge remote-tracking branch 'origin/develop' 2022-06-23 20:02:19 -07:00
snipe d0081188c7
Merge pull request #11387 from snipe/fixes/nicer_settings_search 
Moved the settings search box higher
 2022-06-23 19:31:24 -07:00
snipe ce2362459c Layout tweak for search and back placement 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:30:52 -07:00
snipe 4e568bec8a Moves the settings search box higher 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:25:30 -07:00
snipe 18c37c97b8 Dark skin prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:14:12 -07:00
snipe 82e5faa869 Merge remote-tracking branch 'origin/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-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/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2022-06-23 19:14:01 -07:00
snipe dec7122ac7 Dark skin dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:13:01 -07:00
snipe a75fc8af7e Merge remote-tracking branch 'origin/develop' 2022-06-23 19:12:13 -07:00
snipe 86d2c2b153 Small naming changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 19:11:59 -07:00
snipe 9fc4565bc1 Merge remote-tracking branch 'origin/develop' 2022-06-23 18:56:04 -07:00
snipe f0cc418965
Merge pull request #11383 from snipe/features/adds_user_id_to_users 
Added created_by to users
 2022-06-23 18:48:42 -07:00
snipe 0bc3ca5c42 Fixed comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:44:27 -07:00
snipe 62ab867051 Fixed url param 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:43:10 -07:00
snipe 9fd3541520 Missed on createdBy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:42:22 -07:00
snipe 3e559044b2 Changed method and scope names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:41:13 -07:00
snipe 75a631b91f
Merge pull request #11375 from Godmartinz/bootS_dropdown_menu_fix 
fixes dropdown column select font color  in bootstrap tables
 2022-06-23 18:31:36 -07:00