DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-14 17:44:17 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
10252 commits 96 branches 267 tags 295 MiB
Commit graph

10252 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 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 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 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
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 b39fa1d987 Added merge icon 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:42:17 -07:00
snipe 28cc8f9d69 Nicer user history display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:41:43 -07:00
snipe a54e50961e Added event and listener 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:41:33 -07:00
snipe 82dc57aa18 Renamed some variables, invoked the event listener 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:24:58 -07:00
snipe 9ac4efb912 Better commenting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:24:38 -07:00
snipe c752e3bb86 Fixed divs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:48:41 -07:00
snipe 1a8622dc3b
Merge pull request #12689 from snipe/features/add_password_lock_and_use_new_strings 
Features/add password lock and use new strings
 2023-03-17 02:44:37 -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 30cf7eb750 Disallow action in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:42:50 -07:00
snipe 13a02ff241
Merge pull request #12687 from snipe/features/nicer_ui_for_merge 
Made the table wider, used icons to compact space
 2023-03-16 23:14:25 -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 d8d7ed4465
Merge pull request #12686 from snipe/features/added_email_and_username_to_merge_confirm 
Added email and username to merge user confirmation screen
 2023-03-16 22:49:54 -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
Marcus Moore 3849bb838d
Make a few more factories a bit more pure 2023-03-16 18:29:51 -07:00
snipe f566a71658
Merge pull request #12685 from snipe/features/merge_users 
Added user merge
 2023-03-16 18:20:24 -07:00
snipe 0dd11575c5 Added merge controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:19:16 -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
snipe 853e809ff8 Added route 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:26 -07:00
Marcus Moore 605f214597
Add properties necessary for factories to be called in isolation 2023-03-16 17:08:18 -07:00