DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 03:54:16 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
11928 commits 97 branches 267 tags 296 MiB
Commit graph

11928 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 5217141dfb Yuck, but added helper function to return the demo mode form warning 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:59:34 -07:00
snipe b28a25f544 Normalize the flash session to the way we do it elsewhere 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:59:18 -07:00
snipe d55ae44638 Helper method to make it easier (shorter) to determine if the app is in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:59:03 -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
Marcus Moore 315f5231cd
Send slack notification for check outs to assets and locations 2023-03-21 17:03:51 -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
snipe 342b399191
Merge pull request #12700 from marcusmoore/fixes/purify-factories 
Purifies model factories
 2023-03-21 16:52:30 -07:00
Godfrey M 2754277068 adds csrf token and missing divs 2023-03-21 16:12:46 -07:00
snipe 4cc29b76f0 Merge remote-tracking branch 'origin/develop' 2023-03-21 16:07:03 -07:00
snipe 7059a57be1
Merge pull request #12704 from snipe/features/next_audit_date 
Added next audit date override in bulk asset edit
 2023-03-21 16:02:37 -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 c41aa8ac7f
Merge pull request #12701 from snipe/features/add_default_location_to_maintenance_report 
Fixed #12682 - add default location to maintenance report
 2023-03-21 13:55: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
Marcus Moore 751abe1438
Re-add asset factory states 2023-03-21 09:54:55 -07:00
Marcus Moore d214bd0b06
Remove temporary command 2023-03-20 16:41:33 -07:00
Marcus Moore 3b16a65988
Merge branch 'develop' into fixes/purify-factories 2023-03-20 16:24:35 -07:00
Marcus Moore 918239961a
Add simple test case for assets 2023-03-20 15:47:57 -07:00
Marcus Moore 272cc1adac
Skip creating user when creating a setting since it isn't needed 2023-03-20 15:33:40 -07:00
Marcus Moore 16e3416225
Update test case 2023-03-20 14:27:45 -07:00
snipe 8012c966b0
Merge pull request #12696 from snipe/dependabot/github_actions/docker/build-push-action-4 
Bump docker/build-push-action from 3 to 4
 2023-03-20 14:19:44 -07:00
Marcus Moore a0e547c7fb
Remove some unused imports 2023-03-20 14:18:59 -07:00
Marcus Moore 44a91f0a2b
Seed license checkouts 2023-03-20 14:18:54 -07:00
dependabot[bot] 4537ab3d54
Bump docker/build-push-action from 3 to 4 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 3 to 4.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-20 21:18:50 +00:00
snipe 05b4170116
Merge pull request #12694 from uberbrady/config_cachable_if_no_rollbar 
Fixed #12671: Re-enable config:cache when there's no Rollbar
 2023-03-20 14:17:53 -07:00
Marcus Moore 92e0c59f89
Fix typo in Keyboard accessory name 2023-03-20 12:01:39 -07:00
Marcus Moore 1bad8e1fc2
Remove outdated comments 2023-03-20 11:42:15 -07:00
Marcus Moore 1fd574779b
Remove unneeded or outdated comments and update imports 2023-03-20 11:39:27 -07:00
Marcus Moore a37d69fcf1
Replace remaining user_ids in factories 2023-03-20 11:19:34 -07:00
Brady Wetherington 3a4ca5acad Re-enable config:cache *only* if there's no Rollbar 2023-03-18 21:07:00 -07: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 3a30f04b51 Merge remote-tracking branch 'origin/develop' 2023-03-18 12:00:42 -07:00
snipe f2a3c2a349
Merge pull request #12693 from snipe/fixes/use_statements 
Updates the Gate “use” statement to be more specific
 2023-03-18 12:00:23 -07:00
snipe f9e190eb32 Updates the Gate “use” statement to be more specific 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 11:58:09 -07:00
snipe de6b663833
Merge pull request #12692 from snipe/fixes/small_group_api_fixes 
Corrected gates, added fillable
 2023-03-18 11:56:15 -07:00
snipe 8dd3ae8a37 Corrected gates, added fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 11:53:20 -07:00
snipe 03b4a87a65 Merge remote-tracking branch 'origin/develop' 2023-03-18 00:16:34 -07:00
snipe c7f4a93c17
Merge pull request #12691 from snipe/fixes/small_cleanup_for_bulk_delete_checkin 
Small cleanup for bulk delete checkin
 2023-03-18 00:16:15 -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 d7363a41c8 Merge remote-tracking branch 'origin/develop' 2023-03-17 17:30:32 -07:00
snipe 789c4b4df8
Merge pull request #12690 from snipe/features/more_merge_user_olish 
More merge-user polishing
 2023-03-17 17:29:12 -07:00
snipe 12a2d8ad49 Fixed admin ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 17:03:10 -07:00
snipe e47fc9527b Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:50:02 -07:00