snipe
|
9d3aed42b7
|
Add @denzfarid as a contributor
|
2022-06-05 17:16:58 -07:00 |
|
|
snipe
|
747b58cb59
|
Bumped laravel version in readme
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 16:09:00 -07:00 |
|
|
snipe
|
91e6acbfd9
|
Add @veenone as a contributor
|
2022-04-05 18:52:17 +01:00 |
|
|
snipe
|
a937bd34f6
|
Merge master back down into develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-29 16:28:43 +01:00 |
|
|
snipe
|
a5c16c6a9c
|
Update @insert-waffle as a contributor
|
2022-02-24 14:47:48 -08:00 |
|
|
snipe
|
dd5f812d88
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/FixDoubleEscape.php
# app/Console/Commands/LdapSync.php
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/CompaniesController.php
# app/Http/Controllers/Api/DepartmentsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Models/Loggable.php
# app/Providers/AuthServiceProvider.php
# config/version.php
# database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
# database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
# package-lock.json
# package.json
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
# resources/views/hardware/view.blade.php
|
2022-02-20 13:29:12 -08:00 |
|
|
snipe
|
21a6bdabc6
|
Add @insert-waffle as a contributor
|
2022-02-20 11:12:52 -08:00 |
|
|
snipe
|
ee3166cdc2
|
Add @savornicesei as a contributor
|
2022-02-08 15:38:20 -08:00 |
|
|
snipe
|
2e998b110f
|
Add @TenOfTens as a contributor
|
2022-02-01 13:40:31 -08:00 |
|
|
snipe
|
181dc5127f
|
Add @UniversalSuperBox as a contributor
|
2022-01-11 15:03:08 -08:00 |
|
|
snipe
|
dcc199835b
|
Add @nuraeil as a contributor
|
2022-01-10 14:56:22 -08:00 |
|
|
snipe
|
fde5c6c226
|
Add @adagioajanes as a contributor
|
2021-12-24 11:21:46 -08:00 |
|
|
snipe
|
c3d55ee27e
|
Merge master down into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Models/Setting.php
# config/version.php
# resources/lang/af/button.php
# resources/lang/ar/button.php
# resources/lang/bg/button.php
# resources/lang/cs/button.php
# resources/lang/cy/button.php
# resources/lang/da/button.php
# resources/lang/de/button.php
# resources/lang/el/button.php
# resources/lang/en-GB/button.php
# resources/lang/en-ID/button.php
# resources/lang/es-CO/admin/groups/message.php
# resources/lang/es-MX/button.php
# resources/lang/et/admin/custom_fields/general.php
# resources/lang/et/admin/hardware/table.php
# resources/lang/et/admin/kits/general.php
# resources/lang/et/admin/manufacturers/message.php
# resources/lang/et/admin/models/general.php
# resources/lang/et/admin/settings/general.php
# resources/lang/et/button.php
# resources/lang/et/mail.php
# resources/lang/fa/button.php
# resources/lang/fa/help.php
# resources/lang/fi/button.php
# resources/lang/fil/button.php
# resources/lang/fr/button.php
# resources/lang/ga-IE/button.php
# resources/lang/he/button.php
# resources/lang/hr/button.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/auth/message.php
# resources/lang/hu/button.php
# resources/lang/hu/mail.php
# resources/lang/id/admin/hardware/table.php
# resources/lang/id/button.php
# resources/lang/it/button.php
# resources/lang/iu/button.php
# resources/lang/ja/button.php
# resources/lang/ko/button.php
# resources/lang/lt/button.php
# resources/lang/lv/button.php
# resources/lang/mi/button.php
# resources/lang/mk/button.php
# resources/lang/ml-IN/button.php
# resources/lang/mn/button.php
# resources/lang/ms/admin/hardware/table.php
# resources/lang/ms/admin/kits/general.php
# resources/lang/ms/admin/models/general.php
# resources/lang/ms/admin/models/message.php
# resources/lang/ms/admin/settings/general.php
# resources/lang/ms/button.php
# resources/lang/nl/button.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/auth/message.php
# resources/lang/no/button.php
# resources/lang/no/help.php
# resources/lang/no/mail.php
# resources/lang/pl/button.php
# resources/lang/pt-BR/button.php
# resources/lang/pt-PT/auth/message.php
# resources/lang/pt-PT/button.php
# resources/lang/pt-PT/mail.php
# resources/lang/ro/button.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/help.php
# resources/lang/sl/admin/custom_fields/general.php
# resources/lang/sl/admin/hardware/table.php
# resources/lang/sl/admin/kits/general.php
# resources/lang/sl/admin/manufacturers/message.php
# resources/lang/sl/admin/models/general.php
# resources/lang/sl/admin/settings/general.php
# resources/lang/sl/admin/users/general.php
# resources/lang/sl/auth/message.php
# resources/lang/sl/button.php
# resources/lang/sl/help.php
# resources/lang/sr-CS/button.php
# resources/lang/ta/button.php
# resources/lang/th/button.php
# resources/lang/th/mail.php
# resources/lang/tl/button.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/auth/message.php
# resources/lang/tr/button.php
# resources/lang/uk/button.php
# resources/lang/ur-PK/button.php
# resources/lang/vi/button.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-HK/button.php
# resources/lang/zh-TW/admin/hardware/table.php
# resources/lang/zh-TW/button.php
# resources/lang/zu/button.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/slack.blade.php
|
2021-12-16 14:26:24 -08:00 |
|
|
snipe
|
a05fe9c1f7
|
Add @exula as a contributor
|
2021-12-15 09:30:36 -08:00 |
|
|
snipe
|
e20a10a6a1
|
Add @Haxatron as a contributor
|
2021-12-10 15:17:26 -08:00 |
|
|
snipe
|
a579353198
|
Add @bestlong as a contributor
|
2021-11-24 20:04:26 -08:00 |
|
|
snipe
|
7360e15d4e
|
Add @sneak-it as a contributor
|
2021-11-24 20:04:05 -08:00 |
|
|
snipe
|
9dc2fa61b8
|
Add @adamboutcher as a contributor
|
2021-11-24 20:03:52 -08:00 |
|
|
snipe
|
80fd49a59e
|
Add @leitwerk-ag as a contributor
|
2021-11-24 20:03:40 -08:00 |
|
|
snipe
|
d3d199efc3
|
Add @PlaneNuts as a contributor
|
2021-10-28 16:39:28 -07:00 |
|
|
snipe
|
f41ec640fe
|
Added Huntr.dev badge
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-06 12:49:30 -07:00 |
|
|
snipe
|
fa1cf3073b
|
Add @alwism as a contributor
|
2021-10-04 15:04:58 -07:00 |
|
|
snipe
|
71badee78a
|
Add @Robert-Azelis as a contributor
|
2021-10-04 15:04:47 -07:00 |
|
|
snipe
|
cb0d1add8d
|
Add @01ste02 as a contributor
|
2021-10-04 15:04:22 -07:00 |
|
|
snipe
|
1b0d11a572
|
Add @jethron as a contributor
|
2021-10-04 15:03:50 -07:00 |
|
|
snipe
|
9e522b6a4d
|
Add @Computroniks as a contributor
|
2021-10-04 15:03:35 -07:00 |
|
|
snipe
|
a773e70936
|
Add @Toreg87 as a contributor
|
2021-10-04 15:03:23 -07:00 |
|
|
snipe
|
92a38f2a23
|
Add @jerm as a contributor
|
2021-10-04 15:03:05 -07:00 |
|
|
snipe
|
542f774c68
|
Add @FliegenKLATSCH as a contributor
|
2021-10-04 15:02:56 -07:00 |
|
|
snipe
|
67e106c7fa
|
Add @AL4AL as a contributor
|
2021-10-04 15:02:51 -07:00 |
|
|
snipe
|
f232579e2b
|
Added Discord badge
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-28 20:02:46 -07:00 |
|
|
snipe
|
81f1f4ce6f
|
Add @vapier as a contributor
|
2021-09-20 15:07:37 -07:00 |
|
Jason Spriggs
|
bae3c9ce93
|
Add Deploy to Heroku button to README
|
2021-09-05 10:34:48 -04:00 |
|
JJ Asghar
|
07a2ef2234
|
Update README.md
Typo.
|
2021-08-31 11:11:19 -05:00 |
|
Gage K. Holland
|
63a5c70e8e
|
Update README.md
|
2021-08-10 09:16:51 +01:00 |
|
|
snipe
|
7b4cc5044b
|
Add @derdeagle as a contributor
|
2021-06-23 14:31:48 -07:00 |
|
|
snipe
|
c684e5f481
|
Add @PetriAsi as a contributor
|
2021-06-23 14:31:16 -07:00 |
|
|
snipe
|
c567ad0617
|
Add @travismiller as a contributor
|
2021-06-10 15:18:02 -07:00 |
|
|
snipe
|
11f1b29db9
|
Add @kcoyo as a contributor
|
2021-05-26 13:04:51 -07:00 |
|
|
snipe
|
3f559c4a50
|
Add @tbrconnect as a contributor
|
2021-05-12 13:38:56 -07:00 |
|
|
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 |
|