DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8735 commits 97 branches 266 tags 291 MiB
Commit graph

8735 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 0b2ce7be07 Fixed #11521 - switch to using status meta from status label name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 03:48:58 -07:00
snipe 3d48dd19cb
Merge pull request #11890 from snipe/fixes/statuslabels_assetlist 
Fixed #11889 - API route for status labels asset listing
 2022-09-29 00:51:25 -07:00
snipe 08bab4f101 Fixed #11889 - API route for status labels asset listing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-29 00:50:07 -07:00
snipe 95b49f8deb
Merge pull request #11886 from sunflowerbofh/tmp-replace-patchwork-utf8 
Tmp replace patchwork utf8
 2022-09-28 10:32:07 -07:00
Katharina Drexel 4f5d536e32
Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring. 2022-09-28 14:52:02 +02:00
snipe 9dbc5070f8 Remove phplint (for now) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-27 16:47:09 -07:00
snipe 055a2f827f
Merge pull request #11872 from sunflowerbofh/tmp-replace-patchwork-utf8 
Fixed #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.
 2022-09-27 16:46:12 -07:00
snipe 8d3fe423e1
Merge pull request #11671 from chartjes/ch-fix-tests 
Fixed unit test suite that was not running, added working browser test
 2022-09-27 16:20:56 -07:00
snipe 1377725a97 Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-27 14:53:47 -07:00
snipe 58ccfe9226 Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2022-09-27 14:51:19 -07:00
snipe 05ac9f4a68 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-27 14:47:54 -07:00
snipe 0889cd61cf Updated skins 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-27 14:47:09 -07:00
snipe 8168ca4074
Merge pull request #11853 from Godmartinz/ldap_test_results_color 
Fixes the color choice for the ldap_test_results
 2022-09-27 14:46:46 -07:00
snipe de399a9f8f Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2022-09-27 14:46:30 -07:00
snipe af150f0192 Add @BasO12 as a contributor 2022-09-27 14:44:32 -07:00
snipe c194c8a0c8
Merge pull request #11764 from BasO12/master 
Added notes to audit mail notification
 2022-09-27 14:43:50 -07:00
snipe a7b83fc531
Merge pull request #11854 from inietov/fixes/location_issue_during_import 
Fixed #11847 404 error during Import if a checkout type of location is specified and no checkout location is passed
 2022-09-27 14:34:26 -07:00
snipe ef22da622d
Merge pull request #11870 from snipe/dependabot/github_actions/codacy/codacy-analysis-cli-action-4.2.0 
Bump codacy/codacy-analysis-cli-action from 4.1.0 to 4.2.0
 2022-09-27 14:33:53 -07:00
dependabot[bot] 8443796cbe
Bump codacy/codacy-analysis-cli-action from 4.1.0 to 4.2.0 
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases)
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/v4.1.0...v4.2.0)

---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-27 21:33:19 +00:00
snipe ac996a771c
Merge pull request #11882 from snipe/security/upgraded_fontawesome 
Upgraded fontawesome
 2022-09-27 14:27:22 -07:00
snipe 942eaac2ee Upgraded fontawesome 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-27 14:25:44 -07:00
snipe ada2a2cd43
Merge pull request #11878 from inietov/fixes/asset_importer_duplicate_fields 
Delete duplicate fields from the importer dropdown menu [sc-19547]
 2022-09-27 14:21:30 -07:00
Ivan Nieto Vivanco 06ba9356ca Delete another set of duplicates 2022-09-26 18:57:35 -05:00
Ivan Nieto Vivanco e034f7b674 Delete another duplicate that somehow has survived 2022-09-26 18:56:24 -05:00
Ivan Nieto Vivanco 4d14243f57 Delete duplicate fields from the importer dropdown menu 2022-09-26 18:51:13 -05:00
snipe 88a371082d Merge remote-tracking branch 'origin/develop' 2022-09-26 16:29:21 -07:00
snipe ee7e26ae8d
Merge pull request #11877 from snipe/features/use_built_in_clear_on_datepicker 
Use BS datepicker’s built in clear button
 2022-09-26 16:23:27 -07:00
snipe 9d93c72534 Use BS datepicker’s built in clear button 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-26 14:34:35 -07:00
snipe 44b72e0f5f Merge remote-tracking branch 'origin/develop' 2022-09-26 13:49:48 -07:00
snipe d91d226652
Merge pull request #11857 from inietov/fixes/throw_exception_instead_of_redirect_when_no_available_licenseseats 
Fixed #11827 Throw exception when there are no available seats for checkout.
 2022-09-26 13:43:57 -07:00
snipe 091ef62cbe
Merge pull request #11856 from inietov/fixes/purchase_date_not_nullable 
Fixed Purchase date "readonly" value makes purchase date unable to be nulled in update form [sc-19540]
 2022-09-26 13:38:24 -07:00
Katharina Drexel 8316a4eb92
Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring. 2022-09-26 12:06:06 +02:00
snipe b4518677bd
Merge pull request #11762 from geo-chen/master 
correcting default mysql port from 3309 to 3306
 2022-09-22 15:12:11 -07:00
Ivan Nieto Vivanco 23cf556a8b Adds cursor:pointer to indicate a clickable link 2022-09-20 22:24:52 -05:00
Ivan Nieto Vivanco c0f83a7927 Delete not necessary conditional 2022-09-20 19:02:01 -05:00
Ivan Nieto Vivanco 5a1062f0f4 Delete debugging symbols (just kidding, it's just a dd() function) 2022-09-20 18:58:31 -05:00
Ivan Nieto Vivanco c32676596c Redirect correctly if not enough license seats exists to be checkout 2022-09-20 18:55:53 -05:00
Ivan Nieto Vivanco f75917d34d Add a link used to clear the purchase date input 2022-09-20 17:53:55 -05:00
Godfrey M c55f2d5417 corrects color for query and results of ldap sync test 2022-09-20 10:35:55 -07:00
Ivan Nieto Vivanco e267f5491a Adds a check for empty location values on import 2022-09-19 19:05:48 -05:00
Godfrey M 571ce5b741 corrects the color choice for the ldap_test_results 2022-09-19 11:59:02 -07:00
snipe 733b0750a2 Merge remote-tracking branch 'origin/develop' 2022-09-16 14:20:25 -07:00
snipe 9369165007
Merge pull request #11842 from snipe/security/license_file_access 
Check for `licenses.files` permissions
 2022-09-16 14:19:37 -07:00
snipe f75d348dc0 Fixed license policy method 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:06:46 -07:00
snipe dcab1381e7 Check for licenses.files permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:00:27 -07:00
snipe 0924d2144b 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-09-15 21:47:14 -07:00
snipe 9cae4f1d1b
Merge pull request #11838 from snipe/features/larger_checkboxes_in_lists 
Larger checkbox in lists
 2022-09-15 21:44:42 -07:00
snipe ca70988879 Larger checkbox in lists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 21:42:16 -07:00
snipe 421c9baecc # Conflicts: 
Signed-off-by: snipe <snipe@snipe.net>
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2022-09-15 20:11:07 -07:00
snipe 5c9e84f663 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 20:09:00 -07:00