DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 00:07:42 -07:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
9245 commits 89 branches 265 tags 290 MiB
Commit graph

2932 commits

Author SHA1 Message Date
Ivan Nieto Vivanco f0ecab7bb1 Fix typo in variable (ah-hyuck!) 2022-11-15 11:00:40 -06:00
Ivan Nieto Vivanco 7cc8b39863 Checks if settings let URL's be shown in email notifications 2022-11-15 10:55:54 -06:00
Ivan Nieto Vivanco cd2997b674 Determine if email_logo or logo setting needs to be used in the Forgot Password email 2022-11-15 08:08:26 -06:00
snipe 8122236944
Merge pull request #12096 from snipe/features/add_custom_field_option_to_view_assets 
Added custom field option to view assets
 2022-11-14 22:45:26 +00:00
snipe 602c2698d2 Fixed broken table header tag 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:06:23 +00:00
snipe d4ac7530b6 Removed download button for files that don’t exist on the server 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:04:06 +00:00
snipe 4aded5e117 FIxed 500 error if model files are missing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 22:01:33 +00:00
snipe 077d343f01 Prevent 500 if license file is missing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-14 17:42:40 +00:00
snipe ae95ee49f1 Hide the option if the field is encrypted 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:56:50 +00:00
snipe 2ac558494d Set column width instead of letting BS tables guess 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:21:07 +00:00
snipe ede16ad2c2 Removed unused block 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 17:19:35 +00:00
snipe 7a5fcfb87a Loop through fields array 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-10 16:46:59 +00:00
Godfrey M 92ae271292 adds validation for department names at Company locations 2022-11-09 13:11:33 -08:00
snipe 097821b818 Slight revamping of column layouts and also added new general.display_in_user_view column 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:28:19 +00:00
snipe 2e56c9b521 Added new general.display_in_user_view field to form 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:59 +00:00
snipe b95d24b5eb Additional translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-08 15:27:44 +00:00
snipe 236684ec92 Fixed model file image path/variable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 14:12:49 -07:00
snipe 7cb1ca8754 Fixed image path to show preview 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:51:48 -07:00
snipe eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
snipe 71a7176a6e Updated component blade 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:28:57 -07:00
snipe def89bfa0c Added some generic file translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:28:49 -07:00
snipe 2106b64da6 Fixed some layout issues 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:06:49 -07:00
snipe fa79a6c15f Skip storage:: facade on missing images 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 18:19:13 -07:00
snipe 761da534f3 Updated consumables UI to allow uploads and display files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:53:08 -07:00
snipe a930661150 Check for valid category 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-31 12:16:39 -07:00
snipe c233d7fb1c Removed extra spaces 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 10:51:06 -07:00
snipe dea0fcefbd Reflect color in sidenav if one is given 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 10:48:42 -07:00
snipe e670ffe349 Added Assets Assigned to tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:16:06 -07:00
snipe b503b672ba
Merge pull request #11951 from Godmartinz/AccessKey_shortcuts 
adds shortcuts for listing, creating, and saving
 2022-10-25 15:53:57 -07:00
snipe 85a85082b7 Changed button icon for importer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-21 16:59:19 -07:00
snipe 515b14a001 Updated JS to better handle input IDs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:21:09 -07:00
snipe 4eed2baa31 Added default tab to locations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:06:58 -07:00
Godfrey M f9ac447dd1 adds default group to LDAP 2022-10-18 15:18:09 -07:00
snipe 23e613f903 Fixed kit parse error on model edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-18 15:00:33 -07:00
snipe 2543fa6b98 Fixed user icon for tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-17 20:04:42 -07:00
snipe 7c34652da0 Fixed incorrect icons for mobile view on location tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-17 20:02:27 -07:00
snipe fb228d6ded Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:57:10 -07:00
snipe 1360ce90a5 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:52:45 -07:00
snipe 3549afe157 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:43:24 -07:00
snipe cfb780b20b Remove unused files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:39:10 -07:00
snipe eb9f17122e Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:21:09 -07:00
snipe 2ef45afb2b Removed extraneous files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:18:57 -07:00
snipe e7ae7742b0
Merge pull request #11949 from nh314/Remove-required-mark 
Remove required mark
 2022-10-12 10:55:49 -07:00
