snipe
5e6a6a81d5
Fixed #12776 - larger EOL text
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-05 16:00:02 -07:00
snipe
4b4d4e98b6
Use enclosing span for HTML text in grid
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-05 14:10:57 -07:00
slong753
830e3e5594
cleanup
2023-04-05 15:27:28 -05:00
slong753
d56a4e7173
cleanup+formatting
2023-04-05 15:16:46 -05:00
snipe
9af2d0a6de
Merge branch 'develop' into features/replace_icheck_with_only_css
2023-04-05 13:04:12 -07:00
Godfrey M
b038fe8f2e
adds unavailable message to overcheckout
2023-04-05 10:00:39 -07:00
slong753
3929526a57
ok, this works but needs to be tested more
2023-04-04 18:57:51 -05:00
snipe
55857c910a
Color picker UI fix
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-04 00:33:05 -07:00
snipe
5919f3843d
Small fixes to the color picker (sorry)
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-04 00:27:05 -07:00
snipe
6164e8b3fa
Changed colors for disabled, removed dupe checkmark
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 23:53:57 -07:00
snipe
0e68b8e9f2
Small fixes for profile edits
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 23:06:09 -07:00
snipe
3bd87a2785
Removed iCheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 22:52:54 -07:00
snipe
5df34d0058
Diable SAML submit if in demo mode
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 22:40:25 -07:00
snipe
9a3e727390
Updated other form fields to use new label class, fixed HTML for accessibility
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 22:38:56 -07:00
snipe
aca64dc088
Updated check groups for permissions to skip iCheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 22:38:24 -07:00
snipe
3473e24de5
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 22:36:23 -07:00
snipe
1af7cdb715
Wrapped the image delete into the existing image upload partial
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 22:35:55 -07:00
snipe
2c47b63e91
Small tweaks to overrides
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 19:37:07 -07:00
snipe
a7787a6cdc
Fixed string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 19:20:58 -07:00
snipe
62c99d4e2e
Added check all to user delete
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 19:19:28 -07:00
snipe
858f1c2d12
Updated audit with icheck, removed popover text - need a better solution with layout
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 19:19:12 -07:00
snipe
76b9608de3
Typo fix
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 19:18:40 -07:00
snipe
1ea813a1c5
Updated strings to trans_choice
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 18:54:59 -07:00
snipe
a861672146
Standardized model bulk blades a little more
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 18:54:46 -07:00
snipe
146976975c
Removed <wire:ignore> in model edit for default custom fields
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:38:34 -07:00
snipe
58b3369234
Requestable partial - removing icheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:38:12 -07:00
snipe
21448f6adf
Model edit - removing icheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:38:02 -07:00
snipe
899b936152
Models bulk edit - removing icheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:37:49 -07:00
snipe
866ba36090
Hardware editing un-icheckification
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:37:34 -07:00
snipe
60d60be0ac
Small style specification for notes partial field
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:37:16 -07:00
snipe
5ed9385685
Clearer tab name for user info
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:09:25 -07:00
snipe
c5d74ac27f
Additional form CSS tweaks for disabled and unchecked
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:08:47 -07:00
snipe
9146850ffe
Added string for emailing user credentials
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:08:31 -07:00
snipe
2c5ddca695
More jquery and form fixes for users
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:08:21 -07:00
slong753
29e3d202fe
checking something, quick push
2023-04-03 17:54:31 -05:00
snipe
790f9c2fc4
Updated 2FA to non-icheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 15:38:52 -07:00
snipe
b4df9eb586
More checkbox tweaks
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 15:33:21 -07:00
snipe
0d050e4016
Updated user edit page with with non-icheck toggles
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 14:55:12 -07:00
snipe
4035cd118e
Handle the column selector in bs table styling
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 14:35:47 -07:00
snipe
5c89439ba3
Updated login page to use non-icheck
...
TODO: override that style for the labels
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 12:18:18 -07:00
snipe
85c0ddf475
Tweaked the col-md to use offset
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 12:17:49 -07:00
snipe
868615d5e7
Removed iCheck from snipeit.js and webpack
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 12:17:31 -07:00
snipe
5078b51d4d
Removed temp disabled attributes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 11:39:02 -07:00
snipe
e066f033c8
First attempt at moving us away from iCheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 10:54:01 -07:00
snipe
fcda478712
Merge remote-tracking branch 'origin/develop'
2023-03-30 14:51:23 -07:00
snipe
986c73982e
Check if status is set
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-30 14:50:56 -07:00
snipe
080a4c823b
Merge remote-tracking branch 'origin/develop'
2023-03-30 14:49:19 -07:00
snipe
1fc0a0f94d
Quick fix for bulk restore menu
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-30 14:44:38 -07:00
snipe
048be49c14
Merge remote-tracking branch 'origin/develop'
2023-03-30 14:37:47 -07:00
snipe
dfa9c07217
Merge pull request #12760 from akemidx/apple_warranty_link_fix2
...
Updating Apple warranty link to match current Apple webpage
2023-03-30 12:47:09 -07:00
akemidx
0c38257f80
fixing one liner
2023-03-30 15:40:23 -04:00
snipe
9ca5285781
Merge pull request #12762 from spencerrlongg/feature/sc-20304
...
Bulk Restore from Deleted
2023-03-30 12:37:50 -07:00
slong753
0f72554a9f
translations for messages
2023-03-30 13:57:18 -05:00
slong753
b84eaaf61a
translations done
2023-03-30 13:48:05 -05:00
snipe
b7c09042b0
Merge pull request #12758 from inietov/fixes/call_to_member_function_present_null
...
Fixed Call to a member function present() on null [sc-20594]
2023-03-30 11:01:38 -07:00
snipe
10c1e923dc
Merge pull request #12764 from marcusmoore/fixes/importer-fix
...
Fixes potential unwanted overwrites in asset imports
2023-03-30 09:40:58 -07:00
slong753
d5d50264c3
fix permissions stuff + optional parameter
2023-03-29 19:53:04 -05:00
Ivan Nieto Vivanco
d622dbb943
Revert the php codeblock and replace it with a ternary
2023-03-29 18:37:47 -06:00
snipe
da940a6bcc
Merge remote-tracking branch 'origin/develop'
2023-03-29 17:19:50 -07:00
Marcus Moore
6beb3b551a
Fix typo
2023-03-29 17:01:24 -07:00
slong753
d033733fc0
oops, remove a couple things
2023-03-29 18:30:39 -05:00
slong753
e4c76f454c
this is good, just needs translations done in view
2023-03-29 18:24:56 -05:00
slong753
162b70d5a9
wireframed, needs a view and should work
2023-03-29 17:34:36 -05:00
Marcus Moore
863a346d6e
Translate strings
2023-03-29 13:37:14 -07:00
Marcus Moore
e05546d1fa
Display helpful messages when importing assets
2023-03-29 13:23:45 -07:00
slong753
b0fa298d8f
delete a couple things
2023-03-29 15:14:48 -05:00
slong753
65bbecd145
this all works - could use some eyes
2023-03-29 14:46:31 -05:00
akemidx
6bee4c1a75
Updating Apple warranty link to match current Apple webpage
2023-03-29 15:09:14 -04:00
Marcus Moore
9cc74caa9e
Add wire:model to import form checkboxes
2023-03-29 10:58:25 -07:00
Ivan Nieto Vivanco
d7c531e1c7
Checks if user variable exist before using its properties
2023-03-29 10:33:15 -06:00
slong753
032ae4348e
custom fields display, need to get saving
...
+some clean up
2023-03-28 21:45:31 -05:00
slong753
804a788a27
initial fetch working
2023-03-28 20:31:24 -05:00
snipe
32922e6461
Use corrected language string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-28 16:39:52 -07:00
snipe
527c812d04
Use icon for group users header
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-28 16:39:41 -07:00
snipe
99a05c6401
Merge remote-tracking branch 'origin/develop'
2023-03-28 13:43:24 -07:00
Joe Ferguson
47e18db172
Fix next button string for Step 2 preflight
2023-03-28 10:30:56 -05:00
Joe Ferguson
d667ae53ed
Add missing strings to Step 2 preflight
2023-03-28 10:30:35 -05:00
snipe
03aadc4abf
Merge remote-tracking branch 'origin/develop'
2023-03-28 07:20:22 -07:00
snipe
09674c012c
Use named route with params
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-28 07:18:45 -07:00
snipe
d2daaf30eb
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2023-03-28 03:32:04 -07:00
Joe Ferguson
cd49f65c0b
User preflight fix translation strings w/ bad path
2023-03-24 15:27:08 -05:00
snipe
dcbd216e2c
Merge remote-tracking branch 'origin/develop'
2023-03-24 08:29:22 -07:00
snipe
697cb4fe6d
Fixed translation string for importer
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-24 08:27:53 -07:00
snipe
8a395d63a1
Merge remote-tracking branch 'origin/develop'
2023-03-24 07:23:06 -07:00
snipe
16dcc2d3ed
Fixed #12641 - add JSON to mimes
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-24 06:57:43 -07:00
snipe
43c286c61f
Merge remote-tracking branch 'origin/develop'
2023-03-24 06:18:10 -07:00
snipe
13ad69ee75
Merge pull request #12713 from inietov/fixes/trying_access_array_offset_null
...
Fixed Trying to access array offset on value of type null [sc-20528]
2023-03-24 04:52:56 -07:00
snipe
b91e914a61
Merge remote-tracking branch 'origin/develop'
2023-03-23 10:55:58 -07:00
Marcus Moore
9d2c4a4dee
Update webhook message
2023-03-23 10:38:35 -07:00
Marcus Moore
fe6295a5e4
Update slack_* properties to webhook_*
2023-03-22 14:43:00 -07:00
Ivan Nieto Vivanco
aa8dfcf89f
Added a ternary to avoid null offset in array
2023-03-22 13:48:23 -06:00
snipe
e8e1ada776
Merge pull request #12669 from akemidx/feature/sc-20178
...
#20178 : Added Dell and Lenovo to warranty link function
2023-03-22 00:54:40 -07:00
snipe
58ea1592bb
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/livewire/slack-settings-form.blade.php
2023-03-22 00:26:15 -07:00
snipe
545d023a18
Handled a few more hard-coded strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 23:56:07 -07:00
snipe
473211397f
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent
...
Livewire importer without subcomponent
2023-03-21 23:07:04 -07:00
snipe
e08327be95
Ability to remove user location from users
...
Rework of #9677 - sorry @godmartinez - I suck :(
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 23:03:57 -07:00
Brady Wetherington
6fe520a55d
Hooked various the contents of the components together
2023-03-21 22:26:32 -07:00
snipe
0418d390f0
Corrected width to 100%
...
I should not be allowed to touch computers
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 22:25:15 -07:00
snipe
b3d5bb75a3
Apply master patch to develop because I am an idiot on the wrong branch
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 22:23:09 -07:00
snipe
5346ebba94
Make select2 list in slack settings not searchable
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 22:21:21 -07:00
snipe
1fa9f80c03
Correctly disable the select2 in demo mode
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 22:18:42 -07:00
snipe
e40762cf7f
Small anal-retentive spacing/indenting tweaks
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 21:00:43 -07:00
snipe
2d3ddd1c7a
Fixed default value for webhook_selected
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 20:56:08 -07:00
snipe
637438ccf6
Added select2 to slack settings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 20:00:11 -07:00
snipe
647f47cdfe
Check for demo mode in the clear method for the controller
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 19:27:05 -07:00
snipe
a14d1b981d
Switched singleton to static helper method
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 19:22:18 -07:00
snipe
f29e813332
Translated “Clear & Save”
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 18:58:35 -07:00
snipe
d883084830
Fixed some funky HTML tags
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 18:58:26 -07:00
snipe
658252125e
Added new partial for the form inline “demo mode”
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 18:57:27 -07:00
snipe
35bef6625a
Merge pull request #12703 from Godmartinz/webhook_clean_up
...
adds clear and save button, save button updates accordingly
2023-03-21 17:02:33 -07:00
Godfrey M
2754277068
adds csrf token and missing divs
2023-03-21 16:12:46 -07:00
snipe
c229d69cec
Added next audit date override in bulk asset edit
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 16:01:41 -07:00
Godfrey M
3c28242a2e
save button updates accordingly
2023-03-21 15:53:09 -07:00
snipe
ecb11c3a12
Fixed #12682 - add default location to maintenance report
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-21 13:52:21 -07:00
snipe
4f8542b71b
Merge pull request #12680 from akemidx/clone_accessories
...
Clone accessories
2023-03-21 13:37:04 -07:00
akemidx
bb7b655fd2
translating screen reader lines
2023-03-21 16:02:34 -04:00
akemidx
3134279a95
small edits
2023-03-21 15:48:53 -04:00
Brady Wetherington
704a2ad858
WIP: trying to merge two LW components into one, not working yet
2023-03-18 20:31:56 -07:00
snipe
071a642509
Changed phrasing in translatons
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-18 00:15:28 -07:00
snipe
e39a75f2cc
Fixed min width on select2 bulk menus
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-18 00:14:57 -07:00
snipe
ea4a37d8ef
Fixed cancel button alignment
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-18 00:14:09 -07:00
snipe
e47fc9527b
Updated language
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-17 16:50:02 -07:00
snipe
820ae09a6f
Reworked the layout of the confirm merge form a little
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-17 16:42:41 -07:00
snipe
fb54a21e12
Added strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-17 16:42:22 -07:00
snipe
28cc8f9d69
Nicer user history display
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-17 16:41:43 -07:00
snipe
c752e3bb86
Fixed divs
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-17 02:48:41 -07:00
snipe
e557f03cc2
Disable submit if app is locked
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-17 02:43:33 -07:00
snipe
c93096b767
Made the table wider, used icons to compact space
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-16 23:13:05 -07:00
snipe
736777e1e6
Added email and username to merge user confirmation screen
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-16 22:48:20 -07:00
snipe
d3d26cb988
Added translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-16 18:19:03 -07:00
snipe
07fbbf5f7f
Added merge to user menu
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-16 18:18:54 -07:00
snipe
0dfb51f642
User merge blade
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-16 18:18:32 -07:00
akemidx
a8e2f72e25
accessory cloning, WITHOUT copying over the image.
2023-03-15 16:55:24 -04:00
snipe
e9601bcf13
Handle already-deleted license files more gracefully
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-15 13:05:51 -07:00
akemidx
68094b23b9
moved dell and levono icons to local machine
2023-03-15 15:02:33 -04:00
snipe
fdacd5d5b5
Merge pull request #12636 from akemidx/feature/sc-20330/date-on-all-assigned-pdf
...
Datestamp on "Print All Assigned" generated form
2023-03-15 11:31:52 -07:00
akemidx
f38f6f57ae
fixed localization and formatting. simplified code to remove php snippet
2023-03-15 14:00:29 -04:00
snipe
322fd76353
Merge pull request #12664 from Godmartinz/The_final_lowercase
...
The final lowercase in webhooks
2023-03-14 17:09:20 -07:00
akemidx
d50a5d1880
dell and lenovo icons/links added
2023-03-14 16:04:03 -04:00
akemidx
a9782b7e00
testing links
2023-03-14 15:26:44 -04:00
akemidx
9c5ee060d3
WIP string/int error
2023-03-14 15:01:56 -04:00
snipe
5a709a83e7
Small UI tweaks
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-14 09:38:30 -07:00
Godfrey M
955d8313b2
the final lowercase
2023-03-13 17:14:02 -07:00
Godfrey M
1bd37b49e9
adds translations for webhook names
2023-03-13 16:13:02 -07:00
Godfrey M
7612c5d852
lowercases variables
2023-03-13 15:26:51 -07:00
Godfrey M
11bf3f5285
aligned inputs
2023-03-13 14:06:05 -07:00
Godfrey M
b6d105c4f4
removes help text from general integrations
2023-03-13 10:49:41 -07:00
Godfrey M
27a2ed5c79
Merge branch 'develop' into generalize_webhooks
2023-03-13 10:41:08 -07:00
Godfrey M
82504c9764
updates alerts to notifications in notification settings
2023-03-13 09:51:25 -07:00
snipe
d1d89f872a
Merge pull request #12638 from snipe/fixes/dashboard_category_count_with_show_archived
...
Fixed #12635 - dashboard category should not show archived
2023-03-10 14:19:40 -08:00
Florian
86205bc996
fix translation and adds icon on property reassignable
...
Fixing #12647
2023-03-10 10:36:42 +01:00
akemidx
4533982345
added time of day
2023-03-09 15:11:07 -05:00
snipe
a6f4e53e2b
Added translation strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 16:33:49 -08:00
snipe
fe470b32fc
Added icon and import type to header, more translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 16:33:40 -08:00
snipe
474e32ea2a
Added translations and formatting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 16:33:02 -08:00
snipe
b9e4b2a0ba
Added some translations, date formatting, and filesize human reporting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 16:32:45 -08:00
snipe
7f8bdbd252
Added showableAssets() relationship to Category model
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 13:01:38 -08:00
snipe
00896a8615
Updated comment
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 12:51:53 -08:00
akemidx
2a4d30a748
forgot to add datestamp to title of page
2023-03-08 15:09:33 -05:00
akemidx
cd9f2f7fb7
datestamp for print all assigned form generation
2023-03-08 14:56:14 -05:00
Godfrey M
15c19a7ab7
silenced Discord option and validation, more translations
2023-03-08 10:35:45 -08:00
snipe
1ed7cd27b4
Lots of HTML/CSS tweaks for better UI
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 00:32:30 -08:00
snipe
e143e0c5ee
Make the <tr> reflect that it’s active
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-08 00:32:16 -08:00
snipe
42601fecbf
Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased
2023-03-07 21:42:32 -08:00
Brady Wetherington
7c09de3ea8
Re-introduce the 'placeholder' option for our form-helper
2023-03-07 21:38:55 -08:00
snipe
094859cfe8
Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased
2023-03-07 21:38:04 -08:00
snipe
19d19a4c42
Updated language string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 19:18:32 -08:00
snipe
383b5b43bb
Added a few more jquery options for prevoew flexibility
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 18:54:38 -08:00
snipe
379c5f6790
Reworked the layout for logo upoloads
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 18:54:09 -08:00
snipe
e55d02fd59
Added new string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 18:53:53 -08:00
Brady Wetherington
09c1298e03
Merge branch 'develop' into livewire_importer_2_squashed_and_rebased
...
I'll be taking in the changes to the importer front-end elsewhere
2023-03-07 18:51:05 -08:00
Brady Wetherington
fe699737eb
Add improved field-guessing logic; make sure 'do not map' fields work
2023-03-07 18:26:59 -08:00
snipe
e60fa15414
Nicer layout, but it kinda dosn’t work :(
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 17:02:52 -08:00
Godfrey M
69944853f9
more translations
2023-03-07 15:57:58 -08:00
Godfrey M
35dd0d8def
adds generalized webhooks, updates settings page, translations, validation
2023-03-07 15:48:21 -08:00
snipe
ea54f540de
Dynamically determine target route for expected checkin emails
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 13:42:51 -08:00
akemidx
ec5836dab4
cloning accessories first bit
2023-03-07 16:41:48 -05:00
snipe
1ebbc767f1
Merge pull request #12624 from snipe/features/added_vip_and_byod_to_importer
...
Added `vip` and `byod` to importer
2023-03-06 17:11:28 -08:00
snipe
16bd2cde0f
Updated string for file not found
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-06 15:09:45 -08:00
snipe
f460d881da
Updated vue
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-06 14:27:53 -08:00
Achmad Fienan Rahardianto
0b3becee7a
enable sortable for ID column
2023-03-04 11:27:00 +07:00
Brady Wetherington
7edec26e73
Fixes to layout, improvements to import types, better icons for processing.
2023-03-01 17:18:36 -08:00
Godfrey M
aae178a606
gets select working, placeholders update dynamically
2023-03-01 17:10:10 -08:00
snipe
778787db3c
Rip out jquery for location parent
...
Signed-off-by: snipe <snipe@snipe.net>
2023-03-01 15:36:01 -08:00
Godfrey M
354f04534e
add multi array, migration, still having issues
2023-03-01 12:30:32 -08:00
Brady Wetherington
9b80e86306
Actually display name of company in Accessories Report
2023-03-01 11:34:30 -08:00
Brady Wetherington
54cb38603b
Cleaned up the last of the FIXME's (or downgraded them to TODO's)
2023-02-28 22:34:44 -08:00
Brady Wetherington
5cf66851f7
Finalizing the Livewire Importer! Just going to do some testing now
2023-02-28 21:58:02 -08:00
snipe
44e2796645
Merge pull request #12579 from Godmartinz/gh12571_sidebar_adjustment
...
Fixes the sidebar margin top
2023-02-28 20:30:07 -08:00
Brady Wetherington
2f94bf96ff
Everything's all wired up; just need to clean up all the FIXME's and stuff
2023-02-28 18:36:52 -08:00
snipe
1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable
2023-02-28 18:05:09 -08:00
snipe
af9f9d2523
Convert string to date object for formatting
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-28 15:48:45 -08:00
akemidx
25f3e4d41a
Adding ability to see boolean values when using normal export
2023-02-28 16:01:23 -05:00
Godfrey M
e8fbb0608f
adjusts the sidebar margin top
2023-02-28 09:30:02 -08:00
Brady Wetherington
53db266b69
WIP: cleaning up extraneous gunk and trying to standardize on one single Livewire Select2 implementation
2023-02-27 14:29:02 -08:00
Brady Wetherington
fb201e61f3
More wiring up Livewire to the back-end.
2023-02-27 14:29:02 -08:00
Brady Wetherington
e1c8f155bb
Wiring up more bits to Livewire
2023-02-27 14:29:02 -08:00
Brady Wetherington
5c97e45d00
WIP - trying to get select2 wired up for importer
2023-02-27 14:29:02 -08:00
Brady Wetherington
8009ee79db
I think I have, now, full parity on the base Importer level
...
Meaning that you can upload new files, delete old files, have error
messages, have status updates - and all of them seem to work.
2023-02-27 14:29:02 -08:00
Brady Wetherington
0a085af0a0
Getting the basic wiring of the importer over into Livewire
...
WIP: Wiring up more and more of the actions on the importer
Files now upload okay, a little glitchy on the display-side though
add to readmes so i dont forget
2023-02-27 14:28:59 -08:00
Godfrey M
e8fc895e51
"adds variables, but still not working"
2023-02-27 09:19:59 -08:00
snipe
5e6ebb9a65
Merge pull request #12410 from uberbrady/paginate_accessories_report
...
Paginate accessories report
2023-02-23 12:26:17 -08:00
snipe
8e72da42e8
Merge pull request #12406 from akemidx/vip_tag
...
Added a checkbox to notate VIP status
2023-02-23 12:23:29 -08:00
snipe
eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies
...
Fix full company scoping in user selects
2023-02-23 10:36:33 -08:00
Marcus Moore
6c8de181cf
Properly close tag in mail template
2023-02-22 17:52:47 -08:00
Marcus Moore
aae2106658
Use existing language translation string
2023-02-22 12:02:14 -08:00
snipe
81cb29db5e
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report
...
Added images to emailed user inventory report [sc-19801]
2023-02-22 10:38:07 -08:00
snipe
4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during
...
Adds Boolean to Users Table for Auto Assigning Licenses
2023-02-21 20:10:46 -08:00
snipe
0c3115553e
Merge branch 'develop' into vip_tag
2023-02-21 20:03:49 -08:00
snipe
942fee4d43
Merge pull request #12447 from akemidx/user_setup_translation
...
FIXED: Translations on the User Creation setup page
2023-02-21 19:53:00 -08:00
snipe
29158dece5
Two more translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-21 09:19:34 -08:00
snipe
04d3938f0c
Updated the general translation file with new strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-21 09:04:13 -08:00
snipe
f109218e16
Re-added dropped translations from CrowdIn
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-21 09:00:10 -08:00
snipe
a0b05bac8d
Updated translations with new strings and new translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-21 03:54:55 -08:00
akemidx
f33b6a3e26
Update user.blade.php
2023-02-17 12:52:54 -05:00
akemidx
dfc2aa35f4
Update general.php
2023-02-17 12:51:58 -05:00
snipe
71334b5eae
More tweaking for top button alignment
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 18:13:38 -08:00
snipe
f124249e1c
More padding twiddles
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 18:08:11 -08:00
snipe
e451ca1a5c
Stray semicolon
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 17:37:53 -08:00
snipe
3e111fca6e
Cleanup some small UI bugaboos (padding, etc)
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 17:13:40 -08:00
snipe
df64e0e291
Merge pull request #12523 from Godmartinz/bug/sc-20041/slack-ui-livewire-tweaks
...
Fixes slack settings submit button availability
2023-02-15 16:28:57 -08:00
snipe
51c9a7d4f8
Merge pull request #12521 from akemidx/weird_checkout_text
...
Fixed awkward checkout text in checkedout side panel
2023-02-15 16:28:05 -08:00
akemidx
d8d713426d
indent?
2023-02-15 19:24:20 -05:00
akemidx
7dd789d5c0
translate no assets at checkout
2023-02-15 19:22:13 -05:00
Godfrey M
2d8c8e8f48
removes lazy loading
2023-02-15 16:16:14 -08:00
Godfrey M
7b510d5f2b
greys out submit button conditionally
2023-02-15 15:46:05 -08:00
snipe
d4634e83c9
Nicer padding, removed unused ids
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:45:18 -08:00
snipe
6c3ffa7918
Removed unused CSS
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:39:24 -08:00
snipe
27e5832a28
Use existing slack translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:06:52 -08:00
snipe
2d0bd2b292
Make spinner actually spin
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:06:40 -08:00
akemidx
b96f2f738d
fixed weird phrasing in asset checkout screen
2023-02-15 16:47:48 -05:00
snipe
ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs
...
Adds Livewire slack inputs
2023-02-15 13:27:07 -08:00
snipe
de4f7bd274
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation
...
Enforce Y-m-d as date format for date fields
2023-02-15 12:54:22 -08:00
Godfrey M
793cf4823b
missing things like mr magoo
2023-02-14 14:35:54 -08:00
Godfrey M
c0d8ff1676
simplified to an else instead of elseif
2023-02-14 14:21:24 -08:00
Godfrey M
0cd558593d
adds the red x icon to a false deployable status
2023-02-14 10:34:36 -08:00
Godfrey M
d03e042eda
adds a red icon next to broken- not fixable status label
2023-02-14 09:55:48 -08:00
snipe
1520c9c6a7
Merge pull request #12506 from marcusmoore/fix/use-translation-strings-for-importer-errors
...
Use translation strings for importer exceptions
2023-02-13 14:17:47 -08:00
Marcus Moore
4bdb1cf552
Improve error message wording
2023-02-13 13:34:20 -08:00
Marcus Moore
2349f54013
Use translation strings for importer exceptions
2023-02-13 13:30:36 -08:00
snipe
2bbbc8158b
Merge pull request #12477 from akemidx/apple_warranty_link
...
Added functionality to Apple Warranty link
2023-02-13 13:02:33 -08:00
snipe
2f5b4c8e1b
Merge pull request #12498 from akemidx/layout_trans
...
Translations for the layout setup
2023-02-13 13:01:58 -08:00
Ivan Nieto Vivanco
f0bf16d784
Fix more uneven tags
2023-02-12 12:01:40 -06:00
Ivan Nieto Vivanco
9a68a747a0
Fix uneven tags
2023-02-12 11:59:56 -06:00
Ivan Nieto Vivanco
81cc9f3700
Adds images to emailed user inventory report
2023-02-12 08:23:50 -06:00
akemidx
5714824aa7
translations for the layout setup
2023-02-09 17:24:34 -05:00
snipe
e79818967d
Merge pull request #12490 from akemidx/manufacturer_marker
...
Removed "required" marker for manufacturer on asset models (since it is not actually required)
2023-02-09 12:43:14 -08:00
akemidx
32ed70259e
sweedish chef fixes up your typos
2023-02-09 15:39:10 -05:00
akemidx
1a651b33fc
manufacturer marker removal
2023-02-08 17:31:39 -05:00
snipe
a4a3c03a7c
Merge pull request #12478 from inietov/fixes/added_translation_strings_inventory_report
...
Fixed #12064 Mail-Template missing translation strings
2023-02-08 10:02:19 -08:00
snipe
16fcc6dc44
Fixed UI bug where download button was missing for non-images
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-07 18:40:00 -08:00
Ivan Nieto Vivanco
49b6a1cc53
Adds translation strings to theinventory report sent to users
2023-02-07 18:29:19 -06:00
akemidx
75f3cb3079
fixing external if statement
2023-02-07 19:02:12 -05:00
akemidx
c0074baa26
functionality to Apple Warranty link
2023-02-07 17:27:39 -05:00
Marcus Moore
0e57e4836e
Add translation for Company
2023-02-06 12:21:23 -08:00
Marcus Moore
45e8e9bbed
Move company name to better location
2023-02-06 12:21:09 -08:00
Marcus Moore
78343ddb7c
Add asset's company name to checkout page
2023-02-06 10:58:10 -08:00
Godfrey M
74c64c1fc5
adds validation to the update hook, removes typos and deadlines
2023-02-06 09:40:57 -08:00
snipe
dc414d3552
Updated model restore route
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-02 23:38:59 -08:00
snipe
bbf6e5e69e
Merge pull request #12421 from akemidx/hardware_blades_translations
...
Fixed: translations added for the hardware blades
2023-02-02 13:02:46 -08:00
akemidx
37ce68af5b
once again fixing an apostrophe
2023-02-02 15:54:05 -05:00
akemidx
29851c626f
Merge branch 'develop' into user_setup_translation
2023-02-02 14:34:09 -05:00
snipe
7344bbdd7f
Added checkout/checkin note to user history
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-02 11:26:33 -08:00
snipe
78dca7fd32
Handle missing userfiles more gracefully
...
Signed-off-by: snipe <snipe@snipe.net>
2023-02-02 10:49:36 -08:00
akemidx
69c38bf686
translations on the User Creation page
2023-02-01 20:32:16 -05:00
Godfrey M
3a86547ef5
fixes messages for integration test, removes slack request file, rehouses ajax method
2023-02-01 16:51:05 -08:00
snipe
d9cdb92014
Merge branch 'develop' into vip_tag
2023-02-01 16:03:23 -08:00
snipe
2da4578aa5
Merge branch 'develop' into slack_message
2023-02-01 13:43:09 -08:00
snipe
1a8fb5bcfe
Merge pull request #12423 from snipe/features/edit_fieldset_name
...
Fixed #12418 - added ability to edit custom field names via GUI
2023-02-01 13:39:39 -08:00
snipe
4a6250a08c
Merge pull request #12409 from akemidx/component_checkin_limit
...
Fixed: Checkin limit string translation for components
2023-02-01 13:37:56 -08:00
akemidx
0ffd40a217
fixing syntax
2023-02-01 16:30:07 -05:00
akemidx
33d819fd41
fixing pr
2023-02-01 16:13:53 -05:00
akemidx
90c1bfe03d
fixing pr
2023-02-01 16:12:39 -05:00
akemidx
3702dd87ce
fixing pr
2023-02-01 16:10:30 -05:00
akemidx
4d9d73483f
fixing pr
2023-02-01 16:09:19 -05:00
akemidx
4e5b8fa213
fixing pr
2023-02-01 16:05:50 -05:00
akemidx
a8643e5d35
cleaning up/adding variable
2023-02-01 15:55:16 -05:00
Godfrey M
f95a904d90
adds integration button, working on its functionality
2023-02-01 12:08:13 -08:00
snipe
f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories
2023-01-31 19:56:43 -08:00
snipe
de1141491a
Replaced help text
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-31 19:41:42 -08:00
Brady Wetherington
02ca5248b1
Don't append username to the user's name if it's already there
2023-01-31 17:44:09 -08:00
Godfrey M
1e0c58c3cf
saves data correctly now
2023-01-31 11:32:05 -08:00
Ivan Nieto Vivanco
a7a578bf51
Added head only logo to be used as default in apple-touch-icon
2023-01-31 00:13:44 -06:00
Godfrey M
fc044528b8
validation is working, success message appears, database is not updating
2023-01-30 16:10:02 -08:00
akemidx
214a1af61a
apostrophe updates
2023-01-30 16:54:23 -05:00
snipe
583a0412fe
Added edit fieldsets translations
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-26 17:03:23 -08:00
snipe
a16604285c
Normalize the fieldset form
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-26 17:03:07 -08:00
snipe
37f5cfa8ce
Added edit button for fieldsets
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-26 17:02:53 -08:00
Godfrey M
a63ea560ae
adds submit button, getting setAttribute error
2023-01-26 15:17:08 -08:00
akemidx
79d9cff22a
translations added for the hardware blades
2023-01-26 16:26:31 -05:00
Godfrey M
a69cb6204a
adds rest of inputs, and corrects Data binding
2023-01-25 16:22:34 -08:00
Godfrey M
2e22eeade5
adds one input
2023-01-25 14:29:20 -08:00
akemidx
53d8008a5f
Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag
2023-01-25 17:14:29 -05:00
akemidx
b363524305
vipuser label updated to vip
2023-01-25 15:58:44 -05:00
snipe
4c3354b778
Merge branch 'develop' into vip_tag
2023-01-24 20:29:43 -08:00
Brady Wetherington
b00333c9f5
Merge remote-tracking branch 'upstream/develop' into develop
2023-01-24 17:36:39 -08:00
Brady Wetherington
c9f0f5fe8b
Change Accessories report to use server-side pagination from URL
2023-01-24 17:35:44 -08:00
snipe
a61ccbb965
Added very clunky but better error messages on that validation for date_format
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-24 17:33:49 -08:00
snipe
91394f7262
Removed duplicate comment section
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-24 17:23:06 -08:00
akemidx
3ba79600fb
checkin limit for the components checkin
2023-01-24 18:17:49 -05:00
akemidx
cafe8f3074
notification for slack message
2023-01-24 16:20:20 -05:00
akemidx
596846a94a
Add VIP Checkbox
2023-01-24 15:29:27 -05:00
Godfrey M
4b51424723
fixes a couple buttons color choices in high contrast
2023-01-24 09:42:03 -08:00
Godfrey M
0f8ee22053
Creates Slack Setting Form
2023-01-24 09:25:05 -08:00
snipe
7a9ea91be0
Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete
...
Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck
2023-01-23 21:39:55 -08:00
akemidx
25996cbe03
translating the quick info printed out on accept x eula blades
2023-01-23 16:18:21 -05:00
snipe
4104d7260f
Include new eol date picker blade
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:55:31 -08:00
snipe
3587017591
Updated EOL date in view blade
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:55:19 -08:00
snipe
8040d08e8c
Removed formatter from EOL date
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:54:37 -08:00
snipe
abad579306
Added eol date picker
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-22 00:45:33 -08:00
snipe
72295c093a
Add CSS to the div to correct the weird indenting - fixes #12388
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 18:24:23 -08:00
snipe
2dc1182582
Don’t offer the delete option if there is no avatar currently
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 18:20:26 -08:00
snipe
93ad0d02b9
Use fieldname for aria labels too
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 18:20:02 -08:00
snipe
3674f46ce0
Added arial labels
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 16:42:44 -08:00
snipe
cfa342c81a
Updated HTML for “standard” image edit/delete
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 16:23:04 -08:00
snipe
563a252d18
Updated checkboxed with missing minimal
class for iCheck
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 14:57:52 -08:00
snipe
2bdf3d3f44
Missed a few strong HTML tags
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 14:44:10 -08:00
snipe
56090bc645
Re-ordered notes to be more consistent, fixed missing iCheck class
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 14:38:35 -08:00
snipe
fd73bee850
Fixed hardcoded string and added new checkout count to accessory view
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 14:38:05 -08:00
Marcus Moore
0fa956403c
Fix row divider overflow
2023-01-19 14:16:28 -08:00
Ivan Nieto Vivanco
f045008237
Add index to deleteFile() call, so it knows what element delete
2023-01-19 13:04:49 -06:00
snipe
fa9116b184
Merge pull request #12369 from snipe/features/add_byod_to_assets
...
Added BYOD to assets
2023-01-18 16:09:45 -08:00
Marcus Moore
c089f6eff2
Reference the accessory instance instead of the model
2023-01-18 13:48:01 -08:00
Marcus Moore
e506ed7950
Remove extra quote
2023-01-18 13:42:09 -08:00
Marcus Moore
07744ca7bd
Reference the consumable instance instead of the model
2023-01-18 13:41:58 -08:00
snipe
0c39c7a53d
Updated blades to add byod as a “status”
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:25:46 -08:00
snipe
fce620b54f
Added byod to blades
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:11:02 -08:00
snipe
33fe2b57f7
Added new byod strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:10:48 -08:00
Marcus Moore
ca1198ceb2
Constrain the bottom bar to the content window
2023-01-18 12:55:20 -08:00
Marcus Moore
b31e000165
Have Info and History tables in accessory show page span entire width of row
2023-01-18 12:54:52 -08:00
Godfrey M
7ce230fadc
missed a few renames
2023-01-18 08:57:59 -08:00
Godfrey M
6fbb484dfd
renames db column for auto_assign boolean, rewords trans string, default value of 1 now
2023-01-18 08:43:03 -08:00
Marcus Moore
5282ca47b3
Allow users with consumables.files ability to upload files for consumables
2023-01-17 17:16:50 -08:00
Marcus Moore
1f12137245
Close divs in correct location
2023-01-17 17:09:55 -08:00
Marcus Moore
6c89f08193
Register the accessories.files ability and allow users with the ability to upload files for accessories
2023-01-17 16:59:50 -08:00
Marcus Moore
1fef992fa8
Allow users with components.files ability to upload files for components
2023-01-17 15:58:11 -08:00
snipe
50cc69c427
Added South Sudan to country list
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-13 13:23:57 -08:00
snipe
d508374c57
Disallowed category type change string
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 16:15:51 -08:00
snipe
f50b622eb8
Disallow editing of category type once created, added help text
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 16:15:40 -08:00
snipe
62bf7b1bce
Merge remote-tracking branch 'origin/develop'
2023-01-10 01:56:27 -08:00
snipe
c5c37fa95f
Fixed copypasta
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 01:54:26 -08:00
snipe
9dc016aecc
Fixed issue where assets sidenav would collapse if custom status label is selected
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 01:31:00 -08:00
snipe
e67bd5a275
Merge remote-tracking branch 'origin/develop'
2023-01-09 16:00:33 -08:00
snipe
8d35583634
Merge pull request #12324 from snipe/features/add_username_to_asset_list
...
Added username to display in asset listings
2023-01-09 16:00:01 -08:00
snipe
b39a9e0fe1
Merge remote-tracking branch 'origin/develop'
2023-01-09 15:54:04 -08:00
Brady Wetherington
cbffd105a2
Fix LDAP default group feature
2023-01-09 15:23:19 -08:00
snipe
a57315aed5
Added username to display in asset listings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-09 12:58:58 -08:00
snipe
014eab3abc
Updated language strings
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-09 11:09:26 -08:00
snipe
91d0c383df
Production assets
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-05 18:47:55 -08:00
snipe
e05764ac34
Truncate URL with ellipsis if too long
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-05 18:42:26 -08:00