snipe
|
b7cc12a466
|
Merge remote-tracking branch 'origin/develop'
|
2020-11-09 22:53:23 -08:00 |
|
|
snipe
|
5abfbdd1d2
|
Allow API token expiration in years to be configured via env
|
2020-11-09 22:52:55 -08:00 |
|
|
snipe
|
b59269d5e2
|
Bumped version
|
2020-11-09 21:46:42 -08:00 |
|
|
snipe
|
8bbf8409b1
|
Bumped hash
|
2020-11-09 21:46:08 -08:00 |
|
|
snipe
|
d76eea53c4
|
Bumped hash
|
2020-11-09 19:45:27 -08:00 |
|
|
snipe
|
e0103a7fbd
|
Fixed #8595 - Updated spatie settings
|
2020-11-03 14:50:02 -08:00 |
|
|
snipe
|
4d003ac97a
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# app/Http/Controllers/Auth/ResetPasswordController.php
# config/version.php
|
2020-11-03 11:49:34 -08:00 |
|
|
snipe
|
9f4a212b44
|
Bumped hash
|
2020-11-03 11:47:58 -08:00 |
|
|
snipe
|
12667f41b9
|
bumped hash
|
2020-11-03 11:47:13 -08:00 |
|
|
snipe
|
b29f794b35
|
password.expire updated for forgotten password token expiration
|
2020-11-02 23:58:09 -08:00 |
|
|
snipe
|
001bb3cbe2
|
Bumped version to “pre”
|
2020-10-26 15:04:22 -07:00 |
|
|
snipe
|
2844800caf
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-10-26 14:26:05 -07:00 |
|
|
snipe
|
7937258f6e
|
Bumped version
|
2020-10-26 14:24:19 -07:00 |
|
|
snipe
|
c93f4ef0d5
|
Merge remote-tracking branch 'origin/develop'
|
2020-10-23 19:50:56 -07:00 |
|
|
snipe
|
2602e4d602
|
Exclude the config directory from backups
Everything there is handled via .env anyway
|
2020-10-23 18:21:32 -07:00 |
|
|
snipe
|
79a4acae1a
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-10-23 14:29:40 -07:00 |
|
|
snipe
|
91e0b26bbb
|
Bumped version
|
2020-10-23 14:28:55 -07:00 |
|
|
snipe
|
f182ce1c89
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-10-23 01:12:54 -07:00 |
|
|
snipe
|
c6dde67e86
|
Bumped version
|
2020-10-23 01:12:19 -07:00 |
|
|
snipe
|
810f6a3970
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-10-21 12:03:23 -07:00 |
|
|
snipe
|
33236f16ac
|
Bumped minor version
|
2020-10-21 12:01:36 -07:00 |
|
Folke Ashberg
|
1687e4b850
|
Fix for Issue #8543
* trustedproxy.php sets 'proxies' again according to
env('APP_TRUSTED_PROXIES') again
|
2020-10-21 10:36:27 +02:00 |
|
|
snipe
|
870b097f03
|
Derp. Should be master
|
2020-10-19 17:49:56 -07:00 |
|
|
snipe
|
a62e8413ba
|
Updated version
|
2020-10-19 16:36:25 -07:00 |
|
|
snipe
|
2dc027e479
|
Bumped GM version
|
2020-10-09 17:29:31 -07:00 |
|
|
snipe
|
4dbf1f58e3
|
Bumped RC to GM
|
2020-10-06 19:11:34 -07:00 |
|
|
snipe
|
b0e9875a50
|
Counting is hard. :(
|
2020-09-24 14:20:29 -07:00 |
|
|
snipe
|
7314bc4c4e
|
Bumped hash for newest RC
|
2020-09-24 14:19:34 -07:00 |
|
Bennett Blodinger
|
83dfa2a28c
|
Merge branch 'develop' into gmaps-8465
|
2020-09-22 17:41:38 -05:00 |
|
|
snipe
|
b9e19468e5
|
Bumped version for v4.9.5
|
2020-09-15 18:43:19 -07:00 |
|
|
snipe
|
426897c902
|
Bumped hash
|
2020-09-15 10:13:55 -07:00 |
|
|
snipe
|
24a52eaeae
|
Bumped hash
|
2020-09-12 10:04:36 -07:00 |
|
|
snipe
|
e321aeabae
|
Merge branch 'master' into integrations/2020-08-31-v5-rc
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/Loggable.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/assets/less/overrides.less
# resources/macros/macros.php
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/labels.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# routes/web/fields.php
# tests/unit/UserTest.php
|
2020-08-31 12:14:44 -07:00 |
|
|
snipe
|
5aaa2430b4
|
Fixes for backups
|
2020-08-28 14:10:43 -07:00 |
|
|
snipe
|
daf748e531
|
Bumped hash
|
2020-07-17 12:32:01 -07:00 |
|
|
snipe
|
ec6ed256fb
|
Bumped minor version
|
2020-07-06 18:45:43 -07:00 |
|
|
snipe
|
05b3a9ad7e
|
Config variable for HSTS
|
2020-06-22 23:17:27 -07:00 |
|
|
snipe
|
af06e42056
|
Bumped version
|
2020-06-17 11:17:25 -07:00 |
|
|
snipe
|
7a785b4952
|
Updated a few flysystem settings
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-28 01:54:29 -07:00 |
|
|
snipe
|
42fe1ea398
|
Set public files specifically to public
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-27 02:30:43 -07:00 |
|
Brady Wetherington
|
b03f8a2425
|
Tweak to Flysystem's filesystems.php to make it work with Snipe-IT
|
2020-05-11 21:41:56 -07:00 |
|
Johnson Yi
|
b2930d6069
|
Added #542: add saml authentication
|
2020-05-06 00:06:19 +10:00 |
|
|
snipe
|
87464e6ec0
|
Merge branch 'develop' into integrations/2020-04-15-v5-merge
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
|
2020-04-20 23:20:34 -07:00 |
|
|
snipe
|
48dfc699d7
|
Bumped version
|
2020-04-09 10:49:50 -07:00 |
|
|
snipe
|
be3e572440
|
Bumped version
|
2020-04-08 11:24:30 -07:00 |
|
|
snipe
|
be79a1f3d6
|
Bumped hash
|
2020-04-02 19:27:41 -07:00 |
|
|
snipe
|
a2fae76eaf
|
Bumped version
|
2020-03-04 22:37:17 -08:00 |
|
|
snipe
|
803f5ad0ab
|
Fixed #7870: fixed SSL connectivity for PaaS DBs (#7874)
|
2020-03-04 19:39:23 -08:00 |
|
|
snipe
|
03c5a42f5a
|
Fixes for flysystem paths :(
|
2020-02-11 20:22:55 -08:00 |
|
|
snipe
|
5ef40340fb
|
Bumped version
|
2019-12-11 19:38:04 -08:00 |
|