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

3087 commits

Author SHA1 Message Date
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 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
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
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
snipe 778787db3c Rip out jquery for location parent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 15:36:01 -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
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