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 |
|
|
snipe
|
fbb5f1445a
|
Merge pull request #11837 from snipe/fixes/disappearing_checkboxes
Downgraded BS Tables
|
2022-09-15 20:06:42 -07:00 |
|
|
snipe
|
07e0fec1de
|
Downgraded BS Tables
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 20:05:29 -07:00 |
|
|
snipe
|
c6cbf3712e
|
Merge remote-tracking branch 'origin/develop'
|
2022-09-15 16:22:47 -07:00 |
|
|
snipe
|
0f777b3168
|
Merge pull request #11836 from snipe/fixes/500_if_image_is_missing
Fixed 500 error if uploaded file is missing from asset view
|
2022-09-15 16:21:13 -07:00 |
|
|
snipe
|
62ad3fad1c
|
Remove DL button if file doesn’t exist
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 16:11:27 -07:00 |
|
|
snipe
|
eb1e287c15
|
Better handle missing files
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 16:08:13 -07:00 |
|
|
snipe
|
3eab44f748
|
Merge pull request #11835 from snipe/fixes/depreciation_when_no_purchase_date
Fixes 500 in depreciation on asset view when no purchase date
|
2022-09-15 15:52:58 -07:00 |
|
|
snipe
|
1885e73704
|
Ignore warning icon if no purchase date
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 15:42:47 -07:00 |
|
|
snipe
|
24910433a1
|
Fixed 500 when depreciation is set but no purchase_date
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 15:39:47 -07:00 |
|
Brady Wetherington
|
1899e4d1e8
|
try/catch wrap notifications on checkin/checkout
|
2022-09-15 13:18:42 -07:00 |
|
|
snipe
|
481eb2c7f0
|
Merge remote-tracking branch 'origin/develop'
|
2022-09-15 11:40:33 -07:00 |
|