Skip to content

Commit 5eeb467

Browse files
DarthKilliansnipespencerrlonggGodmartinzmarcusmoore
authored
Update eti assets 12/20/2024 (#34)
* Versioning stuff is hard - fixed v7.0.14 to v7.1.14 Signed-off-by: snipe <[email protected]> * Versioning stuff is hard - fixed v7.0.14 to v7.1.14 Signed-off-by: snipe <[email protected]> * this should work in theory - local is screwy though * working except for null 🤔 * seems to work just fine now, needs translations * note and rm dump and comment * Specify table name in select Signed-off-by: snipe <[email protected]> * Add @maciej-poleszczyk as a contributor * Fixed grokability#15812 - regression in action_type search Signed-off-by: snipe <[email protected]> * Removed Twitter links Signed-off-by: snipe <[email protected]> * Removed extra sort Signed-off-by: snipe <[email protected]> * Fixed anchor links Signed-off-by: snipe <[email protected]> * replace the via channel class * removes tag if qr code is not present * translations and attribute names * fixed rest of dymos * rm unnecessary imports * Corrected route name for filestable on assets Signed-off-by: snipe <[email protected]> * Fixed delete model file route Signed-off-by: snipe <[email protected]> * oops, something went wrong translation * Fixed grokability#15820 - added model number to view-assets Signed-off-by: snipe <[email protected]> * Additional fix for grokability#15817 Signed-off-by: snipe <[email protected]> * Fixed grokability#15825 Signed-off-by: snipe <[email protected]> * Fixed admin user not showing in download all activity report Signed-off-by: snipe <[email protected]> * this should be all it takes to fix this, i think * replace env with config variable for from address * Fix rollback for created_by * Fix rollback for webhook_endpoint by using correct column type * update default from address to alternate config variable * Update README.md typo mosrt to most under Join our Community links * Feature: Added API endpoint for generating asset labels * Feature: Added translations for label generation API endpoint * Feature: Added API route for asset label generation * Fixed variable name Signed-off-by: snipe <[email protected]> * Indicate requiredness on status select on bulk user checkin+delete Signed-off-by: snipe <[email protected]> * use existing validation strings * add testing example var MAIL_FROM_ADDR * fix mail.from.address variables in config, simplify envelop[ variable * adding colon to password translation * Add tests around component check ins via api * Formatting * Use === over == * Add tests around deleting component via ui * Improve check for image existence * Feature: Added category to asset checkout email * Feature: Added category to asset checkin email * Feature: Added category to asset acceptance/decline email * Feature: Added category to asset requested email * Fix: Removed setting validation as it is not strictly necessary * no checked out to email doesnt trigger a 500 * Always run validation on checkin * Use database file for sqlite in GitHub Action for tests * remove the changes to mail.from.address default * Add tests for component checkout api endpoint * [Snyk] Upgrade jquery-ui from 1.14.0 to 1.14.1 grokability#15868 Signed-off-by: snipe <[email protected]> * fixing colon placements * Always call resizeCanvas * WIP: move signature pad creation up and add debugging * Remove debugging * commit for testing * orange bar for requirednessness * Updated translations Signed-off-by: snipe <[email protected]> * Updated version Signed-off-by: snipe <[email protected]> * fix user api update from clearing location_id unnecessarily * fixed mobile view of assets * fix mobile view for asset and user * Harden asset checkout validation by requiring ints * requested changes from pr * fixing line * Dev assets Signed-off-by: snipe <[email protected]> * Use transformer on API update Signed-off-by: snipe <[email protected]> * Fixed order by notes for users Signed-off-by: snipe <[email protected]> * Fixed grokability#15901 - re-added required indicator on text and select custom fields Signed-off-by: snipe <[email protected]> * Fixed bulk user form in user detail view Signed-off-by: snipe <[email protected]> * Revert "Hardened asset checkout validation by requiring integer" * Some CSS twiddling Signed-off-by: snipe <[email protected]> * Fixed funky layout in importer Signed-off-by: snipe <[email protected]> * fixes general webhook not firing * Include MAIL_FROM_ADDR in phpunit configuration * Fixed sr-only blank text Signed-off-by: snipe <[email protected]> * Harden asset checkout validation * fix unaccepted assets report resend acceptance * add property check * adds mail from name to mail envelope * fix typo * layout / added category id * fixed * add mail class for unaccepted assets reminders * fixed conditionals * missed a spot * fix duplicate emails being sent in unaccepted reminder command * cleans up the Unaccepted Asset reminder variables * wrap comment * adds testing to unaccepted reminder command * delete notification version of reminder * Only update asset locations to assets checked out to users. * Removed issue/PR templates Signed-off-by: snipe <[email protected]> * note, will come back to this once question is answered * Show frontend "required" validation for model and status selects * Updated supported versions Signed-off-by: snipe <[email protected]> * add null safe operator to acceptance reminder * Fixes grokability#15952 - fixed typo in content-type Signed-off-by: snipe <[email protected]> * Add @sgross-emlix as a contributor * Fixed grokability#15928 - updated method name to setCreatedBy from SetUserId Signed-off-by: snipe <[email protected]> * Fix league/commonmark's quadratic complexity bugs may lead to a denial of service * Use appropriate category for licenses when seeding * reversed order of the acceptance and note paramter * fix other mailables * Revert "Show frontend "required" validation for model and status selects" This reverts commit 10a7ae8. * fix other mailables * Fix validation messages for select2 inputs * leaving this here for notes etc * Removed index and destroy settinga API endpoints Signed-off-by: snipe <[email protected]> * Fixes to 'clean' mode to better handle character sets and zero-values * Check for assigned (not assigned_to) before trying to present() the name on bulk delete assets Signed-off-by: snipe <[email protected]> * Updated strings Signed-off-by: snipe <[email protected]> * Add accessory ui tests * Add consumable ui tests * Scaffold and implement some license checkin tests * Bumped font-awesome to 6.7.0 Signed-off-by: snipe <[email protected]> * Refactor of grokability#15235 - added accessory checkout to locations, assets Signed-off-by: snipe <[email protected]> * Use history icon Signed-off-by: snipe <[email protected]> * Added currency and history icons Signed-off-by: snipe <[email protected]> * Fixed variable in test Signed-off-by: snipe <[email protected]> * Updated user_id to created_by Signed-off-by: snipe <[email protected]> * Added new route Signed-off-by: snipe <[email protected]> * Updated route Signed-off-by: snipe <[email protected]> * Fixed user_id to created_by Signed-off-by: snipe <[email protected]> * No need to include assigned_to Signed-off-by: snipe <[email protected]> * Updated transformer Signed-off-by: snipe <[email protected]> * Removed create() method Signed-off-by: snipe <[email protected]> * Specify created_by in the API call as well Signed-off-by: snipe <[email protected]> * Added assignedAccessories method Signed-off-by: snipe <[email protected]> * Added assets endpoint Signed-off-by: snipe <[email protected]> * Added accessory transformer to assets transformer Signed-off-by: snipe <[email protected]> * Updated route in view Signed-off-by: snipe <[email protected]> * Updated routes with new endpoints Signed-off-by: snipe <[email protected]> * Updated comment Signed-off-by: snipe <[email protected]> * Added new test Signed-off-by: snipe <[email protected]> * Fixed admin -> adminuser property Signed-off-by: snipe <[email protected]> * Fixed property Signed-off-by: snipe <[email protected]> * Removed inadvertently added files. * Add tests for license checkin * Add permissions property to group factory * Add simple tests to ensure views render * Use correct id * Remove leftover testing logic and fix checkout permissions Removed console logs and temporary testing code from the bootstrap-table view. Updated the transformer to correctly check checkout permissions against the Asset class instead of PredefinedKit. * rm note * change barcode column names in seeder * add note * oops, rm dump * Added a few order options on audit report Signed-off-by: snipe <[email protected]> * Update settings property keys * Fix broken merge conflict files part 1 Signed-off-by: Darth Killian <[email protected]> * More Merge Conflict Bug Fixes Signed-off-by: Darth Killian <[email protected]> * More bug fixes and add bulk checkout company & order number support back in Signed-off-by: Darth Killian <[email protected]> * Fix some additional lang stuff and disable user checkout on accessories Signed-off-by: Darth Killian <[email protected]> * Fix some more missing language references Signed-off-by: Darth Killian <[email protected]> * Fix broken language and testing files Signed-off-by: Darth Killian <[email protected]> * Fix tests (again) Signed-off-by: Darth Killian <[email protected]> --------- Signed-off-by: snipe <[email protected]> Signed-off-by: Darth Killian <[email protected]> Co-authored-by: snipe <[email protected]> Co-authored-by: spencerrlongg <[email protected]> Co-authored-by: Godfrey M <[email protected]> Co-authored-by: Marcus Moore <[email protected]> Co-authored-by: victoria <[email protected]> Co-authored-by: NebelKreis <[email protected]> Co-authored-by: akemidx <[email protected]> Co-authored-by: Brady Wetherington <[email protected]> Co-authored-by: Joël Pittet <[email protected]>
1 parent 6566e10 commit 5eeb467

File tree

4,228 files changed

+139078
-155466
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,228 files changed

+139078
-155466
lines changed

‎.all-contributorsrc‎

Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,6 +3018,232 @@
30183018
"contributions": [
30193019
"code"
30203020
]
3021+
},
3022+
{
3023+
"login": "koiakoia",
3024+
"name": "koiakoia",
3025+
"avatar_url": "https://avatars.githubusercontent.com/u/60405354?v=4",
3026+
"profile": "https://github.com/koiakoia",
3027+
"contributions": [
3028+
"code"
3029+
]
3030+
},
3031+
{
3032+
"login": "mustafa-online",
3033+
"name": "Mustafa Online",
3034+
"avatar_url": "https://avatars.githubusercontent.com/u/5323832?v=4",
3035+
"profile": "https://github.com/mustafa-online",
3036+
"contributions": [
3037+
"code"
3038+
]
3039+
},
3040+
{
3041+
"login": "franceslui",
3042+
"name": "franceslui",
3043+
"avatar_url": "https://avatars.githubusercontent.com/u/104601439?v=4",
3044+
"profile": "https://github.com/franceslui",
3045+
"contributions": [
3046+
"code"
3047+
]
3048+
},
3049+
{
3050+
"login": "Q4kK",
3051+
"name": "Q4kK",
3052+
"avatar_url": "https://avatars.githubusercontent.com/u/125313163?v=4",
3053+
"profile": "https://github.com/Q4kK",
3054+
"contributions": [
3055+
"code"
3056+
]
3057+
},
3058+
{
3059+
"login": "squintfox",
3060+
"name": "squintfox",
3061+
"avatar_url": "https://avatars.githubusercontent.com/u/55590532?v=4",
3062+
"profile": "https://github.com/squintfox",
3063+
"contributions": [
3064+
"code"
3065+
]
3066+
},
3067+
{
3068+
"login": "jeffclay",
3069+
"name": "Jeff Clay",
3070+
"avatar_url": "https://avatars.githubusercontent.com/u/1380084?v=4",
3071+
"profile": "https://github.com/jeffclay",
3072+
"contributions": [
3073+
"code"
3074+
]
3075+
},
3076+
{
3077+
"login": "PP-JN-RL",
3078+
"name": "Phil J R",
3079+
"avatar_url": "https://avatars.githubusercontent.com/u/52716446?v=4",
3080+
"profile": "https://github.com/PP-JN-RL",
3081+
"contributions": [
3082+
"code"
3083+
]
3084+
},
3085+
{
3086+
"login": "chandanchowdhury",
3087+
"name": "i_virus",
3088+
"avatar_url": "https://avatars.githubusercontent.com/u/1496725?v=4",
3089+
"profile": "https://www.corelight.com/",
3090+
"contributions": [
3091+
"code"
3092+
]
3093+
},
3094+
{
3095+
"login": "gitgrimbo",
3096+
"name": "Paul Grime",
3097+
"avatar_url": "https://avatars.githubusercontent.com/u/1020541?v=4",
3098+
"profile": "https://github.com/gitgrimbo",
3099+
"contributions": [
3100+
"code"
3101+
]
3102+
},
3103+
{
3104+
"login": "LeePorte",
3105+
"name": "Lee Porte",
3106+
"avatar_url": "https://avatars.githubusercontent.com/u/922815?v=4",
3107+
"profile": "https://leeporte.co.uk",
3108+
"contributions": [
3109+
"code"
3110+
]
3111+
},
3112+
{
3113+
"login": "bryanlopezinc",
3114+
"name": "BRYAN ",
3115+
"avatar_url": "https://avatars.githubusercontent.com/u/23613427?v=4",
3116+
"profile": "https://github.com/bryanlopezinc",
3117+
"contributions": [
3118+
"code",
3119+
"test"
3120+
]
3121+
},
3122+
{
3123+
"login": "U-H-T",
3124+
"name": "U-H-T",
3125+
"avatar_url": "https://avatars.githubusercontent.com/u/64061710?v=4",
3126+
"profile": "https://github.com/U-H-T",
3127+
"contributions": [
3128+
"code"
3129+
]
3130+
},
3131+
{
3132+
"login": "Tyree",
3133+
"name": "Matt Tyree",
3134+
"avatar_url": "https://avatars.githubusercontent.com/u/5395363?v=4",
3135+
"profile": "https://github.com/Tyree",
3136+
"contributions": [
3137+
"doc"
3138+
]
3139+
},
3140+
{
3141+
"login": "FlorentDotMe",
3142+
"name": "Florent Bervas",
3143+
"avatar_url": "https://avatars.githubusercontent.com/u/292081?v=4",
3144+
"profile": "http://spoontux.net",
3145+
"contributions": [
3146+
"code"
3147+
]
3148+
},
3149+
{
3150+
"login": "dbakan",
3151+
"name": "Daniel Albertsen",
3152+
"avatar_url": "https://avatars.githubusercontent.com/u/4498077?v=4",
3153+
"profile": "https://ditscheri.com",
3154+
"contributions": [
3155+
"code"
3156+
]
3157+
},
3158+
{
3159+
"login": "r-xyz",
3160+
"name": "r-xyz",
3161+
"avatar_url": "https://avatars.githubusercontent.com/u/100710244?v=4",
3162+
"profile": "https://github.com/r-xyz",
3163+
"contributions": [
3164+
"code"
3165+
]
3166+
},
3167+
{
3168+
"login": "DrekiDegga",
3169+
"name": "Steven Mainor",
3170+
"avatar_url": "https://avatars.githubusercontent.com/u/47491036?v=4",
3171+
"profile": "https://github.com/DrekiDegga",
3172+
"contributions": [
3173+
"code"
3174+
]
3175+
},
3176+
{
3177+
"login": "arne-kroeger",
3178+
"name": "arne-kroeger",
3179+
"avatar_url": "https://avatars.githubusercontent.com/u/65785975?v=4",
3180+
"profile": "https://github.com/arne-kroeger",
3181+
"contributions": [
3182+
"code"
3183+
]
3184+
},
3185+
{
3186+
"login": "Glukose1",
3187+
"name": "Glukose1",
3188+
"avatar_url": "https://avatars.githubusercontent.com/u/167117705?v=4",
3189+
"profile": "https://github.com/Glukose1",
3190+
"contributions": [
3191+
"code"
3192+
]
3193+
},
3194+
{
3195+
"login": "Scarzy",
3196+
"name": "Scarzy",
3197+
"avatar_url": "https://avatars.githubusercontent.com/u/1197791?v=4",
3198+
"profile": "https://github.com/Scarzy",
3199+
"contributions": [
3200+
"code"
3201+
]
3202+
},
3203+
{
3204+
"login": "setpill",
3205+
"name": "setpill",
3206+
"avatar_url": "https://avatars.githubusercontent.com/u/37372069?v=4",
3207+
"profile": "https://github.com/setpill",
3208+
"contributions": [
3209+
"code"
3210+
]
3211+
},
3212+
{
3213+
"login": "swift2512",
3214+
"name": "swift2512",
3215+
"avatar_url": "https://avatars.githubusercontent.com/u/3755203?v=4",
3216+
"profile": "https://github.com/swift2512",
3217+
"contributions": [
3218+
"bug"
3219+
]
3220+
},
3221+
{
3222+
"login": "DarrenRainey",
3223+
"name": "Darren Rainey",
3224+
"avatar_url": "https://avatars.githubusercontent.com/u/6136439?v=4",
3225+
"profile": "https://darrenraineys.co.uk",
3226+
"contributions": [
3227+
"code"
3228+
]
3229+
},
3230+
{
3231+
"login": "maciej-poleszczyk",
3232+
"name": "maciej-poleszczyk",
3233+
"avatar_url": "https://avatars.githubusercontent.com/u/133033121?v=4",
3234+
"profile": "https://github.com/maciej-poleszczyk",
3235+
"contributions": [
3236+
"code"
3237+
]
3238+
},
3239+
{
3240+
"login": "sgross-emlix",
3241+
"name": "Sebastian Groß",
3242+
"avatar_url": "https://avatars.githubusercontent.com/u/143394709?v=4",
3243+
"profile": "https://github.com/sgross-emlix",
3244+
"contributions": [
3245+
"code"
3246+
]
30213247
}
30223248
]
30233249
}

0 commit comments

Comments
 (0)