DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-25 02:07:36 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
9134 commits 90 branches 265 tags 292 MiB
Commit graph

9134 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 5926441984
Merge pull request #11542 from snipe/features/users_checkin_without_delete 
Features/users checkin without delete
 2022-07-20 18:59:45 -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 7313bca403 Checkin without deleting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:57:19 -07:00
snipe b7c7e6c623 Added/updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:56:58 -07:00
snipe 0b4d243bf0
Merge pull request #11541 from Godmartinz/gh11540_Error_405_when_checking_out_Accessory 
Fixes #11540 - accessory api routes from get to posts
 2022-07-20 14:14:15 -07:00
Godfrey M 377c0e7075 fixes component routes 2022-07-20 13:41:35 -07:00
Godfrey M 0c4c4fc352 changes api checkin and checkout routes to post 2022-07-20 11:52:54 -07:00
Katharina Drexel 9d627936e6
Fixed #11509: Allow LDAP anonymous bind. 2022-07-20 17:24:20 +02:00
snipe 29a32c4726 Merge remote-tracking branch 'origin/develop' 2022-07-19 12:46:05 -07:00
snipe e72c4f989f
Merge pull request #11528 from uberbrady/upgrade_laravel_scim_server 
Upgraded our fork of laravel-scim-server to better support scim creates
 2022-07-18 19:56:06 -07:00
snipe 0d656e3963 Production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 17:29:37 -07:00
snipe 50ce471dc6 Production assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2022-07-18 17:29:29 -07:00
snipe 8113838eee
Merge pull request #11531 from snipe/security/upgrade_jquery_ui 
Upgraded jquery-UI
 2022-07-18 17:28:22 -07:00
snipe a92bb80055 Upgraded jquery-UI 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 17:27:54 -07:00
snipe e9121c15d8 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-07-18 16:50:53 -07:00
snipe 43bd00da86 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 16:50:12 -07:00
snipe d124c89ced Moved session driver setting to be more clear 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 16:47:46 -07:00
Brady Wetherington b2112e6792 Whoops, bump version to have the right syntax! 2022-07-18 15:16:45 -07:00
Brady Wetherington 250db10249 Upgrade our fork of laravel-scim-server to better support scim creates 2022-07-18 15:05:42 -07:00
snipe ff5d64fcbf Merge remote-tracking branch 'origin/develop' 2022-07-18 12:15:44 -07:00
snipe ec01aadbe4
Merge pull request #11526 from snipe/fixes/use_icheck_on_custom_report 
Use icheckbox formatting on BOM and archived checkboxes
 2022-07-18 12:13:27 -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 145c191a65 Merge remote-tracking branch 'origin/develop' 2022-07-15 19:17:04 -07:00
snipe 5cb5ef249b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 19:16:54 -07:00
snipe ea38cef48c Merge remote-tracking branch 'origin/develop' 2022-07-15 19:15:31 -07:00
snipe 4808185b5c Added link to MosyleSnipeSync 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 19:15:19 -07:00
snipe b3d65b5703 Merge remote-tracking branch 'origin/develop' 2022-07-15 18:53:20 -07:00
snipe 0f38714e21
Merge pull request #11517 from snipe/fixes/small_changes_to_gh_actions_configs 
Changed some autolabeler and code owners
 2022-07-15 18:53:01 -07:00
snipe 7a099bc268 Changed some autolabeler and code owners 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 18:51:57 -07:00
snipe 6f1f6c75e6 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2022-07-15 17:11:55 -07:00
snipe 40d5c37aea
Merge pull request #11516 from snipe/fixes/11508_alert_font_size 
Fixed #11508 - font size in alert menu
 2022-07-15 17:10:26 -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 6428dc5cd2 Removed duplicate supplier_id 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-13 13:08:15 -07:00
snipe 5f5ff04636
Merge pull request #11502 from mikeroq/fixes/eula_download_if_app_locale_is_not_en 
Fixes #11496 - Wrong URL generated for download of asset acceptance PDF if locale was not en
 2022-07-12 16:18:59 -07:00
mikeroq f21824a8e2 Changed comparing the action type from translated in presenter to actual value 2022-07-12 17:59:03 -05: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
Godfrey M 27039325f3 removed comments, because I forgot 2022-07-12 12:41:07 -07:00
Godfrey M 58c54cc3dc uses notArchived scope instead now 2022-07-12 12:20:11 -07:00
Godfrey M 48349071ed accounts for status_id as well 2022-07-12 09:46:44 -07:00
snipe bb5ac900ec
Merge pull request #11492 from mikeroq/fixes/email_all_assigned_to_user_with_no_email 
Fixes "email list of all assigned" apparently being successful even if the user has no email address
 2022-07-11 18:27:01 -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 a0183ff56f Merge remote-tracking branch 'origin/develop' 2022-07-11 17:11:44 -07:00
snipe bb091760af Fixedd unclosed brace 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-11 17:11:28 -07:00
snipe 78d13871eb
Merge pull request #11458 from snipe/dependabot/github_actions/codacy/codacy-analysis-cli-action-4.1.0 
Bump codacy/codacy-analysis-cli-action from 1.1.0 to 4.1.0
 2022-07-11 16:34:51 -07:00
snipe fc5cf3e291
Merge pull request #11483 from snipe/fixes/migrations_on_restore 
Fixes - migrations on restore
 2022-07-11 16:34:06 -07:00
snipe 3182f251e1 Merge remote-tracking branch 'origin/develop' 2022-07-11 16:26:14 -07:00
snipe d6ba8655bb
Merge pull request #11490 from snipe/fixes/print_assigned_sig_broken 
Fixed - print assigned sig broken
 2022-07-11 14:48:25 -07:00