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

8373 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 8d3c9e67a0 Merge remote-tracking branch 'origin/develop' 2022-07-07 16:19:29 -07:00
snipe 3988c0e3f0
Merge pull request #11480 from snipe/fixes/changed_model_file_icon 
Changed model file icon
 2022-07-07 16:19:09 -07:00
snipe 723454b04d Changed model file icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 16:17:35 -07:00
snipe 30c03435e4 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-07 16:01:17 -07:00
snipe 5043533fde
Merge pull request #11479 from snipe/fixes/padlock_icon 
Fixes padlock icon
 2022-07-07 16:00:02 -07:00
snipe d458973649 Removed unneeded JS 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 15:58:37 -07:00
snipe 9c86b4bf88 Fixes padlock icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 15:57:33 -07:00
snipe 3a6c6d8466 Prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:40:39 -07:00
snipe d62167e364 Merge remote-tracking branch 'origin/develop' 2022-07-07 14:39:02 -07:00
snipe 9297d8af1d
Merge pull request #11478 from snipe/fixes/upgrade_font_awesome 
Upgrade font-awesome to v6
 2022-07-07 14:38:34 -07:00
snipe bae9792f01 Missed two 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:36:09 -07:00
snipe b98af0f50f Upgrade font-awesome to v6 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 14:22:08 -07:00
snipe 75e5cde39b Merge remote-tracking branch 'origin/develop' 2022-07-06 18:20:30 -07:00
snipe f853188bc7
Merge pull request #11471 from uberbrady/add_license_seat_indexes 
This adds some indexes for performance on license_seats
 2022-07-06 18:19:40 -07:00
Brady Wetherington 61813a6f2c This adds some indexes for performance on license_seats 2022-07-06 18:10:48 -07:00
snipe 7a0c9776b4 Merge remote-tracking branch 'origin/develop' 2022-07-05 17:58:59 -07:00
snipe ee4f355e49 Changed logging to debug 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 17:58:45 -07:00
snipe bfc8c18675
Merge pull request #11451 from mikeroq/fixes/populate_custom_fields_from_asset_model_create 
Fixes custom fields not populating when creating asset from asset model page
 2022-07-05 17:31:08 -07:00
snipe f1488767f8 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-07-05 16:41:00 -07:00
snipe 2d5755c1dd Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 16:40:17 -07:00
snipe acc2e12f12 Merge remote-tracking branch 'origin/develop' 2022-07-05 16:35:34 -07:00
snipe eb2793bfa7 Added @reederda 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 16:35:12 -07:00
snipe 1a05843183
Merge pull request #11462 from reederda/develop 
Fixed #NA: typo
 2022-07-05 16:33:09 -07:00
snipe ef17fd41f7
Merge branch 'develop' into develop 2022-07-05 16:26:53 -07:00
snipe 7bdbbbee50 Branch in config set to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 16:20:33 -07:00
snipe 2e800e6a0d
Merge pull request #11467 from snipe/translations/updated_strings 
Updated translations
 2022-07-05 16:19:46 -07:00
snipe dae53a1128 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 16:18:53 -07:00
mikeroq 2781bd02b5 Add TODO to indicate future refactoring. 2022-07-05 18:02:37 -05:00
Daniel Reeder 7772ef22db Quick typo fix 2022-07-04 21:57:54 +00:00
snipe 2137c4e897 Back to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-04 10:12:25 -07:00
snipe 4a0e51bf34 Merge remote-tracking branch 'origin/develop' 2022-07-04 10:11:05 -07:00
snipe 9f581a7677
Merge pull request #11460 from mikeroq/fix_missing_use_statement 
Fixes #11459 Missing import for Setting model in AcceptanceController
 2022-07-04 10:07:54 -07:00
mikeroq be8869978d Added import for Setting model 2022-07-04 07:29:01 -05:00
snipe e550fb1a52
Merge pull request #11447 from snipe/dependabot/github_actions/docker/metadata-action-4 
Bump docker/metadata-action from 3 to 4
 2022-07-03 20:04:15 -07:00
snipe fc65bb020f
Merge pull request #11446 from snipe/dependabot/github_actions/docker/login-action-2 
Bump docker/login-action from 1 to 2
 2022-07-03 20:03:50 -07:00
snipe a4dfdcd90d
Merge pull request #11450 from snipe/dependabot/github_actions/docker/build-push-action-3 
Bump docker/build-push-action from 2 to 3
 2022-07-03 20:03:32 -07:00
snipe 16d2e34148
Merge pull request #11448 from snipe/dependabot/github_actions/docker/setup-buildx-action-2 
Bump docker/setup-buildx-action from 1 to 2
 2022-07-03 20:03:08 -07:00
snipe 567eefab1a
Merge pull request #11449 from snipe/dependabot/github_actions/github/codeql-action-2 
Bump github/codeql-action from 1 to 2
 2022-07-03 20:02:31 -07:00
snipe 1ef20ec622 Merge remote-tracking branch 'origin/develop' 2022-07-02 13:08:59 -07:00
snipe afab167e8c Fixed restore button in listings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-02 13:08:46 -07:00
snipe af14ee0d47
Merge pull request #11453 from mikeroq/fixes/asset_restore_not_working 
Fixes #11452 - Asset Restore routes/buttons also asset models/users restore as well
 2022-07-02 13:07:29 -07:00
Mike Roquemore 0a5ca6eb25 Change restore route to POST instead of GET 2022-07-02 14:34:43 -05:00
Mike Roquemore 6e9f24c08f Change restore route to POST instead of GET 2022-07-02 14:34:23 -05:00
Mike Roquemore 07ac4087a3 Remove link from alert since there is already a restore button on the side 2022-07-02 14:34:22 -05:00
Mike Roquemore 1650c9f878 Remove duplicate users routes 2022-07-02 14:34:22 -05:00
Mike Roquemore 123963c14c Modify genericActionsFormatter restore link to be a button instead since it's in a form. 
Changed user restore route to POST
 2022-07-02 14:34:22 -05:00
Mike Roquemore 1b45170ca3 Adds check if request has model_id, if so call fetchCustomFields on document ready 2022-07-01 20:15:11 -05:00
snipe 9a0b677dac Merge remote-tracking branch 'origin/develop' 2022-07-01 14:31:29 -07:00
snipe b44f27dafa Add @mikeroq as a contributor 2022-07-01 14:31:07 -07:00
snipe 92d46edca3 Cleaned up logging output 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-01 13:33:58 -07:00