snipe 06803092c5
Merge pull request #11952 from snipe/features/clearer_activated_helptext 
Added clearer LDAP activated helptext
 2022-10-12 10:52:56 -07:00
Ivan Nieto Vivanco ab0c5bcd9d Add precision parameter to the diffForHumans() Carbon function to report 2022-10-12 12:16:13 -05:00
snipe 5ba01728d9 More text tweaking 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-11 12:51:25 -07:00
snipe ae0eb378e4 Additional clarification 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-11 12:43:54 -07:00
snipe ad8a2387f0 Updated help text to be more clear 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-11 12:38:37 -07:00
Godfrey M 4fa01350c3 adds shortcuts for listing, creating, and saving 2022-10-11 12:00:15 -07:00
Phan Nguyen d3161fad02
Remove required mark 
Because it actually not required by model.
 2022-10-11 15:49:56 +07:00
snipe 15da3b831d
Merge pull request #11937 from Godmartinz/gh11868_sidebar_unclickable 
Fixes the margin top adjustment for desktop
 2022-10-06 10:43:27 -07:00
Godfrey M 0c6441ebed removes the margin top adjustment for desktop 2022-10-06 10:35:28 -07:00
Ivan Nieto Vivanco f1edbc9810 Send item variable that the datepicker needs 2022-10-06 09:15:00 -05:00
snipe ca937667b4 Indented divs per @uberbrady 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 17:21:39 -07:00
snipe 3605aa8f5a Added clear button to generic datepicker and made it wider 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:59:06 -07:00
snipe 0817308822 Added start/end to edit/view screens 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:58:49 -07:00
snipe d23e178c62 Adde language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 16:56:10 -07:00
snipe 18663c2599
Merge pull request #11925 from inietov/fixes/checkbox_customfields_comma_issues 
Fixed #11710 - Validation of checkbox data with multiple values
 2022-10-05 16:48:32 -07:00
Ivan Nieto Vivanco 5b8e0b3af1 Use a regex (gulp) to admit ',' (comma) and ', '(comma plus space) as customfields checkbox value delimiter 2022-10-05 18:40:07 -05:00
snipe 018f71a157 Switched to translations for better autoglossonym support 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 11:46:42 -07:00
snipe c70c8ce856
Merge pull request #11916 from Godmartinz/gh11868_sidebar_unclickable 
fixes mobile views and clickability of sidebar menu
 2022-10-04 18:07:02 -07:00
snipe 81d2a3acda Updated lnaguage strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 17:48:43 -07:00
snipe ba0483b33e Phrasing! 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 16:21:10 -07:00
snipe 97b9f96030 Added nag alert for unaccepted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 16:16:21 -07:00
snipe 891b5b2882 Added routes, language 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 15:45:25 -07:00
Godfrey M e21660ae05 off by a pixel 2022-10-04 12:11:37 -07:00
Godfrey M 53392d6069 fixes mobile views and clickability of sidebar menu 2022-10-04 12:01:13 -07:00
snipe 3469e49470 First UI overhaul 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-03 21:28:22 -07:00
Brady Wetherington 0424308863 Modified dashboard tooltips to add percentage as well as count 2022-09-29 13:46:56 -07:00
Brady Wetherington 420c216973 Added counts to Dashboard Pie Chart legends and tooltips 2022-09-29 13:20:58 -07:00
snipe 70c766e8b3 Added setting to choose dashboard type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 04:16:46 -07:00
snipe 0b2ce7be07 Fixed #11521 - switch to using status meta from status label name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 03:48:58 -07:00
snipe 8168ca4074
Merge pull request #11853 from Godmartinz/ldap_test_results_color 
Fixes the color choice for the ldap_test_results
 2022-09-27 14:46:46 -07:00
snipe c194c8a0c8
Merge pull request #11764 from BasO12/master 
Added notes to audit mail notification
 2022-09-27 14:43:50 -07:00
