snipe
|
ed98683496
|
Add @mikecmpbll as a contributor
|
2021-05-04 22:40:04 -07:00 |
|
|
snipe
|
c1a8b609ea
|
Add @markbrule as a contributor
|
2021-05-04 22:27:35 -07:00 |
|
|
snipe
|
6c0af3c6e1
|
Add @JohnnyPicnic as a contributor
|
2021-05-04 22:21:18 -07:00 |
|
|
snipe
|
36c2edb278
|
Add @nepella as a contributor
|
2021-04-21 11:40:38 -07:00 |
|
|
snipe
|
dd1a5681da
|
Add @psarossy as a contributor
|
2021-04-20 14:53:10 -07:00 |
|
|
snipe
|
e92f69dcda
|
Add @zybersup as a contributor
|
2021-04-20 14:52:29 -07:00 |
|
|
snipe
|
3e471a6587
|
Add @sh1hab as a contributor
|
2021-04-20 14:49:31 -07:00 |
|
|
snipe
|
415ae5854f
|
Add @Skywalker-11 as a contributor
|
2021-04-14 15:15:57 -07:00 |
|
|
snipe
|
252b2ee1b4
|
Add @Jelle-S as a contributor
|
2021-04-14 15:07:40 -07:00 |
|
|
snipe
|
2c0438bdcb
|
Add @andreaci as a contributor
|
2021-04-14 11:18:13 -07:00 |
|
|
snipe
|
f19595f525
|
Add @deivishome as a contributor
|
2021-04-14 10:27:08 -07:00 |
|
|
snipe
|
465ec054d3
|
Add @limeless as a contributor
|
2021-04-14 10:22:58 -07:00 |
|
|
snipe
|
ab8f7e7b84
|
Add @Joly0 as a contributor
|
2021-04-14 10:21:18 -07:00 |
|
|
snipe
|
abddda2ab8
|
Add @kajes as a contributor
|
2021-04-05 21:56:45 -07:00 |
|
|
snipe
|
55692bfe98
|
Add @Tetrachloromethane250 as a contributor
|
2021-04-05 21:52:14 -07:00 |
|
|
snipe
|
f147c43dd4
|
Add @t3easy as a contributor
|
2021-04-05 21:04:39 -07:00 |
|
|
snipe
|
c9ec15101c
|
Add @ajsy as a contributor
|
2021-04-05 20:56:39 -07:00 |
|
|
snipe
|
298bfa73c8
|
Add @ocelotsloth as a contributor
|
2021-04-05 20:35:28 -07:00 |
|
|
snipe
|
26b97d2b0b
|
Add @JuustoMestari as a contributor
|
2021-04-05 20:16:35 -07:00 |
|
|
snipe
|
53651ba3df
|
Add @misilot as a contributor
|
2021-03-24 14:09:02 -07:00 |
|
|
snipe
|
d527f23ec8
|
Add @raelldottin as a contributor
|
2021-03-24 14:08:56 -07:00 |
|
|
snipe
|
ca882e2b3d
|
Add @elyscape as a contributor
|
2021-03-15 16:42:52 -07:00 |
|
|
snipe
|
52bf050c4f
|
Add @joelpittet as a contributor
|
2021-02-26 15:59:17 -08:00 |
|
|
snipe
|
f636aac2dd
|
Add @sw-mreyes as a contributor
|
2021-02-19 10:11:52 -08:00 |
|
|
snipe
|
bfadb2cea6
|
Add @koelle25 as a contributor
|
2021-02-17 12:58:57 -08:00 |
|
|
snipe
|
2a88781cd5
|
Add @Kurokat as a contributor
|
2021-02-03 16:07:25 -08:00 |
|
|
snipe
|
f96c867bd3
|
Update @ghost as a contributor
|
2021-02-03 16:07:06 -08:00 |
|
|
snipe
|
06f8e8620a
|
Add @EDVLeer as a contributor
|
2021-02-03 16:06:28 -08:00 |
|
|
snipe
|
95d907c9e9
|
Add @sean-borg as a contributor
|
2021-02-03 16:06:14 -08:00 |
|
|
snipe
|
d990152856
|
Add @andres-baller as a contributor
|
2021-02-03 16:05:45 -08:00 |
|
|
snipe
|
05609230b2
|
Add @ncareau as a contributor
|
2021-02-03 16:05:21 -08:00 |
|
|
snipe
|
220c254093
|
Add @benwa as a contributor
|
2021-02-03 16:05:06 -08:00 |
|
|
snipe
|
02313ce361
|
Add @fashberg as a contributor
|
2021-02-03 16:04:47 -08:00 |
|
|
snipe
|
e70f7c610a
|
Add @winstan as a contributor
|
2021-02-03 16:03:20 -08:00 |
|
|
snipe
|
32f77c3285
|
Add @alek13 as a contributor
|
2021-02-03 16:02:49 -08:00 |
|
|
snipe
|
0a639f4fcc
|
Add @ThoBur as a contributor
|
2021-02-03 16:02:38 -08:00 |
|
|
snipe
|
f2b55fb641
|
Add @PauloLuna as a contributor
|
2021-02-03 16:02:27 -08:00 |
|
|
snipe
|
0e443356f0
|
Add @iansltx as a contributor
|
2021-02-03 16:02:00 -08:00 |
|
|
snipe
|
76f7f01398
|
Add @derlucas as a contributor
|
2021-02-03 16:01:42 -08:00 |
|
|
snipe
|
992de0156b
|
Add @phenixdotnet as a contributor
|
2021-02-03 16:01:27 -08:00 |
|
|
snipe
|
c96b5f5a85
|
Add @sigmoidal as a contributor
|
2021-02-03 16:01:12 -08:00 |
|
|
snipe
|
8d2685f0f0
|
Add @PeterDaveHello as a contributor
|
2021-02-03 16:01:00 -08:00 |
|
|
snipe
|
eb14cc7f43
|
Add @giannello as a contributor
|
2021-02-03 15:59:48 -08:00 |
|
|
snipe
|
6e068ec339
|
Add @chamilton-ccn as a contributor
|
2020-11-16 22:15:59 -08:00 |
|
|
snipe
|
7432e3fb2d
|
Add @dampfklon as a contributor
|
2020-11-12 15:28:29 -08:00 |
|
|
snipe
|
9ba290e507
|
Add @jbiel as a contributor
|
2020-08-26 13:39:53 -07:00 |
|
|
snipe
|
09190e05ae
|
Add @PeterUpfold as a contributor
|
2020-08-10 17:24:20 -07:00 |
|
|
snipe
|
2bb5ac61a9
|
Add @sanjay900 as a contributor
|
2020-07-31 11:02:06 -07:00 |
|
|
snipe
|
6018a9c6ee
|
Add @johnson-yi as a contributor
|
2020-05-06 19:21:56 -07: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 |
|