DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8299 commits 101 branches 268 tags 320 MiB
Commit graph

8299 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 3a8786fdb7 Updated assets for prod 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:27:31 -07:00
snipe f2a89161b3 Merge remote-tracking branch 'origin/develop' 2022-06-23 18:26:36 -07:00
snipe 1c25057e42
Merge pull request #11379 from Godmartinz/license_acceptance_eula 
adds eula blade for licenses/consumables/components and fixes assigned_to for dom_pdf
 2022-06-23 18:26:19 -07:00
snipe 590630e4e0
Merge pull request #11386 from snipe/fixes/default_skin_settings_colors 
Small fixes to default blue
 2022-06-23 18:23:45 -07:00
snipe 487dedba25
Merge pull request #11384 from snipe/fixes/bs_tables_undefined_for_archived 
Fixed missing archived tooltip
 2022-06-23 18:16:31 -07:00
snipe f4c346a57c Small fixes to default blue skin 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:11:42 -07:00
snipe 35365882ac Used new settings_button class in settings index 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:10:28 -07:00
snipe ea254ccc04 Tweaked default @blue 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:10:14 -07:00
snipe 06d5b5f4b1 Small change to color in overrides 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:10:03 -07:00
snipe 2536b02ace Fixed some colors on default skin 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:09:52 -07:00
snipe 6b8abb1511 Fixed missing archived tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:32:39 -07:00
snipe 9c9f5be6fe Do not show the creating admin by default in list view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:28:34 -07:00
snipe d8daec2e0a Added created_by results to user index API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:19:30 -07:00
snipe c9b81d65f1 Save the user id who is creating the user 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:19:08 -07:00
snipe 7f05029089 Added created_by to API output 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:18:31 -07:00
snipe 23c50ea9a5 Added admihn scopes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:18:11 -07:00
snipe 2e5e8f363b Added admin to oresenter 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:18:04 -07:00
snipe e63183649a Show admin in user view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:17:48 -07:00
snipe ef86c0273a Added migration to store admin ID 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 17:17:38 -07:00
snipe dd8d90aa39 Merge remote-tracking branch 'origin/develop' 2022-06-23 16:16:04 -07:00
snipe 670a46e85c
Merge pull request #11382 from snipe/fixes/check_for_archived_setting_on_counts 
Fixes check for archived setting on counts
 2022-06-23 16:13:20 -07:00
snipe daf6c72005 Fleshed out comments on new scope 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 16:02:54 -07:00
snipe 1a4579b770 Missed one 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 16:00:27 -07:00
snipe 398c77bfdc Use new scope for additional tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 15:37:39 -07:00
snipe d45d322b54 Use scoped query for asset count 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 13:43:23 -07:00
Godfrey M b0897a1fc9 adds acceptance for consumables and components 2022-06-23 11:52:35 -07:00
Godfrey M d00b469001 fixed the search for the license 2022-06-23 11:33:36 -07:00