Ivan Nieto Vivanco 06ba9356ca Delete another set of duplicates 2022-09-26 18:57:35 -05:00
Ivan Nieto Vivanco e034f7b674 Delete another duplicate that somehow has survived 2022-09-26 18:56:24 -05:00
Ivan Nieto Vivanco 4d14243f57 Delete duplicate fields from the importer dropdown menu 2022-09-26 18:51:13 -05:00
snipe 9d93c72534 Use BS datepicker’s built in clear button 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-26 14:34:35 -07:00
Ivan Nieto Vivanco 23cf556a8b Adds cursor:pointer to indicate a clickable link 2022-09-20 22:24:52 -05:00
Ivan Nieto Vivanco f75917d34d Add a link used to clear the purchase date input 2022-09-20 17:53:55 -05:00
Godfrey M c55f2d5417 corrects color for query and results of ldap sync test 2022-09-20 10:35:55 -07:00
Godfrey M 571ce5b741 corrects the color choice for the ldap_test_results 2022-09-19 11:59:02 -07:00
snipe dcab1381e7 Check for licenses.files permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:00:27 -07:00
snipe ca70988879 Larger checkbox in lists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 21:42:16 -07:00
snipe 62ad3fad1c Remove DL button if file doesn’t exist 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 16:11:27 -07:00
snipe eb1e287c15 Better handle missing files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 16:08:13 -07:00
snipe 1885e73704 Ignore warning icon if no purchase date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 15:42:47 -07:00
snipe 24910433a1 Fixed 500 when depreciation is set but no purchase_date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 15:39:47 -07:00
Ivan Nieto Vivanco 9b2eda2d70 Save and show the default values properly on custom fields of type checkbox 2022-09-15 11:52:49 -05:00
Ivan Nieto Vivanco 20220764bb Add possible values for custom fields of type checkbox 2022-09-15 11:18:54 -05:00
snipe 72feaee6c0 Added Applecare lookup link if manufacturer is apple 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-14 19:43:48 -07:00
Godfrey M 9b448227f7 tinkering to no avail 2022-09-13 11:40:10 -07:00
snipe 93428e1ed4 Increased colspan for checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-31 13:34:27 -07:00
Godfrey M 193b31e427 select options working, testing sync then done 2022-08-31 12:58:33 -07:00
Godfrey M 70ac8af9c4 . 2022-08-31 09:53:20 -07:00
BasO12 61e1650542
Add files via upload 2022-08-31 13:08:09 +02:00
BasO12 ab54ac9408
Add files via upload 2022-08-31 13:07:05 +02:00
snipe dcbd407698
Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance 
Send notifications when Acceptance Assets actions occur [sc-9917]
 2022-08-30 12:14:58 -07:00
