DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 14:09:43 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
8812 commits 101 branches 268 tags 288 MiB
Commit graph

2786 commits

Author SHA1 Message Date
snipe 93428e1ed4 Increased colspan for checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-31 13:34:27 -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
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
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
snipe 744d0d299e Handle model route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:03:45 -07:00
snipe b035003546 Handled hardware route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 15:59:54 -07:00
Godfrey M 842dafefec adds options to include Deleted assets to custom asset reports 2022-08-01 14:52:12 -07:00
snipe a51b446a10
Merge pull request #11578 from snipe/fixes/conditionally_add_nbsp 
Switched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty
 2022-08-01 14:07:50 -07:00
snipe 8b30992a11 Added bulk edit to company view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 14:06:18 -07:00
snipe 33de45d8fb Swirtched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-29 00:57:20 -07:00
snipe c5530104ff Fixed #11549 - dark skin dropdowbn menu fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-22 15:36:51 -07:00
snipe a1fe2a8d58 Fixed translation reference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 18:01:55 -07:00
snipe 25cc46e416 Fixed button string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 18:01:41 -07:00
snipe 458d61fafe Front-end updates for checkin without delete 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:57:39 -07:00
snipe 32010d5387 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:57:27 -07:00
snipe b7c7e6c623 Added/updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:56:58 -07:00
snipe f0a9de72b1 Use icheckbox formatting on BOM and archived checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 12:12:22 -07:00
snipe 58499c2322 Fixed #11508 - font size in alert menu 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 17:09:17 -07:00
snipe 0ccd7e09de
Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include 
adds a checkbox to exclude archived assets from custom reports
 2022-07-12 12:59:18 -07:00
mikeroq 5efe45226d Fixes Email List of All Assigned being "successful" when the user has no email 
Added check in view to disable button if there is no email
Added translation for title on disabled button and for email check in controller
Fixed missing trans for user not found message
 2022-07-11 20:02:10 -05:00
snipe 8114d01799 Only show sig file if there is a value for accepted sig 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-11 14:46:45 -07:00
Godfrey M 75844c5942 adds a checkbox to exclude archived assets from custom reports 2022-07-11 09:56:58 -07:00
mikeroq 397e89cbed Fixes modal showing entire model data instead of just the name 2022-07-09 14:09:40 -05:00
snipe 723454b04d Changed model file icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 16:17:35 -07:00
snipe 9c86b4bf88 Fixes padlock icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 15:57:33 -07:00
snipe bae9792f01 Missed two 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:36:09 -07:00
snipe b98af0f50f Upgrade font-awesome to v6 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:22:08 -07:00
snipe bfc8c18675
Merge pull request #11451 from mikeroq/fixes/populate_custom_fields_from_asset_model_create 
Fixes custom fields not populating when creating asset from asset model page
 2022-07-05 17:31:08 -07:00
snipe ef17fd41f7
Merge branch 'develop' into develop 2022-07-05 16:26:53 -07:00
snipe dae53a1128 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 16:18:53 -07:00
mikeroq 2781bd02b5 Add TODO to indicate future refactoring. 2022-07-05 18:02:37 -05:00
Daniel Reeder 7772ef22db Quick typo fix 2022-07-04 21:57:54 +00:00
snipe afab167e8c Fixed restore button in listings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-02 13:08:46 -07:00
snipe af14ee0d47
Merge pull request #11453 from mikeroq/fixes/asset_restore_not_working 
Fixes #11452 - Asset Restore routes/buttons also asset models/users restore as well
 2022-07-02 13:07:29 -07:00
Mike Roquemore 07ac4087a3 Remove link from alert since there is already a restore button on the side 2022-07-02 14:34:22 -05:00
Mike Roquemore 123963c14c Modify genericActionsFormatter restore link to be a button instead since it's in a form. 
Changed user restore route to POST
 2022-07-02 14:34:22 -05:00
Mike Roquemore 1b45170ca3 Adds check if request has model_id, if so call fetchCustomFields on document ready 2022-07-01 20:15:11 -05:00
snipe b910db0617 Fixed #11393 - reject acceptance if no file is present 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 21:01:58 -07:00
snipe df1e2687d6 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 17:35:02 -07:00
snipe 46d055cf74 Fixed weird extra padding on crown 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 14:17:53 -07:00
Godfrey M fc636ea888 removed redundant header 2022-06-29 12:01:56 -07:00
Godfrey M e471aa8639 adds button to email user list of assets from profile 2022-06-29 11:15:15 -07:00
snipe 5b02d9ed06 Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/views/account/accept/create.blade.php
 2022-06-29 04:58:13 -07:00
snipe be9e6fe847 Another typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-29 00:24:33 -07:00
snipe b0e13611f7 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-29 00:24:08 -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