DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 09:34:10 -08:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity
8626 commits 95 branches 267 tags 295 MiB
Commit graph

8626 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe c5a6cec194
Merge pull request #11380 from snipe/features/better_excel_export 
Fixed #11378 - Added better excel export
 2022-06-23 11:25:33 -07:00
snipe e2b1494511 Reordered and added xlsx to export list 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 11:18:59 -07:00
Godfrey M df76e6eacf adds eula blade for licenses and fixes assigned_to for dom_pdf 2022-06-23 11:15:15 -07:00
Godfrey M 541ae919d9 fixes dropdown column select font color in bootstrap tables 2022-06-23 09:38:44 -07:00
Ivan Nieto Vivanco 7976401aa2 Add error message when the default customfield values can't be validated 2022-06-22 22:17:05 -05:00
Ivan Nieto Vivanco 7e10abe605 Fix the date control in custom fields' default values form to show the selected date 2022-06-22 21:47:08 -05:00
Ivan Nieto Vivanco afdf93ca63 Adds controls for custom fields of type date in the default value form 2022-06-22 21:37:11 -05:00
Ivan Nieto Vivanco 321367b974 Adds validation to custom fields' default values 2022-06-22 21:06:07 -05:00
snipe 366f3aacef
Merge pull request #11367 from snipe/js_library_updates 
Updated/upgraded assets
 2022-06-22 16:23:03 -07:00
snipe 4b9ec9218d Upgraded/updates assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 15:54:58 -07:00
snipe cae66753fb
Merge pull request #11323 from Godmartinz/bug/sc-19255/issues-with-black-light-sk 
fixes non-dark mode black theme
 2022-06-22 15:47:55 -07:00
snipe 5ac9efa9a3 Merge remote-tracking branch 'origin/develop' 2022-06-22 12:20:04 -07:00
snipe ded635207f
Merge pull request #11365 from snipe/fixes/adds_missing_zip_to_user_view 
Added missing postal code from user view
 2022-06-22 12:19:27 -07:00
snipe f0f37df76e Added missing postal code from user view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 12:18:57 -07:00
snipe f5702532f0 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 11:21:51 -07:00
snipe 2f02eee69b Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 11:21:04 -07:00
snipe 89c234b1c2
Merge pull request #11358 from snipe/fixes/missing_token_lang 
Fixed missing password.token string and checked for user existing before attempting to send reset email
 2022-06-22 11:15:08 -07:00
snipe c24052cb2d
Merge pull request #11364 from snipe/features/link_asset_to_order_number 
Fixed #11351 - add link on asset view to order number
 2022-06-22 11:08:40 -07:00
snipe a7a61a3620 Fixed #11351 - add link on asset view to order number 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 11:07:54 -07:00
snipe 135fdae209
Merge pull request #11337 from mikeroq/fixes/user_edit_website_missing 
Fixed #11332 Added website field that was missing from update and store method.
 2022-06-22 10:16:38 -07:00
snipe 5c30de517d Use rate limiter for API calls 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 09:11:40 -07:00
snipe a7dc6162fa Simplify password attempts rate limiting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 09:11:24 -07:00
snipe 18778d3723 Additional example variables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 09:07:48 -07:00