Godfrey M 0c362e8b57 gets the groups selector to appear but options are blank 2022-08-29 12:09:56 -07:00
snipe 9cf5f30c77 Set safeMode to true and use helper for all parsedown 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-29 11:26:47 -07:00
David Sferruzza f60ea9581d
Fixed #11742: display correct file sizes when using S3(-like) storage 2022-08-28 12:07:14 +02:00
Godfrey M fc6fefdb4e adds migration, variables, checkbox,working on groups 2022-08-25 15:19:38 -07:00
snipe 36ab794adc Added signature field to user history 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 18:05:43 -07:00
snipe a5fd9ebbb1 Added style to readonly datetime picker field 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 17:10:15 -07:00
Ivan Nieto Vivanco 581cae94ab Add readonly property to datepickers 2022-08-24 18:21:54 -05:00
snipe af34fc207c Suppress error output if file doesn’t exist on server 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 13:47:56 -07:00
Godfrey M 2994c3613a adds clearfix to settings page 2022-08-22 10:46:15 -07:00
snipe 368bd5da3f Adds the category in the side info on Models > View 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-14 14:01:58 -07:00
snipe 7b3be076b4 Make location field the same width 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-11 18:38:34 -07:00
snipe 2c68ec927a Use trans_choice for string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-11 18:30:59 -07:00
snipe a0ba33ed7c Added checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-11 18:25:22 -07:00
snipe 70bb4cd746 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-11 18:25:15 -07:00
Ivan Nieto Vivanco a33ca39237 Figure out declined notifications 2022-08-11 16:00:21 -05:00
Ivan Nieto Vivanco d2c486bb1e Create the mail template for the acceptance 2022-08-11 15:28:30 -05:00
Ivan Nieto Vivanco 509bbbc685 Create Notifications classes for accepted and declined and add some necesary lang strings 2022-08-11 13:01:21 -05:00
snipe acd666fdf5 Added notes to user consumables tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:34:07 -07:00
snipe 8de7e9a2ab Use route name in case the user biffs the checkout twice 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:17:52 -07:00
snipe dd0260c3be Use old note on validation failure 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:15:29 -07:00
snipe fb3d7bf82e Made button wider 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:07:58 -07:00
snipe 0d9eccb7eb Addeed note field 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:03:12 -07:00
snipe 637604dfaf Fixed #8928 - add URL and ID to custom asset report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 13:51:47 -07:00
Brad Coudriet 77a1fcb1fc There was actually a missing p tag too 2022-08-09 06:36:53 -04:00
Brad Coudriet 0cf0598936 Added a closing div tag around the mail text help block, this was causing labels further down the page to be formatted in correctly 2022-08-09 06:32:03 -04:00
snipe c39bf7b7e6 Added German (Informal) to select list 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-08 15:30:58 -07:00
snipe 9db0b038a5 Updated translation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-08 15:29:28 -07:00
snipe 095dd3ecf2 Added configuration, PAT test strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 20:19:28 -07:00
snipe 5a1b8bc4b6 Fixed icheck checkbox class 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 20:19:19 -07:00
snipe 975b4dee2f Added deleted header 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:58:17 -07:00
snipe 9ae7c66b77 Fixed indenting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:50:21 -07:00
snipe 77ab4ac1b5 Fixed labels on radio buttons in custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:48:41 -07:00
snipe da1c1dbdd9 Added warning icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:19:08 -07:00
snipe 56b6904564 Added time difference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:13:02 -07:00
snipe 10e64deafe Updated method name in mail 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:12:44 -07:00
snipe 0a9bd07f20 Disallow checkout if qty = 0 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 12:27:58 -07:00
snipe 8027039754 Hide requested assets if the user cannot see requestable items 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 11:48:45 -07:00
snipe 031b7998c9
Merge pull request #11603 from inietov/fixes/actions_on_licenses 
Use apropiate string for license actions
 2022-08-02 10:40:20 -07:00
Ivan Nieto Vivanco 13053b85ef Remove Actions button and pass the correct variable to the routes 2022-08-02 12:37:27 -05:00
snipe e3b13143bf
Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports 
Adds options to include Deleted assets to custom asset reports
 2022-08-02 10:33:57 -07:00
Godfrey M e150ab58e9 reworded trans 2022-08-02 10:31:06 -07:00
Godfrey M ff080a2d8f replace checkboxes with radiobuttons 2022-08-02 10:27:55 -07:00
Ivan Nieto Vivanco a63d00bb5c Use apropiate string for license actions 2022-08-02 11:55:11 -05:00
snipe e07532dd1b Applied master fix to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 18:55:28 -07:00
snipe 4133ac6ef0 Applied date formatter to Current Date output on location print assigned 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 18:47:29 -07:00
snipe 4834c33861 Missed a named route 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 18:43:54 -07:00
snipe e79a819724 Fixed inconsistency in naming 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 17:45:39 -07:00
snipe af7ccf3beb Handle logout route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:17:40 -07:00
snipe 3e48f436af Handled user route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:13:30 -07:00
snipe 5e488bd81f Handle components route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:10:39 -07:00
snipe 53ff28d2b0 Handle consumables route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:07:56 -07:00
snipe 4a4636bd03 Handle accessories route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:06:28 -07:00